summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorAnton Gerasimov <anton@advancedtelematic.com>2016-10-28 12:46:49 +0200
committerAnton Gerasimov <anton@advancedtelematic.com>2016-10-28 14:16:06 +0200
commit9df92779f86367df2dc0a794b1fb4ae954609b7d (patch)
tree0bb8090f317b4f4caacc9635d7e777c78c2ea728 /templates
parent0f2b2c95aeff4e382d145ba583c46076ed044c54 (diff)
Move machine-dependent sota configuration to machine templates
Change-Id: Iaf00906eb44f50490a67e5f5e5ca229fd1f76028 Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>
Diffstat (limited to 'templates')
-rw-r--r--templates/feature/agl-sota/50_local.conf.inc23
1 files changed, 1 insertions, 22 deletions
diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc
index eff85b5..172ad8b 100644
--- a/templates/feature/agl-sota/50_local.conf.inc
+++ b/templates/feature/agl-sota/50_local.conf.inc
@@ -1,4 +1,5 @@
DISTRO_FEATURES_append = " agl-ota"
+OVERRIDES .= ":sota"
IMAGE_INSTALL_append = " ostree"
@@ -6,28 +7,6 @@ IMAGE_INSTALL_append = " ostree"
IMAGE_CLASSES += "image_types_ostree image_types_ota"
IMAGE_FSTYPES += "otaimg"
-IMAGE_CLASSES_append_raspberrypi = " sdcard_image-rpi-ota"
-IMAGE_CLASSES_append_raspberrypi2 = " sdcard_image-rpi-ota"
-
-IMAGE_CLASSES_remove_raspberrypi = " sdcard_image-rpi-gdp"
-IMAGE_CLASSES_remove_raspberrypi2 = " sdcard_image-rpi-gdp"
-
-IMAGE_FSTYPES += "${@'rpi-sdimg-ota' if d.getVar('MACHINE', True) in [ 'raspberrypi', 'raspberrypi2', 'raspberrypi3' ] else ''}"
-
-IMAGE_FSTYPES_remove_raspberrypi = "rpi-sdimg"
-IMAGE_FSTYPES_remove_raspberrypi2 = "rpi-sdimg"
-
-UBOOT_MACHINE_qemux86 = "qemu-x86_defconfig"
-UBOOT_MACHINE_qemux86-64 = "qemu-x86_defconfig"
-UBOOT_MACHINE_raspberrypi3 = "rpi_3_32b_defconfig"
-
-KERNEL_IMAGETYPE_arm = "uImage"
-
-PREFERRED_PROVIDER_virtual/bootloader_qemux86 ?= "u-boot-ota"
-PREFERRED_PROVIDER_virtual/bootloader_qemux86-64 ?= "u-boot-ota"
-PREFERRED_PROVIDER_virtual/bootloader_raspberrypi3 ?= "u-boot"
-PREFERRED_PROVIDER_virtual/bootloader_raspberrypi2 ?= "u-boot"
-
# Please redefine OSTREE_REPO in order to have a persistent OSTree repo
OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
OSTREE_BRANCHNAME ?= "agl-ota"