Skip to content
Snippets Groups Projects
Commit 96094585 authored by Samuli Piippo's avatar Samuli Piippo
Browse files

Update meta layers


Pull in latest from poky/yocto and openembedded

Change-Id: Ifd57a6ddb4714eb07b5bbaaf76138e84e0cf07c6
Reviewed-by: default avatarTeemu Holappa <teemu.holappa@theqtcompany.com>
parent e245c1dc
No related branches found
No related tags found
No related merge requests found
############################################################################
##
## Copyright (C) 2016 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
##
## $QT_BEGIN_LICENSE:GPL$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 3 or (at your option) any later version
## approved by the KDE Free Qt Foundation. The licenses are as published by
## the Free Software Foundation and appearing in the file LICENSE.GPL3
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
############################################################################
# Reported upstream https://bugzilla.yoctoproject.org/show_bug.cgi?id=9144
python do_fix_quotes () {
with open(d.expand('${B}/os-release'), 'w') as f:
for field in d.getVar('OS_RELEASE_FIELDS', True).split():
value = d.getVar(field, True)
if value:
f.write('{0}="{1}"\n'.format(field, value))
}
do_verify_if_fixed_by_upstream () {
pretty_name_first_char=$(cat ${B}/os-release | grep "^PRETTY_NAME" | cut -f 2 -d '=' | cut -c1)
if [ "${pretty_name_first_char}" = "\"" ]] ; then
bbwarn "Issue appears to be fixed by upstream, remove this workaround."
fi
}
addtask do_verify_if_fixed_by_upstream after do_compile before do_install
addtask do_fix_quotes after do_verify_if_fixed_by_upstream before do_install
......@@ -17,11 +17,11 @@
<project name="poky"
remote="yocto"
revision="b1f23d1254682866236bfaeb843c0d8aa332efc2"
revision="40376446904ae3529be41737fed9a0b650ed167d"
path="sources/poky"/>
<project name="meta-openembedded"
remote="oe-mirror"
revision="dc5634968b270dde250690609f0015f881db81f2"
revision="8ab04afbffb4bc5184cfe0655049de6f44269990"
path="sources/meta-openembedded"/>
<project name="meta-qt5"
remote="qtyocto"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment