From ef8959c72e639d0bfe6c08ccd2eb8c6bb9f781c7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 7 Aug 2026 15:49:05 -0300 Subject: [PATCH 1/6] updatehub-sdk-qt: Remove S variable assignment Since oe-core 46480a5e66, carried from Whinlatter on, do_qa_unpack is fatal for recipes that set S = "${WORKDIR}/git": the value bitbake.conf derives now works on its own, as BB_GIT_DEFAULT_DESTSUFFIX is "${BP}" and S defaults to "${UNPACKDIR}/${BP}", so the git checkout already lands where S points. Drop the assignment rather than rewriting it to ${UNPACKDIR}/git, which the same check also rejects. SRC_URI carries no destsuffix override, so the resolved source directory is unchanged. Signed-off-by: Otavio Salvador (cherry picked from commit 4fc836b00068dafe20f139ebc17a7437fa6edd5c) --- .../recipes-updatehub/updatehub-sdk-qt/updatehub-sdk-qt_git.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/dynamic-layers/qt5/recipes-updatehub/updatehub-sdk-qt/updatehub-sdk-qt_git.bb b/dynamic-layers/qt5/recipes-updatehub/updatehub-sdk-qt/updatehub-sdk-qt_git.bb index cc544b3..da8d2c3 100644 --- a/dynamic-layers/qt5/recipes-updatehub/updatehub-sdk-qt/updatehub-sdk-qt_git.bb +++ b/dynamic-layers/qt5/recipes-updatehub/updatehub-sdk-qt/updatehub-sdk-qt_git.bb @@ -7,8 +7,6 @@ PV = "2.0.0" SRCREV = "04ef75ddbc3e35e41f56ca09a8622e237bc66d44" SRC_URI = "git://github.com/updatehub/agent-sdk-qt.git;protocol=https;branch=master" -S = "${WORKDIR}/git" - inherit qmake5 PACKAGECONFIG ??= "qmlplugin" From 965fb3c90425618949a47e9feaa24b1b62c1494b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 7 Aug 2026 15:49:06 -0300 Subject: [PATCH 2/6] updatehub-active-inactive-backend-grub-tools: Remove S variable assignment Since oe-core 46480a5e66, carried from Whinlatter on, do_qa_unpack is fatal for recipes that set S = "${WORKDIR}/git": the value bitbake.conf derives now works on its own, as BB_GIT_DEFAULT_DESTSUFFIX is "${BP}" and S defaults to "${UNPACKDIR}/${BP}", so the git checkout already lands where S points. Drop the assignment rather than rewriting it to ${UNPACKDIR}/git, which the same check also rejects. SRC_URI carries no destsuffix override, so the resolved source directory is unchanged. Signed-off-by: Otavio Salvador (cherry picked from commit aeb8adf071afc9df79441b084a95499c8b8dc22c) --- .../updatehub-active-inactive-backend-grub-tools_git.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-tools_git.bb b/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-tools_git.bb index 6b5e9b7..ba5db92 100644 --- a/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-tools_git.bb +++ b/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-tools_git.bb @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=838c366f69b72c5df05c96dff79b35f2" SRC_URI = "git://github.com/updatehub/active-inactive-backend-grub.git;protocol=https;branch=master" SRCREV = "e9ef6369857ab48ae245a224874de3bad7bd29ed" -S = "${WORKDIR}/git" - PV = "0.0+${SRCPV}" inherit allarch From b9f98fdf2c3bac9fcf0cb45d099ead8ba8804835 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 7 Aug 2026 15:49:06 -0300 Subject: [PATCH 3/6] updatehub-device-attributes: Remove S variable assignment Since oe-core 46480a5e66, carried from Whinlatter on, do_qa_unpack is fatal for recipes that set S = "${WORKDIR}/git": the value bitbake.conf derives now works on its own, as BB_GIT_DEFAULT_DESTSUFFIX is "${BP}" and S defaults to "${UNPACKDIR}/${BP}", so the git checkout already lands where S points. Drop the assignment rather than rewriting it to ${UNPACKDIR}/git, which the same check also rejects. SRC_URI carries no destsuffix override, so the resolved source directory is unchanged. Signed-off-by: Otavio Salvador (cherry picked from commit 71cbe5a751191d3ee3f1a9cff9f82f96e428ab1a) --- recipes-core/updatehub/updatehub-device-attributes_git.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes-core/updatehub/updatehub-device-attributes_git.bb b/recipes-core/updatehub/updatehub-device-attributes_git.bb index 8cb21de..9c54814 100644 --- a/recipes-core/updatehub/updatehub-device-attributes_git.bb +++ b/recipes-core/updatehub/updatehub-device-attributes_git.bb @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=838c366f69b72c5df05c96dff79b35f2" SRC_URI = "git://github.com/updatehub/device-attributes;protocol=https;branch=master" SRCREV = "c7ee915b0d304cec33a08cea7d3f184150c88dd1" -S = "${WORKDIR}/git" - inherit allarch do_configure[noexec] = "1" From a1a9f82b63fd37ac45e9ec1e24b7adc4c6496fab Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 7 Aug 2026 15:49:06 -0300 Subject: [PATCH 4/6] updatehub-grub-script: Set S relative to UNPACKDIR Since oe-core 46480a5e66, carried from Whinlatter on, do_qa_unpack is fatal whenever the unexpanded value of S contains ${WORKDIR}. The recipe still carried the Walnascar idiom of pointing S at ${WORKDIR}/sources and then overriding UNPACKDIR to match, so it fails do_unpack outright. Walnascar tolerated that idiom because base_do_unpack moved the unpacked directory back under ${WORKDIR}; that compatibility shim is gone from Whinlatter on, so the source is no longer where S points either. Point S at ${UNPACKDIR} and drop the override. UNPACKDIR already defaults to ${WORKDIR}/sources, so the resolved path is unchanged. Signed-off-by: Otavio Salvador (cherry picked from commit c06587bd13a5d513d9f6946563e9a8dbaaa838b3) --- recipes-bsp/grub/updatehub-grub-script.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-bsp/grub/updatehub-grub-script.bb b/recipes-bsp/grub/updatehub-grub-script.bb index 9c56ad3..31c2b81 100644 --- a/recipes-bsp/grub/updatehub-grub-script.bb +++ b/recipes-bsp/grub/updatehub-grub-script.bb @@ -5,8 +5,7 @@ SRC_URI = "file://grub.cfg" inherit deploy -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" do_deploy () { install -Dm644 ${UNPACKDIR}/grub.cfg ${DEPLOYDIR}/grub.cfg-${MACHINE}-${PV}-${PR} From 63c66d1621a387e526761211dcd98aac57c07dfa Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 7 Aug 2026 15:49:06 -0300 Subject: [PATCH 5/6] updatehub-active-inactive-backend-grub: Set S relative to UNPACKDIR Since oe-core 46480a5e66, carried from Whinlatter on, do_qa_unpack is fatal whenever the unexpanded value of S contains ${WORKDIR}. The recipe still carried the Walnascar idiom of pointing S at ${WORKDIR}/sources and then overriding UNPACKDIR to match, so it fails do_unpack outright. Walnascar tolerated that idiom because base_do_unpack moved the unpacked directory back under ${WORKDIR}; that compatibility shim is gone from Whinlatter on, so the source is no longer where S points either. Point S at ${UNPACKDIR} and drop the override. UNPACKDIR already defaults to ${WORKDIR}/sources, so the resolved path is unchanged. Signed-off-by: Otavio Salvador (cherry picked from commit 818af6318a09bea6b747619e16e2c91b59b2c032) --- .../updatehub-active-inactive-backend-grub.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub.bb b/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub.bb index 04a4a59..c0b5781 100644 --- a/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub.bb +++ b/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub.bb @@ -4,8 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = "file://updatehub-grubenv.default" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" do_configure[noexec] = "1" do_compile[noexec] = "1" From 274ae0c93f6188c9bea61d11b3744568355ab133 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 7 Aug 2026 15:49:06 -0300 Subject: [PATCH 6/6] updatehub-active-inactive-backend-grub-efi: Set S relative to UNPACKDIR Since oe-core 46480a5e66, carried from Whinlatter on, do_qa_unpack is fatal whenever the unexpanded value of S contains ${WORKDIR}. The recipe still carried the Walnascar idiom of pointing S at ${WORKDIR}/sources and then overriding UNPACKDIR to match, so it fails do_unpack outright. Walnascar tolerated that idiom because base_do_unpack moved the unpacked directory back under ${WORKDIR}; that compatibility shim is gone from Whinlatter on, so the source is no longer where S points either. Point S at ${UNPACKDIR} and drop the override. UNPACKDIR already defaults to ${WORKDIR}/sources, so the resolved path is unchanged. Signed-off-by: Otavio Salvador (cherry picked from commit 0d27861457c67c00d314cfc002d31219061177b3) --- .../updatehub-active-inactive-backend-grub-efi.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-efi.bb b/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-efi.bb index 38e7fdd..2e90897 100644 --- a/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-efi.bb +++ b/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-efi.bb @@ -4,8 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = "file://updatehub-grubenv.default" -S = "${WORKDIR}/sources" -UNPACKDIR = "${S}" +S = "${UNPACKDIR}" do_configure[noexec] = "1" do_compile[noexec] = "1"