[whinlatter] Finish the UNPACKDIR migration: remove remaining ${WORKDIR} uses in S - #134
Merged
Merged
Conversation
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 <otavio@ossystems.com.br>
(cherry picked from commit 4fc836b)
…nment
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 <otavio@ossystems.com.br>
(cherry picked from commit aeb8adf)
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 <otavio@ossystems.com.br>
(cherry picked from commit 71cbe5a)
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 <otavio@ossystems.com.br>
(cherry picked from commit c06587b)
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 <otavio@ossystems.com.br>
(cherry picked from commit 818af63)
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 <otavio@ossystems.com.br>
(cherry picked from commit 0d27861)
otavio
commented
Aug 7, 2026
otavio
left a comment
otavio
left a comment
Member
Author
There was a problem hiding this comment.
Backport of #132; see the review there for the substantive analysis.
Branch-specific checks for this target: same bitbake.conf values and same fatal do_qa_unpack as master, and no Walnascar base_do_unpack shim — so the recipes fail for real here, not just on lint. All six files were byte-identical to master's beforehand, the cherry-picks applied without conflict, and all six now match the master branch byte-for-byte. git grep '${WORKDIR}' over the layer returns nothing.
Not built. Merge after #132.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #132 to
whinlatter. Six commits, cherry-picked with-x; all six resulting files are byte-identical to the master branch.Merge after #132.
Why whinlatter needs it
whinlatter's oe-core has the samebitbake.confas master —UNPACKDIR ??= "\${WORKDIR}/sources",BB_GIT_DEFAULT_DESTSUFFIX = "\${BP}",S = "\${UNPACKDIR}/\${BP}"— and the same fataldo_qa_unpackfrom oe-core46480a5e66, wired asdo_unpack[postfuncs]. It also lacks Walnascar'sbase_do_unpackshim that moved the unpacked directory back under\${WORKDIR}, so these recipes fail for real, not just on lint.All six recipes were byte-identical to master's before this change, so the cherry-picks applied without conflict.
Changes
Assignment removed (the git checkout already lands at the default
S):updatehub-sdk-qtupdatehub-active-inactive-backend-grub-toolsupdatehub-device-attributesS = "\${UNPACKDIR}", dropping the redundantUNPACKDIR = "\${S}"override:updatehub-grub-scriptupdatehub-active-inactive-backend-grubupdatehub-active-inactive-backend-grub-efiEvery resolved path is unchanged. After this,
git grep '\${WORKDIR}'over the layer's.bb/.bbappend/.inc/.bbclassreturns nothing on this branch.Not backported further
Walnascar's
do_qa_unpackhas no\${WORKDIR}check and itsbase_do_unpackstill carries the compatibility shim; Scarthgap and older have noUNPACKDIRat all and unpack into\${WORKDIR}directly. Both were checked against their own oe-core — the current recipes are correct there and must not be changed.Testing
Not built. Verified by inspection against this branch's
insane.bbclass,bitbake.confandbase.bbclass, plus a byte-for-byte diff of all six recipes against master.