From 38c42da75031a12a7f12c9b816894859514d136b Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Wed, 24 May 2017 15:57:31 +0200 Subject: Remove unneeded image types --- classes/image_types_ota.bbclass | 2 ++ classes/sota_raspberrypi.bbclass | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'classes') diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index cb71899..c5f3c85 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass @@ -98,6 +98,8 @@ IMAGE_CMD_otaimg () { HOME_TMP=`mktemp -d ${WORKDIR}/home-tmp-XXXXX` tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota || true mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true + # Create /var/sota if it doesn't exist yet + mkdir -p ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota || true mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ || true rm -rf ${HOME_TMP} diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass index 7b67c0f..b6cf639 100644 --- a/classes/sota_raspberrypi.bbclass +++ b/classes/sota_raspberrypi.bbclass @@ -1,10 +1,7 @@ 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)}" -### both rpi-sdimg and rpi-sdimg-ota broken -IMAGE_FSTYPES += "ext4.xz ext4.bmap tar.xz" - -IMAGE_FSTYPES_remove = "wic" +IMAGE_FSTYPES_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'wic rpi-sdimg', '', d)}" KERNEL_IMAGETYPE_sota = "uImage" PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" -- cgit v1.2.3-54-g00ecf