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-support/ns-backupmanager/ns-backupmanager_1.0.0.bb | 2 +- .../recipes-support/os-eventlibrary/os-eventlibrary_1.0.0.bb | 2 +- .../recipes-support/os-rpclibrary/os-rpclibrary-tool_1.0.0.bb | 4 ++-- .../recipes-support/os-rpclibrary/os-rpclibrary_1.0.0.bb | 2 +- .../os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb | 2 +- .../recipes-support/ps-communication/ps-communication_1.0.0.bb | 2 +- .../recipes-support/ss-interfaceunified/ss-interfaceunified_1.0.0.bb | 2 +- .../recipes-support/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb | 2 +- .../recipes-support/ss-versionlibrary/ss-versionlibrary_1.0.0.bb | 2 +- .../vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) (limited to 'meta-oem-production-readiness/meta-agl-basesystem/recipes-support') diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ns-backupmanager/ns-backupmanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ns-backupmanager/ns-backupmanager_1.0.0.bb index 13e3605f..3724f894 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ns-backupmanager/ns-backupmanager_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ns-backupmanager/ns-backupmanager_1.0.0.bb @@ -19,7 +19,7 @@ inherit agl-basesystem-common BSMAKE_FILE = "Makefile.client" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ns-frameworkunified \ libnv-hal \ " diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-eventlibrary/os-eventlibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-eventlibrary/os-eventlibrary_1.0.0.bb index a4aa6302..5332eb38 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-eventlibrary/os-eventlibrary_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-eventlibrary/os-eventlibrary_1.0.0.bb @@ -17,6 +17,6 @@ inherit agl-basesystem-common BSMAKE_FILE = "Makefile.client" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ kernel-module-evklib \ " diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary-tool_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary-tool_1.0.0.bb index 573207ac..6db3ef90 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary-tool_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary-tool_1.0.0.bb @@ -14,7 +14,7 @@ SRCREV := "${BASESYSTEM_REVISION}" S = "${WORKDIR}/git/service/other/rpc_library/tool" -do_compile_prepend () { +do_compile:prepend () { oe_runmake clean } @@ -22,7 +22,7 @@ do_install () { install -D -m 755 ${S}/rpc_apidef ${D}${bindir}/rpc_apidef } -FILES_${PN} += " \ +FILES:${PN} += " \ ${bindir}/rpc_apidef \ " diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary_1.0.0.bb index b39930b6..50c84831 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary_1.0.0.bb @@ -19,7 +19,7 @@ inherit agl-basesystem-common BSMAKE_FILE = "Makefile.client" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ns-commonlibrary \ ns-loglibrary \ " diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb index e5ed88d5..4c8ff27a 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb @@ -15,6 +15,6 @@ inherit agl-basesystem-common BSMAKE_FILE = "Makefile.client" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ns-backupmanager \ " diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ps-communication/ps-communication_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ps-communication/ps-communication_1.0.0.bb index 08625095..7eb17412 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ps-communication/ps-communication_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ps-communication/ps-communication_1.0.0.bb @@ -18,7 +18,7 @@ inherit agl-basesystem-common BSMAKE_FILE = "Makefile.client" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ns-frameworkunified \ ps-communicationsubcpu \ " diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-interfaceunified/ss-interfaceunified_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-interfaceunified/ss-interfaceunified_1.0.0.bb index 6366ea8e..ed880d25 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-interfaceunified/ss-interfaceunified_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-interfaceunified/ss-interfaceunified_1.0.0.bb @@ -22,7 +22,7 @@ BSMAKE_FILE = "Makefile.client" DIRFILES = "1" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ns-commonlibrary \ ns-frameworkunified \ ss-romaccesslibrary \ diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb index dc9b1df0..42dcf22e 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb @@ -19,7 +19,7 @@ inherit agl-basesystem-common BSMAKE_FILE = "Makefile.client" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ns-frameworkunified \ ns-commonlibrary \ ns-memorygpioaccesslibrary \ diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-versionlibrary/ss-versionlibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-versionlibrary/ss-versionlibrary_1.0.0.bb index 7ff32db7..42bb3bc5 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-versionlibrary/ss-versionlibrary_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-versionlibrary/ss-versionlibrary_1.0.0.bb @@ -19,7 +19,7 @@ inherit agl-basesystem-common BSMAKE_FILE = "Makefile.client" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ns-frameworkunified \ ss-interfaceunified \ ss-romaccesslibrary \ diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb index d77d028a..30cb3fd6 100644 --- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb +++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb @@ -19,7 +19,7 @@ inherit agl-basesystem-common BSMAKE_FILE = "Makefile.client" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ns-frameworkunified \ os-eventlibrary \ os-vehicleparameterlibrary \ -- cgit 1.2.3-korg