diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-08-20 13:58:45 -0400 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2021-08-20 15:51:10 -0400 |
commit | 4249268041b879b3d2bae338d5de88f4f2d54b26 (patch) | |
tree | 757fd0c2daef3e0ccea1a12c27f900defaea2827 /recipes-core | |
parent | e89376af34201168a3e8d3fe72258b587edb7d71 (diff) |
Convert to new override syntax
This is the result of running a slightly customized version of the
convert-overrides.py script from poky with additional overrides
added.
The intent of these changes is to minimize the effort to keep the
"next" branch that builds against poky master up to date and tested
in preparation for the switch to the next Yocto LTS release in
early 2022.
Bug-AGL: SPEC-4052
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I6eeadd2c985c008b04f8f9815bf0f6fb064bedac
Diffstat (limited to 'recipes-core')
-rw-r--r-- | recipes-core/dbus/dbus_agldemo.inc | 6 | ||||
-rw-r--r-- | recipes-core/dbus/libdbus-c++_agldemo.inc | 4 | ||||
-rw-r--r-- | recipes-core/psplash/psplash_agldemo.inc | 6 | ||||
-rw-r--r-- | recipes-core/udev/demo-i2c-udev-conf_1.0.bb | 4 | ||||
-rw-r--r-- | recipes-core/udev/sw-gpsd-udev-conf_1.0.bb | 2 | ||||
-rw-r--r-- | recipes-core/udev/usb-can-udev-conf_1.0.bb | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/recipes-core/dbus/dbus_agldemo.inc b/recipes-core/dbus/dbus_agldemo.inc index 379c5435..a642d3e7 100644 --- a/recipes-core/dbus/dbus_agldemo.inc +++ b/recipes-core/dbus/dbus_agldemo.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/dbus" +FILESEXTRAPATHS:append := ":${THISDIR}/dbus" SRC_URI += "file://dbus.service \ file://dbus.socket \ @@ -7,7 +7,7 @@ SRC_URI += "file://dbus.service \ inherit systemd -do_install_append() { +do_install:append() { if [ "${PN}" != "nativesdk-dbus" ]; then if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -m 644 -p -D ${WORKDIR}/dbus.service ${D}${systemd_user_unitdir}/dbus.service @@ -22,7 +22,7 @@ do_install_append() { fi } -FILES_${PN} += " \ +FILES:${PN} += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_user_unitdir}/dbus.*', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_system_unitdir}/user@.service.d/dbus_env.conf', '', d)} \ " diff --git a/recipes-core/dbus/libdbus-c++_agldemo.inc b/recipes-core/dbus/libdbus-c++_agldemo.inc index 4c135cc1..d91ce459 100644 --- a/recipes-core/dbus/libdbus-c++_agldemo.inc +++ b/recipes-core/dbus/libdbus-c++_agldemo.inc @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/libdbus-c++:" -SRC_URI_append = " file://dbus-c++-threading.patch" +FILESEXTRAPATHS:prepend := "${THISDIR}/libdbus-c++:" +SRC_URI:append = " file://dbus-c++-threading.patch" diff --git a/recipes-core/psplash/psplash_agldemo.inc b/recipes-core/psplash/psplash_agldemo.inc index dad26129..84a6814b 100644 --- a/recipes-core/psplash/psplash_agldemo.inc +++ b/recipes-core/psplash/psplash_agldemo.inc @@ -1,9 +1,9 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI_append = " file://psplash-colors.h" +SRC_URI:append = " file://psplash-colors.h" SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default" -do_configure_append () { +do_configure:append () { cp -f ${WORKDIR}/psplash-colors.h ${S} } diff --git a/recipes-core/udev/demo-i2c-udev-conf_1.0.bb b/recipes-core/udev/demo-i2c-udev-conf_1.0.bb index 04101cf3..332c698b 100644 --- a/recipes-core/udev/demo-i2c-udev-conf_1.0.bb +++ b/recipes-core/udev/demo-i2c-udev-conf_1.0.bb @@ -30,6 +30,6 @@ do_install() { fi } -FILES_${PN} += "${systemd_unitdir}" +FILES:${PN} += "${systemd_unitdir}" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" diff --git a/recipes-core/udev/sw-gpsd-udev-conf_1.0.bb b/recipes-core/udev/sw-gpsd-udev-conf_1.0.bb index 9b6fd57d..0dfd0521 100644 --- a/recipes-core/udev/sw-gpsd-udev-conf_1.0.bb +++ b/recipes-core/udev/sw-gpsd-udev-conf_1.0.bb @@ -13,4 +13,4 @@ do_install() { fi } -RDEPENDS_${PN} += "systemd" +RDEPENDS:${PN} += "systemd" diff --git a/recipes-core/udev/usb-can-udev-conf_1.0.bb b/recipes-core/udev/usb-can-udev-conf_1.0.bb index fb5deec3..9c6035e9 100644 --- a/recipes-core/udev/usb-can-udev-conf_1.0.bb +++ b/recipes-core/udev/usb-can-udev-conf_1.0.bb @@ -20,6 +20,6 @@ do_install() { fi } -FILES_${PN} += "${systemd_system_unitdir}" +FILES:${PN} += "${systemd_system_unitdir}" -RDEPENDS_${PN} += "systemd" +RDEPENDS:${PN} += "systemd" |