From 9785aefe8a6fea45325bc1ad1e23ab88f8900f5c Mon Sep 17 00:00:00 2001 From: Risto Avila Date: Thu, 22 Sep 2016 14:21:08 +0300 Subject: Update dbus-session-init to work with systemd Change-Id: I7a275d592222ef63f590668087a442f2bb1137a7 Reviewed-by: Samuli Piippo --- recipes/dbus/dbus/dbus-session.init | 13 +++++++++++-- recipes/dbus/dbus/dbus-session.service | 13 +++++++++++++ recipes/dbus/dbus_%.bbappend | 24 +++++++++++++++++++++--- 3 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 recipes/dbus/dbus/dbus-session.service diff --git a/recipes/dbus/dbus/dbus-session.init b/recipes/dbus/dbus/dbus-session.init index 11a6757..0690511 100644 --- a/recipes/dbus/dbus/dbus-session.init +++ b/recipes/dbus/dbus/dbus-session.init @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh ### BEGIN INIT INFO # Provides: dbus # Required-Start: $remote_fs $syslog @@ -17,13 +17,16 @@ # set -e # Source function library. -. /etc/init.d/functions +#. /etc/init.d/functions DAEMON=@bindir@/dbus-launch NAME=dbus-session ADDRESSFILE=/var/run/dbus/session_bus_address UUIDDIR=/var/lib/dbus DESC="session message bus" +APPCONTROLLERPATH="/tmp/b2qt/appcontroller.conf.d" +APPCONTROLLERADDRESSFILE="session_bus_address" + test -x $DAEMON || exit 0 @@ -38,12 +41,18 @@ if [ -e $ADDRESSFILE ]; then . $ADDRESSFILE fi +if [ ! -d $APPCONTROLLERPATH ]; then +mkdir -p $APPCONTROLLERPATH +fi + test "$ENABLED" != "0" || exit 0 start_it_up() { echo -n "Starting $DESC: " $DAEMON --auto-syntax > $ADDRESSFILE + ADDR=`cat $ADDRESSFILE|grep -i DBUS_SESSION_BUS_ADDRESS=` + echo "env=${ADDR%?}" |tr -d \' > ${APPCONTROLLERPATH}/${APPCONTROLLERADDRESSFILE} echo "$NAME." } diff --git a/recipes/dbus/dbus/dbus-session.service b/recipes/dbus/dbus/dbus-session.service new file mode 100644 index 0000000..dbd6fcd --- /dev/null +++ b/recipes/dbus/dbus/dbus-session.service @@ -0,0 +1,13 @@ +[Unit] +Description=D-BUS Session Message Bus. +After=dbus.service + +[Service] +Type=forking +ExecStart=/usr/bin/dbus-session.init start +ExecStop=/usr/bin/dbus-session.init stop +Environment=HOME=/home/root + +[Install] +WantedBy=multi-user.target + diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend index b7fff89..f9f1345 100644 --- a/recipes/dbus/dbus_%.bbappend +++ b/recipes/dbus/dbus_%.bbappend @@ -27,28 +27,46 @@ ## ############################################################################ +inherit systemd + FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" SRC_URI += " \ file://dbus-session.init \ + file://dbus-session.service \ file://dbus-session-address \ " - INITSCRIPT_PACKAGES = "${PN} ${PN}-session-init" INITSCRIPT_NAME_${PN}-session-init = "dbus-session" INITSCRIPT_PARAMS_${PN}-session-init = "start 20 5 3 2 . stop 10 0 1 6 ." PACKAGES =+ "${PN}-session-init" +SYSTEMD_PACKAGES =+ "${PN}-session-init" + FILES_${PN}-session-init = " \ ${sysconfdir}/init.d/dbus-session \ ${sysconfdir}/profile.d/dbus-session-address \ + ${bindir}/dbus-session.init \ + ${systemd_unitdir}/system/dbus-session.service \ " do_install_append_class-target() { + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init + if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d - sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh - install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session + install -m 0755 ${WORKDIR}/dbus-session.init ${D}${sysconfdir}/init.d/dbus-session fi + + if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -m 0755 -d ${D}${bindir}/ + install -m 0755 ${WORKDIR}/dbus-session.init ${D}${bindir}/ + + install -m 0755 -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dbus-session.service ${D}${systemd_unitdir}/system/ + fi + install -d ${D}${sysconfdir}/profile.d install -m 0755 ${WORKDIR}/dbus-session-address ${D}${sysconfdir}/profile.d/ } + +SYSTEMD_SERVICE_${PN}-session-init = "dbus-session.service" -- cgit v1.2.3-54-g00ecf From 92c92eec83fd8c68de419decbe7743b0791dc38c Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 23 Sep 2016 09:52:06 +0300 Subject: Add connman patch to disable connman with boot over nfs A workaround to avoid connman to bring the boot interface down then up during network boot. Task-number: QTBUG-56051 Change-Id: Ic22fac9cd7e9892439fb462f08313cda4d9da9aa Reviewed-by: Samuli Piippo --- recipes/connman/connman_%.bbappend | 24 ++++++++++++++++++++++ ...001-disable-connman-when-booting-over-nfs.patch | 21 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 recipes/connman/connman_%.bbappend create mode 100644 recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch diff --git a/recipes/connman/connman_%.bbappend b/recipes/connman/connman_%.bbappend new file mode 100644 index 0000000..0b03755 --- /dev/null +++ b/recipes/connman/connman_%.bbappend @@ -0,0 +1,24 @@ +############################################################################## +## +## 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$ +## +############################################################################## + +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://0001-disable-connman-when-booting-over-nfs.patch" diff --git a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch new file mode 100644 index 0000000..d45ce18 --- /dev/null +++ b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch @@ -0,0 +1,21 @@ +From a934f6b3ef4c4ff5f36a79d11c9eed59b3ffa9ae Mon Sep 17 00:00:00 2001 +From: Mikko Gronoff +Date: Tue, 20 Sep 2016 11:02:50 +0300 +Subject: [PATCH] Disable connman when booting over NFS + +--- + src/connman.service.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/connman.service.in b/src/connman.service.in +index 7b6195e..3fc197a 100644 +--- a/src/connman.service.in ++++ b/src/connman.service.in +@@ -3,6 +3,7 @@ Description=Connection service + Requires=dbus.socket + After=dbus.socket + Before=remote-fs.target ++ConditionKernelCommandLine=!root=/dev/nfs + + [Service] + Type=dbus -- cgit v1.2.3-54-g00ecf From ab693fb13c88b7134733455c5cb1706813e44e3d Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 26 Sep 2016 09:37:35 +0300 Subject: qt5: update submodules updated final 5.6.2 content Change-Id: I15e5e804a487598091a9809b50687c96cdb3093a Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtwebengine_git.bbappend | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 0fb1a15..7debc2e 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "f242b91189e3bd0cc96dd1a2695eef0521099aea" +SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 529748f..4ab7742 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "f242b91189e3bd0cc96dd1a2695eef0521099aea" +SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 9c92738..cdb1566 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -45,7 +45,7 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "f242b91189e3bd0cc96dd1a2695eef0521099aea" +SRCREV = "b4ada3f0d8feed7dbff22aa780d38ab126020ac6" # Temporarily here, until merged upstream PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index 97ba560..35c9471 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -25,5 +25,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "2f24e3c307aecb657736310948c7cdaad5176678" +SRCREV_qtwebengine = "ec84507898e58a167b185ba674acf300cc695380" SRCREV_chromium = "4d61c01b71fcbe706ea4220d33294d4f5600ca31" -- cgit v1.2.3-54-g00ecf From 4dea735eb4b3c071d706f17776e4e36cb5ff2733 Mon Sep 17 00:00:00 2001 From: Risto Avila Date: Thu, 22 Sep 2016 16:07:35 +0300 Subject: Enable dbus by default for neptune ui Task-number: AUTOSUITE-10 Change-Id: I1961d972a3bc7c4e0f3e7ac0788044629b8dd2f4 Reviewed-by: Samuli Piippo Reviewed-by: Teemu Holappa --- recipes-qt/automotive/neptune-ui/neptune.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service index 32e3243..e9f3793 100644 --- a/recipes-qt/automotive/neptune-ui/neptune.service +++ b/recipes-qt/automotive/neptune-ui/neptune.service @@ -1,9 +1,9 @@ [Unit] Description=Neptune -After=systemd-user-sessions.service +After=dbus.service dbus-session.service systemd-user-sessions.service [Service] -ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml -c am-config.yaml --dbus none Main.qml +ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml --dbus session -c am-config.yaml Main.qml Restart=on-failure WorkingDirectory=/opt/neptune -- cgit v1.2.3-54-g00ecf From 7f9285cfbb79906d1ca96ef9db3b2e0ce16aa3ec Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 4 Oct 2016 12:31:15 +0300 Subject: qt5: update submodules Change-Id: I4a52b28896eab692d628563c72cc09cee5af32c7 Reviewed-by: Risto Avila --- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- recipes-qt/qt5/qt3d_git.bbappend | 2 +- recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtcharts_git.bbappend | 2 +- recipes-qt/qt5/qtconnectivity_git.bbappend | 2 +- recipes-qt/qt5/qtdeclarative-render2d_git.bbappend | 2 +- recipes-qt/qt5/qtdeclarative_git.bbappend | 2 +- recipes-qt/qt5/qtimageformats_git.bbappend | 2 +- recipes-qt/qt5/qtlocation_git.bbappend | 2 +- recipes-qt/qt5/qtmultimedia_git.bbappend | 2 +- recipes-qt/qt5/qtquickcompiler_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bbappend | 2 +- recipes-qt/qt5/qtquickcontrols_git.bbappend | 2 +- recipes-qt/qt5/qtsvg_git.bbappend | 2 +- recipes-qt/qt5/qttools_git.bbappend | 2 +- recipes-qt/qt5/qtwayland-native_git.bbappend | 2 +- recipes-qt/qt5/qtwayland_git.bbappend | 2 +- recipes-qt/qt5/qtwebengine_git.bbappend | 4 ++-- recipes-qt/qt5/qtxmlpatterns_git.bbappend | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 10fcb28..2ee368c 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "dbfd7f304c4d91096e104ec2383d92a37502d836" +SRCREV = "cf88d74466cd6506875676ef2557c179d72fe422" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index 5a522af..1d3b3ed 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend @@ -39,4 +39,4 @@ SRC_URI_append_class-target = " \ file://0001-Remove-qgltf.patch \ " -SRCREV = "db3baec236841f9390e9450772838cb7ba878069" +SRCREV = "88ca1827cf6532b0e8d4fbacb4bc87a515c2cff4" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 62170bc..033db9c 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "dbfd7f304c4d91096e104ec2383d92a37502d836" +SRCREV = "cf88d74466cd6506875676ef2557c179d72fe422" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 8861ba5..cc30534 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -53,7 +53,7 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "dbfd7f304c4d91096e104ec2383d92a37502d836" +SRCREV = "cf88d74466cd6506875676ef2557c179d72fe422" # Temporarily here, until merged upstream PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" diff --git a/recipes-qt/qt5/qtcharts_git.bbappend b/recipes-qt/qt5/qtcharts_git.bbappend index 3a23c41..83f9b7c 100644 --- a/recipes-qt/qt5/qtcharts_git.bbappend +++ b/recipes-qt/qt5/qtcharts_git.bbappend @@ -29,4 +29,4 @@ inherit qtquickcompiler -SRCREV = "c121fb4ad00bc9617a011e040ef5ed695610a504" +SRCREV = "bf26aa9d15e525fdcf6fd3f59268418533f06790" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 84d173a..fa3f91b 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -27,5 +27,5 @@ ## ############################################################################ -SRCREV = "dc1e5850237660df4c64c5ed29e5f7824be6ce81" +SRCREV = "ecc2ca9e9e6b98e8da7c7d223cfa5eb5257591d6" diff --git a/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend b/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend index b6b620b..44e94d5 100644 --- a/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "13a6c51f26128015c0a3c335bdae676b46df6ed6" +SRCREV = "fe2807312ff3d2285b51a4de363b1c1fb8d85f82" diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 727e2b0..cf01acd 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "6839f03051d2950e4721cbb5ee88fa7b07109588" +SRCREV = "48dce24717ca537a6f5d817b2f5cd689df86ad68" diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend index 9b1fe9e..344ee7e 100644 --- a/recipes-qt/qt5/qtimageformats_git.bbappend +++ b/recipes-qt/qt5/qtimageformats_git.bbappend @@ -40,4 +40,4 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -SRCREV = "167f91bebe2ee53fcd13d843dc9e0aad80b92d82" +SRCREV = "ca1370e27a4f86771809b4499da9dc61807ba03e" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index bb03307..acb73bd 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -41,4 +41,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "19642842cea91a4588828362eba023c5da5ab57b" +SRCREV = "c78af3434956645b68dd13ab6b8a945239c5782c" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index f694f7a..ae62be8 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -31,4 +31,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d) ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" -SRCREV = "29a46aa4ac38bf9faedbaca6d1c191d38d2db079" +SRCREV = "da7d462e315fb101fc9112a294b5ca2e3bd35a75" diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 564fc3d..4d0fb6a 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -37,7 +37,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ " -SRCREV = "973a3d4c78c4435c34f1967a737e8b358c88f16f" +SRCREV = "033370939c8d969bfcb529745f643ee5d8a08790" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend index 9b2122d..994ca7a 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend @@ -33,4 +33,4 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ " -SRCREV = "b63d182dc2ab737a814bdee06f20907bec9c26eb" +SRCREV = "9ae57848671419b2622e254af8642fef7b1b7c33" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index 3e22418..c344eec 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -38,4 +38,4 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -SRCREV = "22fab1502f562bccb3c16dde0288aa867e3b094a" +SRCREV = "abe319c9cb811832bb4c9c95290564dfa7b3603a" diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend index 84be9fd..1ebc44c 100644 --- a/recipes-qt/qt5/qtsvg_git.bbappend +++ b/recipes-qt/qt5/qtsvg_git.bbappend @@ -27,7 +27,7 @@ ## ############################################################################ -SRCREV = "55825068ab0e3102bf5f8843c0cccab1ff120ae1" +SRCREV = "4469fbecd4e004979dada2da72573c06719fee3c" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index c46a1a7..f7e6db4 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "cb72077e562a5a53e52f7ac94b0c3c26320c6242" +SRCREV = "781efbabf32e4438ae9c698ce498cc32cc900c57" diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index 5e9bb70..d81cde7 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "19cdda76e8e1803c3c36252088e2f8d756e7cbea" +SRCREV = "2f83f4490b6c644bb02fa6bf9d88e87492418723" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index 5e9bb70..d81cde7 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "19cdda76e8e1803c3c36252088e2f8d756e7cbea" +SRCREV = "2f83f4490b6c644bb02fa6bf9d88e87492418723" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index 0fa4d14..39a07f2 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -33,5 +33,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "801356387748f237b7dc24f9772774573fd83ef0" -SRCREV_chromium = "7f6555e9921bfff1886f1e63bb802c252281e882" +SRCREV_qtwebengine = "3cc148853f0f7468526df9dd2397a70a8eeeedae" +SRCREV_chromium = "950d3ff70f627f0ee30251a84967222d5449e46d" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend index f6e93db..1bb13dd 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend +++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -SRCREV = "30a4041893c8132040cd982c9ca1204345801750" +SRCREV = "332ef472a9597822cd29da143f27c8e4083af621" -- cgit v1.2.3-54-g00ecf From 415e9f875b9c153c62883b5177bf836e722e8800 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 10 Oct 2016 16:57:28 +0300 Subject: Always append to MACHINE_EXTRA_INSTALL Packages are added to MACHINE_EXTRA_INSTALL in multiple places, make sure we always append. This adds back the missing gst plugins to nitrogen6x. Change-Id: I7c424b37d84b0125b74774fd308926e53e031590 Reviewed-by: Risto Avila --- conf/distro/include/am335x-evm.conf | 4 ++-- conf/distro/include/beagleboard.conf | 4 ++-- conf/distro/include/beaglebone.conf | 4 ++-- conf/distro/include/colibri-vf.conf | 4 ++-- conf/distro/include/emulator.conf | 4 ++-- conf/distro/include/imx7dsabresd.conf | 4 ++-- conf/distro/include/intel-corei7-64.conf | 4 ++-- conf/distro/include/nitrogen6x.conf | 2 +- conf/distro/include/nvidia-logan.conf | 4 ++-- conf/distro/include/raspberrypi.inc | 4 ++-- conf/distro/include/rcar-gen2.inc | 2 +- conf/distro/include/smarc-samx6i.conf | 2 +- conf/distro/include/tegra-t18x.conf | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index 12f8a57..4f90a0e 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf @@ -47,12 +47,12 @@ PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" PREFERRED_VERSION_libgles-omap3 = "5.01.01.02" PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.02" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ libgles-omap3 \ libgles-omap3-rawdemos \ lighttpd \ " -MACHINE_EXTRA_INSTALL_SDK = "\ +MACHINE_EXTRA_INSTALL_SDK += "\ libgles-omap3-dev \ " diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index bde997c..7f42acf 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf @@ -43,12 +43,12 @@ PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ libgles-omap3 \ libgles-omap3-rawdemos \ " -MACHINE_EXTRA_INSTALL_SDK = "\ +MACHINE_EXTRA_INSTALL_SDK += "\ libgles-omap3-dev \ " diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf index da4ed1c..54455a3 100644 --- a/conf/distro/include/beaglebone.conf +++ b/conf/distro/include/beaglebone.conf @@ -53,12 +53,12 @@ EXTRA_IMAGEDEPENDS_remove = "u-boot-denx" UBOOT_MACHINE = "am335x_boneblack_config" KERNEL_IMAGETYPE = "zImage" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ libgles-omap3 \ libgles-omap3-rawdemos \ " -MACHINE_EXTRA_INSTALL_SDK = "\ +MACHINE_EXTRA_INSTALL_SDK += "\ libgles-omap3-dev \ " diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 6b2c5bf..002e0e0 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -52,10 +52,10 @@ PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" DISTRO_FEATURES_remove = "webengine" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ opengldummy \ " -MACHINE_EXTRA_INSTALL_SDK = "\ +MACHINE_EXTRA_INSTALL_SDK += "\ opengldummy-dev \ " diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index a8dcc84..cd3a80a 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -43,10 +43,10 @@ KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf" DISTRO_FEATURES_remove = "webengine opengl" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ mount-vboxsf \ " -MACHINE_EXTRA_INSTALL_SDK = "\ +MACHINE_EXTRA_INSTALL_SDK += "\ qtglesstream-dummy-client-dev \ " MACHINE_EXTRA_INSTALL_QT = "\ diff --git a/conf/distro/include/imx7dsabresd.conf b/conf/distro/include/imx7dsabresd.conf index 66d2b4c..b21e5b1 100644 --- a/conf/distro/include/imx7dsabresd.conf +++ b/conf/distro/include/imx7dsabresd.conf @@ -50,9 +50,9 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" DISTRO_FEATURES_remove = "webengine" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ " -MACHINE_EXTRA_INSTALL_SDK = "\ +MACHINE_EXTRA_INSTALL_SDK += "\ " diff --git a/conf/distro/include/intel-corei7-64.conf b/conf/distro/include/intel-corei7-64.conf index 395a631..d350c0e 100644 --- a/conf/distro/include/intel-corei7-64.conf +++ b/conf/distro/include/intel-corei7-64.conf @@ -40,13 +40,13 @@ INITRAMFS_IMAGE = "initramfs-basic" SYSVINIT_ENABLED_GETTYS = "1" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ wayland \ mesa-megadriver \ grub-efi-config \ " -MACHINE_EXTRA_INSTALL_SDK = " \ +MACHINE_EXTRA_INSTALL_SDK += " \ mesa-dev \ " diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 511deab..bfe29bf 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -99,7 +99,7 @@ KERNEL_DEVICETREE += "\ DISTRO_FEATURES_DEFAULT += "wayland" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ bcm4330-nvram-config \ " diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf index 0f932c2..632e31b 100644 --- a/conf/distro/include/nvidia-logan.conf +++ b/conf/distro/include/nvidia-logan.conf @@ -35,7 +35,7 @@ KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-v PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}' NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ libegl \ libgles2 \ tegra-firmware-gk20a \ @@ -43,7 +43,7 @@ MACHINE_EXTRA_INSTALL = "\ libdrm-nv \ " -MACHINE_EXTRA_INSTALL_SDK = "\ +MACHINE_EXTRA_INSTALL_SDK += "\ libegl-dev \ libgles2-dev \ graphics-headers-dev \ diff --git a/conf/distro/include/raspberrypi.inc b/conf/distro/include/raspberrypi.inc index 10b11a3..0833404 100644 --- a/conf/distro/include/raspberrypi.inc +++ b/conf/distro/include/raspberrypi.inc @@ -36,11 +36,11 @@ BOOTFS_CONTENT = "\ BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy" -MACHINE_EXTRA_INSTALL_SDK = " \ +MACHINE_EXTRA_INSTALL_SDK += " \ userland-dev \ " -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ userland \ omxplayer \ " diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc index f196ad5..9b638c3 100644 --- a/conf/distro/include/rcar-gen2.inc +++ b/conf/distro/include/rcar-gen2.inc @@ -106,7 +106,7 @@ RENESAS_WORKAROUNGS = " \ libdrm-tests \ " -MACHINE_EXTRA_INSTALL = " \ +MACHINE_EXTRA_INSTALL += " \ kernel-devicetree \ libdrm-kms \ libegl \ diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf index 95388b6..7c441ff 100644 --- a/conf/distro/include/smarc-samx6i.conf +++ b/conf/distro/include/smarc-samx6i.conf @@ -36,7 +36,7 @@ KERNEL_IMAGETYPE = "uImage" BOOTFS_CONTENT = " " -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ kernel-devicetree \ " diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf index baf7f5c..50ed829 100644 --- a/conf/distro/include/tegra-t18x.conf +++ b/conf/distro/include/tegra-t18x.conf @@ -29,7 +29,7 @@ KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/kernel")}' PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/vibrante-t186ref-linux")}' NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" -MACHINE_EXTRA_INSTALL = "\ +MACHINE_EXTRA_INSTALL += "\ tegra-firmware-fecs \ tegra-firmware-gmicrocode \ tegra-firmware-gpccs \ -- cgit v1.2.3-54-g00ecf