recipes: Switch away from S = WORKDIR

Aligns with the changes and recommendations in oe-core. Signed-off-by: Enrico Jörns <[email protected]>
pengutronix · Jun 4, 2024 · b5e4d7e · b5e4d7e
1 parent c15e642
commit b5e4d7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/recipes-core/ptx-profile/ptx-profile.bb b/recipes-core/ptx-profile/ptx-profile.bb
@@ -4,7 +4,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 SRC_URI = "file://00-ptx.sh"
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 do_install () {
 	install -d ${D}${sysconfdir}/profile.d/

diff --git a/recipes-core/systemd/systemd-rc-once.bb b/recipes-core/systemd/systemd-rc-once.bb
@@ -9,16 +9,17 @@ SRC_URI = "\
   file://systemd-rc-once \
   "
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit allarch systemd
 
 do_install() {
 	install -d ${D}${base_libdir}/init
-	install -m 0755 ${WORKDIR}/rc-once.sh ${D}${base_libdir}/init/
+	install -m 0755 ${S}/rc-once.sh ${D}${base_libdir}/init/
 	install -d ${D}${systemd_unitdir}/system
-	install -m 0755 ${WORKDIR}/systemd-rc-once ${D}${systemd_unitdir}/
-	install -m 0644 ${WORKDIR}/rc-once.service ${D}${systemd_unitdir}/system/
+	install -m 0755 ${S}/systemd-rc-once ${D}${systemd_unitdir}/
+	install -m 0644 ${S}/rc-once.service ${D}${systemd_unitdir}/system/
 	install -d ${D}${systemd_unitdir}/system/system-update.target.wants
 	ln -sf ../rc-once.service ${D}${systemd_unitdir}/system/system-update.target.wants/rc-once.service
 	install -d ${D}${sysconfdir}/rc.once.d