diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-08-20 13:58:45 -0400 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2021-11-17 14:20:22 -0500 |
| commit | 12ad591d3038db609db5290d8bbe809a34c743de (patch) | |
| tree | dbbcc9a44134a012f531d48132c8803c3940bfa2 /recipes-support | |
| parent | 88c424f8b8c78dfc5520ea9be1866027df4735b8 (diff) | |
Convert to new override syntaxlamprey_12.1.2lamprey_12.1.1lamprey_12.1.0lamprey/12.1.2lamprey/12.1.1lamprey/12.1.012.1.212.1.112.1.0
This is effectively a manual cherry-pick and squash of commits:
4249268041b879b3d2bae338d5de88f4f2d54b26
07f4ab8c2833ae5377b97cc9e3820bed67e539d0
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 <scott.murray@konsulko.com>
Change-Id: I3b47f1b7d62038b314a17763d24a64f6d4e15e72
Diffstat (limited to 'recipes-support')
| -rw-r--r-- | recipes-support/lin-config/lin-config_git.bb | 4 | ||||
| -rw-r--r-- | recipes-support/opencv/opencv_agldemo.inc | 2 | ||||
| -rw-r--r-- | recipes-support/udisks/udisks2_agldemo.inc | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/recipes-support/lin-config/lin-config_git.bb b/recipes-support/lin-config/lin-config_git.bb index 0e45a55a4..0bb604d6a 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;branch=mast 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 86d759b61..16640023e 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 44c9a5bac..a3b2ac4d7 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 \ " |