From 3288587aeb009fb65652776242c0a526b90771e2 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 1 May 2024 22:50:08 +0100
Subject: recipes: Update S = WORKDIR recipes to use ${S} correctly

Where recipes use S = ${WORKDIR}, ensure they are referencing ${S} correctly
to access files as soon we want to stop doing this in WORKDIR at which point
they would break unless corrected.

(From OE-Core rev: f25dd633fffe6560f191526d1869e657e129bad9)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/base-files/base-files_3.0.14.bb | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'meta/recipes-core/base-files')

diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 9fab53ce63..42a8026e63 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -113,23 +113,23 @@ do_install () {
 	ln -snf ../run ${D}${localstatedir}/run
 	ln -snf ../run/lock ${D}${localstatedir}/lock
 
-	install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts
+	install -m 0644 ${S}/hosts ${D}${sysconfdir}/hosts
 	${BASEFILESISSUEINSTALL}
 
-	rotation=`cat ${WORKDIR}/rotation`
+	rotation=`cat ${S}/rotation`
 	if [ "$rotation" != "0" ]; then
- 		install -m 0644 ${WORKDIR}/rotation ${D}${sysconfdir}/rotation
+ 		install -m 0644 ${S}/rotation ${D}${sysconfdir}/rotation
 	fi
 
-	install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
-	install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile
+	install -m 0644 ${S}/fstab ${D}${sysconfdir}/fstab
+	install -m 0644 ${S}/profile ${D}${sysconfdir}/profile
 	sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}${sysconfdir}/profile
         sed -i 's#@BINDIR@#${bindir}#g' ${D}${sysconfdir}/profile
-	install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells
-	install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile
-	install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc
-	install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf
-	install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd
+	install -m 0644 ${S}/shells ${D}${sysconfdir}/shells
+	install -m 0755 ${S}/share/dot.profile ${D}${sysconfdir}/skel/.profile
+	install -m 0755 ${S}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc
+	install -m 0644 ${S}/host.conf ${D}${sysconfdir}/host.conf
+	install -m 0644 ${S}/motd ${D}${sysconfdir}/motd
 
 	ln -sf /proc/mounts ${D}${sysconfdir}/mtab
 
@@ -145,12 +145,12 @@ do_install () {
 }
 
 do_install:append:libc-glibc () {
-	install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf
+	install -m 0644 ${S}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf
 }
 
 DISTRO_VERSION[vardepsexclude] += "DATE"
 do_install_basefilesissue () {
-	install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}
+	install -m 644 ${S}/issue*  ${D}${sysconfdir}
         if [ -n "${DISTRO_NAME}" ]; then
 		printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue
 		printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net
-- 
cgit v1.2.3-54-g00ecf