On Mon, 2026-02-23 at 16:50 -0500, Trevor Woerner via lists.openembedded.org wrote: > By convention, wic will look for a "wic" directory in the top-level > of all BBLAYERS in order to find *wks files. oe-core was the only > exception; it stored its *wks files in scripts/lib/wic/canned-wks. > Take the *wks, *wks.in, *inc, and *cfg files that were in the old wks > location and place them in a "wic" top-level directory in the oe-core > layer, thereby following the convention of every other layer. > > Signed-off-by: Trevor Woerner <[email protected]> > --- > changes in v5 > - rebase with master > - split patchset out again > > v4: skipped to align/combine with other patch set > > changes in v3: > - squashed into 1 large patch > > changes in v2: > - none > --- > meta/classes-recipe/image_types_wic.bbclass | 2 +- > meta/wic/common.wks.inc | 3 +++ > meta/wic/directdisk-bootloader-config.cfg | 27 +++++++++++++++++++++ > meta/wic/directdisk-bootloader-config.wks | 8 ++++++ > meta/wic/directdisk-gpt.wks | 10 ++++++++ > meta/wic/directdisk-multi-rootfs.wks | 23 ++++++++++++++++++ > meta/wic/directdisk.wks | 8 ++++++ > meta/wic/efi-bootdisk.wks.in | 3 +++ > meta/wic/efi-uki-bootdisk.wks.in | 3 +++ > meta/wic/mkdisk-ufs.wks | 5 ++++ > meta/wic/mkefidisk.wks | 11 +++++++++ > meta/wic/mkhybridiso.wks | 7 ++++++ > meta/wic/qemuloongarch.wks | 3 +++ > meta/wic/qemuriscv.wks | 3 +++ > meta/wic/qemux86-directdisk.wks | 8 ++++++ > meta/wic/sdimage-bootpart.wks | 6 +++++ > meta/wic/systemd-bootdisk.wks | 11 +++++++++ > 17 files changed, 140 insertions(+), 1 deletion(-) > create mode 100644 meta/wic/common.wks.inc > create mode 100644 meta/wic/directdisk-bootloader-config.cfg > create mode 100644 meta/wic/directdisk-bootloader-config.wks > create mode 100644 meta/wic/directdisk-gpt.wks > create mode 100644 meta/wic/directdisk-multi-rootfs.wks > create mode 100644 meta/wic/directdisk.wks > create mode 100644 meta/wic/efi-bootdisk.wks.in > create mode 100644 meta/wic/efi-uki-bootdisk.wks.in > create mode 100644 meta/wic/mkdisk-ufs.wks > create mode 100644 meta/wic/mkefidisk.wks > create mode 100644 meta/wic/mkhybridiso.wks > create mode 100644 meta/wic/qemuloongarch.wks > create mode 100644 meta/wic/qemuriscv.wks > create mode 100644 meta/wic/qemux86-directdisk.wks > create mode 100644 meta/wic/sdimage-bootpart.wks > create mode 100644 meta/wic/systemd-bootdisk.wks
Can we move these files from scripts/lib/wic/canned-wks to the new location before removing wic, i.e. re-order this and the previous commit? That would better preserve the history of these files and simplify the diff. Best regards, -- Paul Barker
signature.asc
Description: This is a digitally signed message part
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#231760): https://lists.openembedded.org/g/openembedded-core/message/231760 Mute This Topic: https://lists.openembedded.org/mt/117965969/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
