summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-sota/classes/image_types_ostree.bbclass8
-rw-r--r--templates/feature/agl-sota/50_local.conf.inc23
2 files changed, 6 insertions, 25 deletions
diff --git a/meta-sota/classes/image_types_ostree.bbclass b/meta-sota/classes/image_types_ostree.bbclass
index f3eafd7..fcba6d9 100644
--- a/meta-sota/classes/image_types_ostree.bbclass
+++ b/meta-sota/classes/image_types_ostree.bbclass
@@ -10,7 +10,9 @@ export OSTREE_REPO
export OSTREE_BRANCHNAME
RAMDISK_EXT ?= ".ext4.gz"
-RAMDISK_EXT_arm = ".ext4.gz.u-boot"
+RAMDISK_EXT_arm ?= ".ext4.gz.u-boot"
+
+OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}"
IMAGE_CMD_ostree () {
if [ -z "$OSTREE_REPO" ]; then
@@ -93,9 +95,9 @@ IMAGE_CMD_ostree () {
mkdir -p boot/loader.1
ln -sf boot/loader.0 boot/loader
- checksum=`sha256sum ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} | cut -f 1 -d " "`
+ checksum=`sha256sum ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} | cut -f 1 -d " "`
- cp ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} boot/vmlinuz-${checksum}
+ cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} boot/vmlinuz-${checksum}
cp ${DEPLOY_DIR_IMAGE}/${OSTREE_INITRAMFS_IMAGE}-${MACHINE}${RAMDISK_EXT} boot/initramfs-${checksum}
cd ${WORKDIR}
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"