follow WORKDIR -> UNPACKDIR transition

This adapts to the oe-core rework to enforce a separate directory for unpacking local sources (UNPACKDIR) instead of polluting WORKDIR directly. Follows the preliminary guideline from: https://lists.openembedded.org/g/openembedded-architecture/message/2007 Signed-off-by: Enrico Jörns <[email protected]>
pengutronix · Jun 4, 2024 · c15e642 · c15e642
1 parent 92b8b7e
commit c15e642
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/recipes-bsp/barebox/barebox.inc b/recipes-bsp/barebox/barebox.inc
@@ -48,8 +48,8 @@ EXTRA_OEMAKE = " \
 "
 
 do_configure() {
-	if [ -e ${WORKDIR}/defconfig ]; then
-		cp ${WORKDIR}/defconfig ${B}/.config
+	if [ -e ${UNPACKDIR}/defconfig ]; then
+		cp ${UNPACKDIR}/defconfig ${B}/.config
 	else
 		if [ -n "${BAREBOX_CONFIG}" ]; then
 			oe_runmake ${BAREBOX_CONFIG}
@@ -68,9 +68,9 @@ BAREBOX_FIRMWARE_DIR[doc] = "Overwrite barebox' firmware blobs search directory
 do_compile () {
 	# If there is an 'env' directory, append its content
 	# to the compiled environment
-	if [ -d ${WORKDIR}/env/ ]; then \
+	if [ -d ${UNPACKDIR}/env/ ]; then \
 		mkdir -p ${S}/.yocto-defaultenv
-		cp -r ${WORKDIR}/env/* ${S}/.yocto-defaultenv/; \
+		cp -r ${UNPACKDIR}/env/* ${S}/.yocto-defaultenv/; \
 		grep -q .yocto-defaultenv ${B}/.config || \
 	        sed -i -e "s,^\(CONFIG_DEFAULT_ENVIRONMENT_PATH=.*\)\"$,\1 .yocto-defaultenv\"," \
 		                ${B}/.config; \