From aceeb142c2976f19f91aa62942be092d9d853253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrico=20J=C3=B6rns?= Date: Sun, 26 May 2024 00:42:20 +0200 Subject: [PATCH] qemux86: rauc-qemu-grubconf: Switch away from S = WORKDIR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reflects the recent changes in oe-core to enforce unpacking to a subdirectory of WORKDIR. As done in oe-core commit d9328e3b ("recipes: Switch away from S = WORKDIR"), use explicit 'sources/' subdirectory as UNPACKDIR (and S). Signed-off-by: Enrico Jörns --- meta-rauc-qemux86/recipes-bsp/grub/rauc-qemu-grubconf.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-rauc-qemux86/recipes-bsp/grub/rauc-qemu-grubconf.bb b/meta-rauc-qemux86/recipes-bsp/grub/rauc-qemu-grubconf.bb index 5a30063..342e6df 100644 --- a/meta-rauc-qemux86/recipes-bsp/grub/rauc-qemu-grubconf.bb +++ b/meta-rauc-qemux86/recipes-bsp/grub/rauc-qemu-grubconf.bb @@ -11,20 +11,21 @@ SRC_URI += " \ file://grubenv \ " -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" inherit deploy do_install() { install -d ${D}${EFI_FILES_PATH} - install -m 644 ${WORKDIR}/grub.cfg ${D}${EFI_FILES_PATH}/grub.cfg + install -m 644 ${S}/grub.cfg ${D}${EFI_FILES_PATH}/grub.cfg } FILES:${PN} += "${EFI_FILES_PATH}" do_deploy() { - install -m 644 ${WORKDIR}/grub.cfg ${DEPLOYDIR} - install -m 644 ${WORKDIR}/grubenv ${DEPLOYDIR} + install -m 644 ${S}/grub.cfg ${DEPLOYDIR} + install -m 644 ${S}/grubenv ${DEPLOYDIR} } addtask deploy after do_install before do_build