From 95fc94d91fca50d35f4458dce89cbd6a0248bf50 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 19 Apr 2016 17:02:33 +0300 Subject: Make ABI selection more robust in configure-qtcreator.sh Map current TARGET_ARCH to the ABI used by qtcreator. Currently mapping was done by kernel-arch.bbclass and it worked by accident, but it's now broken in jethro. Change-Id: I15c5b60a1bc1dd560685fedac9b61048a1e89266 Reviewed-by: Risto Avila Reviewed-by: Teemu Holappa --- classes/abi-arch.bbclass | 41 +++++++++++++++++++++++++++++++++++ classes/populate_b2qt_qt5_sdk.bbclass | 4 ++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 classes/abi-arch.bbclass diff --git a/classes/abi-arch.bbclass b/classes/abi-arch.bbclass new file mode 100644 index 0000000..826fed4 --- /dev/null +++ b/classes/abi-arch.bbclass @@ -0,0 +1,41 @@ +############################################################################## +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:COMM$ +## +## 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 http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## $QT_END_LICENSE$ +## +############################################################################## + +# map target architecture to abi architectures used by Qt Creator +valid_archs = "arm x86 itanium mips ppc sh" + +def map_abi_arch(a, d): + import re + + valid_archs = d.getVar('valid_archs', True).split() + + if re.match('i.86$', a): return 'x86' + elif re.match('x86.64$', a): return 'x86' + elif re.match('armeb$', a): return 'arm' + elif re.match('aarch64', a): return 'arm' + elif re.match('mips(el|64|64el)$', a): return 'mips' + elif re.match('p(pc|owerpc)(|64)', a): return 'ppc' + elif re.match('sh(3|4)$', a): return 'sh' + elif a in valid_archs: return a + else: + bb.error("cannot map '%s' to a abi architecture" % a) + +ABI = "${@map_abi_arch(d.getVar('TARGET_ARCH', True), d)}" diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/classes/populate_b2qt_qt5_sdk.bbclass index d6b2b10..ae88685 100644 --- a/classes/populate_b2qt_qt5_sdk.bbclass +++ b/classes/populate_b2qt_qt5_sdk.bbclass @@ -19,7 +19,7 @@ ## ############################################################################## -inherit populate_b2qt_sdk populate_sdk_qt5_base +inherit populate_b2qt_sdk populate_sdk_qt5_base abi-arch siteinfo SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs" SDK_MKSPEC = "devices/linux-oe-generic-g++" @@ -65,7 +65,7 @@ create_qtcreator_configure_script () { # add qtcreator configuration script install -m 0755 ${B2QTBASE}/scripts/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH} sed -i -e '/^CONFIG=/c\CONFIG="${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh - sed -i -e '/^ABI=/c\ABI="${ARCH}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh + sed -i -e '/^ABI=/c\ABI="${ABI}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh } create_qtcreator_configure_script_mingw32 () { -- cgit v1.2.3-54-g00ecf From f69d1e363c4b2034c8f66c3dc8c832859f2e9c2f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 21 Apr 2016 15:58:51 +0300 Subject: colibri-vf: change partition alignment to 1M Toradex eboot, used in some of the toradex modules, does not work with FAT partition that starts from the default 4M alignment. This prevents flashing u-boot from our image. Change-Id: Ice28be02090305d0c02206296c23a0c2fe54641c Reviewed-by: Rainer Keller --- conf/distro/include/colibri-vf.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 0d31f99..6512f2b 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -24,6 +24,7 @@ include conf/distro/include/toradex.inc DEPLOY_CONF_NAME = "Toradex Colibri VF" IMAGE_FSTYPES += "ext3 sdcard" +IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" BOOTFS_CONTENT = "\ u-boot-${MACHINE}.imx:u-boot.imx \ -- cgit v1.2.3-54-g00ecf From e3ef984ac6f5926d7a910eff33bafeb5da6c2ff0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 4 May 2016 11:14:41 +0300 Subject: automotive: update src uris after repos were opened Repos are now opened so there is no need to use sdk-sources anymore. Change-Id: Ibad7b3b7f9004b51e119dc1c6897410656f40742 Reviewed-by: Teemu Holappa --- recipes-qt/automotive/neptune-ui_git.bb | 4 ++-- recipes-qt/automotive/qtapplicationmanager_git.bb | 6 +++--- recipes-qt/automotive/qtivi_git.bb | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index aef6034..4dcac1d 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -23,10 +23,10 @@ DESCRIPTION = "Neptune IVI UI" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=024d61f4545fb889faa57982553ce094" -inherit qt5-module sdk-sources systemd +inherit qt5-module systemd SRC_URI = " \ - git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Src/neptune-ui \ + git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=ssh \ file://neptune.service \ " diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb index 2c21d1b..502dd06 100644 --- a/recipes-qt/automotive/qtapplicationmanager_git.bb +++ b/recipes-qt/automotive/qtapplicationmanager_git.bb @@ -23,14 +23,14 @@ DESCRIPTION = "Qt component for application lifecycle management" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=311507adb75495acc0b61d69109485ce" -inherit qmake5 sdk-sources +inherit qmake5 SRC_URI = " \ - git://codereview.qt-project.org/qt/qtapplicationmanager;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Src/qtapplicationmanager \ + git://codereview.qt-project.org/qt/qtapplicationmanager;branch=${BRANCH};protocol=ssh \ " SRCREV = "b7578378b578788c2ae9c60708a2908d3b090c16" -BRANCH = "master" +BRANCH = "dev" DEPENDS = "qtbase qtdeclarative libyaml libarchive \ ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index c2d82df..038a0c4 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -23,14 +23,14 @@ DESCRIPTION = "Qt IVI" LICENSE = "LGPL-3.0" LIC_FILES_CHKSUM = "file://header.LGPL3-PELAGICORE;md5=0f5beb4df202cb6ef5cbc5296f3a3fa4" -inherit qt5-module sdk-sources +inherit qt5-module SRC_URI = " \ - git://codereview.qt-project.org/qt/tqtc-qtivi;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Src/qtivi \ + git://codereview.qt-project.org/qt/qtivi;branch=${BRANCH};protocol=ssh \ " SRCREV = "2d378320dc07b8b3ac9a9ce89b7f7a99caa72f8a" -BRANCH = "master" +BRANCH = "dev" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf