From a8dbd14daaac8b5c52326262dbc43975836cc0df Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 20 Aug 2021 13:57:33 -0400 Subject: Convert to new override syntax This is effectively a manual cherry-pick of commit: 37d3b1b316470fdcfebc59d5522bfbfefc025ff6 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: Ic649d942ac043edc52976a3d4190590bb1c125e7 --- .../recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb | 4 ++-- .../meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb | 4 ++-- .../ns-frameworkunified/ns-frameworkunified-library_1.0.0.bb | 2 +- .../recipes-core/ns-frameworkunified/ns-frameworkunified_1.0.0.bb | 2 +- .../meta-agl-basesystem/recipes-core/ss-config/ss-config_1.0.0.bb | 2 +- .../recipes-core/ss-resourcemanager/ss-resourcemanager_1.0.0.bb | 2 +- .../recipes-core/ss-taskmanager/ss-taskmanager_1.0.0.bb | 2 +- .../recipes-core/vs-positioning/vs-positioning_1.0.0.bb | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'meta-oem-production-readiness/meta-agl-basesystem/recipes-core') diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb index 27b2cae0..fd40a394 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb @@ -17,11 +17,11 @@ do_install() { install -m 644 -D ${S}/include/* ${D}${includedir}/basesystem/ } -do_install_class-native() { +do_install:class-native() { install -d ${D}${bindir} install -m 755 -D ${S}/bin/launch_xml2cfg.sh ${D}${bindir}/ } -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" BBCLASSEXTEND = "native" diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb index 4de2b702..a918ee0b 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb @@ -29,9 +29,9 @@ do_install() { install -m 644 ${S}/99-basesystem.rules ${D}/lib/udev/rules.d/ } -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ launch_sm.service \ systemd-udev-trigger.service \ setup_refhw.service \ diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified-library_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified-library_1.0.0.bb index 2d88fca3..b8e34099 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified-library_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified-library_1.0.0.bb @@ -19,7 +19,7 @@ inherit agl-basesystem-common BSMAKE_FILE = "Makefile.library" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ os-posixbasedos001legacylibrary \ ns-loglibrary \ ns-commonlibrary \ diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified_1.0.0.bb index 5017e615..d0c5bf06 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified_1.0.0.bb @@ -20,7 +20,7 @@ inherit agl-basesystem-common BSMAKE_FILE = "Makefile.client" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ os-posixbasedos001legacylibrary \ ns-loglibrary \ ns-commonlibrary \ diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-config/ss-config_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-config/ss-config_1.0.0.bb index bbd743a7..423190b3 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-config/ss-config_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-config/ss-config_1.0.0.bb @@ -22,7 +22,7 @@ inherit agl-basesystem-common BSMAKE_FILE = "Makefile.client" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ss-interfaceunified \ ss-romaccesslibrary \ ns-frameworkunified \ diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-resourcemanager/ss-resourcemanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-resourcemanager/ss-resourcemanager_1.0.0.bb index ea0c0725..657a3405 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-resourcemanager/ss-resourcemanager_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-resourcemanager/ss-resourcemanager_1.0.0.bb @@ -23,7 +23,7 @@ inherit agl-basesystem-common BSMAKE_FILE = "Makefile.client" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ns-frameworkunified \ ss-interfaceunified \ ns-commonlibrary \ diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-taskmanager/ss-taskmanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-taskmanager/ss-taskmanager_1.0.0.bb index 279995f9..18f0ab1e 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-taskmanager/ss-taskmanager_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-taskmanager/ss-taskmanager_1.0.0.bb @@ -26,7 +26,7 @@ inherit agl-basesystem-common BSMAKE_FILE = "Makefile.client" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ss-interfaceunified \ ns-frameworkunified \ ns-commonlibrary \ diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/vs-positioning/vs-positioning_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/vs-positioning/vs-positioning_1.0.0.bb index 38e3aaf8..472e90bf 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/vs-positioning/vs-positioning_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/vs-positioning/vs-positioning_1.0.0.bb @@ -20,7 +20,7 @@ inherit agl-basesystem-common BSMAKE_FILE = "Makefile.client" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ns-frameworkunified \ os-vehicleparameterlibrary \ vs-positioningbaselibrary \ -- cgit 1.2.3-korg