diff mbox series

[meta-anaconda] recipes: WORKDIR -> UNPACKDIR transition

Message ID 20240527031529.3012126-1-changqing.li@windriver.com
State New
Headers show
Series [meta-anaconda] recipes: WORKDIR -> UNPACKDIR transition | expand

Commit Message

Changqing Li May 27, 2024, 3:15 a.m. UTC
From: Changqing Li <changqing.li@windriver.com>

* WORKDIR -> UNPACKDIR transition
* Switch away from S = WORKDIR

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 recipes-core/systemd/systemd-serialgetty.bbappend     |  2 +-
 .../xorg-xserver/xserver-xf86-config_0.1.bbappend     |  8 ++++----
 recipes-installer/anaconda-init/anaconda-init.bb      | 11 ++++++-----
 .../anaconda/python3-anaconda_39.32.6.bb              |  8 ++++----
 .../initramfs-module-setup-live_1.0.bbappend          |  6 +++---
 recipes-installer/logos/yocto-compat-logos.bb         |  3 ++-
 .../multipath-tools/multipath-tools_%.bbappend        |  2 +-
 7 files changed, 21 insertions(+), 19 deletions(-)

Comments

Kai Kang May 28, 2024, 7:37 a.m. UTC | #1
Merged.

Thanks,

Kai
diff mbox series

Patch

diff --git a/recipes-core/systemd/systemd-serialgetty.bbappend b/recipes-core/systemd/systemd-serialgetty.bbappend
index 0325192..519c1e6 100644
--- a/recipes-core/systemd/systemd-serialgetty.bbappend
+++ b/recipes-core/systemd/systemd-serialgetty.bbappend
@@ -7,7 +7,7 @@  SRC_URI:append:anaconda = " \
 do_install:append:anaconda() {
 	if [ "${INSTALLER_SERIAL}" = "1" ]; then
 		install -d ${D}${sysconfdir}/profile.d
-		install -m 644 ${WORKDIR}/serial-screen-anaconda.sh ${D}${sysconfdir}/profile.d/
+		install -m 644 ${UNPACKDIR}/serial-screen-anaconda.sh ${D}${sysconfdir}/profile.d/
 
 		sed -i -e 's,@ROOT_HOME@,${ROOT_HOME},g' ${D}${systemd_unitdir}/system/serial-getty@.service
 	fi
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index d62f8cc..788150f 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
@@ -1,12 +1,12 @@ 
 do_install:prepend:qemux86-64:anaconda () {
-    if test -s ${WORKDIR}/xorg.conf; then
-        sed -i 's/Modes *"640x480"/Modes    "1024x768"/g' ${WORKDIR}/xorg.conf
+    if test -s ${S}/xorg.conf; then
+        sed -i 's/Modes *"640x480"/Modes    "1024x768"/g' ${S}/xorg.conf
     fi
 }
 
 do_install:prepend:qemux86:anaconda () {
-    if test -s ${WORKDIR}/xorg.conf; then
-        sed -i 's/Modes *"640x480"/Modes    "1024x768"/g' ${WORKDIR}/xorg.conf
+    if test -s ${S}/xorg.conf; then
+        sed -i 's/Modes *"640x480"/Modes    "1024x768"/g' ${S}/xorg.conf
     fi
 }
 
