From ac05154c5150af98be52ab225d6252ec4e78c217 Mon Sep 17 00:00:00 2001 From: Ziad Elhanafy Date: Mon, 28 Oct 2024 17:18:35 +0000 Subject: [PATCH] arm-systemready/linux-distros: 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 guidelines from: https://lists.openembedded.org/g/openembedded-architecture/message/2007 Signed-off-by: Ziad Elhanafy Signed-off-by: Jon Mason --- .../arm-systemready-linux-distros-unattended.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-unattended.inc b/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-unattended.inc index f8c9c6c5..75951b0e 100644 --- a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-unattended.inc +++ b/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-unattended.inc @@ -19,7 +19,7 @@ python () { unpackiso() { # Unpack the ISO image - bsdtar -xf ${WORKDIR}/${ISO_IMAGE_NAME}.iso -C ${EXTRACTED_ISO_TEMP_DIR} + bsdtar -xf ${UNPACKDIR}/${ISO_IMAGE_NAME}.iso -C ${EXTRACTED_ISO_TEMP_DIR} chmod -R u+rw ${EXTRACTED_ISO_TEMP_DIR} } @@ -34,7 +34,7 @@ repackiso() { -boot-load-size 4 -boot-info-table -J -R -V ${ISO_LABEL} -eltorito-alt-boot \ -eltorito-boot ${EFI_IMAGE} -no-emul-boot ${EXTRACTED_ISO_TEMP_DIR} - mv -f ${NEW_ISO_TEMP_DIR}/${ISO_IMAGE_NAME}.iso ${WORKDIR} + mv -f ${NEW_ISO_TEMP_DIR}/${ISO_IMAGE_NAME}.iso ${UNPACKDIR} } # Write the test data in IMAGE_POSTPROCESS_COMMAND