From 7e6ffbce3f8717d91142d1e80d7cda279f24145a Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Tue, 15 May 2018 15:42:26 +0200 Subject: Fix boot on qemux86-64 It needs a plain compressed file system and not an u-boot legacy image --- classes/sota.bbclass | 2 +- classes/sota_qemux86-64.bbclass | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 621db24..38d4ce5 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" -OSTREE_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" diff --git a/classes/sota_qemux86-64.bbclass b/classes/sota_qemux86-64.bbclass index a5fd6a4..15b2043 100644 --- a/classes/sota_qemux86-64.bbclass +++ b/classes/sota_qemux86-64.bbclass @@ -4,6 +4,7 @@ IMAGE_FSTYPES_remove = "wic" PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot" UBOOT_MACHINE_sota = "qemu-x86_defconfig" OSTREE_BOOTLOADER ?= "u-boot" +OSTREE_INITRAMFS_FSTYPES ?= "ext4.gz" OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda" -- cgit v1.2.3-54-g00ecf