diff mbox series

[yocto-autobuilder-helper,v3] config: Fix wic builder after wic removal

Message ID 20260407-contrib-mathieu-wic-builder-v3-1-100c1e736c56@bootlin.com
State New
Headers show
Series [yocto-autobuilder-helper,v3] config: Fix wic builder after wic removal | expand

Commit Message

Mathieu Dubois-Briand April 7, 2026, 9:57 a.m. UTC 
Wic tool is now stored in an external git, so we can no longer rely on
it being provided by openembedded-core scripts directory. Use the
version provided by the wic recipe instead.

Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
---
Changes in v3:
- updating --vars parameter, as it now has to be a folder.
- Link to v2: https://lore.kernel.org/r/20260306-contrib-mathieu-wic-builder-v2-1-e93e1915894e@bootlin.com

Changes in v2:
- Fixing append syntax.
- Link to v1: https://lore.kernel.org/r/20260305-contrib-mathieu-wic-builder-v1-1-5886c06cd38a@bootlin.com
---
 config.json | 44 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)


---
base-commit: 4304a9d29045086b204f7a6274faf2c8ea91b82c
change-id: 20260305-contrib-mathieu-wic-builder-39c9c19c0265

Best regards,
diff mbox series

Patch

diff --git a/config.json b/config.json
index 5e5071e6f964..192ee7d850c8 100644
--- a/config.json
+++ b/config.json
@@ -1030,41 +1030,53 @@ 
             "step1" : {
                 "MACHINE" : "qemux86",
                 "shortname" : "qemux86 wic",
-                "BBTARGETS" : "wic-tools core-image-sato",
+                "BBTARGETS" : "core-image-sato:do_rootfs_wicenv core-image-sato wic-native:do_addto_recipe_sysroot wic-tools",
+                "extravars" : [
+                     "DEPENDS:append:pn-core-image-sato = ' parted-native cross-localedef-native'"
+                ],
                 "EXTRACMDS" : [
-                    "wic create directdisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86/directdisk/core-image-sato/",
-                    "wic create directdisk-gpt -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86/directdisk/core-image-sato/",
-                    "wic create mkefidisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86/directdisk/core-image-sato/"
+                    "oe-run-native wic-native wic create directdisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86/directdisk/core-image-sato/ --vars ${BUILDDIR}/tmp/deploy/images/qemux86/",
+                    "oe-run-native wic-native wic create directdisk-gpt -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86/directdisk/core-image-sato/ --vars ${BUILDDIR}/tmp/deploy/images/qemux86/",
+                    "oe-run-native wic-native wic create mkefidisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86/directdisk/core-image-sato/ --vars ${BUILDDIR}/tmp/deploy/images/qemux86/"
                 ]
             },
             "step2" : {
                 "MACHINE" : "genericx86",
                 "shortname" : "genericx86 wic",
-                "BBTARGETS" : "wic-tools core-image-sato",
+                "BBTARGETS" : "core-image-sato:do_rootfs_wicenv core-image-sato wic-native:do_addto_recipe_sysroot wic-tools",
+                "extravars" : [
+                     "DEPENDS:append:pn-core-image-sato = ' parted-native cross-localedef-native'"
+                ],
                 "EXTRACMDS" : [
-                    "wic create directdisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86/directdisk/core-image-sato/",
-                    "wic create directdisk-gpt -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86/directdisk/core-image-sato/",
-                    "wic create mkefidisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86/directdisk/core-image-sato/"
+                    "oe-run-native wic-native wic create directdisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86/directdisk/core-image-sato/ --vars ${BUILDDIR}/tmp/deploy/images/genericx86/",
+                    "oe-run-native wic-native wic create directdisk-gpt -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86/directdisk/core-image-sato/ --vars ${BUILDDIR}/tmp/deploy/images/genericx86/",
+                    "oe-run-native wic-native wic create mkefidisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86/directdisk/core-image-sato/ --vars ${BUILDDIR}/tmp/deploy/images/genericx86/"
                 ]
             },
             "step3" : {
                 "MACHINE" : "qemux86-64",
                 "shortname" : "qemux86-64 wic",
-                "BBTARGETS" : "wic-tools core-image-sato",
+                "BBTARGETS" : "core-image-sato:do_rootfs_wicenv core-image-sato wic-native:do_addto_recipe_sysroot wic-tools",
+                "extravars" : [
+                     "DEPENDS:append:pn-core-image-sato = ' parted-native cross-localedef-native'"
+                ],
                 "EXTRACMDS" : [
-                    "wic create directdisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86-64/directdisk/core-image-sato/",
-                    "wic create directdisk-gpt -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86-64/directdisk/core-image-sato/",
-                    "wic create mkefidisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86-64/directdisk/core-image-sato/"
+                    "oe-run-native wic-native wic create directdisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86-64/directdisk/core-image-sato/ --vars ${BUILDDIR}/tmp/deploy/images/qemux86-64/",
+                    "oe-run-native wic-native wic create directdisk-gpt -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86-64/directdisk/core-image-sato/ --vars ${BUILDDIR}/tmp/deploy/images/qemux86-64/",
+                    "oe-run-native wic-native wic create mkefidisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/qemux86-64/directdisk/core-image-sato/ --vars ${BUILDDIR}/tmp/deploy/images/qemux86-64/"
                 ]
             },
             "step4" : {
                 "MACHINE" : "genericx86-64",
                 "shortname" : "genericx86-64 wic",
-                "BBTARGETS" : "wic-tools core-image-sato",
+                "BBTARGETS" : "core-image-sato:do_rootfs_wicenv core-image-sato wic-native:do_addto_recipe_sysroot wic-tools",
+                "extravars" : [
+                     "DEPENDS:append:pn-core-image-sato = ' parted-native cross-localedef-native'"
+                ],
                 "EXTRACMDS" : [
-                    "wic create directdisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86-64/directdisk/core-image-sato/",
-                    "wic create directdisk-gpt -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86-64/directdisk/core-image-sato/",
-                    "wic create mkefidisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/wic_images/genericx86-64/directdisk/core-image-sato/"
+                    "oe-run-native wic-native wic create directdisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/images/genericx86-64/directdisk/core-image-sato/ --vars ${BUILDDIR}/tmp/deploy/images/genericx86-64/",
+                    "oe-run-native wic-native wic create directdisk-gpt -e core-image-sato -o ${BUILDDIR}/tmp/deploy/images/genericx86-64/directdisk/core-image-sato/ --vars ${BUILDDIR}/tmp/deploy/images/genericx86-64/",
+                    "oe-run-native wic-native wic create mkefidisk -e core-image-sato -o ${BUILDDIR}/tmp/deploy/images/genericx86-64/directdisk/core-image-sato/ --vars ${BUILDDIR}/tmp/deploy/images/genericx86-64/"
                 ]
             }
         },