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.

Sign up for GitHub

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

Jump to bottom

bundle: RAUC_META_mysection[metadata] isn't expending variables anymore (kirkstone -> scarthgap) #335

Closed
FederAndInk opened this issue Jul 24, 2024 · 3 comments · Fixed by #336
Closed

bundle: RAUC_META_mysection[metadata] isn't expending variables anymore (kirkstone -> scarthgap) #335

FederAndInk opened this issue Jul 24, 2024 · 3 comments · Fixed by #336

Comments

@FederAndInk
Copy link
Contributor

After the kirkstone -> scarthgap migration, meta varflags using yocto variables isn't working anymore

e.g:

RAUC_META_SECTIONS += "mysection"
RAUC_META_mysection[machine-name] = "${DISTRO}_${MACHINE}_${DISTRO_VERSION}"

will inject the mysection: machine-name=${DISTRO}_${MACHINE}_${DISTRO_VERSION} into the manifest as is
@FederAndInk
Copy link
Contributor Author

It looks like it's been introduced here:
ffba61f#diff-e5c2ad51d1ccb7561b62ea8e03cc127183911bb93f3b109efb41479a5d0d2631L334-L339

When changing d.getVarFlag to d.getVarFlags, d.getVarFlag expand parameter defaults to True, while d.getVarFlags does not.

@jluebbe
Copy link
Member

jluebbe commented Jul 24, 2024

For d.getVarFlags, one needs to pass a list of flags to expand, not just true.

It seems that the change to the metadata handling should be reverted. Do you want to make a PR?

FederAndInk added a commit to FederAndInk/meta-rauc that referenced this issue Jul 24, 2024
@FederAndInk
bundle.bbclass: fix variable expansion of RAUC_META_* varflags
26e69ab 
variables assigned to `RAUC_META_<section>[varflag]` are not expanded anymore.

This is caused by `getVarFlags` not expanding variables by default,
revert to using `getVarFlag` which does expand variables by default.

fix rauc#335

partially revert changes introduced in ffba61f

Signed-off-by: Ludovic Jozeau <ludovic.jozeau@scle.fr>
@FederAndInk
Copy link
Contributor Author

Sure

@FederAndInk FederAndInk mentioned this issue Jul 24, 2024
Merged
jluebbe pushed a commit to FederAndInk/meta-rauc that referenced this issue Jul 25, 2024
@FederAndInk @jluebbe
bundle.bbclass: fix variable expansion of RAUC_META_* varflags
792b1cc 
Variables assigned to `RAUC_META_<section>[varflag]` are not expanded
anymore. This is caused by `getVarFlags` not expanding variables by
default, revert to using `getVarFlag` which does expand variables by
default.

Fixes: rauc#335
Fixes: ffba61f ("bundle.bbclass: simplify varflag usage")
Signed-off-by: Ludovic Jozeau <ludovic.jozeau@scle.fr>
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
jluebbe pushed a commit to jluebbe/meta-rauc that referenced this issue Jul 25, 2024
@FederAndInk @jluebbe
bundle.bbclass: fix variable expansion of RAUC_META_* varflags
f4d80f9 
Variables assigned to `RAUC_META_<section>[varflag]` are not expanded
anymore. This is caused by `getVarFlags` not expanding variables by
default, revert to using `getVarFlag` which does expand variables by
default.

Fixes: rauc#335
Fixes: ffba61f ("bundle.bbclass: simplify varflag usage")
Signed-off-by: Ludovic Jozeau <ludovic.jozeau@scle.fr>
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
(cherry picked from commit 792b1cc)
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
jluebbe pushed a commit that referenced this issue Jul 25, 2024
@FederAndInk @jluebbe
bundle.bbclass: fix variable expansion of RAUC_META_* varflags
8fd3907 
Variables assigned to `RAUC_META_<section>[varflag]` are not expanded
anymore. This is caused by `getVarFlags` not expanding variables by
default, revert to using `getVarFlag` which does expand variables by
default.

Fixes: #335
Fixes: ffba61f ("bundle.bbclass: simplify varflag usage")
Signed-off-by: Ludovic Jozeau <ludovic.jozeau@scle.fr>
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
ejoerns pushed a commit to ejoerns/meta-rauc that referenced this issue Sep 9, 2024
@FederAndInk @ejoerns
bundle.bbclass: fix variable expansion of RAUC_META_* varflags
dcbb871 
Variables assigned to `RAUC_META_<section>[varflag]` are not expanded
anymore. This is caused by `getVarFlags` not expanding variables by
default, revert to using `getVarFlag` which does expand variables by
default.

Fixes: rauc#335
Fixes: ffba61f ("bundle.bbclass: simplify varflag usage")
Signed-off-by: Ludovic Jozeau <ludovic.jozeau@scle.fr>
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
(cherry picked from commit 8fd3907)
Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

bundle.bbclass: fix variable expansion of RAUC_META_* varflags FederAndInk/meta-rauc
2 participants
@jluebbe @FederAndInk