Skip to content

Commit

Permalink
yoe-initramfs-image: Remove any non cpio image types
Browse files Browse the repository at this point in the history
We append to IMAGE_FSTYPES in site.conf which can cause
loops while parsing images which use initramfs on some
machines like sifive unmatched or other riscv machines

Signed-off-by: Khem Raj <[email protected]>
  • Loading branch information
kraj committed Sep 30, 2022
1 parent bc8bedd commit b45a0be
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions conf/site.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ SCONF_VERSION = "1"
# Modify the following if you need to change the types of images generated
# most of the time, this is set by the machine conf or in a custom image
# recipe.
# Ensure that meta-yoe/recipes-core/images/yoe-initramfs-image.bb is removing
# all these appends, otherwise it can cause parsing cycles on some riscv machines
# e.g. unmatched
IMAGE_FSTYPES:append = " wic.xz wic.bmap tar.xz"
IMAGE_FSTYPES:remove:qemuall = "tar.bz2 tar.xz tar tar.gz wic.xz wic.bmap"

Expand Down
3 changes: 3 additions & 0 deletions sources/meta-yoe/recipes-core/images/yoe-initramfs-image.bb
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ PACKAGE_INSTALL = "\
util-linux-fdisk \
"
IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
# Check conf/site.conf where there is IMAGE_FSTYPES:append
# if that value changes make the change here as well
IMAGE_FSTYPES:remove = "wic.* wic.xz wic.bmap tar.xz"
inherit core-image

IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt"
Expand Down

0 comments on commit b45a0be

Please sign in to comment.