From 86f02ab9dc95fb37c1384c7f30dd582b3a9fd860 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 8 Jul 2015 11:36:08 +0300 Subject: qt5: patch qdevice.conf from correct location Mkspecs are now used directly from target sysroot, instead of the symlink. Change-Id: Ibd390b5377e137096e3c92a9b9af1f6ddf36bdff Reviewed-by: aavit --- recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb index 98ff5cc..45d3148 100644 --- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb +++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb @@ -65,4 +65,5 @@ create_sdk_files_append () { echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf } -SDK_POST_INSTALL_COMMAND += "$SUDO_EXEC sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" $native_sysroot/mkspecs/qdevice.pri ;" +SDK_POST_INSTALL_COMMAND += "$SUDO_EXEC sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" \ + $target_sdk_dir/sysroots/@REAL_MULTIMACH_TARGET_SYS@/usr/lib/${QT_DIR_NAME}/mkspecs/qdevice.pri ;" -- cgit v1.2.3-54-g00ecf From b59fc1f10417b7c3542ed87f3f0f1b71ede6194b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 26 Aug 2015 13:10:53 +0300 Subject: qt5: use 5.5-next branch for meta-qt5 5.5-next has been rebased with upstream/master and includes upstream support for Qt 5.5 Change-Id: I8869f56126bd22242cfc05a3077670caa36e364a Reviewed-by: aavit --- scripts/manifest_qt5.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest_qt5.xml b/scripts/manifest_qt5.xml index 1a50a10..69eb254 100644 --- a/scripts/manifest_qt5.xml +++ b/scripts/manifest_qt5.xml @@ -7,7 +7,7 @@ -- cgit v1.2.3-54-g00ecf From 2ddb4bfe04da0a162be32ac0e33b22bfd7b9c098 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 26 Aug 2015 15:08:07 +0300 Subject: qt5: remove separate designer packages qt5-module bbclass already creates ${PN}-designer packages, no need to have them in addons. Change-Id: I5bcf47da769a8f97197cd66fbf8d8118ac03d0a2 Reviewed-by: aavit --- recipes-qt/qt5-addons/qtcharts_2.0.bb | 9 --------- recipes-qt/qt5-addons/qtdatavisualization_1.2.bb | 4 ---- 2 files changed, 13 deletions(-) diff --git a/recipes-qt/qt5-addons/qtcharts_2.0.bb b/recipes-qt/qt5-addons/qtcharts_2.0.bb index 216268a..c4d88f4 100644 --- a/recipes-qt/qt5-addons/qtcharts_2.0.bb +++ b/recipes-qt/qt5-addons/qtcharts_2.0.bb @@ -37,12 +37,3 @@ BRANCH = "master" S = "${WORKDIR}/git" DEPENDS = "qtbase qtdeclarative qtmultimedia" - -PACKAGES =+ "${PN}-designer" -DEBIAN_NOAUTONAME_${PN}-designer = "1" - -FILES_${PN}-designer = " \ - ${OE_QMAKE_PATH_QML}/QtCharts/designer \ - " - -RRECOMMENDS_${PN}-dev += "${PN}-designer" diff --git a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb index 1a06675..11c4279 100644 --- a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb +++ b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb @@ -37,7 +37,3 @@ BRANCH = "master" S = "${WORKDIR}/git" DEPENDS += "qtbase qtdeclarative qtmultimedia" - -FILES_${PN}-qmlplugins += " \ - ${OE_QMAKE_PATH_QML}/QtDataVisualization/designer/* \ - " -- cgit v1.2.3-54-g00ecf From 0af6a703f328205d2185429a44267d80a128b25f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 2 Sep 2015 11:32:59 +0300 Subject: Use correct path for mkspecs Fix qtcreator configure script to use the correct path for mkspecs. Also add command line argument to specify the sdktool location. Change-Id: I6534e1df6dc01767e0e9904d12e7c51c9ec3f0bb Reviewed-by: aavit Reviewed-by: Teemu Holappa --- scripts/configure-qtcreator.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/configure-qtcreator.sh b/scripts/configure-qtcreator.sh index 4ffe64f..7661297 100755 --- a/scripts/configure-qtcreator.sh +++ b/scripts/configure-qtcreator.sh @@ -29,7 +29,7 @@ ABI="arm-linux-generic-elf-32bit" printUsage () { - echo "Usage: $0 [--remove]" + echo "Usage: $0 [--remove] [--sdktool ]" } while test -n "$1"; do @@ -37,17 +37,19 @@ while test -n "$1"; do "--help" | "-h") printUsage exit 0 - shift ;; "--remove") REMOVEONLY=1 + ;; + "--sdktool") shift + SDKTOOL=$1 ;; *) CONFIG=$1 - shift ;; esac + shift done if [ ! -f "$CONFIG" ]; then @@ -65,12 +67,13 @@ fi source $CONFIG -if [ ! -d "${OECORE_NATIVE_SYSROOT}/mkspecs/${MKSPEC}" ]; then - echo Error: $CONFIG is invalid. +MKSPECPATH=$(find ${OECORE_TARGET_SYSROOT} -name $(basename ${MKSPEC})) +if [ ! -d "${MKSPECPATH}" ]; then + echo "Error: could not find mkspec ${MKSPEC} from the toolchain" exit 1 fi -MACHINE=$(grep '^MACHINE' ${OECORE_NATIVE_SYSROOT}/mkspecs/qdevice.pri | cut -d'=' -f2 | tr -d ' ') +MACHINE=$(grep '^MACHINE' ${MKSPECPATH}/../../qdevice.pri | cut -d'=' -f2 | tr -d ' ') RELEASE=$(qmake -query QT_VERSION) -- cgit v1.2.3-54-g00ecf From 52a88e184e3d9541fd76ba09a426420691dfc81d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 8 Sep 2015 12:05:08 +0300 Subject: Add libevent to toolchain and image QtWebEngine 5.6 has dependency to libevent. Change-Id: Id63d2fd0cf8e6baccb872277185fd2ac39a34c99 Reviewed-by: Joerg Bornemann --- recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | 1 + recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index 34a53c9..82e801b 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -59,6 +59,7 @@ RDEPENDS_${PN} = "\ tzdata-asia \ tzdata-europe \ atk \ + libevent \ ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ ${MACHINE_EXTRA_INSTALL} \ " diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb index f567f4e..b31ea3f 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb @@ -49,6 +49,7 @@ RDEPENDS_${PN} += "\ libmysqlclient-dev \ libpq-dev \ atk-dev \ + libevent-dev \ ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \ ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \ ${MACHINE_EXTRA_INSTALL_SDK} \ -- cgit v1.2.3-54-g00ecf From 0ecf64d67502119af80c10aeb564c4e4e41789b9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 1 Sep 2015 13:35:54 +0300 Subject: Use mirror from github to clone git-repo tool The repo tool is normally cloned from google, but in China the url is blocked. Use mirror repo from github by default and add command line parameter to allow using a custom url. Change-Id: I91541fb1e42f8c668f7ff97d29232ca61eb3e20e Reviewed-by: Karim Pinter Reviewed-by: aavit --- b2qt-init-build-env | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 0ccd952..a367d31 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -48,6 +48,10 @@ while test -n "$1"; do shift DEVICE=$1 ;; + "--repo-url") + shift + REPO_URL="--repo-url $1" + ;; *) if [ -n "$COMMAND" ]; then echo "Unknown argument: $1" @@ -70,6 +74,10 @@ if [ -n "${REFERENCE}" ]; then REFERENCE="--reference $(readlink -f ${REFERENCE})" fi +if [ -z "${REPO_URL}" ]; then + REPO_URL="--repo-url git://github.com/theqtcompany/git-repo" +fi + get_repo() { REPO="./repo" if [ -n "$(command -v repo)" ]; then @@ -126,7 +134,7 @@ mirror() { mkdir -p .repo/manifests cp ${DIR}/scripts/manifest.xml .repo/manifests/ MANIFEST="manifest.xml" - ${REPO} init -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g all --mirror + ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g all --mirror ${REPO} sync } @@ -146,7 +154,7 @@ init() { else MANIFEST="manifest.xml" fi - ${REPO} init -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE} + ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE} ${REPO} sync if [ ! -e "sources/meta-b2qt" ]; then -- cgit v1.2.3-54-g00ecf From e3b10f658c196d80db975345d9b5ef3eb8751f9c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 9 Sep 2015 14:11:46 +0300 Subject: Include CDC-ACM kernel module Task-number: QTEE-972 Change-Id: I9fc3e211c2cc4739d7fad210737b7a0cf860d8ce Reviewed-by: Teemu Holappa Reviewed-by: Karim Pinter --- meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb | 1 + meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend | 2 ++ meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend | 1 + meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend | 1 + meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend | 1 + 5 files changed, 6 insertions(+) diff --git a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb index 948382f..87326af 100644 --- a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb +++ b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb @@ -32,4 +32,5 @@ do_configure_prepend() { echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig } diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend index 1d7f942..c25739b 100644 --- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend @@ -45,4 +45,6 @@ do_configure_prepend() { # enable uvcvideo module echo "CONFIG_MEDIA_USB_SUPPORT=y" >> ${WORKDIR}/defconfig echo "CONFIG_USB_VIDEO_CLASS=m" >> ${WORKDIR}/defconfig + + echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig } diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend index 6861aff..b6358d7 100644 --- a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend @@ -38,4 +38,5 @@ do_configure_prepend() { echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig } diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend index d8d2812..f739245 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend @@ -32,4 +32,5 @@ RDEPENDS_kernel-base = "" config_script () { # FunctionFS for adb echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config + echo "CONFIG_USB_ACM=m" >> ${S}/.config } diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend index 76bf87d..fd9ad55 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend @@ -29,5 +29,6 @@ SRC_URI += " \ do_configure_prepend () { # FunctionFS for adb echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig } -- cgit v1.2.3-54-g00ecf From b54b20eb868b68379c792efab0baf8a15cd8a283 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 9 Sep 2015 14:00:35 +0300 Subject: Fix c_rehash run during image creation Add support to run c_rehash using SYSROOT environment variable, so that it can create hashes for the certificates during rootfs build phase of image creation. Change-Id: Ib60d4f9c217334ab7abba98dc07efd2ef8d1c7a5 Task-number: QTEE-971 Reviewed-by: Joerg Bornemann --- .../openssl/0001-Support-SYSROOT-in-c_rehash.patch | 98 ++++++++++++++++++++++ recipes/openssl/openssl_1.%.bbappend | 3 + 2 files changed, 101 insertions(+) create mode 100644 recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch diff --git a/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch b/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch new file mode 100644 index 0000000..01775eb --- /dev/null +++ b/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch @@ -0,0 +1,98 @@ +From 6b833a7767c25b60fb0bb8dcc00484df19946288 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 9 Sep 2015 13:37:28 +0300 +Subject: [PATCH] Support SYSROOT in c_rehash + +update-ca-certificates is ran during image creation, which in turn runs +c_rehash. Since the symlinks in /etc/ssl/certs/ are pointing to absolute +location, c_rehash does not find the actual files. Add support for SYSROOT +environment variable and use it to locate the actual files during image +creation. + +Upstream-status: Pending + +--- + tools/c_rehash.in | 28 ++++++++++++++++++---------- + 1 file changed, 18 insertions(+), 10 deletions(-) + +diff --git a/tools/c_rehash.in b/tools/c_rehash.in +index f8d0ce1..e81ec5b 100644 +--- a/tools/c_rehash.in ++++ b/tools/c_rehash.in +@@ -5,6 +5,7 @@ + # and add symbolic links to their hash values. + + my $openssl; ++my $sysroot; + + my $dir; + my $prefix; +@@ -16,6 +17,10 @@ if(defined $ENV{OPENSSL}) { + $ENV{OPENSSL} = $openssl; + } + ++if(defined $ENV{SYSROOT}) { ++ $sysroot = $ENV{SYSROOT}; ++} ++ + my $pwd; + eval "require Cwd"; + if (defined(&Cwd::getcwd)) { +@@ -76,15 +81,16 @@ sub hash_dir { + } + closedir DIR; + FILE: foreach $fname (grep {/\.pem$/} @flist) { ++ $fullname = $sysroot . readlink($fname); + # Check to see if certificates and/or CRLs present. +- my ($cert, $crl) = check_file($fname); ++ my ($cert, $crl) = check_file($fullname); + if(!$cert && !$crl) { + print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n"; + next; + } +- link_hash_cert($fname) if($cert); +- link_hash_cert_old($fname) if($cert); +- link_hash_crl($fname) if($crl); ++ link_hash_cert($fname, $fullname) if($cert); ++ link_hash_cert_old($fname, $fullname) if($cert); ++ link_hash_crl($fname, $fullname) if($crl); + } + } + +@@ -117,9 +123,10 @@ sub check_file { + + sub link_hash_cert { + my $fname = $_[0]; +- my $hashopt = $_[1] || '-subject_hash'; +- $fname =~ s/'/'\\''/g; +- my ($hash, $fprint) = `"$openssl" x509 $hashopt -fingerprint -noout -in "$fname"`; ++ my $fullname = $_[1]; ++ my $hashopt = $_[2] || '-subject_hash'; ++ $fullname =~ s/'/'\\''/g; ++ my ($hash, $fprint) = `"$openssl" x509 $hashopt -fingerprint -noout -in "$fullname"`; + chomp $hash; + chomp $fprint; + $fprint =~ s/^.*=//; +@@ -150,15 +157,16 @@ sub link_hash_cert { + } + + sub link_hash_cert_old { +- link_hash_cert($_[0], '-subject_hash_old'); ++ link_hash_cert($_[0], $_[1], '-subject_hash_old'); + } + + # Same as above except for a CRL. CRL links are of the form .r + + sub link_hash_crl { + my $fname = $_[0]; +- $fname =~ s/'/'\\''/g; +- my ($hash, $fprint) = `"$openssl" crl -hash -fingerprint -noout -in '$fname'`; ++ my $fullname = $_[1]; ++ $fullname =~ s/'/'\\''/g; ++ my ($hash, $fprint) = `"$openssl" crl -hash -fingerprint -noout -in '$fullname'`; + chomp $hash; + chomp $fprint; + $fprint =~ s/^.*=//; +-- +1.9.1 + diff --git a/recipes/openssl/openssl_1.%.bbappend b/recipes/openssl/openssl_1.%.bbappend index 461cb45..ce68b59 100644 --- a/recipes/openssl/openssl_1.%.bbappend +++ b/recipes/openssl/openssl_1.%.bbappend @@ -20,6 +20,9 @@ ## ############################################################################# +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "file://0001-Support-SYSROOT-in-c_rehash.patch" + PACKAGECONFIG += "perl" do_install_append () { -- cgit v1.2.3-54-g00ecf