diff options
| author | Laurent Bonnans <laurent.bonnans@here.com> | 2018-05-15 15:42:26 +0200 |
|---|---|---|
| committer | Laurent Bonnans <laurent.bonnans@here.com> | 2018-05-16 12:37:19 +0200 |
| commit | 7e6ffbce3f8717d91142d1e80d7cda279f24145a (patch) | |
| tree | 3ec6119050fe4362d9604d168daa8ed527029af7 | |
| parent | 6cc92819f88ecf79fa9a54b3b21446da61dbab48 (diff) | |
| download | meta-updater-7e6ffbce3f8717d91142d1e80d7cda279f24145a.tar.gz | |
Fix boot on qemux86-64
It needs a plain compressed file system and not an u-boot legacy image
| -rw-r--r-- | classes/sota.bbclass | 2 | ||||
| -rw-r--r-- | classes/sota_qemux86-64.bbclass | 1 |
2 files changed, 2 insertions, 1 deletions
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" | |||
| 20 | 20 | ||
| 21 | EXTRA_IMAGEDEPENDS_append_sota = " parted-native mtools-native dosfstools-native" | 21 | EXTRA_IMAGEDEPENDS_append_sota = " parted-native mtools-native dosfstools-native" |
| 22 | 22 | ||
| 23 | OSTREE_INITRAMFS_FSTYPES ?= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'ext4.gz.u-boot', 'ext4.gz')}" | 23 | OSTREE_INITRAMFS_FSTYPES ??= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'ext4.gz.u-boot', 'ext4.gz')}" |
| 24 | 24 | ||
| 25 | # Please redefine OSTREE_REPO in order to have a persistent OSTree repo | 25 | # Please redefine OSTREE_REPO in order to have a persistent OSTree repo |
| 26 | OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" | 26 | 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" | |||
| 4 | PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot" | 4 | PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot" |
| 5 | UBOOT_MACHINE_sota = "qemu-x86_defconfig" | 5 | UBOOT_MACHINE_sota = "qemu-x86_defconfig" |
| 6 | OSTREE_BOOTLOADER ?= "u-boot" | 6 | OSTREE_BOOTLOADER ?= "u-boot" |
| 7 | OSTREE_INITRAMFS_FSTYPES ?= "ext4.gz" | ||
| 7 | 8 | ||
| 8 | OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda" | 9 | OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda" |
| 9 | 10 | ||