LM
/
coreos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(coreos-image-swupdate): adapt the class to OE new image naming scheme 

Now the coreos-image-swupdate class and the related sw-description
file use the IMAGE_LINK_NAME variable to retrieve the name of the
image instead of hardcoding each components that form the image
filename.

This fix an issue with OE-Core master, as a .rootfs suffix was
added
This commit is contained in:
Sam Dolt 2023-11-17 09:46:23 +01:00
parent 761ff86d88
commit c7291625af
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layers/meta-belden-coreos/classes/coreos-image-swupdate.bbclass
View File

@ -9,7 +9,8 @@
IMAGE_FSTYPES:append = " ext4.zst" IMAGE_FSTYPES:append = " ext4.zst"
python () { python () {
image = d.getVar('IMAGE_BASENAME') image = d.getVar('IMAGE_LINK_NAME')
d.setVarFlag("SWUPDATE_IMAGES_FSTYPES", image, ".ext4.zst") d.setVarFlag("SWUPDATE_IMAGES_FSTYPES", image, ".ext4.zst")
} }

8
layers/meta-belden-coreos/files/sw-description
View File

@ -7,14 +7,14 @@ software =
copy0 = { copy0 = {
images: ( images: (
{ {
filename = "@@PN@@-@@MACHINE@@.ext4.zst"; filename = "@@IMAGE_LINK_NAME@@.ext4.zst";
compressed = "zstd"; compressed = "zstd";
installed-directly = true; installed-directly = true;
# partlabel are stored inside the GPT partition table. # partlabel are stored inside the GPT partition table.
# The partition table is flashed only once and never updated # The partition table is flashed only once and never updated
device = "/dev/disk/by-partlabel/rootfs0"; device = "/dev/disk/by-partlabel/rootfs0";
type = "raw"; type = "raw";
sha256 = "$swupdate_get_sha256(@@PN@@-@@MACHINE@@.ext4.zst)"; sha256 = "$swupdate_get_sha256(@@IMAGE_LINK_NAME@@.ext4.zst)";
} }
# Don't remove the trailing whitspace on the next line otherwise # Don't remove the trailing whitspace on the next line otherwise
# it will not work due to a regex bug in meta-swupdate # it will not work due to a regex bug in meta-swupdate
@ -64,14 +64,14 @@ software =
copy1 = { copy1 = {
images: ( images: (
{ {
filename = "@@PN@@-@@MACHINE@@.ext4.zst"; filename = "@@IMAGE_LINK_NAME@@.ext4.zst";
compressed = "zstd"; compressed = "zstd";
installed-directly = true; installed-directly = true;
# partlabel are stored inside the GPT partition table. # partlabel are stored inside the GPT partition table.
# The partition table is flashed only once and never updated # The partition table is flashed only once and never updated
device = "/dev/disk/by-partlabel/rootfs1"; device = "/dev/disk/by-partlabel/rootfs1";
type = "raw"; type = "raw";
sha256 = "$swupdate_get_sha256(@@PN@@-@@MACHINE@@.ext4.zst)"; sha256 = "$swupdate_get_sha256(@@IMAGE_LINK_NAME@@.ext4.zst)";
} }
# Don't remove the trailing whitspace on the next line otherwise # Don't remove the trailing whitspace on the next line otherwise
# it will not work due to a regex bug in meta-swupdate # it will not work due to a regex bug in meta-swupdate