diff --git a/recipes-installer/anaconda-init/anaconda-init.bb b/recipes-installer/anaconda-init/anaconda-init.bb
index 61e3190..8218767 100644
--- a/recipes-installer/anaconda-init/anaconda-init.bb
+++ b/recipes-installer/anaconda-init/anaconda-init.bb
@@ -9,7 +9,8 @@  SRC_URI = "file://anaconda-init \
            file://Xusername \
            file://COPYING"
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -35,7 +36,7 @@  CLEANBROKEN = "1"
 
 do_install() {
     install -d ${D}/${sbindir}
-    install -m 0755 ${WORKDIR}/anaconda-init ${D}${sbindir}/anaconda-init
+    install -m 0755 ${S}/anaconda-init ${D}${sbindir}/anaconda-init
     if [ -n "${EULA_DIR}" ]; then
         sed -i "s#@EULA_DIR@#${EULA_DIR}#g" ${D}${sbindir}/anaconda-init
     else
@@ -47,9 +48,9 @@  do_install() {
     install -d ${D}/${sysconfdir}/init.d
     ln -sf ${sbindir}/anaconda-init ${D}/${sysconfdir}/init.d/anaconda-init
     install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/anaconda-init.service \
-                    ${WORKDIR}/anaconda-init-screen@.service \
-                    ${WORKDIR}/anaconda-init.target \
+    install -m 0644 ${S}/anaconda-init.service \
+                    ${S}/anaconda-init-screen@.service \
+                    ${S}/anaconda-init.target \
                ${D}${systemd_unitdir}/system
 
 
diff --git a/recipes-installer/anaconda/python3-anaconda_39.32.6.bb b/recipes-installer/anaconda/python3-anaconda_39.32.6.bb
index 9c5ef5b..7fcfa9a 100755
--- a/recipes-installer/anaconda/python3-anaconda_39.32.6.bb
+++ b/recipes-installer/anaconda/python3-anaconda_39.32.6.bb
@@ -93,12 +93,12 @@  do_configure:prepend() {
 
 do_install:append() {
     mkdir -p ${D}${datadir}/anaconda/post-scripts
-    install -m 644 ${WORKDIR}/81-edit-sudoers.ks ${D}${datadir}/anaconda/post-scripts
-    install -m 644 ${WORKDIR}/81-systemd-preset-all.ks ${D}${datadir}/anaconda/post-scripts
-    install -m 644 ${WORKDIR}/81-add-env-file-for-sshd.ks ${D}${datadir}/anaconda/post-scripts
+    install -m 644 ${UNPACKDIR}/81-edit-sudoers.ks ${D}${datadir}/anaconda/post-scripts
+    install -m 644 ${UNPACKDIR}/81-systemd-preset-all.ks ${D}${datadir}/anaconda/post-scripts
+    install -m 644 ${UNPACKDIR}/81-add-env-file-for-sshd.ks ${D}${datadir}/anaconda/post-scripts
     install -m 644 ${S}/widgets/src/resources/*.svg ${D}${datadir}/anaconda/pixmaps
     install -m 644 ${S}/widgets/src/resources/*.png ${D}${datadir}/anaconda/pixmaps
-    install -m 644 ${WORKDIR}/fedora.css ${D}${datadir}/anaconda/pixmaps
+    install -m 644 ${UNPACKDIR}/fedora.css ${D}${datadir}/anaconda/pixmaps
 }
 
 python __anonymous () {
diff --git a/recipes-installer/initrdscripts/initramfs-module-setup-live_1.0.bbappend b/recipes-installer/initrdscripts/initramfs-module-setup-live_1.0.bbappend
index 6be120d..0ed97d1 100644
--- a/recipes-installer/initrdscripts/initramfs-module-setup-live_1.0.bbappend
+++ b/recipes-installer/initrdscripts/initramfs-module-setup-live_1.0.bbappend
@@ -7,9 +7,9 @@  SRC_URI:append:anaconda = " \
 "
 
 do_install:append:anaconda() {
-    install -m 0755 ${WORKDIR}/union-fs ${D}/init.d/91-union-fs
-    install -m 0755 ${WORKDIR}/realroot ${D}/init.d/92-realroot
-    install -m 0755 ${WORKDIR}/umountfs ${D}/init.d/93-umountfs
+    install -m 0755 ${UNPACKDIR}/union-fs ${D}/init.d/91-union-fs
+    install -m 0755 ${UNPACKDIR}/realroot ${D}/init.d/92-realroot
+    install -m 0755 ${UNPACKDIR}/umountfs ${D}/init.d/93-umountfs
 }
 
 FILES:${PN}:append:anaconda = " \
diff --git a/recipes-installer/logos/yocto-compat-logos.bb b/recipes-installer/logos/yocto-compat-logos.bb
index c5d1875..c76c835 100644
--- a/recipes-installer/logos/yocto-compat-logos.bb
+++ b/recipes-installer/logos/yocto-compat-logos.bb
@@ -8,7 +8,8 @@  SRC_URI = "file://sidebar-logo.png \
            file://banner_yocto2.png \
            file://COPYING"
 
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 
 inherit allarch
 
diff --git a/recipes-support/multipath-tools/multipath-tools_%.bbappend b/recipes-support/multipath-tools/multipath-tools_%.bbappend
index 5ce6b3c..9ec4428 100644
--- a/recipes-support/multipath-tools/multipath-tools_%.bbappend
+++ b/recipes-support/multipath-tools/multipath-tools_%.bbappend
@@ -2,7 +2,7 @@  SYSTEMD_AUTO_ENABLE:anaconda = "disable"
 
 do_install:append:anaconda () {
     install -d ${D}${sysconfdir}/multipath
-    install -m 0644 ${WORKDIR}/multipath.conf.example \
+    install -m 0644 ${UNPACKDIR}/multipath.conf.example \
     ${D}${sysconfdir}/multipath.conf
 }