From 9df92779f86367df2dc0a794b1fb4ae954609b7d Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Fri, 28 Oct 2016 12:46:49 +0200 Subject: Move machine-dependent sota configuration to machine templates Change-Id: Iaf00906eb44f50490a67e5f5e5ca229fd1f76028 Signed-off-by: Anton Gerasimov --- meta-sota/classes/image_types_ostree.bbclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta-sota/classes') 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} -- cgit 1.2.3-korg