From c15e6425f5cd97c8e1a156cd7442a936134143a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20J=C3=B6rns?= Date: Mon, 27 May 2024 09:44:30 +0200 Subject: [PATCH] follow WORKDIR -> UNPACKDIR transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- recipes-bsp/barebox/barebox.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-bsp/barebox/barebox.inc b/recipes-bsp/barebox/barebox.inc index 2a234b6..454b860 100644 --- 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; \