From 84913d17a11cbc3ec357ed91bdc725db6b639469 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti Date: Thu, 8 Feb 2018 18:47:27 -0200 Subject: Replace INITRAMFS_FSTYPES with OSTREE_INITRAMFS_FSTYPES User is able to customize the init script via OSTREE_INITRAMFS_IMAGE but there is no way to set INITRAMFS_FSTYPES as it gets defined by sota.bbclass. Create a new variable called OSTREE_INITRAMFS_IMAGE to handle the INITRAMFS_FSTYPES update, and also allow the user to override it. Signed-off-by: Ricardo Salveti --- classes/image_types_ostree.bbclass | 2 +- classes/sota.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 904db96..5893e8d 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass @@ -10,7 +10,7 @@ do_image_ostree[depends] += "ostree-native:do_populate_sysroot \ export OSTREE_REPO export OSTREE_BRANCHNAME -RAMDISK_EXT ?= ".${INITRAMFS_FSTYPES}" +RAMDISK_EXT ?= ".${OSTREE_INITRAMFS_FSTYPES}" export GARAGE_TARGET_NAME OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 2a12e8f..6531809 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass @@ -20,7 +20,7 @@ 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')}" +OSTREE_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" -- cgit v1.2.3-54-g00ecf