From e36a7821467fe3ae3f22e0ca67b91ebb3e65d2cb Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Tue, 11 Apr 2017 11:18:02 +0200 Subject: Add tweaks for compatibility with AGL --- conf/include/local/sota_minnowboard.inc | 9 +++++---- conf/include/local/sota_porter.inc | 8 ++++---- conf/include/local/sota_qemux86-64.inc | 6 +----- conf/include/local/sota_raspberrypi.inc | 12 +++++------- 4 files changed, 15 insertions(+), 20 deletions(-) (limited to 'conf') diff --git a/conf/include/local/sota_minnowboard.inc b/conf/include/local/sota_minnowboard.inc index 0bd4210..5a5b3f4 100644 --- a/conf/include/local/sota_minnowboard.inc +++ b/conf/include/local/sota_minnowboard.inc @@ -1,8 +1,9 @@ MACHINE = "intel-corei7-64" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ota" -UBOOT_MACHINE = "minnowmax_defconfig" +PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota" +UBOOT_MACHINE_sota = "minnowmax_defconfig" -EXTRA_IMAGEDEPENDS_append = " minnowboard-bootfiles" -IMAGE_BOOT_FILES = "minnowboard-bootfiles/*" +EXTRA_IMAGEDEPENDS_append_sota = " minnowboard-bootfiles" +IMAGE_BOOT_FILES_sota += "minnowboard-bootfiles/*" +OSTREE_BOOTLOADER ?= "u-boot" diff --git a/conf/include/local/sota_porter.inc b/conf/include/local/sota_porter.inc index fcda041..64923f9 100644 --- a/conf/include/local/sota_porter.inc +++ b/conf/include/local/sota_porter.inc @@ -3,10 +3,10 @@ MACHINE = "porter" # Commit united image to OSTree, not just uImage OSTREE_KERNEL = "uImage+dtb" -EXTRA_IMAGEDEPENDS_append = " porter-bootfiles" -IMAGE_CLASSES_append = " image_types_uboot " -IMAGE_BOOT_FILES = "porter-bootfiles/*" +EXTRA_IMAGEDEPENDS_append_sota = " porter-bootfiles" +IMAGE_CLASSES_append_sota = " image_types_uboot " +IMAGE_BOOT_FILES_sota += "porter-bootfiles/*" OSTREE_BOOTLOADER ?= "u-boot" -UBOOT_MACHINE = "porter_vin_config" +UBOOT_MACHINE_sota = "porter_vin_config" diff --git a/conf/include/local/sota_qemux86-64.inc b/conf/include/local/sota_qemux86-64.inc index b72c29d..5fa1521 100644 --- a/conf/include/local/sota_qemux86-64.inc +++ b/conf/include/local/sota_qemux86-64.inc @@ -1,12 +1,8 @@ MACHINE = "qemux86-64" -PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "5.4%" -PREFERRED_VERSION_libgcc ?= "5.4%" -PREFERRED_VERSION_gcc-runtime ?= "5.4%" - # U-Boot support for SOTA PREFERRED_PROVIDER_virtual/bootloader_sota = "u-boot-ota" -UBOOT_MACHINE = "qemu-x86_defconfig" +UBOOT_MACHINE_sota = "qemu-x86_defconfig" OSTREE_BOOTLOADER ?= "u-boot" OSTREE_KERNEL_ARGS ?= "ramdisk_size=16384 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda" diff --git a/conf/include/local/sota_raspberrypi.inc b/conf/include/local/sota_raspberrypi.inc index 51919f0..ae13b8e 100644 --- a/conf/include/local/sota_raspberrypi.inc +++ b/conf/include/local/sota_raspberrypi.inc @@ -1,16 +1,14 @@ MACHINE ?= "raspberrypi3" -# normal image class is sdcard_image-rpi-gdp, for sota it is image_types_uboot & sdcard_image-rpi-ota -IMAGE_CLASSES += "image_types_uboot sdcard_image-rpi-ota" +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', 'rpi-sdimg', d)}" -# normal image is rpi-sdimg, for sota it is rpi-sdimg-ota -IMAGE_FSTYPES += "rpi-sdimg-ota" ### both rpi-sdimg and rpi-sdimg-ota broken IMAGE_FSTYPES += "ext4.xz ext4.bmap tar.xz" KERNEL_IMAGETYPE_sota = "uImage" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot" -UBOOT_MACHINE_raspberrypi2 = "rpi_2_defconfig" -UBOOT_MACHINE_raspberrypi3 = "rpi_3_32b_defconfig" +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" -- cgit v1.2.3-54-g00ecf