From b49c2631b6bc48ead4d352e2bd00cdfbca7af5e8 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Mon, 3 Apr 2017 12:05:53 +0200 Subject: Replace sdcard_image* classes with wic --- conf/distro/sota.conf.inc | 48 ++++++++++++----------------------------------- 1 file changed, 12 insertions(+), 36 deletions(-) (limited to 'conf/distro') diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc index 23e5a43..c8b4388 100644 --- a/conf/distro/sota.conf.inc +++ b/conf/distro/sota.conf.inc @@ -1,8 +1,17 @@ -IMAGE_INSTALL_append = " ostree rvi-sota-client" +DISTRO_FEATURES_append = " sota" +OVERRIDES .= ":sota" + +IMAGE_INSTALL_append = " ostree" # live image for OSTree-enabled systems -IMAGE_CLASSES_append = " image_types_ostree image_types_ota" -IMAGE_FSTYPES += "ostreepush otaimg" +IMAGE_CLASSES += "image_types_ostree image_types_ota" +IMAGE_FSTYPES += "ostreepush otaimg wic" +WKS_FILE = "sdimage-sota.wks" +do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg" + +# No working WKS for Raspberry Pi yet +IMAGE_FSTYPES_remove_raspberrypi3 = "wic" +IMAGE_FSTYPES_remove_raspberrypi2 = "wic" # Please redefine OSTREE_REPO in order to have a persistent OSTree repo OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" @@ -10,36 +19,3 @@ OSTREE_BRANCHNAME ?= "ota-${MACHINE}" OSTREE_OSNAME ?= "poky" OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image" -# Platform-specific configurations - -## RaspberryPi -IMAGE_CLASSES_append_raspberrypi2 = " image_types_uboot sdcard_image-rpi-ota" -IMAGE_CLASSES_append_raspberrypi3 = " image_types_uboot sdcard_image-rpi-ota" -IMAGE_FSTYPES += "${@'rpi-sdimg-ota' if d.getVar('MACHINE', True).startswith('raspberrypi') else ''}" -IMAGE_FSTYPES_remove = "rpi-sdimg" - -KERNEL_IMAGETYPE_raspberrypi2 = "uImage" -KERNEL_IMAGETYPE_raspberrypi3 = "uImage" - -UBOOT_MACHINE_raspberrypi2 = "rpi_2_defconfig" -UBOOT_MACHINE_raspberrypi3 = "rpi_3_32b_defconfig" -PREFERRED_PROVIDER_virtual/bootloader_raspberrypi2 = "u-boot" -PREFERRED_PROVIDER_virtual/bootloader_raspberrypi3 = "u-boot" - -# Some BSPs (e.g. meta-raspberrypi) use this variable to turn debug on/off -DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "release",d)}" - -## Minnowboard -PREFERRED_PROVIDER_virtual/bootloader_intel-corei7-64 = "u-boot-ota" -UBOOT_MACHINE_intel-corei7-64 = "minnowmax_defconfig" -IMAGE_CLASSES_append_intel-corei7-64 = " sdcard_image-minnowboard-ota" -IMAGE_FSTYPES += "${@'minnowboard-sdimg-ota' if d.getVar('MACHINE', True).startswith('intel-corei7-64') else ''}" - -## QEMU -PREFERRED_PROVIDER_virtual/bootloader_qemux86 = "u-boot-ota" -UBOOT_MACHINE_qemux86 = "qemu-x86_defconfig" -PREFERRED_PROVIDER_virtual/bootloader_qemux86-64= "u-boot-ota" -UBOOT_MACHINE_qemux86-64 = "qemu-x86_defconfig" - -DISTROOVERRIDES_append = ":sota" -DISTRO_FEATURES_append = " sota" -- cgit v1.2.3-54-g00ecf