From 95fea5050884c2138bd72bc540f53df48bc14da2 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 29 Nov 2017 16:17:05 +0200 Subject: qdb: use -native name for the recipe Bitbake will otherwise try to find the manifest file from wrong architecture. WARNING: Manifest .../manifest-allarch-installer-framework.populate_sysroot not found? Change-Id: I9766aac3bc1a8f97cf2fc095410af7fb92689dd3 Reviewed-by: Kari Hormi --- classes/qbsp.bbclass | 2 +- .../qt5-addons/installer-framework-native_3.0.1.bb | 50 ++++++++++++++++++++++ recipes-qt/qt5-addons/installer-framework_3.0.1.bb | 50 ---------------------- 3 files changed, 51 insertions(+), 51 deletions(-) create mode 100644 recipes-qt/qt5-addons/installer-framework-native_3.0.1.bb delete mode 100644 recipes-qt/qt5-addons/installer-framework_3.0.1.bb diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass index 57aa7ca..b3f4521 100644 --- a/classes/qbsp.bbclass +++ b/classes/qbsp.bbclass @@ -43,7 +43,7 @@ SRC_URI = "\ INHIBIT_DEFAULT_DEPS = "1" do_qbsp[depends] += "\ p7zip-native:do_populate_sysroot \ - installer-framework:do_populate_sysroot \ + installer-framework-native:do_populate_sysroot \ ${QBSP_SDK_TASK}:do_populate_sdk \ ${QBSP_IMAGE_TASK}:do_image_complete \ " diff --git a/recipes-qt/qt5-addons/installer-framework-native_3.0.1.bb b/recipes-qt/qt5-addons/installer-framework-native_3.0.1.bb new file mode 100644 index 0000000..5bc09c0 --- /dev/null +++ b/recipes-qt/qt5-addons/installer-framework-native_3.0.1.bb @@ -0,0 +1,50 @@ +############################################################################ +## +## Copyright (C) 2017 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$ +## +############################################################################ + +DESCRIPTION = "Qt Installer Framework" +LICENSE = "The-Qt-Company-DCLA-2.1" +LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" + +inherit bin_package native + +do_unpack[depends] += "p7zip-native:do_populate_sysroot" + +SRC_URI = "http://download.qt.io/development_releases/installer-framework/${PV}/installer-framework-build-stripped-${PV}-linux-x64.7z" + +SRC_URI[md5sum] = "68b7c1f761ca0dba18f1d165d66005d6" +SRC_URI[sha256sum] = "c2eb769351025e0c7df2882116390fffaf958368f873a2abab99e37caee0a498" + +S = "${WORKDIR}/ifw-pkg" + +do_install() { + install -d ${D}${bindir} + install -m 0755 -t ${D}${bindir} ${S}/bin/* +} + +INSANE_SKIP_${PN} += "already-stripped" diff --git a/recipes-qt/qt5-addons/installer-framework_3.0.1.bb b/recipes-qt/qt5-addons/installer-framework_3.0.1.bb deleted file mode 100644 index 5bc09c0..0000000 --- a/recipes-qt/qt5-addons/installer-framework_3.0.1.bb +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################ -## -## Copyright (C) 2017 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$ -## -############################################################################ - -DESCRIPTION = "Qt Installer Framework" -LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" - -inherit bin_package native - -do_unpack[depends] += "p7zip-native:do_populate_sysroot" - -SRC_URI = "http://download.qt.io/development_releases/installer-framework/${PV}/installer-framework-build-stripped-${PV}-linux-x64.7z" - -SRC_URI[md5sum] = "68b7c1f761ca0dba18f1d165d66005d6" -SRC_URI[sha256sum] = "c2eb769351025e0c7df2882116390fffaf958368f873a2abab99e37caee0a498" - -S = "${WORKDIR}/ifw-pkg" - -do_install() { - install -d ${D}${bindir} - install -m 0755 -t ${D}${bindir} ${S}/bin/* -} - -INSANE_SKIP_${PN} += "already-stripped" -- cgit v1.2.3-54-g00ecf