diff mbox series

[meta-swupdate-boards,3/3] recipes: Transition from WORKDIR to UNPACKDIR

Message ID 20241018150953.485062-4-ungerer.ricardo@gmail.com
State New
Headers show
Series Bump to styhead | expand

Commit Message

Ricardo Ungerer Oct. 18, 2024, 3:09 p.m. UTC 
The do_unpack tasks now uses UNPACKDIR, not WORKDIR.

See more information OE-Core commit:

b84eec5c4cbf4b39d6712800dd0d2fe5337721cb
base: Switch UNPACKDIR to a subdir of WORKDIR

Signed-off-by: Ricardo Ungerer <ungerer.ricardo@gmail.com>
---
 .../raspberrypi/recipes-core/overlayfs/etc-overlay.bb       | 4 ++--
 recipes-bsp/libubootenv/libubootenv_%.bbappend              | 2 +-
 recipes-support/swupdate/swupdate_%.bbappend                | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/dynamic-layers/raspberrypi/recipes-core/overlayfs/etc-overlay.bb b/dynamic-layers/raspberrypi/recipes-core/overlayfs/etc-overlay.bb
index 6f6bd58..469c823 100644
--- a/dynamic-layers/raspberrypi/recipes-core/overlayfs/etc-overlay.bb
+++ b/dynamic-layers/raspberrypi/recipes-core/overlayfs/etc-overlay.bb
@@ -19,8 +19,8 @@  do_install () {
     install -d ${D}${systemd_system_unitdir}
 
     install -d ${D}/etc/ecs
-    install -m 0644 ${WORKDIR}/etc.mount ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/overlays-etc-dirs.service ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/etc.mount ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/overlays-etc-dirs.service ${D}${systemd_system_unitdir}
 }
 
 SYSTEMD_SERVICE:${PN} = "etc.mount overlays-etc-dirs.service"
diff --git a/recipes-bsp/libubootenv/libubootenv_%.bbappend b/recipes-bsp/libubootenv/libubootenv_%.bbappend
index 17d8ad5..59ba255 100644
--- a/recipes-bsp/libubootenv/libubootenv_%.bbappend
+++ b/recipes-bsp/libubootenv/libubootenv_%.bbappend
@@ -4,7 +4,7 @@  SRC_URI:append:class-target = " file://fw_env.config"
 
 do_install:append:class-target() {
 	install -d ${D}${sysconfdir}
-	install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}
+	install -m 644 ${UNPACKDIR}/fw_env.config ${D}${sysconfdir}
 }
 
 FILES:${PN}:append:class-target = " ${sysconfdir}"
diff --git a/recipes-support/swupdate/swupdate_%.bbappend b/recipes-support/swupdate/swupdate_%.bbappend
index 139b111..2e5de68 100644
--- a/recipes-support/swupdate/swupdate_%.bbappend
+++ b/recipes-support/swupdate/swupdate_%.bbappend
@@ -13,16 +13,16 @@  SRC_URI:append:beaglebone-yocto = " file://10-remove-force-ro"
 RDEPENDS:${PN} += "u-boot-fw-utils"
 
 do_install:append() {
-    install -m 0644 ${WORKDIR}/09-swupdate-args ${D}${libdir}/swupdate/conf.d/
+    install -m 0644 ${UNPACKDIR}/09-swupdate-args ${D}${libdir}/swupdate/conf.d/
     sed -i "s#@MACHINE@#${MACHINE}#g" ${D}${libdir}/swupdate/conf.d/09-swupdate-args
 
     install -d ${D}${sysconfdir}
-    install -m 644 ${WORKDIR}/swupdate.cfg ${D}${sysconfdir}
+    install -m 644 ${UNPACKDIR}/swupdate.cfg ${D}${sysconfdir}
 }
 
 do_install:append:beaglebone-yocto() {
     # Recent swupdate as well as libubootenv handles force_ro flags automatically
     if ${@bb.utils.contains('DEPENDS','libubootenv','false','true',d)}; then
-        install -m 0644 ${WORKDIR}/10-remove-force-ro ${D}${libdir}/swupdate/conf.d/
+        install -m 0644 ${UNPACKDIR}/10-remove-force-ro ${D}${libdir}/swupdate/conf.d/
     fi
 }