Skip to content

Commit 40af8f5

Browse files
ricardosalvetiricardosalveti
authored
ci/qcom-distro: fix wic changes in OE (#1897)
2 parents df33d0c + 1be4015 commit 40af8f5

5 files changed

Lines changed: 170 additions & 0 deletions

‎ci/meta-arm.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ header:
44
repos:
55
meta-arm:
66
url: https://git.yoctoproject.org/meta-arm
7+
patches:
8+
plain:
9+
repo: meta-qcom
10+
path: patches/0001-wic-move-to-files-wic.patch
711
layers:
812
meta-arm:
913
meta-arm-toolchain:

‎ci/qcom-distro.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ repos:
2424
meta-virtualization:
2525
url: https://git.yoctoproject.org/git/meta-virtualization
2626
branch: master
27+
patches:
28+
plain:
29+
repo: meta-qcom
30+
path: patches/0001-wic-move-files-to-files-wic.patch
2731

2832
meta-audioreach:
2933
url: https://github.com/AudioReach/meta-audioreach
@@ -40,6 +44,10 @@ repos:
4044
meta-security:
4145
url: https://git.yoctoproject.org/meta-security
4246
branch: master
47+
patches:
48+
plain:
49+
repo: meta-qcom
50+
path: patches/0001-wic-wic-need-to-be-moved-to-files-wic-within-the-lay.patch
4351
layers:
4452
.:
4553
meta-tpm:

‎patches/0001-wic-move-files-to-files-wic.patch‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
From d110b387e96ac64e859573bc99894ad9c1c16eb3 Mon Sep 17 00:00:00 2001
2+
From: "Ricardo Salveti via lists.yoctoproject.org"
3+
<ricardo.salveti=oss.qualcomm.com@lists.yoctoproject.org>
4+
Date: Tue, 7 Apr 2026 19:47:24 -0300
5+
Subject: [PATCH] wic: move files to files/wic
6+
7+
Move local wic files to the new expected location files/wic, needed after
8+
the wic migration to a standalone project outside oe-core.
9+
10+
Upstream-Status: Submitted [https://lists.yoctoproject.org/g/meta-virtualization/message/9687]
11+
12+
Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
13+
Signed-off-by: Jose Quaresma <jose.quaresma@oss.qualcomm.com>
14+
---
15+
{wic => files/wic}/directdisk-bootloader-xen.cfg | 0
16+
{wic => files/wic}/directdisk-bootloader-xen.wks | 0
17+
{wic => files/wic}/directdisk-xen.wks | 0
18+
{wic => files/wic}/qemuboot-xen-x86-64.cfg | 0
19+
{wic => files/wic}/qemuboot-xen-x86-64.wks | 0
20+
5 files changed, 0 insertions(+), 0 deletions(-)
21+
rename {wic => files/wic}/directdisk-bootloader-xen.cfg (100%)
22+
rename {wic => files/wic}/directdisk-bootloader-xen.wks (100%)
23+
rename {wic => files/wic}/directdisk-xen.wks (100%)
24+
rename {wic => files/wic}/qemuboot-xen-x86-64.cfg (100%)
25+
rename {wic => files/wic}/qemuboot-xen-x86-64.wks (100%)
26+
27+
diff --git a/wic/directdisk-bootloader-xen.cfg b/files/wic/directdisk-bootloader-xen.cfg
28+
similarity index 100%
29+
rename from wic/directdisk-bootloader-xen.cfg
30+
rename to files/wic/directdisk-bootloader-xen.cfg
31+
diff --git a/wic/directdisk-bootloader-xen.wks b/files/wic/directdisk-bootloader-xen.wks
32+
similarity index 100%
33+
rename from wic/directdisk-bootloader-xen.wks
34+
rename to files/wic/directdisk-bootloader-xen.wks
35+
diff --git a/wic/directdisk-xen.wks b/files/wic/directdisk-xen.wks
36+
similarity index 100%
37+
rename from wic/directdisk-xen.wks
38+
rename to files/wic/directdisk-xen.wks
39+
diff --git a/wic/qemuboot-xen-x86-64.cfg b/files/wic/qemuboot-xen-x86-64.cfg
40+
similarity index 100%
41+
rename from wic/qemuboot-xen-x86-64.cfg
42+
rename to files/wic/qemuboot-xen-x86-64.cfg
43+
diff --git a/wic/qemuboot-xen-x86-64.wks b/files/wic/qemuboot-xen-x86-64.wks
44+
similarity index 100%
45+
rename from wic/qemuboot-xen-x86-64.wks
46+
rename to files/wic/qemuboot-xen-x86-64.wks
47+
--
48+
2.53.0
49+

‎patches/0001-wic-move-to-files-wic.patch‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
From d900160bb34504e7d628f5f7d81bc5e64de842ad Mon Sep 17 00:00:00 2001
2+
From: Jose Quaresma <jose.quaresma@oss.qualcomm.com>
3+
Date: Wed, 8 Apr 2026 12:27:57 +0100
4+
Subject: [PATCH] wic: move to files/wic
5+
6+
Upstream-Status: Submitted [https://lists.yoctoproject.org/g/meta-arm/message/7008]
7+
8+
Signed-off-by: Jose Quaresma <jose.quaresma@oss.qualcomm.com>
9+
---
10+
.../{ => files}/wic/corstone1000-flash-firmware-fvp.wks.in | 0
11+
.../{ => files}/wic/corstone1000-flash-firmware-mps3.wks.in | 0
12+
meta-arm-bsp/{ => files}/wic/efi-disk-esp-only.wks.in | 0
13+
meta-arm-bsp/{ => files}/wic/efi-disk-no-swap.wks.in | 0
14+
meta-arm/{ => files}/wic/efi-disk.wks.in | 0
15+
meta-arm/{ => files}/wic/qemu-efi-disk.wks.in | 0
16+
meta-arm/{ => files}/wic/qemuarm.cfg | 0
17+
meta-arm/{ => files}/wic/qemuarm.wks | 0
18+
meta-arm/{ => files}/wic/qemuarm64.cfg | 0
19+
meta-arm/{ => files}/wic/qemuarm64.wks | 0
20+
10 files changed, 0 insertions(+), 0 deletions(-)
21+
rename meta-arm-bsp/{ => files}/wic/corstone1000-flash-firmware-fvp.wks.in (100%)
22+
rename meta-arm-bsp/{ => files}/wic/corstone1000-flash-firmware-mps3.wks.in (100%)
23+
rename meta-arm-bsp/{ => files}/wic/efi-disk-esp-only.wks.in (100%)
24+
rename meta-arm-bsp/{ => files}/wic/efi-disk-no-swap.wks.in (100%)
25+
rename meta-arm/{ => files}/wic/efi-disk.wks.in (100%)
26+
rename meta-arm/{ => files}/wic/qemu-efi-disk.wks.in (100%)
27+
rename meta-arm/{ => files}/wic/qemuarm.cfg (100%)
28+
rename meta-arm/{ => files}/wic/qemuarm.wks (100%)
29+
rename meta-arm/{ => files}/wic/qemuarm64.cfg (100%)
30+
rename meta-arm/{ => files}/wic/qemuarm64.wks (100%)
31+
32+
diff --git a/meta-arm-bsp/wic/corstone1000-flash-firmware-fvp.wks.in b/meta-arm-bsp/files/wic/corstone1000-flash-firmware-fvp.wks.in
33+
similarity index 100%
34+
rename from meta-arm-bsp/wic/corstone1000-flash-firmware-fvp.wks.in
35+
rename to meta-arm-bsp/files/wic/corstone1000-flash-firmware-fvp.wks.in
36+
diff --git a/meta-arm-bsp/wic/corstone1000-flash-firmware-mps3.wks.in b/meta-arm-bsp/files/wic/corstone1000-flash-firmware-mps3.wks.in
37+
similarity index 100%
38+
rename from meta-arm-bsp/wic/corstone1000-flash-firmware-mps3.wks.in
39+
rename to meta-arm-bsp/files/wic/corstone1000-flash-firmware-mps3.wks.in
40+
diff --git a/meta-arm-bsp/wic/efi-disk-esp-only.wks.in b/meta-arm-bsp/files/wic/efi-disk-esp-only.wks.in
41+
similarity index 100%
42+
rename from meta-arm-bsp/wic/efi-disk-esp-only.wks.in
43+
rename to meta-arm-bsp/files/wic/efi-disk-esp-only.wks.in
44+
diff --git a/meta-arm-bsp/wic/efi-disk-no-swap.wks.in b/meta-arm-bsp/files/wic/efi-disk-no-swap.wks.in
45+
similarity index 100%
46+
rename from meta-arm-bsp/wic/efi-disk-no-swap.wks.in
47+
rename to meta-arm-bsp/files/wic/efi-disk-no-swap.wks.in
48+
diff --git a/meta-arm/wic/efi-disk.wks.in b/meta-arm/files/wic/efi-disk.wks.in
49+
similarity index 100%
50+
rename from meta-arm/wic/efi-disk.wks.in
51+
rename to meta-arm/files/wic/efi-disk.wks.in
52+
diff --git a/meta-arm/wic/qemu-efi-disk.wks.in b/meta-arm/files/wic/qemu-efi-disk.wks.in
53+
similarity index 100%
54+
rename from meta-arm/wic/qemu-efi-disk.wks.in
55+
rename to meta-arm/files/wic/qemu-efi-disk.wks.in
56+
diff --git a/meta-arm/wic/qemuarm.cfg b/meta-arm/files/wic/qemuarm.cfg
57+
similarity index 100%
58+
rename from meta-arm/wic/qemuarm.cfg
59+
rename to meta-arm/files/wic/qemuarm.cfg
60+
diff --git a/meta-arm/wic/qemuarm.wks b/meta-arm/files/wic/qemuarm.wks
61+
similarity index 100%
62+
rename from meta-arm/wic/qemuarm.wks
63+
rename to meta-arm/files/wic/qemuarm.wks
64+
diff --git a/meta-arm/wic/qemuarm64.cfg b/meta-arm/files/wic/qemuarm64.cfg
65+
similarity index 100%
66+
rename from meta-arm/wic/qemuarm64.cfg
67+
rename to meta-arm/files/wic/qemuarm64.cfg
68+
diff --git a/meta-arm/wic/qemuarm64.wks b/meta-arm/files/wic/qemuarm64.wks
69+
similarity index 100%
70+
rename from meta-arm/wic/qemuarm64.wks
71+
rename to meta-arm/files/wic/qemuarm64.wks
72+
--
73+
2.53.0
74+

‎patches/0001-wic-wic-need-to-be-moved-to-files-wic-within-the-lay.patch‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
From 39265604d05b0af0e85d5237eadcb88688b107a4 Mon Sep 17 00:00:00 2001
2+
From: "Khem Raj via lists.yoctoproject.org"
3+
<raj.khem=gmail.com@lists.yoctoproject.org>
4+
Date: Tue, 7 Apr 2026 16:01:39 -0700
5+
Subject: [PATCH] wic: wic need to be moved to files/wic within the layer to be
6+
found/used
7+
8+
Upstream-Status: Submitted [https://lists.yoctoproject.org/g/yocto-patches/message/3658]
9+
10+
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
11+
Signed-off-by: Jose Quaresma <jose.quaresma@oss.qualcomm.com>
12+
---
13+
{wic => files/wic}/beaglebone-yocto-verity.wks.in | 0
14+
{wic => files/wic}/systemd-bootdisk-dmverity-hash.wks.in | 0
15+
{wic => files/wic}/systemd-bootdisk-dmverity.wks.in | 0
16+
3 files changed, 0 insertions(+), 0 deletions(-)
17+
rename {wic => files/wic}/beaglebone-yocto-verity.wks.in (100%)
18+
rename {wic => files/wic}/systemd-bootdisk-dmverity-hash.wks.in (100%)
19+
rename {wic => files/wic}/systemd-bootdisk-dmverity.wks.in (100%)
20+
21+
diff --git a/wic/beaglebone-yocto-verity.wks.in b/files/wic/beaglebone-yocto-verity.wks.in
22+
similarity index 100%
23+
rename from wic/beaglebone-yocto-verity.wks.in
24+
rename to files/wic/beaglebone-yocto-verity.wks.in
25+
diff --git a/wic/systemd-bootdisk-dmverity-hash.wks.in b/files/wic/systemd-bootdisk-dmverity-hash.wks.in
26+
similarity index 100%
27+
rename from wic/systemd-bootdisk-dmverity-hash.wks.in
28+
rename to files/wic/systemd-bootdisk-dmverity-hash.wks.in
29+
diff --git a/wic/systemd-bootdisk-dmverity.wks.in b/files/wic/systemd-bootdisk-dmverity.wks.in
30+
similarity index 100%
31+
rename from wic/systemd-bootdisk-dmverity.wks.in
32+
rename to files/wic/systemd-bootdisk-dmverity.wks.in
33+
--
34+
2.53.0
35+

0 commit comments

Comments
 (0)