diff options
| author | cajun-rat <phil@advancedtelematic.com> | 2017-11-09 09:46:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-09 09:46:49 +0100 |
| commit | cbb8f8ff4e231f1842089fa6eaecf382e3673619 (patch) | |
| tree | fac6c5dc433769704060881eb81b171964b32994 /classes/sota_raspberrypi.bbclass | |
| parent | 6329b9c94c9f4fd2f57819ed98eaf9f1ee3cd525 (diff) | |
| parent | 9edb72f79953669259ee386ff6c9c5cfe59f6d9c (diff) | |
| download | meta-updater-cbb8f8ff4e231f1842089fa6eaecf382e3673619.tar.gz | |
Merge pull request #166 from advancedtelematic/bugfix/pyrobuild
Fix incompatibilities with latest pyro, use wic on RPi
Diffstat (limited to 'classes/sota_raspberrypi.bbclass')
| -rw-r--r-- | classes/sota_raspberrypi.bbclass | 8 |
1 files changed, 3 insertions, 5 deletions
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 @@ | |||
| 1 | IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'image_types_uboot sdcard_image-rpi-ota', '', d)}" | ||
| 2 | IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota.xz', 'rpi-sdimg.xz', d)}" | ||
| 3 | |||
| 4 | IMAGE_FSTYPES_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'wic rpi-sdimg rpi-sdimg.xz', '', d)}" | ||
| 5 | |||
| 6 | KERNEL_IMAGETYPE_sota = "uImage" | 1 | KERNEL_IMAGETYPE_sota = "uImage" |
| 7 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" | 2 | PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" |
| 8 | UBOOT_MACHINE_raspberrypi2_sota ?= "rpi_2_defconfig" | 3 | UBOOT_MACHINE_raspberrypi2_sota ?= "rpi_2_defconfig" |
| 9 | UBOOT_MACHINE_raspberrypi3_sota ?= "rpi_3_32b_defconfig" | 4 | UBOOT_MACHINE_raspberrypi3_sota ?= "rpi_3_32b_defconfig" |
| 10 | 5 | ||
| 11 | OSTREE_BOOTLOADER ?= "u-boot" | 6 | OSTREE_BOOTLOADER ?= "u-boot" |
| 7 | |||
| 8 | # OSTree puts its own boot.scr to bcm2835-bootfiles | ||
| 9 | IMAGE_BOOT_FILES_remove_sota += "boot.scr" | ||