From: Trevor Woerner <twoerner@gmail.com>
To: yocto-patches@lists.yoctoproject.org
Cc: Bruce Ashfield <bruce.ashfield@gmail.com>,
Mark Hatle <mark.hatle@kernel.crashing.org>
Subject: [wic][PATCH 1/9] re-organize for python src layout packaging
Date: Fri, 3 Apr 2026 14:36:36 -0400 [thread overview]
Message-ID: <20260403183644.2783267-2-twoerner@gmail.com> (raw)
In-Reply-To: <20260403183644.2783267-1-twoerner@gmail.com>
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
next prev parent reply other threads:[~2026-04-03 18:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-03 18:36 [wic][PATCH 0/9] standalone wic repository Trevor Woerner
2026-04-03 18:36 ` Trevor Woerner [this message]
2026-04-03 18:36 ` [wic][PATCH 2/9] move example *wks files Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 3/9] create python hatch project Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 4/9] add oe-core and bitbake helper packages Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 5/9] bump version: 0.2.0 -> 0.3.0 Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 6/9] cli.py: remove bitbake coupling Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 7/9] plugins/source/bootimg_biosplusefi.py: add import os 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260403183644.2783267-2-twoerner@gmail.com \
--to=twoerner@gmail.com \
--cc=bruce.ashfield@gmail.com \
--cc=mark.hatle@kernel.crashing.org \
--cc=yocto-patches@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.