From 4249268041b879b3d2bae338d5de88f4f2d54b26 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 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 Change-Id: I6eeadd2c985c008b04f8f9815bf0f6fb064bedac --- recipes-support/lin-config/lin-config_git.bb | 4 ++-- recipes-support/opencv/opencv_agldemo.inc | 2 +- recipes-support/udisks/udisks2_agldemo.inc | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'recipes-support') diff --git a/recipes-support/lin-config/lin-config_git.bb b/recipes-support/lin-config/lin-config_git.bb index 3858168e..7585156f 100644 --- a/recipes-support/lin-config/lin-config_git.bb +++ b/recipes-support/lin-config/lin-config_git.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/trainman419/linux-lin.git;protocol=https" SRCREV = "155d885e8ccc907a56f6c86c4b159fac27ef6fec" S = "${WORKDIR}/git/lin_config/src" -SRC_URI_append = " \ +SRC_URI:append = " \ file://0001-Change-Makefile-to-use-pkg-config-for-libxml-2.0.patch \ file://0002-Change-Makefile-to-use-LDFLAGS.patch \ " @@ -19,7 +19,7 @@ PV = "0.1+git${SRCPV}" do_configure[noexec] = "1" -do_install_append() { +do_install:append() { install -d ${D}/${bindir} install -m 755 ${S}/lin_config ${D}/${bindir} } diff --git a/recipes-support/opencv/opencv_agldemo.inc b/recipes-support/opencv/opencv_agldemo.inc index 86d759b6..16640023 100644 --- a/recipes-support/opencv/opencv_agldemo.inc +++ b/recipes-support/opencv/opencv_agldemo.inc @@ -1 +1 @@ -PACKAGECONFIG_poky = "jpeg png v4l libv4l gstreamer" +PACKAGECONFIG:poky = "jpeg png v4l libv4l gstreamer" diff --git a/recipes-support/udisks/udisks2_agldemo.inc b/recipes-support/udisks/udisks2_agldemo.inc index 44c9a5ba..a3b2ac4d 100644 --- a/recipes-support/udisks/udisks2_agldemo.inc +++ b/recipes-support/udisks/udisks2_agldemo.inc @@ -1,14 +1,14 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI_append = " file://automount.service \ +SRC_URI:append = " file://automount.service \ file://automount.sh \ file://99-udisks2.rules \ " SYSTEMD_AUTO_ENABLE = "enable" -SYSTEMD_SERVICE_${PN}_append = " automount.service" +SYSTEMD_SERVICE:${PN}:append = " automount.service" -do_install_append () { +do_install:append () { sed -i 's/^WantedBy=.*/WantedBy=multi-user.target/' ${D}${systemd_unitdir}/system/udisks2.service install -d ${D}${base_libdir}/systemd/system @@ -21,7 +21,7 @@ do_install_append () { install -m 0644 ${WORKDIR}/99-udisks2.rules ${D}${sysconfdir}/udev/rules.d } -FILES_${PN}_append = " \ +FILES:${PN}:append = " \ ${base_libdir}/systemd/system/automount.service \ ${libexecdir}/automount.sh \ " -- cgit 1.2.3-korg