From 0af8477aaa48831eff9669466413266e8a26f98e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Nov 2017 15:49:52 +0200 Subject: qbsp: update installer-framework Use latest release from publicly available server. Search files for QBSP_IMAGE_CONTENT from alternative locations. Task-number: QTBUG-64522 Change-Id: I64fd9f28640db996d908dc74b48cf0f462d74b52 Reviewed-by: Mikko Gronoff --- classes/qbsp-image.bbclass | 9 +++- recipes-qt/qt5-addons/installer-framework_2.0.3.bb | 48 --------------------- recipes-qt/qt5-addons/installer-framework_3.0.1.bb | 50 ++++++++++++++++++++++ 3 files changed, 58 insertions(+), 49 deletions(-) delete mode 100644 recipes-qt/qt5-addons/installer-framework_2.0.3.bb create mode 100644 recipes-qt/qt5-addons/installer-framework_3.0.1.bb diff --git a/classes/qbsp-image.bbclass b/classes/qbsp-image.bbclass index b8da767..71d1d45 100644 --- a/classes/qbsp-image.bbclass +++ b/classes/qbsp-image.bbclass @@ -42,7 +42,14 @@ fakeroot do_qbsp_image () { src=`echo $item | awk -F':' '{ print $1 }'` dst=`echo $item | awk -F':' '{ print $2 }'` - install -D -m 0755 ${IMGDEPLOYDIR}/$src ${S}/qbsp/$dst + if [ -e "${IMGDEPLOYDIR}/$src" ]; then + install -D -m 0755 ${IMGDEPLOYDIR}/$src ${S}/qbsp/$dst + elif [ -e "${DEPLOY_DIR_IMAGE}/$src" ]; then + install -D -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/qbsp/$dst + else + echo "Could not copy file $src" + exit 1 + fi done cd ${S}/qbsp diff --git a/recipes-qt/qt5-addons/installer-framework_2.0.3.bb b/recipes-qt/qt5-addons/installer-framework_2.0.3.bb deleted file mode 100644 index 0ea0ec4..0000000 --- a/recipes-qt/qt5-addons/installer-framework_2.0.3.bb +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################ - -DESCRIPTION = "Qt Installer Framework" -LICENSE = "The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b" - -inherit bin_package native - -SRC_URI = "http://ci-files02-hki.intra.qt.io/packages/jenkins/opensource/ifw/installer-framework/installer-framework-build-stripped-linux-x64.7z" - -SRC_URI[md5sum] = "08beb5450c3938fcfd1b380f6aaec75d" -SRC_URI[sha256sum] = "91bfef896db58f28e4c2c6db437b958101a59e87aa880c38b6ddc40ebe6c38e6" - -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 new file mode 100644 index 0000000..5bc09c0 --- /dev/null +++ b/recipes-qt/qt5-addons/installer-framework_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" -- cgit v1.2.3-54-g00ecf