From 9edb72f79953669259ee386ff6c9c5cfe59f6d9c Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Tue, 7 Nov 2017 14:22:34 +0100 Subject: Fix incompatibilities with latest pyro, use wic on RPi --- classes/sota_raspberrypi.bbclass | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'classes/sota_raspberrypi.bbclass') diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass index cc6b666..51d07b2 100644 --- a/classes/sota_raspberrypi.bbclass +++ b/classes/sota_raspberrypi.bbclass @@ -1,11 +1,9 @@ -IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'image_types_uboot sdcard_image-rpi-ota', '', d)}" -IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota.xz', 'rpi-sdimg.xz', d)}" - -IMAGE_FSTYPES_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'wic rpi-sdimg rpi-sdimg.xz', '', d)}" - KERNEL_IMAGETYPE_sota = "uImage" PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" UBOOT_MACHINE_raspberrypi2_sota ?= "rpi_2_defconfig" UBOOT_MACHINE_raspberrypi3_sota ?= "rpi_3_32b_defconfig" OSTREE_BOOTLOADER ?= "u-boot" + +# OSTree puts its own boot.scr to bcm2835-bootfiles +IMAGE_BOOT_FILES_remove_sota += "boot.scr" -- cgit v1.2.3-54-g00ecf