Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Follow WORKDIR -> UNPACKDIR transition #320

Merged
merged 3 commits into from
Jun 3, 2024
Merged

Conversation

ejoerns
Copy link
Member

@ejoerns ejoerns commented May 26, 2024

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 guidelines from:
https://lists.openembedded.org/g/openembedded-architecture/message/2007

For this, we need to break compatibility with all releases before master.

We will need to do some breaking changes.

Add compatibility with 'styhead' which will be the codename for the
upcoming 5.1 poky release.

Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
@troth
Copy link
Contributor

troth commented May 29, 2024

Testing your patches for this and I see the following WARNING:

WARNING: rauc-conf-1.0-r0 do_unpack: rauc-conf: the directory ${WORKDIR}/${BP} (/home/troth/work/judo/judo-main/build/tmp/work/armv7at2hf-neon-trimble-linux-gnueabi/rauc-conf/1.0/rauc-conf-1.0) pointed to by the S variable doesn't exist - please set S within the recipe to point to where the source has been unpacked to

Adding the following after SRC_URI should quell the warning:

S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"

@ejoerns
Copy link
Member Author

ejoerns commented May 29, 2024

@troth Indeed, I get the same error when building rauc-conf. No idea why I missed this, thanks for the hint!

I also wasn't fully aware yet that setting S became mandatory with the recent oe-core changes.

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 <ejo@pengutronix.de>
Aligns with the changes and recommendations in oe-core.

Replaces usages of WORKDIR by UNPACKDIR since this seems to better match
the purpose here than S does.

Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
@ejoerns
Copy link
Member Author

ejoerns commented May 29, 2024

Should have read this paragraph :)

Previously, S was always created but after the recent changes it is
not. This means the check in do_unpack_qa triggers where S is not
created by a recipe where as it did not before. This can mean adding a
S definition to a recipe that only uses file:// SRC_URI entries.

@Emantor Emantor merged commit 970eab6 into rauc:master Jun 3, 2024
2 checks passed
@ejoerns ejoerns deleted the fix-master branch June 3, 2024 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants