sota: introduce INITRAMFS_FSTYPES

RAMDISK_EXT and IMAGE_FSTYPES of initramfs-ostree-image should not be
defined separately, because they are representing the same fstype of
a same initramfs image, or else, they turn out to be inconsistent if
the users change one of them.

So we use INITRAMFS_FSTYPES already defined in bitbake.conf, to be able
to set fstype for initramfs. And it should default to ext4.gz.u-boot or
ext4.gz depending on what OSTREE_BOOTLOADER is being set.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index 1e765f0..7ff4bf1 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -20,13 +20,15 @@ WKS_FILE_sota ?= "sdimage-sota.wks"
 
 EXTRA_IMAGEDEPENDS_append_sota = " parted-native mtools-native dosfstools-native"
 
+INITRAMFS_FSTYPES = "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'ext4.gz.u-boot', 'ext4.gz')}"
+
 # Please redefine OSTREE_REPO in order to have a persistent OSTree repo
 OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
 # For UPTANE operation, OSTREE_BRANCHNAME must start with "${MACHINE}-"
 OSTREE_BRANCHNAME ?= "${MACHINE}"
 OSTREE_OSNAME ?= "poky"
 OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image"
-
+OSTREE_BOOTLOADER ??= 'u-boot'
 
 GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo"
 GARAGE_SIGN_KEYNAME ?= "garage-key"