* [wic][PATCH 1/9] re-organize for python src layout packaging
2026-04-03 18:36 [wic][PATCH 0/9] standalone wic repository Trevor Woerner
@ 2026-04-03 18:36 ` Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 2/9] move example *wks files Trevor Woerner
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Trevor Woerner @ 2026-04-03 18:36 UTC (permalink / raw)
To: yocto-patches; +Cc: Bruce Ashfield, Mark Hatle
The git-filter-repo tool was used to take OpenEmbedded's wic utility and
import it (without any modification whatsoever) into its own source code
repository while preserving the entire git history, removing any files
and git history not related to wic. The specific command used to perform
this conversion on a clean checkout of the OpenEmbedded repository was:
$ git-filter-repo --force --path scripts/wic --path scripts/lib/wic/
The goal of this conversion process is to end up with an independent
Python package for wic. This commit moves the wic components into the
Python de facto standard packaging "src layout" order. All components
are moved as they are; the main wic program is moved and renamed to
`src/wic/cli.py`.
NOTE: this commit does not work as-is, but is being provided in order to
explicitly show a clean transition from oe-core
Reviewed-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Reviewed-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
{scripts/lib => src}/wic/__init__.py | 0
{scripts/lib => src}/wic/canned-wks/common.wks.inc | 0
.../lib => src}/wic/canned-wks/directdisk-bootloader-config.cfg | 0
.../lib => src}/wic/canned-wks/directdisk-bootloader-config.wks | 0
{scripts/lib => src}/wic/canned-wks/directdisk-gpt.wks | 0
{scripts/lib => src}/wic/canned-wks/directdisk-multi-rootfs.wks | 0
{scripts/lib => src}/wic/canned-wks/directdisk.wks | 0
{scripts/lib => src}/wic/canned-wks/efi-bootdisk.wks.in | 0
{scripts/lib => src}/wic/canned-wks/efi-uki-bootdisk.wks.in | 0
{scripts/lib => src}/wic/canned-wks/mkefidisk.wks | 0
{scripts/lib => src}/wic/canned-wks/mkhybridiso.wks | 0
{scripts/lib => src}/wic/canned-wks/qemuloongarch.wks | 0
{scripts/lib => src}/wic/canned-wks/qemuriscv.wks | 0
{scripts/lib => src}/wic/canned-wks/qemux86-directdisk.wks | 0
{scripts/lib => src}/wic/canned-wks/sdimage-bootpart.wks | 0
{scripts/lib => src}/wic/canned-wks/systemd-bootdisk.wks | 0
scripts/wic => src/wic/cli.py | 0
{scripts/lib => src}/wic/engine.py | 0
{scripts/lib => src}/wic/filemap.py | 0
{scripts/lib => src}/wic/help.py | 0
{scripts/lib => src}/wic/ksparser.py | 0
{scripts/lib => src}/wic/misc.py | 0
{scripts/lib => src}/wic/partition.py | 0
{scripts/lib => src}/wic/pluginbase.py | 0
{scripts/lib => src}/wic/plugins/imager/direct.py | 0
{scripts/lib => src}/wic/plugins/source/bootimg_biosplusefi.py | 0
{scripts/lib => src}/wic/plugins/source/bootimg_efi.py | 0
{scripts/lib => src}/wic/plugins/source/bootimg_partition.py | 0
{scripts/lib => src}/wic/plugins/source/bootimg_pcbios.py | 0
{scripts/lib => src}/wic/plugins/source/empty.py | 0
{scripts/lib => src}/wic/plugins/source/extra_partition.py | 0
{scripts/lib => src}/wic/plugins/source/isoimage_isohybrid.py | 0
{scripts/lib => src}/wic/plugins/source/rawcopy.py | 0
{scripts/lib => src}/wic/plugins/source/rootfs.py | 0
34 files changed, 0 insertions(+), 0 deletions(-)
rename {scripts/lib => src}/wic/__init__.py (100%)
rename {scripts/lib => src}/wic/canned-wks/common.wks.inc (100%)
rename {scripts/lib => src}/wic/canned-wks/directdisk-bootloader-config.cfg (100%)
rename {scripts/lib => src}/wic/canned-wks/directdisk-bootloader-config.wks (100%)
rename {scripts/lib => src}/wic/canned-wks/directdisk-gpt.wks (100%)
rename {scripts/lib => src}/wic/canned-wks/directdisk-multi-rootfs.wks (100%)
rename {scripts/lib => src}/wic/canned-wks/directdisk.wks (100%)
rename {scripts/lib => src}/wic/canned-wks/efi-bootdisk.wks.in (100%)
rename {scripts/lib => src}/wic/canned-wks/efi-uki-bootdisk.wks.in (100%)
rename {scripts/lib => src}/wic/canned-wks/mkefidisk.wks (100%)
rename {scripts/lib => src}/wic/canned-wks/mkhybridiso.wks (100%)
rename {scripts/lib => src}/wic/canned-wks/qemuloongarch.wks (100%)
rename {scripts/lib => src}/wic/canned-wks/qemuriscv.wks (100%)
rename {scripts/lib => src}/wic/canned-wks/qemux86-directdisk.wks (100%)
rename {scripts/lib => src}/wic/canned-wks/sdimage-bootpart.wks (100%)
rename {scripts/lib => src}/wic/canned-wks/systemd-bootdisk.wks (100%)
rename scripts/wic => src/wic/cli.py (100%)
rename {scripts/lib => src}/wic/engine.py (100%)
rename {scripts/lib => src}/wic/filemap.py (100%)
rename {scripts/lib => src}/wic/help.py (100%)
rename {scripts/lib => src}/wic/ksparser.py (100%)
rename {scripts/lib => src}/wic/misc.py (100%)
rename {scripts/lib => src}/wic/partition.py (100%)
rename {scripts/lib => src}/wic/pluginbase.py (100%)
rename {scripts/lib => src}/wic/plugins/imager/direct.py (100%)
rename {scripts/lib => src}/wic/plugins/source/bootimg_biosplusefi.py (100%)
rename {scripts/lib => src}/wic/plugins/source/bootimg_efi.py (100%)
rename {scripts/lib => src}/wic/plugins/source/bootimg_partition.py (100%)
rename {scripts/lib => src}/wic/plugins/source/bootimg_pcbios.py (100%)
rename {scripts/lib => src}/wic/plugins/source/empty.py (100%)
rename {scripts/lib => src}/wic/plugins/source/extra_partition.py (100%)
rename {scripts/lib => src}/wic/plugins/source/isoimage_isohybrid.py (100%)
rename {scripts/lib => src}/wic/plugins/source/rawcopy.py (100%)
rename {scripts/lib => src}/wic/plugins/source/rootfs.py (100%)
diff --git a/scripts/lib/wic/__init__.py b/src/wic/__init__.py
similarity index 100%
rename from scripts/lib/wic/__init__.py
rename to src/wic/__init__.py
diff --git a/scripts/lib/wic/canned-wks/common.wks.inc b/src/wic/canned-wks/common.wks.inc
similarity index 100%
rename from scripts/lib/wic/canned-wks/common.wks.inc
rename to src/wic/canned-wks/common.wks.inc
diff --git a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg b/src/wic/canned-wks/directdisk-bootloader-config.cfg
similarity index 100%
rename from scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
rename to src/wic/canned-wks/directdisk-bootloader-config.cfg
diff --git a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks b/src/wic/canned-wks/directdisk-bootloader-config.wks
similarity index 100%
rename from scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks
rename to src/wic/canned-wks/directdisk-bootloader-config.wks
diff --git a/scripts/lib/wic/canned-wks/directdisk-gpt.wks b/src/wic/canned-wks/directdisk-gpt.wks
similarity index 100%
rename from scripts/lib/wic/canned-wks/directdisk-gpt.wks
rename to src/wic/canned-wks/directdisk-gpt.wks
diff --git a/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks b/src/wic/canned-wks/directdisk-multi-rootfs.wks
similarity index 100%
rename from scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks
rename to src/wic/canned-wks/directdisk-multi-rootfs.wks
diff --git a/scripts/lib/wic/canned-wks/directdisk.wks b/src/wic/canned-wks/directdisk.wks
similarity index 100%
rename from scripts/lib/wic/canned-wks/directdisk.wks
rename to src/wic/canned-wks/directdisk.wks
diff --git a/scripts/lib/wic/canned-wks/efi-bootdisk.wks.in b/src/wic/canned-wks/efi-bootdisk.wks.in
similarity index 100%
rename from scripts/lib/wic/canned-wks/efi-bootdisk.wks.in
rename to src/wic/canned-wks/efi-bootdisk.wks.in
diff --git a/scripts/lib/wic/canned-wks/efi-uki-bootdisk.wks.in b/src/wic/canned-wks/efi-uki-bootdisk.wks.in
similarity index 100%
rename from scripts/lib/wic/canned-wks/efi-uki-bootdisk.wks.in
rename to src/wic/canned-wks/efi-uki-bootdisk.wks.in
diff --git a/scripts/lib/wic/canned-wks/mkefidisk.wks b/src/wic/canned-wks/mkefidisk.wks
similarity index 100%
rename from scripts/lib/wic/canned-wks/mkefidisk.wks
rename to src/wic/canned-wks/mkefidisk.wks
diff --git a/scripts/lib/wic/canned-wks/mkhybridiso.wks b/src/wic/canned-wks/mkhybridiso.wks
similarity index 100%
rename from scripts/lib/wic/canned-wks/mkhybridiso.wks
rename to src/wic/canned-wks/mkhybridiso.wks
diff --git a/scripts/lib/wic/canned-wks/qemuloongarch.wks b/src/wic/canned-wks/qemuloongarch.wks
similarity index 100%
rename from scripts/lib/wic/canned-wks/qemuloongarch.wks
rename to src/wic/canned-wks/qemuloongarch.wks
diff --git a/scripts/lib/wic/canned-wks/qemuriscv.wks b/src/wic/canned-wks/qemuriscv.wks
similarity index 100%
rename from scripts/lib/wic/canned-wks/qemuriscv.wks
rename to src/wic/canned-wks/qemuriscv.wks
diff --git a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks b/src/wic/canned-wks/qemux86-directdisk.wks
similarity index 100%
rename from scripts/lib/wic/canned-wks/qemux86-directdisk.wks
rename to src/wic/canned-wks/qemux86-directdisk.wks
diff --git a/scripts/lib/wic/canned-wks/sdimage-bootpart.wks b/src/wic/canned-wks/sdimage-bootpart.wks
similarity index 100%
rename from scripts/lib/wic/canned-wks/sdimage-bootpart.wks
rename to src/wic/canned-wks/sdimage-bootpart.wks
diff --git a/scripts/lib/wic/canned-wks/systemd-bootdisk.wks b/src/wic/canned-wks/systemd-bootdisk.wks
similarity index 100%
rename from scripts/lib/wic/canned-wks/systemd-bootdisk.wks
rename to src/wic/canned-wks/systemd-bootdisk.wks
diff --git a/scripts/wic b/src/wic/cli.py
similarity index 100%
rename from scripts/wic
rename to src/wic/cli.py
diff --git a/scripts/lib/wic/engine.py b/src/wic/engine.py
similarity index 100%
rename from scripts/lib/wic/engine.py
rename to src/wic/engine.py
diff --git a/scripts/lib/wic/filemap.py b/src/wic/filemap.py
similarity index 100%
rename from scripts/lib/wic/filemap.py
rename to src/wic/filemap.py
diff --git a/scripts/lib/wic/help.py b/src/wic/help.py
similarity index 100%
rename from scripts/lib/wic/help.py
rename to src/wic/help.py
diff --git a/scripts/lib/wic/ksparser.py b/src/wic/ksparser.py
similarity index 100%
rename from scripts/lib/wic/ksparser.py
rename to src/wic/ksparser.py
diff --git a/scripts/lib/wic/misc.py b/src/wic/misc.py
similarity index 100%
rename from scripts/lib/wic/misc.py
rename to src/wic/misc.py
diff --git a/scripts/lib/wic/partition.py b/src/wic/partition.py
similarity index 100%
rename from scripts/lib/wic/partition.py
rename to src/wic/partition.py
diff --git a/scripts/lib/wic/pluginbase.py b/src/wic/pluginbase.py
similarity index 100%
rename from scripts/lib/wic/pluginbase.py
rename to src/wic/pluginbase.py
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/src/wic/plugins/imager/direct.py
similarity index 100%
rename from scripts/lib/wic/plugins/imager/direct.py
rename to src/wic/plugins/imager/direct.py
diff --git a/scripts/lib/wic/plugins/source/bootimg_biosplusefi.py b/src/wic/plugins/source/bootimg_biosplusefi.py
similarity index 100%
rename from scripts/lib/wic/plugins/source/bootimg_biosplusefi.py
rename to src/wic/plugins/source/bootimg_biosplusefi.py
diff --git a/scripts/lib/wic/plugins/source/bootimg_efi.py b/src/wic/plugins/source/bootimg_efi.py
similarity index 100%
rename from scripts/lib/wic/plugins/source/bootimg_efi.py
rename to src/wic/plugins/source/bootimg_efi.py
diff --git a/scripts/lib/wic/plugins/source/bootimg_partition.py b/src/wic/plugins/source/bootimg_partition.py
similarity index 100%
rename from scripts/lib/wic/plugins/source/bootimg_partition.py
rename to src/wic/plugins/source/bootimg_partition.py
diff --git a/scripts/lib/wic/plugins/source/bootimg_pcbios.py b/src/wic/plugins/source/bootimg_pcbios.py
similarity index 100%
rename from scripts/lib/wic/plugins/source/bootimg_pcbios.py
rename to src/wic/plugins/source/bootimg_pcbios.py
diff --git a/scripts/lib/wic/plugins/source/empty.py b/src/wic/plugins/source/empty.py
similarity index 100%
rename from scripts/lib/wic/plugins/source/empty.py
rename to src/wic/plugins/source/empty.py
diff --git a/scripts/lib/wic/plugins/source/extra_partition.py b/src/wic/plugins/source/extra_partition.py
similarity index 100%
rename from scripts/lib/wic/plugins/source/extra_partition.py
rename to src/wic/plugins/source/extra_partition.py
diff --git a/scripts/lib/wic/plugins/source/isoimage_isohybrid.py b/src/wic/plugins/source/isoimage_isohybrid.py
similarity index 100%
rename from scripts/lib/wic/plugins/source/isoimage_isohybrid.py
rename to src/wic/plugins/source/isoimage_isohybrid.py
diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/src/wic/plugins/source/rawcopy.py
similarity index 100%
rename from scripts/lib/wic/plugins/source/rawcopy.py
rename to src/wic/plugins/source/rawcopy.py
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/src/wic/plugins/source/rootfs.py
similarity index 100%
rename from scripts/lib/wic/plugins/source/rootfs.py
rename to src/wic/plugins/source/rootfs.py
--
2.51.0
^ permalink raw reply [flat|nested] 10+ messages in thread* [wic][PATCH 2/9] move example *wks files
2026-04-03 18:36 [wic][PATCH 0/9] standalone wic repository Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 1/9] re-organize for python src layout packaging Trevor Woerner
@ 2026-04-03 18:36 ` Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 3/9] create python hatch project Trevor Woerner
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Trevor Woerner @ 2026-04-03 18:36 UTC (permalink / raw)
To: yocto-patches; +Cc: Bruce Ashfield, Mark Hatle
These canned *wks files come directly from the OpenEmbedded project, are
only relevant to that project, and therefore should be preserved there.
Instead of removing them, keep them around as example *wks files for
this project.
However, move them away from a location (relative to the wic invoking
script itself, cli.py) so they do not accidentally interfere with any
usage of this tool.
NOTE: this commit does not work as-is, but is being provided in order to
explicitly show a clean transition from oe-core
Reviewed-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Reviewed-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
{src/wic/canned-wks => example-wks}/common.wks.inc | 0
.../canned-wks => example-wks}/directdisk-bootloader-config.cfg | 0
.../canned-wks => example-wks}/directdisk-bootloader-config.wks | 0
{src/wic/canned-wks => example-wks}/directdisk-gpt.wks | 0
{src/wic/canned-wks => example-wks}/directdisk-multi-rootfs.wks | 0
{src/wic/canned-wks => example-wks}/directdisk.wks | 0
{src/wic/canned-wks => example-wks}/efi-bootdisk.wks.in | 0
{src/wic/canned-wks => example-wks}/efi-uki-bootdisk.wks.in | 0
{src/wic/canned-wks => example-wks}/mkefidisk.wks | 0
{src/wic/canned-wks => example-wks}/mkhybridiso.wks | 0
{src/wic/canned-wks => example-wks}/qemuloongarch.wks | 0
{src/wic/canned-wks => example-wks}/qemuriscv.wks | 0
{src/wic/canned-wks => example-wks}/qemux86-directdisk.wks | 0
{src/wic/canned-wks => example-wks}/sdimage-bootpart.wks | 0
{src/wic/canned-wks => example-wks}/systemd-bootdisk.wks | 0
15 files changed, 0 insertions(+), 0 deletions(-)
rename {src/wic/canned-wks => example-wks}/common.wks.inc (100%)
rename {src/wic/canned-wks => example-wks}/directdisk-bootloader-config.cfg (100%)
rename {src/wic/canned-wks => example-wks}/directdisk-bootloader-config.wks (100%)
rename {src/wic/canned-wks => example-wks}/directdisk-gpt.wks (100%)
rename {src/wic/canned-wks => example-wks}/directdisk-multi-rootfs.wks (100%)
rename {src/wic/canned-wks => example-wks}/directdisk.wks (100%)
rename {src/wic/canned-wks => example-wks}/efi-bootdisk.wks.in (100%)
rename {src/wic/canned-wks => example-wks}/efi-uki-bootdisk.wks.in (100%)
rename {src/wic/canned-wks => example-wks}/mkefidisk.wks (100%)
rename {src/wic/canned-wks => example-wks}/mkhybridiso.wks (100%)
rename {src/wic/canned-wks => example-wks}/qemuloongarch.wks (100%)
rename {src/wic/canned-wks => example-wks}/qemuriscv.wks (100%)
rename {src/wic/canned-wks => example-wks}/qemux86-directdisk.wks (100%)
rename {src/wic/canned-wks => example-wks}/sdimage-bootpart.wks (100%)
rename {src/wic/canned-wks => example-wks}/systemd-bootdisk.wks (100%)
diff --git a/src/wic/canned-wks/common.wks.inc b/example-wks/common.wks.inc
similarity index 100%
rename from src/wic/canned-wks/common.wks.inc
rename to example-wks/common.wks.inc
diff --git a/src/wic/canned-wks/directdisk-bootloader-config.cfg b/example-wks/directdisk-bootloader-config.cfg
similarity index 100%
rename from src/wic/canned-wks/directdisk-bootloader-config.cfg
rename to example-wks/directdisk-bootloader-config.cfg
diff --git a/src/wic/canned-wks/directdisk-bootloader-config.wks b/example-wks/directdisk-bootloader-config.wks
similarity index 100%
rename from src/wic/canned-wks/directdisk-bootloader-config.wks
rename to example-wks/directdisk-bootloader-config.wks
diff --git a/src/wic/canned-wks/directdisk-gpt.wks b/example-wks/directdisk-gpt.wks
similarity index 100%
rename from src/wic/canned-wks/directdisk-gpt.wks
rename to example-wks/directdisk-gpt.wks
diff --git a/src/wic/canned-wks/directdisk-multi-rootfs.wks b/example-wks/directdisk-multi-rootfs.wks
similarity index 100%
rename from src/wic/canned-wks/directdisk-multi-rootfs.wks
rename to example-wks/directdisk-multi-rootfs.wks
diff --git a/src/wic/canned-wks/directdisk.wks b/example-wks/directdisk.wks
similarity index 100%
rename from src/wic/canned-wks/directdisk.wks
rename to example-wks/directdisk.wks
diff --git a/src/wic/canned-wks/efi-bootdisk.wks.in b/example-wks/efi-bootdisk.wks.in
similarity index 100%
rename from src/wic/canned-wks/efi-bootdisk.wks.in
rename to example-wks/efi-bootdisk.wks.in
diff --git a/src/wic/canned-wks/efi-uki-bootdisk.wks.in b/example-wks/efi-uki-bootdisk.wks.in
similarity index 100%
rename from src/wic/canned-wks/efi-uki-bootdisk.wks.in
rename to example-wks/efi-uki-bootdisk.wks.in
diff --git a/src/wic/canned-wks/mkefidisk.wks b/example-wks/mkefidisk.wks
similarity index 100%
rename from src/wic/canned-wks/mkefidisk.wks
rename to example-wks/mkefidisk.wks
diff --git a/src/wic/canned-wks/mkhybridiso.wks b/example-wks/mkhybridiso.wks
similarity index 100%
rename from src/wic/canned-wks/mkhybridiso.wks
rename to example-wks/mkhybridiso.wks
diff --git a/src/wic/canned-wks/qemuloongarch.wks b/example-wks/qemuloongarch.wks
similarity index 100%
rename from src/wic/canned-wks/qemuloongarch.wks
rename to example-wks/qemuloongarch.wks
diff --git a/src/wic/canned-wks/qemuriscv.wks b/example-wks/qemuriscv.wks
similarity index 100%
rename from src/wic/canned-wks/qemuriscv.wks
rename to example-wks/qemuriscv.wks
diff --git a/src/wic/canned-wks/qemux86-directdisk.wks b/example-wks/qemux86-directdisk.wks
similarity index 100%
rename from src/wic/canned-wks/qemux86-directdisk.wks
rename to example-wks/qemux86-directdisk.wks
diff --git a/src/wic/canned-wks/sdimage-bootpart.wks b/example-wks/sdimage-bootpart.wks
similarity index 100%
rename from src/wic/canned-wks/sdimage-bootpart.wks
rename to example-wks/sdimage-bootpart.wks
diff --git a/src/wic/canned-wks/systemd-bootdisk.wks b/example-wks/systemd-bootdisk.wks
similarity index 100%
rename from src/wic/canned-wks/systemd-bootdisk.wks
rename to example-wks/systemd-bootdisk.wks
--
2.51.0
^ permalink raw reply [flat|nested] 10+ messages in thread* [wic][PATCH 3/9] create python hatch project
2026-04-03 18:36 [wic][PATCH 0/9] standalone wic repository Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 1/9] re-organize for python src layout packaging Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 2/9] move example *wks files Trevor Woerner
@ 2026-04-03 18:36 ` Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 4/9] add oe-core and bitbake helper packages Trevor Woerner
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Trevor Woerner @ 2026-04-03 18:36 UTC (permalink / raw)
To: yocto-patches; +Cc: Bruce Ashfield, Mark Hatle
Add the pieces necessary to convert this project into a standard Python
hatch package.
NOTE: this commit does not work as-is, but is being provided in order to
explicitly show a clean transition from oe-core
Reviewed-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Reviewed-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
.gitignore | 1 +
LICENSE | 288 +++++++++++++++++++++++++++++++++++++++++++++++++
README.md | 51 +++++++++
pyproject.toml | 38 +++++++
4 files changed, 378 insertions(+)
create mode 100644 .gitignore
create mode 100644 LICENSE
create mode 100644 README.md
create mode 100644 pyproject.toml
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..eeb8a6ec4087
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+**/__pycache__
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000000..5db3c0a21cdb
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,288 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+Note:
+Individual files contain the following tag instead of the full license text.
+
+ SPDX-License-Identifier: GPL-2.0-only
+
+This enables machine processing of license information based on the SPDX
+License Identifiers that are here available: http://spdx.org/licenses/
diff --git a/README.md b/README.md
new file mode 100644
index 000000000000..8ee02d89738b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,51 @@
+# WIC Standalone
+
+This packages the OpenEmbedded Image Creator (`wic`) as an installable
+Python CLI using Hatch. It either consumes BitBake-exported environment
+files (generated via `bitbake -c rootfs_wicenv <image>`) or will invoke
+BitBake directly (if available on the PATH).
+
+## Quick start
+
+### Using wicenv
+1. Ensure you have a BitBake-generated `<image>.env` file (from `rootfs_wicenv`).
+2. Install locally for development:
+ ```bash
+ hatch shell
+ ```
+3. Run the CLI:
+ ```bash
+ hatch run wic --vars /path/to/<image>.env --help
+ ```
+
+### With bitbake
+1. Ensure you have bitbake available in your PATH.
+2. Install locally for development:
+ ```bash
+ hatch shell
+ ```
+3. Run the CLI:
+ ```bash
+ hatch run wic --help
+ ```
+
+## Project layout
+
+- `src/wic/cli.py`: CLI entrypoint (formerly `scripts/wic`).
+- `src/wic/*`: core engine, plugins, and helpers.
+- `src/bb/*`: various bitbake helpers that were brought along and used in other parts of wic.
+- `src/oe/*`: various oe-core helpers that were brought along and used in other parts of wic.
+
+## Contributing
+
+Please send all patches, comments, or questions to the yocto-patches
+mailing list (yocto-patches@lists.yoctoproject.org).
+See https://lists.yoctoproject.org/g/yocto-patches
+
+When sending patches, please make sure the email subject line includes
+"[wic][PATCH]" and follow The Yocto Project community's patch submission
+guidelines.
+
+## Licensing
+
+GPL-2.0-only to match the original OpenEmbedded wic tooling.
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 000000000000..fdc1ce0f5ece
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,38 @@
+[project]
+name = "wic"
+description = "OpenEmbedded Image Creator (wic) packaged as a standalone CLI"
+dynamic = ["version"]
+readme = "README.md"
+license = { text = "GPL-2.0-only" }
+maintainers = [
+ { name = "Trevor Woerner", email = "twoerner@gmail.com" },
+]
+requires-python = ">=3.8"
+classifiers = [
+ "Intended Audience :: Developers",
+ "Topic :: Software Development :: Build Tools",
+ "Topic :: Software Development :: Embedded Systems",
+ "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
+ "Programming Language :: Python",
+ "Programming Language :: Python :: 3",
+]
+
+[project.urls]
+Homepage = "https://git.yoctoproject.org/wic"
+Repository = "https://git.yoctoproject.org/wic"
+
+[project.scripts]
+wic = "wic.cli:main"
+
+[tool.hatch.build]
+packages = ["src/wic"]
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/wic"]
+
+[build-system]
+requires = ["hatchling>=1.21"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+path = "src/wic/cli.py"
--
2.51.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [wic][PATCH 4/9] add oe-core and bitbake helper packages
2026-04-03 18:36 [wic][PATCH 0/9] standalone wic repository Trevor Woerner
` (2 preceding siblings ...)
2026-04-03 18:36 ` [wic][PATCH 3/9] create python hatch project Trevor Woerner
@ 2026-04-03 18:36 ` Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 5/9] bump version: 0.2.0 -> 0.3.0 Trevor Woerner
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Trevor Woerner @ 2026-04-03 18:36 UTC (permalink / raw)
To: yocto-patches; +Cc: Bruce Ashfield, Mark Hatle
When it was part of oe-core, wic used a couple packages from bitbake and
oe-core. Import those packages, with minor tweaks, so that the
independent wic will be able to function.
NOTE: this commit does not work as-is, but is being provided in order to
explicitly show a clean transition from oe-core
Reviewed-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Reviewed-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
pyproject.toml | 4 +-
src/bb/__init__.py | 14 ++
src/bb/utils.py | 23 +++
src/oe/__init__.py | 1 +
src/oe/bootfiles.py | 58 ++++++++
src/oe/path.py | 351 ++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 449 insertions(+), 2 deletions(-)
create mode 100644 src/bb/__init__.py
create mode 100644 src/bb/utils.py
create mode 100644 src/oe/__init__.py
create mode 100644 src/oe/bootfiles.py
create mode 100644 src/oe/path.py
diff --git a/pyproject.toml b/pyproject.toml
index fdc1ce0f5ece..6ef29462f3f5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,10 +25,10 @@ Repository = "https://git.yoctoproject.org/wic"
wic = "wic.cli:main"
[tool.hatch.build]
-packages = ["src/wic"]
+packages = ["src/wic", "src/oe", "src/bb"]
[tool.hatch.build.targets.wheel]
-packages = ["src/wic"]
+packages = ["src/wic", "src/oe", "src/bb"]
[build-system]
requires = ["hatchling>=1.21"]
diff --git a/src/bb/__init__.py b/src/bb/__init__.py
new file mode 100644
index 000000000000..d83315486080
--- /dev/null
+++ b/src/bb/__init__.py
@@ -0,0 +1,14 @@
+"""
+Minimal stub of BitBake's bb module for standalone wic.
+Provides debug logging used by vendored oe helpers.
+"""
+import logging
+
+def debug(level, msg):
+ """
+ Mirror bb.debug signature but route to standard logging.
+ """
+ logging.getLogger("bb").debug(msg)
+
+# Expose utils so callers can access bb.utils.mkdirhier
+from . import utils
diff --git a/src/bb/utils.py b/src/bb/utils.py
new file mode 100644
index 000000000000..3750056ba563
--- /dev/null
+++ b/src/bb/utils.py
@@ -0,0 +1,23 @@
+"""
+Minimal subset of BitBake's bb.utils used by standalone wic.
+"""
+import os
+
+# from bitbake/lib/bb/utils.py
+def mkdirhier(directory):
+ """Create a directory like 'mkdir -p', but does not complain if
+ directory already exists list ``os.makedirs()``.
+
+ Arguments:
+
+ - ``directory``: path to the directory.
+
+ No return value.
+ """
+ if '${' in str(directory):
+ raise Exception("Directory name {} contains unexpanded bitbake variable. This may cause build failures and WORKDIR polution.".format(directory))
+ try:
+ os.makedirs(directory, exist_ok=True)
+ except OSError as e:
+ if e.errno != errno.EEXIST or not os.path.isdir(directory):
+ raise e
diff --git a/src/oe/__init__.py b/src/oe/__init__.py
new file mode 100644
index 000000000000..abefaa7a8f58
--- /dev/null
+++ b/src/oe/__init__.py
@@ -0,0 +1 @@
+# Minimal vendored OpenEmbedded helpers used by wic.
diff --git a/src/oe/bootfiles.py b/src/oe/bootfiles.py
new file mode 100644
index 000000000000..b67bb0fe9814
--- /dev/null
+++ b/src/oe/bootfiles.py
@@ -0,0 +1,58 @@
+#
+# SPDX-License-Identifier: MIT
+#
+# Copyright (C) 2024 Marcus Folkesson
+# Author: Marcus Folkesson <marcus.folkesson@gmail.com>
+#
+# Utility functions handling boot files
+#
+# Look into deploy_dir and search for boot_files.
+# Returns a list of tuples with (original filepath relative to
+# deploy_dir, desired filepath renaming)
+#
+# Heavily inspired of bootimg_partition.py
+#
+# from oe-core/meta/lib/oe/bootfiles.py
+def get_boot_files(deploy_dir, boot_files):
+ import re
+ import os
+ from glob import glob
+
+ if boot_files is None:
+ return None
+
+ # list of tuples (src_name, dst_name)
+ deploy_files = []
+ for src_entry in re.findall(r'[\w;\-\./\*]+', boot_files):
+ if ';' in src_entry:
+ dst_entry = tuple(src_entry.split(';'))
+ if not dst_entry[0] or not dst_entry[1]:
+ raise ValueError('Malformed boot file entry: %s' % src_entry)
+ else:
+ dst_entry = (src_entry, src_entry)
+
+ deploy_files.append(dst_entry)
+
+ install_files = []
+ for deploy_entry in deploy_files:
+ src, dst = deploy_entry
+ if '*' in src:
+ # by default install files under their basename
+ entry_name_fn = os.path.basename
+ if dst != src:
+ # unless a target name was given, then treat name
+ # as a directory and append a basename
+ entry_name_fn = lambda name: \
+ os.path.join(dst,
+ os.path.basename(name))
+
+ srcs = glob(os.path.join(deploy_dir, src))
+
+ for entry in srcs:
+ src = os.path.relpath(entry, deploy_dir)
+ entry_dst_name = entry_name_fn(entry)
+ install_files.append((src, entry_dst_name))
+ else:
+ install_files.append((src, dst))
+
+ return install_files
diff --git a/src/oe/path.py b/src/oe/path.py
new file mode 100644
index 000000000000..47b0c1347b61
--- /dev/null
+++ b/src/oe/path.py
@@ -0,0 +1,351 @@
+#
+# Copyright OpenEmbedded Contributors
+#
+# SPDX-License-Identifier: GPL-2.0-only
+#
+
+import errno
+import glob
+import shutil
+import subprocess
+import os.path
+
+import bb
+
+def join(*paths):
+ """Like os.path.join but doesn't treat absolute RHS specially"""
+ return os.path.normpath("/".join(paths))
+
+def relative(src, dest):
+ """ Return a relative path from src to dest.
+
+ >>> relative("/usr/bin", "/tmp/foo/bar")
+ ../../tmp/foo/bar
+
+ >>> relative("/usr/bin", "/usr/lib")
+ ../lib
+
+ >>> relative("/tmp", "/tmp/foo/bar")
+ foo/bar
+ """
+
+ return os.path.relpath(dest, src)
+
+def make_relative_symlink(path):
+ """ Convert an absolute symlink to a relative one """
+ if not os.path.islink(path):
+ return
+ link = os.readlink(path)
+ if not os.path.isabs(link):
+ return
+
+ # find the common ancestor directory
+ ancestor = path
+ depth = 0
+ while ancestor and not link.startswith(ancestor):
+ ancestor = ancestor.rpartition('/')[0]
+ depth += 1
+
+ if not ancestor:
+ print("make_relative_symlink() Error: unable to find the common ancestor of %s and its target" % path)
+ return
+
+ base = link.partition(ancestor)[2].strip('/')
+ while depth > 1:
+ base = "../" + base
+ depth -= 1
+
+ os.remove(path)
+ os.symlink(base, path)
+
+def replace_absolute_symlinks(basedir, d):
+ """
+ Walk basedir looking for absolute symlinks and replacing them with relative ones.
+ The absolute links are assumed to be relative to basedir
+ (compared to make_relative_symlink above which tries to compute common ancestors
+ using pattern matching instead)
+ """
+ for walkroot, dirs, files in os.walk(basedir):
+ for file in files + dirs:
+ path = os.path.join(walkroot, file)
+ if not os.path.islink(path):
+ continue
+ link = os.readlink(path)
+ if not os.path.isabs(link):
+ continue
+ walkdir = os.path.dirname(path.rpartition(basedir)[2])
+ base = os.path.relpath(link, walkdir)
+ bb.debug(2, "Replacing absolute path %s with relative path %s" % (link, base))
+ os.remove(path)
+ os.symlink(base, path)
+
+def format_display(path, metadata):
+ """ Prepare a path for display to the user. """
+ rel = relative(metadata.getVar("TOPDIR"), path)
+ if len(rel) > len(path):
+ return path
+ else:
+ return rel
+
+def copytree(src, dst):
+ # We could use something like shutil.copytree here but it turns out to
+ # to be slow. It takes twice as long copying to an empty directory.
+ # If dst already has contents performance can be 15 time slower
+ # This way we also preserve hardlinks between files in the tree.
+
+ bb.utils.mkdirhier(dst)
+ cmd = "tar --xattrs --xattrs-include='*' -cf - -S -C %s -p . | tar --xattrs --xattrs-include='*' -xf - -C %s" % (src, dst)
+ subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
+
+def copyhardlinktree(src, dst):
+ """Make a tree of hard links when possible, otherwise copy."""
+ bb.utils.mkdirhier(dst)
+ if os.path.isdir(src) and not len(os.listdir(src)):
+ return
+
+ canhard = False
+ testfile = None
+ for root, dirs, files in os.walk(src):
+ if len(files):
+ testfile = os.path.join(root, files[0])
+ break
+
+ if testfile is not None:
+ try:
+ os.link(testfile, os.path.join(dst, 'testfile'))
+ os.unlink(os.path.join(dst, 'testfile'))
+ canhard = True
+ except Exception as e:
+ bb.debug(2, "Hardlink test failed with " + str(e))
+
+ if (canhard):
+ # Need to copy directories only with tar first since cp will error if two
+ # writers try and create a directory at the same time
+ cmd = "cd %s; find . -type d -print | tar --xattrs --xattrs-include='*' -cf - -S -C %s -p --no-recursion --files-from - | tar --xattrs --xattrs-include='*' -xhf - -C %s" % (src, src, dst)
+ subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
+ source = ''
+ if os.path.isdir(src):
+ if len(glob.glob('%s/.??*' % src)) > 0:
+ source = './.??* '
+ if len(glob.glob('%s/**' % src)) > 0:
+ source += './*'
+ s_dir = src
+ else:
+ source = src
+ s_dir = os.getcwd()
+ cmd = 'cp -afl --preserve=xattr %s %s' % (source, os.path.realpath(dst))
+ subprocess.check_output(cmd, shell=True, cwd=s_dir, stderr=subprocess.STDOUT)
+ else:
+ copytree(src, dst)
+
+def copyhardlink(src, dst):
+ """Make a hard link when possible, otherwise copy."""
+
+ try:
+ os.link(src, dst)
+ except OSError:
+ shutil.copy(src, dst)
+
+def remove(path, recurse=True):
+ """
+ Equivalent to rm -f or rm -rf
+ NOTE: be careful about passing paths that may contain filenames with
+ wildcards in them (as opposed to passing an actual wildcarded path) -
+ since we use glob.glob() to expand the path. Filenames containing
+ square brackets are particularly problematic since the they may not
+ actually expand to match the original filename.
+ """
+ for name in glob.glob(path):
+ try:
+ os.unlink(name)
+ except OSError as exc:
+ if recurse and exc.errno == errno.EISDIR:
+ shutil.rmtree(name)
+ elif exc.errno != errno.ENOENT:
+ raise
+
+def symlink(source, destination, force=False):
+ """Create a symbolic link"""
+ try:
+ if force:
+ remove(destination)
+ os.symlink(source, destination)
+ except OSError as e:
+ if e.errno != errno.EEXIST or os.readlink(destination) != source:
+ raise
+
+def relsymlink(target, name, force=False):
+ symlink(os.path.relpath(target, os.path.dirname(name)), name, force=force)
+
+def find(dir, **walkoptions):
+ """ Given a directory, recurses into that directory,
+ returning all files as absolute paths. """
+
+ for root, dirs, files in os.walk(dir, **walkoptions):
+ for file in files:
+ yield os.path.join(root, file)
+
+
+## realpath() related functions
+def __is_path_below(file, root):
+ return (file + os.path.sep).startswith(root)
+
+def __realpath_rel(start, rel_path, root, loop_cnt, assume_dir):
+ """Calculates real path of symlink 'start' + 'rel_path' below
+ 'root'; no part of 'start' below 'root' must contain symlinks. """
+ have_dir = True
+
+ for d in rel_path.split(os.path.sep):
+ if not have_dir and not assume_dir:
+ raise OSError(errno.ENOENT, "no such directory %s" % start)
+
+ if d == os.path.pardir: # '..'
+ if len(start) >= len(root):
+ # do not follow '..' before root
+ start = os.path.dirname(start)
+ else:
+ # emit warning?
+ pass
+ else:
+ (start, have_dir) = __realpath(os.path.join(start, d),
+ root, loop_cnt, assume_dir)
+
+ assert(__is_path_below(start, root))
+
+ return start
+
+def __realpath(file, root, loop_cnt, assume_dir):
+ while os.path.islink(file) and len(file) >= len(root):
+ if loop_cnt == 0:
+ raise OSError(errno.ELOOP, file)
+
+ loop_cnt -= 1
+ target = os.path.normpath(os.readlink(file))
+
+ if not os.path.isabs(target):
+ tdir = os.path.dirname(file)
+ assert(__is_path_below(tdir, root))
+ else:
+ tdir = root
+
+ file = __realpath_rel(tdir, target, root, loop_cnt, assume_dir)
+
+ try:
+ is_dir = os.path.isdir(file)
+ except:
+ is_dir = false
+
+ return (file, is_dir)
+
+def realpath(file, root, use_physdir = True, loop_cnt = 100, assume_dir = False):
+ """ Returns the canonical path of 'file' with assuming a
+ toplevel 'root' directory. When 'use_physdir' is set, all
+ preceding path components of 'file' will be resolved first;
+ this flag should be set unless it is guaranteed that there is
+ no symlink in the path. When 'assume_dir' is not set, missing
+ path components will raise an ENOENT error"""
+
+ root = os.path.normpath(root)
+ file = os.path.normpath(file)
+
+ if not root.endswith(os.path.sep):
+ # letting root end with '/' makes some things easier
+ root = root + os.path.sep
+
+ if not __is_path_below(file, root):
+ raise OSError(errno.EINVAL, "file '%s' is not below root" % file)
+
+ try:
+ if use_physdir:
+ file = __realpath_rel(root, file[(len(root) - 1):], root, loop_cnt, assume_dir)
+ else:
+ file = __realpath(file, root, loop_cnt, assume_dir)[0]
+ except OSError as e:
+ if e.errno == errno.ELOOP:
+ # make ELOOP more readable; without catching it, there will
+ # be printed a backtrace with 100s of OSError exceptions
+ # else
+ raise OSError(errno.ELOOP,
+ "too much recursions while resolving '%s'; loop in '%s'" %
+ (file, e.strerror))
+
+ raise
+
+ return file
+
+def is_path_parent(possible_parent, *paths):
+ """
+ Return True if a path is the parent of another, False otherwise.
+ Multiple paths to test can be specified in which case all
+ specified test paths must be under the parent in order to
+ return True.
+ """
+ def abs_path_trailing(pth):
+ pth_abs = os.path.abspath(pth)
+ if not pth_abs.endswith(os.sep):
+ pth_abs += os.sep
+ return pth_abs
+
+ possible_parent_abs = abs_path_trailing(possible_parent)
+ if not paths:
+ return False
+ for path in paths:
+ path_abs = abs_path_trailing(path)
+ if not path_abs.startswith(possible_parent_abs):
+ return False
+ return True
+
+def which_wild(pathname, path=None, mode=os.F_OK, *, reverse=False, candidates=False):
+ """Search a search path for pathname, supporting wildcards.
+
+ Return all paths in the specific search path matching the wildcard pattern
+ in pathname, returning only the first encountered for each file. If
+ candidates is True, information on all potential candidate paths are
+ included.
+ """
+ paths = (path or os.environ.get('PATH', os.defpath)).split(':')
+ if reverse:
+ paths.reverse()
+
+ seen, files = set(), []
+ for index, element in enumerate(paths):
+ if not os.path.isabs(element):
+ element = os.path.abspath(element)
+
+ candidate = os.path.join(element, pathname)
+ globbed = glob.glob(candidate)
+ if globbed:
+ for found_path in sorted(globbed):
+ if not os.access(found_path, mode):
+ continue
+ rel = os.path.relpath(found_path, element)
+ if rel not in seen:
+ seen.add(rel)
+ if candidates:
+ files.append((found_path, [os.path.join(p, rel) for p in paths[:index+1]]))
+ else:
+ files.append(found_path)
+
+ return files
+
+def canonicalize(paths, sep=','):
+ """Given a string with paths (separated by commas by default), expand
+ each path using os.path.realpath() and return the resulting paths as a
+ string (separated using the same separator a the original string).
+ """
+ # Ignore paths containing "$" as they are assumed to be unexpanded bitbake
+ # variables. Normally they would be ignored, e.g., when passing the paths
+ # through the shell they would expand to empty strings. However, when they
+ # are passed through os.path.realpath(), it will cause them to be prefixed
+ # with the absolute path to the current directory and thus not be empty
+ # anymore.
+ #
+ # Also maintain trailing slashes, as the paths may actually be used as
+ # prefixes in sting compares later on, where the slashes then are important.
+ canonical_paths = []
+ for path in (paths or '').split(sep):
+ if '$' not in path:
+ trailing_slash = path.endswith('/') and '/' or ''
+ canonical_paths.append(os.path.realpath(path) + trailing_slash)
+
+ return sep.join(canonical_paths)
--
2.51.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [wic][PATCH 5/9] bump version: 0.2.0 -> 0.3.0
2026-04-03 18:36 [wic][PATCH 0/9] standalone wic repository Trevor Woerner
` (3 preceding siblings ...)
2026-04-03 18:36 ` [wic][PATCH 4/9] add oe-core and bitbake helper packages Trevor Woerner
@ 2026-04-03 18:36 ` Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 6/9] cli.py: remove bitbake coupling Trevor Woerner
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Trevor Woerner @ 2026-04-03 18:36 UTC (permalink / raw)
To: yocto-patches; +Cc: Bruce Ashfield, Mark Hatle
Now that wic is its own standalone tool, bump the version to make the
change explicit.
NOTE: this commit does not work as-is, but is being provided in order to
explicitly show a clean transition from oe-core
Reviewed-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Reviewed-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
src/wic/cli.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/wic/cli.py b/src/wic/cli.py
index a3402bffcc63..9de5efbb5aec 100755
--- a/src/wic/cli.py
+++ b/src/wic/cli.py
@@ -14,7 +14,7 @@
# AUTHORS
# Tom Zanussi <tom.zanussi (at] linux.intel.com>
#
-__version__ = "0.2.0"
+__version__ = "0.3.0"
# Python Standard Library modules
import os
--
2.51.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [wic][PATCH 6/9] cli.py: remove bitbake coupling
2026-04-03 18:36 [wic][PATCH 0/9] standalone wic repository Trevor Woerner
` (4 preceding siblings ...)
2026-04-03 18:36 ` [wic][PATCH 5/9] bump version: 0.2.0 -> 0.3.0 Trevor Woerner
@ 2026-04-03 18:36 ` Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 7/9] plugins/source/bootimg_biosplusefi.py: add import os Trevor Woerner
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Trevor Woerner @ 2026-04-03 18:36 UTC (permalink / raw)
To: yocto-patches; +Cc: Bruce Ashfield, Mark Hatle
The code that is being removed in this commit uses the scriptpath module
to add more paths to sys.path in order to find oe-core-specific and
bitbake-specific modules by using relative paths. In other words, this
code assumes it is located within oe-core or bitbake. By splitting out
wic, it is no longer located where these relative searches have any
chance of working, therefore remove this coupling.
Additionally, the bitbake_path variable does not appear to be used
anywhere, so it is removed as well.
NOTE: this commit does not work as-is, but is being provided in order to
explicitly show a clean transition from oe-core
Reviewed-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Reviewed-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
src/wic/cli.py | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/wic/cli.py b/src/wic/cli.py
index 9de5efbb5aec..04b2ad25cac5 100755
--- a/src/wic/cli.py
+++ b/src/wic/cli.py
@@ -28,10 +28,6 @@ from collections import namedtuple
# External modules
scripts_path = os.path.dirname(os.path.realpath(__file__))
-lib_path = scripts_path + '/lib'
-sys.path.insert(0, lib_path)
-import scriptpath
-scriptpath.add_oe_lib_path()
# Check whether wic is running within eSDK environment
sdkroot = scripts_path
@@ -48,9 +44,6 @@ if os.environ.get('SDKTARGETSYSROOT'):
sdkroot = os.path.dirname(sdkroot)
bitbake_exe = shutil.which('bitbake')
-if bitbake_exe:
- bitbake_path = scriptpath.add_bitbake_lib_path()
- import bb
from wic import WicError
from wic.misc import get_bitbake_var, BB_VARS
--
2.51.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [wic][PATCH 7/9] plugins/source/bootimg_biosplusefi.py: add import os
2026-04-03 18:36 [wic][PATCH 0/9] standalone wic repository Trevor Woerner
` (5 preceding siblings ...)
2026-04-03 18:36 ` [wic][PATCH 6/9] cli.py: remove bitbake coupling Trevor Woerner
@ 2026-04-03 18:36 ` Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 8/9] ksparser.py: search for *inc files Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 9/9] cli.py: fix main() for standalone mode Trevor Woerner
8 siblings, 0 replies; 10+ messages in thread
From: Trevor Woerner @ 2026-04-03 18:36 UTC (permalink / raw)
To: yocto-patches; +Cc: Bruce Ashfield, Mark Hatle
BitBake's bb/build.py:55 deliberately injects os (and bb) into Python's
__builtins__ at the module level:
# When we execute a Python function, we'd like certain things
# in all namespaces, hence we add them to __builtins__.
# If we do not do this and use the exec globals, they will
# not be available to subfunctions.
if hasattr(__builtins__, '__setitem__'):
builtins = __builtins__
else:
builtins = __builtins__.__dict__
builtins['bb'] = bb
builtins['os'] = os
When wic was part of oe-core this injection would occur, and once
os is in __builtins__, Python's name resolution (locals -> globals
-> builtins) finds it for any code in the process, even modules
that never explicitly import os. So when bootimg_biosplusefi.py's
__instanciateSubClasses referenced os.path.join(...), Python resolved os
from builtins rather than the module's own globals.
Since wic is now split out from oe-core (and bitbake) this plugin fails
with:
NameError: name 'os' is not defined.
Therefore, add "import os" to bootimg_biosplusefi.py.
NOTE: this commit does not work as-is, but is being provided in order to
explicitly show a clean transition from oe-core
AI-Generated: codex/claude-opus-4-6 (xhigh)
Reviewed-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Reviewed-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
src/wic/plugins/source/bootimg_biosplusefi.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/wic/plugins/source/bootimg_biosplusefi.py b/src/wic/plugins/source/bootimg_biosplusefi.py
index 4279ddded83a..cd7cd270a970 100644
--- a/src/wic/plugins/source/bootimg_biosplusefi.py
+++ b/src/wic/plugins/source/bootimg_biosplusefi.py
@@ -19,6 +19,7 @@
# William Bourque <wbourque [at) gmail.com>
import types
+import os
from wic.pluginbase import SourcePlugin
from importlib.machinery import SourceFileLoader
--
2.51.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [wic][PATCH 8/9] ksparser.py: search for *inc files
2026-04-03 18:36 [wic][PATCH 0/9] standalone wic repository Trevor Woerner
` (6 preceding siblings ...)
2026-04-03 18:36 ` [wic][PATCH 7/9] plugins/source/bootimg_biosplusefi.py: add import os Trevor Woerner
@ 2026-04-03 18:36 ` Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 9/9] cli.py: fix main() for standalone mode Trevor Woerner
8 siblings, 0 replies; 10+ messages in thread
From: Trevor Woerner @ 2026-04-03 18:36 UTC (permalink / raw)
To: yocto-patches; +Cc: Bruce Ashfield, Mark Hatle
If a *wks file has an "include" directive, try looking for the include
file at the path where the *wks file was found.
NOTE: this commit does not work as-is, but is being provided in order to
explicitly show a clean transition from oe-core
AI-Generated: codex/gpt-5.4 (high)
Reviewed-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Reviewed-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
src/wic/ksparser.py | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/wic/ksparser.py b/src/wic/ksparser.py
index 4ccd70dc555a..8e5fbfadd81f 100644
--- a/src/wic/ksparser.py
+++ b/src/wic/ksparser.py
@@ -101,6 +101,15 @@ def overheadtype(arg):
return result
+def resolve_canned_path(arg, current_confpath=None):
+ if current_confpath:
+ current_dir = os.path.dirname(os.path.abspath(current_confpath))
+ relative_path = os.path.join(current_dir, arg)
+ if os.path.exists(relative_path):
+ return relative_path
+
+ return None
+
def cannedpathtype(arg):
"""
Custom type for ArgumentParser
@@ -202,7 +211,7 @@ class KickStart():
bootloader.add_argument('--source')
include = subparsers.add_parser('include')
- include.add_argument('path', type=cannedpathtype)
+ include.add_argument('path')
self._parse(parser, confpath)
if not self.bootloader:
@@ -289,7 +298,12 @@ class KickStart():
self.partnum += 1
self.partitions.append(Partition(parsed, self.partnum))
elif line.startswith('include'):
- self._parse(parser, parsed.path)
+ include_path = resolve_canned_path(parsed.path, confpath)
+ if not include_path:
+ err = "%s:%d: argument path: file not found: %s" % \
+ (confpath, lineno, parsed.path)
+ raise KickStartError(err)
+ self._parse(parser, include_path)
elif line.startswith('bootloader'):
if not self.bootloader:
self.bootloader = parsed
--
2.51.0
^ permalink raw reply related [flat|nested] 10+ messages in thread* [wic][PATCH 9/9] cli.py: fix main() for standalone mode
2026-04-03 18:36 [wic][PATCH 0/9] standalone wic repository Trevor Woerner
` (7 preceding siblings ...)
2026-04-03 18:36 ` [wic][PATCH 8/9] ksparser.py: search for *inc files Trevor Woerner
@ 2026-04-03 18:36 ` Trevor Woerner
8 siblings, 0 replies; 10+ messages in thread
From: Trevor Woerner @ 2026-04-03 18:36 UTC (permalink / raw)
To: yocto-patches; +Cc: Bruce Ashfield, Mark Hatle
The generated hatch launcher calls wic.cli.main() with no arguments, but
wic defines main(argv). Update main() handling to match.
AI-Generated: codex/gpt-5.4 (high)
Reviewed-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Reviewed-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
src/wic/cli.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/wic/cli.py b/src/wic/cli.py
index 04b2ad25cac5..cf3e51e3afad 100755
--- a/src/wic/cli.py
+++ b/src/wic/cli.py
@@ -590,7 +590,10 @@ class WicArgumentParser(argparse.ArgumentParser):
def format_help(self):
return hlp.wic_help
-def main(argv):
+def main(argv=None):
+ if argv is None:
+ argv = sys.argv[1:]
+
parser = WicArgumentParser(
description="wic version %s" % __version__)
--
2.51.0
^ permalink raw reply related [flat|nested] 10+ messages in thread