diff mbox series

[yocto-autobuilder-helper] config.json: Use new wicenv image type

Message ID 20260421-wicenv-v1-1-17447e94d2f6@pbarker.dev
State New
Headers show
Series [yocto-autobuilder-helper] config.json: Use new wicenv image type | expand

Commit Message

Paul Barker April 21, 2026, 8:12 p.m. UTC 
After the recent addition of the wicenv image type in openembedded-core,
we can use this instead of manually specifying do_rootfs_wicenv as a
target when we want to create the wic .env file.

This fixes the race condition which has previously caused failures of
the wic builder - dependencies now are set correctly so that the .env
file is always populated before do_image_complete syncs files over to
${DEPLOY_DIR_IMAGE}.

Fixes: [YOCTO #16246]
Signed-off-by: Paul Barker <paul@pbarker.dev>
Cc: Trevor Woerner <twoerner@gmail.com>
---
This should be applied alongside "image_types_wic: Introduce wicenv
image type" in openembedded-core.
  https://lore.kernel.org/openembedded-core/20260421-wicenv-v1-1-75450eff8364@pbarker.dev/T/

Test run on autobuilder:
  https://autobuilder.yoctoproject.org/valkyrie/#/builders/15/builds/3600
---
 config.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


---
base-commit: 0bba6f667fb614af7d172cf8990cdc429e6fd919
change-id: 20260421-wicenv-54a88aab5c46

Best regards,
--  
Paul Barker
diff mbox series

Patch

diff --git a/config.json b/config.json
index 2db902c4dd27..bc0c03174ae4 100644
--- a/config.json
+++ b/config.json
@@ -1024,13 +1024,13 @@ 
         "wic" : {
             "BUILDINFO" : true,
             "extravars" : [
-                "IMAGE_FSTYPES += ' hddimg'",
+                "IMAGE_FSTYPES += ' hddimg wicenv'",
                 "MACHINE_FEATURES:append = ' efi'"
             ],
             "step1" : {
                 "MACHINE" : "qemux86",
                 "shortname" : "qemux86 wic",
-                "BBTARGETS" : "core-image-sato:do_rootfs_wicenv core-image-sato wic-native:do_addto_recipe_sysroot wic-tools",
+                "BBTARGETS" : "core-image-sato wic-native:do_addto_recipe_sysroot wic-tools",
                 "extravars" : [
                      "DEPENDS:append:pn-core-image-sato = ' parted-native cross-localedef-native'"
                 ],
@@ -1043,7 +1043,7 @@ 
             "step2" : {
                 "MACHINE" : "genericx86",
                 "shortname" : "genericx86 wic",
-                "BBTARGETS" : "core-image-sato:do_rootfs_wicenv core-image-sato wic-native:do_addto_recipe_sysroot wic-tools",
+                "BBTARGETS" : "core-image-sato wic-native:do_addto_recipe_sysroot wic-tools",
                 "extravars" : [
                      "DEPENDS:append:pn-core-image-sato = ' parted-native cross-localedef-native'"
                 ],
@@ -1056,7 +1056,7 @@ 
             "step3" : {
                 "MACHINE" : "qemux86-64",
                 "shortname" : "qemux86-64 wic",
-                "BBTARGETS" : "core-image-sato:do_rootfs_wicenv core-image-sato wic-native:do_addto_recipe_sysroot wic-tools",
+                "BBTARGETS" : "core-image-sato wic-native:do_addto_recipe_sysroot wic-tools",
                 "extravars" : [
                      "DEPENDS:append:pn-core-image-sato = ' parted-native cross-localedef-native'"
                 ],
@@ -1069,7 +1069,7 @@ 
             "step4" : {
                 "MACHINE" : "genericx86-64",
                 "shortname" : "genericx86-64 wic",
-                "BBTARGETS" : "core-image-sato:do_rootfs_wicenv core-image-sato wic-native:do_addto_recipe_sysroot wic-tools",
+                "BBTARGETS" : "core-image-sato wic-native:do_addto_recipe_sysroot wic-tools",
                 "extravars" : [
                      "DEPENDS:append:pn-core-image-sato = ' parted-native cross-localedef-native'"
                 ],