Fix WORKDIR usage

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
superna9999 · Jul 4, 2024 · 20731e3 · 20731e3
1 parent d971362
commit 20731e3
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 20 deletions.
diff --git a/recipes-bsp/alsa-board-conf/alsa-board-conf.bb b/recipes-bsp/alsa-board-conf/alsa-board-conf.bb
@@ -8,7 +8,7 @@ SRC_URI = "file://board.conf \
 
 do_install() {
 	install -d ${D}${datadir}/alsa/alsa.conf.d
-	install -m 0644 ${WORKDIR}/board.conf ${D}${datadir}/alsa/alsa.conf.d/board.conf
+	install -m 0644 ${UNPACKDIR}/board.conf ${D}${datadir}/alsa/alsa.conf.d/board.conf
 }
 
 FILES:${PN} = "${sysconfdir} ${datadir}/alsa/alsa.conf.d"
diff --git a/recipes-bsp/pyamlboot-script/pyamlboot-script.bb b/recipes-bsp/pyamlboot-script/pyamlboot-script.bb
@@ -7,14 +7,12 @@ SRC_URI = "file://boot.cmd"
 
 inherit deploy
 
-S = "${WORKDIR}"
-
 do_configure() {
 	:
 }
 
 do_compile() {
-	mkimage -A arm -T script -C none -d ${B}/boot.cmd ${B}/boot.scr
+	mkimage -A arm -T script -C none -d ${UNPACKDIR}/boot.cmd ${B}/boot.scr
 }
 
 do_deploy() {

diff --git a/recipes-bsp/s905-autoscript-multiboot/s905-autoscript-multiboot.bb b/recipes-bsp/s905-autoscript-multiboot/s905-autoscript-multiboot.bb
@@ -7,10 +7,8 @@ SRC_URI = "file://aml_autoscript.cmd"
 
 inherit deploy
 
-S = "${WORKDIR}"
-
 do_compile() {
-	mkimage -A arm64 -O linux -T script -C none -a 0 -e 0 -n "aml_autoscript" -d ${WORKDIR}/aml_autoscript.cmd ${B}/aml_autoscript
+	mkimage -A arm64 -O linux -T script -C none -a 0 -e 0 -n "aml_autoscript" -d ${UNPACKDIR}/aml_autoscript.cmd ${B}/aml_autoscript
 	zip ${B}/aml_autoscript.zip ${B}/aml_autoscript
 }
 

diff --git a/recipes-bsp/s905-autoscript/s905-autoscript.bb b/recipes-bsp/s905-autoscript/s905-autoscript.bb
@@ -7,10 +7,8 @@ SRC_URI = "file://s905_autoscript.cmd"
 
 inherit deploy
 
-S = "${WORKDIR}"
-
 do_compile() {
-	mkimage -A arm64 -O linux -T script -C none -a 0 -e 0 -n "s905_autoscript" -d ${WORKDIR}/s905_autoscript.cmd ${B}/s905_autoscript
+	mkimage -A arm64 -O linux -T script -C none -a 0 -e 0 -n "s905_autoscript" -d ${UNPACKDIR}/s905_autoscript.cmd ${B}/s905_autoscript
 }
 
 do_deploy() {

diff --git a/recipes-extended/shadow-securetty/shadow-securetty_%.bbappend b/recipes-extended/shadow-securetty/shadow-securetty_%.bbappend
@@ -3,5 +3,5 @@ FILESEXTRAPATHS:append := ":${THISDIR}/${PN}"
 SRC_URI:append = " file://securetty-aml"
 
 do_configure:prepend () {
-	cat ${WORKDIR}/securetty-aml >> ${WORKDIR}/securetty
+	cat ${UNPACKDIR}/securetty-aml >> ${UNPACKDIR}/securetty
 }
diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -8,10 +8,10 @@ SRC_URI += " \
 SRCREV_brcmfmac-sdio-firmware = "3ddc301c272f081aa5513c1934f6d530bf80de4a"
 
 do_install:append() {
-	for f in ${WORKDIR}/brcmfmac_sdio-firmware/*.txt ${WORKDIR}/brcmfmac_sdio-firmware/*.bin; do
+	for f in ${UNPACKDIR}/brcmfmac_sdio-firmware/*.txt ${UNPACKDIR}/brcmfmac_sdio-firmware/*.bin; do
 	        install -m 0644 $f ${D}${nonarch_base_libdir}/firmware/brcm
 	done
-	install -m 0644 ${WORKDIR}/brcmfmac4354-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm
+	install -m 0644 ${UNPACKDIR}/brcmfmac4354-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm
 }
 
 FILES_${PN}-bcm4329 += " \

diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
@@ -41,8 +41,8 @@ do_configure:prepend() {
     #
     # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used
     #
-    if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
-        install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
+    if [ -e ${UNPACKDIR}/logo_linux_clut224.ppm ]; then
+        install -m 0644 ${UNPACKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
         kernel_conf_variable LOGO y
         kernel_conf_variable LOGO_LINUX_CLUT224 y
     fi
@@ -112,7 +112,7 @@ do_configure:prepend() {
     fi
 
     sed -e "${CONF_SED_SCRIPT}" \
-    < '${WORKDIR}/defconfig' >>'${B}/.config'
+    < '${UNPACKDIR}/defconfig' >>'${B}/.config'
 
     yes '' | oe_runmake -C ${S} O=${B} oldconfig
 }

diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend
@@ -7,6 +7,6 @@ SRC_URI += " \
 
 do_install:append() {
     install -D -t ${D}/${datadir}/alsa/cards \
-                  ${WORKDIR}/axg-sound-card.conf \
-                  ${WORKDIR}/gx-sound-card.conf
+                  ${UNPACKDIR}/axg-sound-card.conf \
+                  ${UNPACKDIR}/gx-sound-card.conf
 }
diff --git a/recipes-multimedia/alsa/alsa-utils_%.bbappend b/recipes-multimedia/alsa/alsa-utils_%.bbappend
@@ -19,8 +19,8 @@ do_install:append:meson-gx:udev-enabled() {
     UDEV_DIR=`pkg-config --variable=udevdir udev`
     UDEV_RULES_DIR=${UDEV_DIR}/rules.d
     install -d ${D}${UDEV_RULES_DIR}
-    install "${WORKDIR}/soundconfig" ${D}${UDEV_DIR}
-    install -m 0644 ${WORKDIR}/90-alsa-restore.rules.in ${D}${UDEV_RULES_DIR}/90-alsa-restore.rules.in
+    install "${UNPACKDIR}/soundconfig" ${D}${UDEV_DIR}
+    install -m 0644 ${UNPACKDIR}/90-alsa-restore.rules.in ${D}${UDEV_RULES_DIR}/90-alsa-restore.rules.in
     sed -i 's!@@UDEV_DIR@@!'${UDEV_DIR}'!g' ${D}${UDEV_RULES_DIR}/90-alsa-restore.rules.in
     mv ${D}${UDEV_RULES_DIR}/90-alsa-restore.rules.in ${D}${UDEV_RULES_DIR}/90-alsa-restore.rules
 }