From 42422ac20922a3fa2a6f1ab7c08a25b22769b44a Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 11 Apr 2022 19:44:45 -0400 Subject: Fix remaining use of old override syntax Some usage of the old override syntax crept back in with recent commits, fix those so that building with kirkstone is feasible. Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray Change-Id: I2293a2ad463c52022e2f3f052719dca59b404d6b --- meta-agl-lxc/classes/guest-kernel-module.bbclass | 2 +- meta-agl-lxc/conf/multiconfig/agl-container-ivi.conf | 2 +- .../kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend | 2 +- meta-agl-lxc/recipes-demo/ilm-manager/ilm-manager_git.bb | 8 ++++---- meta-agl-lxc/recipes-demo/momiscreen/momiscreen_git.bb | 2 +- .../packagegroups/packagegroup-agl-ros2-ydlidar.bb | 2 +- .../recipes-ros2/ydlidar-ros2-sdk/ydlidar-ros2-sdk_1.4.7.bb | 2 +- templates/feature/agl-egvirt/50_local.conf.inc | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta-agl-lxc/classes/guest-kernel-module.bbclass b/meta-agl-lxc/classes/guest-kernel-module.bbclass index bbe25c20..6c8da4a2 100644 --- a/meta-agl-lxc/classes/guest-kernel-module.bbclass +++ b/meta-agl-lxc/classes/guest-kernel-module.bbclass @@ -18,4 +18,4 @@ do_install:aglcontainerguest() { # Guest doesn't build the module, so go ahead and quiet warnings about # double '/' in base recipe definition -FILES_${PN}:aglcontainerguest = "" +FILES:${PN}:aglcontainerguest = "" diff --git a/meta-agl-lxc/conf/multiconfig/agl-container-ivi.conf b/meta-agl-lxc/conf/multiconfig/agl-container-ivi.conf index 9c44da98..4553e7a2 100644 --- a/meta-agl-lxc/conf/multiconfig/agl-container-ivi.conf +++ b/meta-agl-lxc/conf/multiconfig/agl-container-ivi.conf @@ -1,5 +1,5 @@ # The aglcontainerguest is a common keyword for agl container. -OVERRIDES_append = ":aglcontainerguest" +OVERRIDES:append = ":aglcontainerguest" # The aglcontainerivi is specific keyword for ivi guest. OVERRIDES:append = ":aglcontainerivi" diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend index f41a0ec4..057613fb 100644 --- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend +++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend @@ -6,4 +6,4 @@ do_install:aglcontainerguest:append() { } PACKAGES:append:aglcontainerguest = " ${PN}-dev" -FILES_${PN}-dev:aglcontainerguest += "${includedir}" +FILES:${PN}-dev:aglcontainerguest += "${includedir}" diff --git a/meta-agl-lxc/recipes-demo/ilm-manager/ilm-manager_git.bb b/meta-agl-lxc/recipes-demo/ilm-manager/ilm-manager_git.bb index 12f14c84..209cd978 100644 --- a/meta-agl-lxc/recipes-demo/ilm-manager/ilm-manager_git.bb +++ b/meta-agl-lxc/recipes-demo/ilm-manager/ilm-manager_git.bb @@ -9,7 +9,7 @@ PV = "0.1.0+rev${SRCPV}" SRCREV = "e3a33d47195e4656f7117753d27a0f2d6b21aab9" SRC_URI = " \ - git://github.com/AGLExport/ilm-manager.git;protocol=https \ + git://github.com/AGLExport/ilm-manager.git;branch=master;protocol=https \ file://agl.json \ file://ilm-manager.service \ " @@ -17,7 +17,7 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig systemd -do_install_append() { +do_install:append() { #install scripts install -d ${D}/etc install -m 0644 ${WORKDIR}/agl.json ${D}/etc @@ -26,6 +26,6 @@ do_install_append() { install -m 0644 ${WORKDIR}/ilm-manager.service ${D}/lib/systemd/system } -FILES_${PN} += " ${systemd_unitdir} /etc/* " +FILES:${PN} += " ${systemd_unitdir} /etc/* " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "ilm-manager.service" +SYSTEMD_SERVICE:${PN} = "ilm-manager.service" diff --git a/meta-agl-lxc/recipes-demo/momiscreen/momiscreen_git.bb b/meta-agl-lxc/recipes-demo/momiscreen/momiscreen_git.bb index 6fdc3097..35fc6e75 100644 --- a/meta-agl-lxc/recipes-demo/momiscreen/momiscreen_git.bb +++ b/meta-agl-lxc/recipes-demo/momiscreen/momiscreen_git.bb @@ -25,7 +25,7 @@ inherit qmake5 systemd QT_INSTALL_PREFIX = "/usr" -do_install_append() { +do_install:append() { install -d ${D}/lib/systemd/system install -m 0644 ${WORKDIR}/momiscreen.service ${D}/lib/systemd/system diff --git a/meta-agl-ros2/recipes-platform/packagegroups/packagegroup-agl-ros2-ydlidar.bb b/meta-agl-ros2/recipes-platform/packagegroups/packagegroup-agl-ros2-ydlidar.bb index 7fcee019..a066e85a 100644 --- a/meta-agl-ros2/recipes-platform/packagegroups/packagegroup-agl-ros2-ydlidar.bb +++ b/meta-agl-ros2/recipes-platform/packagegroups/packagegroup-agl-ros2-ydlidar.bb @@ -7,7 +7,7 @@ PACKAGES = "\ packagegroup-agl-ros2-ydlidar \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" RDEPENDS:${PN} += " \ ydlidar-ros2-driver \ diff --git a/meta-agl-ros2/recipes-ros2/ydlidar-ros2-sdk/ydlidar-ros2-sdk_1.4.7.bb b/meta-agl-ros2/recipes-ros2/ydlidar-ros2-sdk/ydlidar-ros2-sdk_1.4.7.bb index 62fed08a..db01372f 100644 --- a/meta-agl-ros2/recipes-ros2/ydlidar-ros2-sdk/ydlidar-ros2-sdk_1.4.7.bb +++ b/meta-agl-ros2/recipes-ros2/ydlidar-ros2-sdk/ydlidar-ros2-sdk_1.4.7.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/git" inherit cmake -FILES_${PN} += "${datadir} ${prefix}/startup" +FILES:${PN} += "${datadir} ${prefix}/startup" do_install:append() { sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc diff --git a/templates/feature/agl-egvirt/50_local.conf.inc b/templates/feature/agl-egvirt/50_local.conf.inc index 151a16e0..5f222755 100644 --- a/templates/feature/agl-egvirt/50_local.conf.inc +++ b/templates/feature/agl-egvirt/50_local.conf.inc @@ -1,7 +1,7 @@ # gstreamer1.0-plugins-bad contains: # * videoparsersbad plugin which contains h264parse element needed to demonstrate H.264 hardware decoding # * waylandsink plugin -MACHINE_EXTRA_RDEPENDS_append = " \ +MACHINE_EXTRA_RDEPENDS:append = " \ kernel-module-virtio-video \ gstreamer1.0-plugins-bad \ " -- cgit 1.2.3-korg