From 12ad591d3038db609db5290d8bbe809a34c743de Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 20 Aug 2021 13:58:45 -0400 Subject: Convert to new override syntax This is effectively a manual cherry-pick and squash of commits: 4249268041b879b3d2bae338d5de88f4f2d54b26 07f4ab8c2833ae5377b97cc9e3820bed67e539d0 from the master branch with additional review and fixups. The intent of these changes is to minimize the effort to backport fixes from the master branch, which has been updated in preparation for the switch to the next Yocto LTS release in early 2022. Bug-AGL: SPEC-4144 Signed-off-by: Scott Murray Change-Id: I3b47f1b7d62038b314a17763d24a64f6d4e15e72 --- .../packagegroups/nativesdk-packagegroup-sdk-host.bbappend | 4 ++-- .../packagegroups/packagegroup-agl-app-framework.bbappend | 2 +- .../packagegroups/packagegroup-agl-appfw-html5.bb | 4 ++-- .../packagegroups/packagegroup-agl-appfw-native-qt5.bb | 4 ++-- .../packagegroups/packagegroup-agl-cluster-demo-platform.bb | 6 +++--- .../packagegroup-agl-cluster-demo-qtcompositor.bb | 6 +++--- .../packagegroups/packagegroup-agl-core-devel.bbappend | 2 +- .../packagegroups/packagegroup-agl-demo-platform-html5.bb | 6 +++--- .../packagegroups/packagegroup-agl-demo-platform-qa.bb | 4 ++-- .../packagegroups/packagegroup-agl-demo-platform.bb | 12 ++++++------ .../packagegroups/packagegroup-agl-demo-qt-examples.bb | 4 ++-- recipes-platform/packagegroups/packagegroup-agl-demo.bb | 8 ++++---- .../packagegroups/packagegroup-agl-graphical-services.bb | 4 ++-- .../packagegroup-agl-graphical-weston_agldemo.inc | 4 ++-- recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb | 8 ++++---- .../packagegroups/packagegroup-agl-image-ivi.bbappend | 2 +- .../packagegroups/packagegroup-agl-ivi-connectivity.bb | 4 ++-- .../packagegroups/packagegroup-agl-ivi-connectivity.bbappend | 2 +- .../packagegroups/packagegroup-agl-ivi-graphics.bb | 4 ++-- .../packagegroups/packagegroup-agl-ivi-identity.bb | 2 +- .../packagegroups/packagegroup-agl-ivi-multimedia.bb | 6 +++--- .../packagegroups/packagegroup-agl-ivi-navigation.bb | 2 +- .../packagegroups/packagegroup-agl-ivi-services.bb | 2 +- .../packagegroups/packagegroup-agl-networking.bb | 4 ++-- .../packagegroups/packagegroup-agl-profile-cluster-qt5.bb | 6 +++--- .../packagegroup-agl-profile-cluster-qtcompositor.bb | 8 ++++---- .../packagegroups/packagegroup-agl-profile-cluster.bb | 6 +++--- .../packagegroup-agl-profile-graphical-html5.bb | 8 ++++---- .../packagegroups/packagegroup-agl-profile-graphical-qt5.bb | 8 ++++---- .../packagegroup-agl-profile-graphical.bbappend | 2 +- .../packagegroups/packagegroup-agl-profile-telematics.bb | 6 +++--- .../packagegroup-agl-source-han-sans-ttf-fonts.bb | 4 ++-- .../packagegroups/packagegroup-agl-speech-services.bb | 2 +- .../packagegroup-agl-telematics-demo-platform.bb | 6 +++--- recipes-platform/packagegroups/packagegroup-agl-ttf-fonts.bb | 4 ++-- recipes-platform/packagegroups/packagegroup-hmi-framework.bb | 6 +++--- .../packagegroups/packagegroup-qt5-toolchain-target.bbappend | 4 ++-- 37 files changed, 88 insertions(+), 88 deletions(-) (limited to 'recipes-platform/packagegroups') diff --git a/recipes-platform/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/recipes-platform/packagegroups/nativesdk-packagegroup-sdk-host.bbappend index f75f9ab1e..9476fac5e 100644 --- a/recipes-platform/packagegroups/nativesdk-packagegroup-sdk-host.bbappend +++ b/recipes-platform/packagegroups/nativesdk-packagegroup-sdk-host.bbappend @@ -1,5 +1,5 @@ -RDEPENDS_${PN} =+ "nativesdk-af-main-tools nativesdk-af-binder-devtools" -RDEPENDS_${PN} += "nativesdk-low-level-can-generator \ +RDEPENDS:${PN} =+ "nativesdk-af-main-tools nativesdk-af-binder-devtools" +RDEPENDS:${PN} += "nativesdk-low-level-can-generator \ nativesdk-cmake-apps-module \ nativesdk-cmake-apps-module-doc \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-app-framework.bbappend b/recipes-platform/packagegroups/packagegroup-agl-app-framework.bbappend index d0fa1a2e2..bb9f0f9d7 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-app-framework.bbappend +++ b/recipes-platform/packagegroups/packagegroup-agl-app-framework.bbappend @@ -1 +1 @@ -RDEPENDS_${PN}_append = " systemd-agl-sync run-agl-postinsts" +RDEPENDS:${PN}:append = " systemd-agl-sync run-agl-postinsts" diff --git a/recipes-platform/packagegroups/packagegroup-agl-appfw-html5.bb b/recipes-platform/packagegroups/packagegroup-agl-appfw-html5.bb index cc9ed3d64..6fed7e7d8 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-appfw-html5.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-appfw-html5.bb @@ -9,10 +9,10 @@ PACKAGES = "\ packagegroup-agl-appfw-html5 \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" # add packages for WAM -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ chromium-browser-service \ wam \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-appfw-native-qt5.bb b/recipes-platform/packagegroups/packagegroup-agl-appfw-native-qt5.bb index 2161e1a8e..151245d5d 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-appfw-native-qt5.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-appfw-native-qt5.bb @@ -9,9 +9,9 @@ PACKAGES = "\ packagegroup-agl-appfw-native-qt5 \ " -#ALLOW_EMPTY_${PN} = "1" +#ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ qtbase \ qtbase-dev \ qtbase-plugins \ diff --git a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb index 7902146d5..681a04370 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb @@ -9,9 +9,9 @@ PACKAGES = "\ packagegroup-agl-cluster-demo-platform \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-profile-cluster-qt5 \ packagegroup-agl-ttf-fonts \ packagegroup-agl-source-han-sans-ttf-fonts \ @@ -31,7 +31,7 @@ AGL_APIS = " \ agl-service-signal-composer \ " -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ hmi-debug \ can-utils \ linux-firmware-ralink \ diff --git a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-qtcompositor.bb b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-qtcompositor.bb index 70c7356a0..6a1455e99 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-qtcompositor.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-qtcompositor.bb @@ -9,9 +9,9 @@ PACKAGES = "\ packagegroup-agl-cluster-demo-qtcompositor \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-profile-cluster-qtcompositor \ packagegroup-agl-ttf-fonts \ packagegroup-agl-networking \ @@ -33,7 +33,7 @@ AGL_APPS = " \ cluster-gauges-qtcompositor \ " -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ libva-utils \ linux-firmware-ralink \ can-utils \ diff --git a/recipes-platform/packagegroups/packagegroup-agl-core-devel.bbappend b/recipes-platform/packagegroups/packagegroup-agl-core-devel.bbappend index dfbddd934..37414a170 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-core-devel.bbappend +++ b/recipes-platform/packagegroups/packagegroup-agl-core-devel.bbappend @@ -1,4 +1,4 @@ -RDEPENDS_${PN}_append = "\ +RDEPENDS:${PN}:append = "\ pyagl \ gcov \ gcov-symlinks \ diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb index d1ea021a7..ac82d73c7 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-html5.bb @@ -9,9 +9,9 @@ PACKAGES = "\ packagegroup-agl-demo-platform-html5 \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-image-ivi \ packagegroup-agl-profile-graphical-html5 \ packagegroup-agl-demo \ @@ -28,7 +28,7 @@ AGL_APPS = " \ html5-background \ " -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ weston-ini-conf-landscape \ ${AGL_APPS} \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-qa.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-qa.bb index 739f859b9..ca4cf1571 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform-qa.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform-qa.bb @@ -9,7 +9,7 @@ PACKAGES = "\ packagegroup-agl-demo-platform-qa \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index 72e5d7a61..6fec1fc5c 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -11,13 +11,13 @@ PACKAGES = "\ packagegroup-agl-demo-platform-devel \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-image-ivi \ " -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-profile-graphical-qt5 \ packagegroup-hmi-framework \ packagegroup-agl-demo \ @@ -42,7 +42,7 @@ AGL_APPS = " \ QTAGLEXTRAS = " libqtappfw" # add support for websocket in Qt and QML -QTAGLEXTRAS_append = " qtwebsockets qtwebsockets-qmlplugins" +QTAGLEXTRAS:append = " qtwebsockets qtwebsockets-qmlplugins" #PREFERRED_PROVIDER_virtual/webruntime = "web-runtime" # Cluster demo support. @@ -66,7 +66,7 @@ DEMO_UNIT_CONF += " demo-i2c-udev-conf " # Preload only if agl-demo-preload is set DEMO_PRELOAD = "${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", " ${DEMO_UNIT_CONF} poiapp-api-key", "",d)}" -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ weston-ini-conf \ qtquickcontrols2-agl \ qtquickcontrols2-agl-style \ @@ -82,7 +82,7 @@ RDEPENDS_${PN}_append = " \ # Also, the navigation and mixer debug widgets are currently # specified explicitly, as there's no simple way to derive their # names from the virtual/ RPROVIDES at present. -RDEPENDS_${PN}-devel = " \ +RDEPENDS:${PN}-devel = " \ packagegroup-hmi-framework-devel \ dashboard-dbg \ hvac-dbg \ diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-qt-examples.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-qt-examples.bb index adebabe76..f928d6527 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-qt-examples.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-qt-examples.bb @@ -9,9 +9,9 @@ PACKAGES = "\ packagegroup-agl-demo-qt-examples \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ qt3d-examples \ qtbase-examples \ qtconnectivity-examples \ diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb index b5599ea42..48b605dbd 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb @@ -9,7 +9,7 @@ PACKAGES = "\ packagegroup-agl-demo \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" # MOST out-of-tree kernel drivers ################################# @@ -40,9 +40,9 @@ UNICENS ?= " \ # setting DEMO_ENABLE_BTWILINK to "true" in local.conf / site.conf re-enables. DEMO_ENABLE_BTWILINK ?= "" DEMO_PLATFORM_CONF = "" -DEMO_PLATFORM_CONF_append_ulcb = "${@bb.utils.contains("DEMO_ENABLE_BTWILINK", "true", "", " btwilink-disable-conf", d)}" +DEMO_PLATFORM_CONF:append:ulcb = "${@bb.utils.contains("DEMO_ENABLE_BTWILINK", "true", "", " btwilink-disable-conf", d)}" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ udisks2 \ " @@ -60,7 +60,7 @@ TTF_FONTS = " \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ linux-firmware-ath9k \ linux-firmware-ralink \ can-utils \ diff --git a/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb b/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb index e587ab21c..9152dc4ac 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-graphical-services.bb @@ -7,9 +7,9 @@ PACKAGES = "\ packagegroup-agl-graphical-services \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'agl-service-mediaplayer', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'agl-service-radio', '', d)} \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc index f68b2e21a..83b5c3497 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc +++ b/recipes-platform/packagegroups/packagegroup-agl-graphical-weston_agldemo.inc @@ -1,7 +1,7 @@ -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ agl-compositor \ " # appfw -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ agl-login-manager \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb b/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb index 19cf0e6a0..1f912be22 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bb @@ -8,19 +8,19 @@ PACKAGES = "\ packagegroup-agl-image-ivi \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-image-minimal \ " -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-ivi-connectivity \ packagegroup-agl-ivi-graphics \ packagegroup-agl-ivi-multimedia \ packagegroup-agl-ivi-navigation \ " -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ agl-login-manager \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bbappend b/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bbappend index 8856d9744..a80d9de78 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bbappend +++ b/recipes-platform/packagegroups/packagegroup-agl-image-ivi.bbappend @@ -1,4 +1,4 @@ -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ packagegroup-agl-ivi-identity \ packagegroup-agl-ivi-services \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bb index 17d0d4b63..2820c2118 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bb @@ -8,9 +8,9 @@ PACKAGES = "\ packagegroup-agl-ivi-connectivity \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ bluez5-obex \ ${@bb.utils.contains("DISTRO_FEATURES", "3g", "libqmi", "", d)} \ rtl-sdr \ diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bbappend b/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bbappend index 6e19d78c4..dcff983b2 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bbappend +++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-connectivity.bbappend @@ -1,5 +1,5 @@ -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ agl-service-nfc \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb index d7650564b..c5807ed2f 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-graphics.bb @@ -8,7 +8,7 @@ PACKAGES = "\ packagegroup-agl-ivi-graphics \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-identity.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-identity.bb index fa157c8f0..b5549a0dc 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-ivi-identity.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-identity.bb @@ -1,6 +1,6 @@ inherit packagegroup -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ agl-service-data-persistence \ agl-service-identity-agent \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb index 34622efd0..2f6521a53 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-multimedia.bb @@ -8,9 +8,9 @@ PACKAGES = "\ packagegroup-agl-ivi-multimedia \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ gstreamer1.0-plugins-base-meta \ gstreamer1.0-plugins-good-meta \ lightmediascanner-meta \ @@ -22,6 +22,6 @@ PIPEWIRE = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'packagegroup-pipewire', '', d)}\ " -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ ${PIPEWIRE} \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-navigation.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-navigation.bb index c42d0250c..9db2c0bf0 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-ivi-navigation.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-navigation.bb @@ -10,7 +10,7 @@ PACKAGES = "\ packagegroup-agl-ivi-navigation \ " -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ gpsd \ geoclue \ ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'virtual/gpsd-conf', '', d)} \ diff --git a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb index 2b09fa417..39e77fabd 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-ivi-services.bb @@ -7,7 +7,7 @@ PACKAGES = "\ packagegroup-agl-ivi-services \ " -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ agl-service-bluetooth \ agl-service-bluetooth-map \ agl-service-bluetooth-pbap \ diff --git a/recipes-platform/packagegroups/packagegroup-agl-networking.bb b/recipes-platform/packagegroups/packagegroup-agl-networking.bb index c1f5ff115..c3f9c4057 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-networking.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-networking.bb @@ -9,11 +9,11 @@ PACKAGES = "\ packagegroup-agl-networking \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" # fonts -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ connman \ connman-client \ connman-tools \ diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb index 5436a5617..aeef45daa 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qt5.bb @@ -9,13 +9,13 @@ PACKAGES = "\ profile-cluster-qt5 \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-image-boot \ packagegroup-agl-core-security \ packagegroup-agl-graphical-weston \ packagegroup-agl-appfw-native-qt5 \ " -RDEPENDS_profile-cluster-qt5 = "${PN}" +RDEPENDS:profile-cluster-qt5 = "${PN}" diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb index 9d54b33a4..c004f48aa 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster-qtcompositor.bb @@ -9,9 +9,9 @@ PACKAGES = "\ profile-cluster-qt5 \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-image-boot \ packagegroup-agl-core-security \ packagegroup-agl-core-connectivity \ @@ -28,9 +28,9 @@ QT_LITE = " \ qtcompositor-conf \ " -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ ${QT_LITE} \ agl-login-manager \ " -RDEPENDS_profile-cluster-qt5 = "${PN}" +RDEPENDS:profile-cluster-qt5 = "${PN}" diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster.bb index c0c612467..8b1099f38 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-profile-cluster.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-profile-cluster.bb @@ -9,12 +9,12 @@ PACKAGES = "\ profile-cluster \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-image-boot \ packagegroup-agl-core-security \ packagegroup-agl-graphical-weston \ " -RDEPENDS_profile-cluster = "${PN}" +RDEPENDS:profile-cluster = "${PN}" diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-html5.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-html5.bb index 202750140..c25401a24 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-html5.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-html5.bb @@ -9,15 +9,15 @@ PACKAGES = "\ profile-graphical-html5 \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-profile-graphical \ packagegroup-agl-appfw-html5 \ " -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ agl-login-manager \ " -RDEPENDS_profile-graphical-html5 = "${PN}" +RDEPENDS:profile-graphical-html5 = "${PN}" diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb index 74b35f70a..fc30d6a45 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-profile-graphical-qt5.bb @@ -9,15 +9,15 @@ PACKAGES = "\ profile-graphical-qt5 \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-profile-graphical \ packagegroup-agl-appfw-native-qt5 \ " -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ agl-login-manager \ " -RDEPENDS_profile-graphical-qt5 = "${PN}" +RDEPENDS:profile-graphical-qt5 = "${PN}" diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bbappend b/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bbappend index 1c980d93a..56afcfa41 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bbappend +++ b/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bbappend @@ -1,3 +1,3 @@ -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-graphical-services \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-profile-telematics.bb b/recipes-platform/packagegroups/packagegroup-agl-profile-telematics.bb index 66fc0f765..32702d74a 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-profile-telematics.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-profile-telematics.bb @@ -9,9 +9,9 @@ PACKAGES = "\ profile-telematics \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-image-boot \ packagegroup-agl-core-security \ ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','connman','connman connman-client','',d)} \ @@ -22,4 +22,4 @@ RDEPENDS_${PN} += "\ can-utils \ " -RDEPENDS_profile-telematics = "${PN}" +RDEPENDS:profile-telematics = "${PN}" diff --git a/recipes-platform/packagegroups/packagegroup-agl-source-han-sans-ttf-fonts.bb b/recipes-platform/packagegroups/packagegroup-agl-source-han-sans-ttf-fonts.bb index fb3328990..0afb95052 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-source-han-sans-ttf-fonts.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-source-han-sans-ttf-fonts.bb @@ -9,11 +9,11 @@ PACKAGES = "\ packagegroup-agl-source-han-sans-ttf-fonts \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" # fonts -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ source-han-sans-cn-fonts \ source-han-sans-jp-fonts \ source-han-sans-tw-fonts \ diff --git a/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb b/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb index acdeca72a..18691c2a0 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb @@ -7,7 +7,7 @@ PACKAGES = "\ packagegroup-agl-speech-services \ " -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ agl-service-voice-high \ agl-service-voice-high-capabilities \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb index 0dbbd6297..548337d45 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-telematics-demo-platform.bb @@ -9,9 +9,9 @@ PACKAGES = "\ packagegroup-agl-telematics-demo-platform \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-profile-telematics \ " @@ -23,7 +23,7 @@ AGL_APIS = " \ agl-service-gps \ " -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ gpsd \ sw-gpsd-udev-conf \ usb-can-udev-conf \ diff --git a/recipes-platform/packagegroups/packagegroup-agl-ttf-fonts.bb b/recipes-platform/packagegroups/packagegroup-agl-ttf-fonts.bb index 9a3b578c0..4bc11de68 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-ttf-fonts.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-ttf-fonts.bb @@ -9,11 +9,11 @@ PACKAGES = "\ packagegroup-agl-ttf-fonts \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" # fonts -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ ttf-bitstream-vera \ ttf-dejavu-sans \ ttf-dejavu-sans-mono \ diff --git a/recipes-platform/packagegroups/packagegroup-hmi-framework.bb b/recipes-platform/packagegroups/packagegroup-hmi-framework.bb index 6061bf43d..d4f32d483 100644 --- a/recipes-platform/packagegroups/packagegroup-hmi-framework.bb +++ b/recipes-platform/packagegroups/packagegroup-hmi-framework.bb @@ -15,7 +15,7 @@ PACKAGES = "\ packagegroup-hmi-framework-devel \ " -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ agl-service-homescreen \ homescreen \ libhomescreen \ @@ -25,11 +25,11 @@ RDEPENDS_${PN} = " \ " # temporarily disable due to failure to install package when AGLCI is on -#RDEPENDS_append_${PN} = " ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'homescreen-demo-ci', '', d)}" +#RDEPENDS:append_${PN} = " ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'homescreen-demo-ci', '', d)}" # NOTE: Currently no coverage versions of these widgets, they should # be added here when available. -RDEPENDS_${PN}-devel = " \ +RDEPENDS:${PN}-devel = " \ agl-service-homescreen-dbg \ homescreen-dbg \ launcher-dbg \ diff --git a/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend b/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend index 08afa6c7f..a677f40db 100644 --- a/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend +++ b/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend @@ -1,6 +1,6 @@ # add missing dependencies for SDK -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ qttools-plugins \ qtquickcontrols-dev \ qtquickcontrols-qmlplugins \ @@ -11,7 +11,7 @@ RDEPENDS_${PN} += " \ # remove dependency on qtwebkit (still added to SDK by packagegroup-qt5-toolchain-target) # see SPEC-1159 -RDEPENDS_${PN}_remove = " \ +RDEPENDS:${PN}:remove = " \ qtwebkit-dev \ qtwebkit-mkspecs \ qtwebkit-qmlplugins \ -- cgit 1.2.3-korg