summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomuald Jeanne <romuald.jeanne@st.com>2023-03-10 11:36:21 +0100
committerSteve Sakoman <steve@sakoman.com>2023-03-21 04:35:36 -1000
commit417b096d5cf51f5b947bccc32e6be97a93aed9d6 (patch)
treebb121479907b6fd59ee68de8180381a41edf7e23
parent612e2cff28852d9d3dfc947ee07dbe4111748239 (diff)
downloadopenembedded-core-417b096d5cf51f5b947bccc32e6be97a93aed9d6.tar.gz
image_types: fix multiubi var init
Make sure to expand all MKUBIFS_ARGS_<label> and UBINIZE_ARGS_<label> vars in 'do_image_multiubi' task to use them to init the local 'mkubifs_args' and 'ubinize_args' vars. See [YOCTO #15065] Signed-off-by: Romuald JEANNE <romuald.jeanne@st.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 09d05215cf61981c7bc828cc0ff64c2fd5edc43c) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/classes-recipe/image_types.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass
index c6cb8f5336..e4939af459 100644
--- a/meta/classes-recipe/image_types.bbclass
+++ b/meta/classes-recipe/image_types.bbclass
@@ -209,7 +209,10 @@ multiubi_mkfs() {
fi
}
+MULTIUBI_ARGS = "MKUBIFS_ARGS UBINIZE_ARGS"
+
IMAGE_CMD:multiubi () {
+ ${@' '.join(['%s_%s="%s";' % (arg, name, d.getVar('%s_%s' % (arg, name))) for arg in d.getVar('MULTIUBI_ARGS').split() for name in d.getVar('MULTIUBI_BUILD').split()])}
# Split MKUBIFS_ARGS_<name> and UBINIZE_ARGS_<name>
for name in ${MULTIUBI_BUILD}; do
eval local mkubifs_args=\"\$MKUBIFS_ARGS_${name}\"