summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorcajun-rat <p@beta16.co.uk>2017-05-26 15:40:27 +0200
committerGitHub <noreply@github.com>2017-05-26 15:40:27 +0200
commit134caccaddd5bc038885c05c0b31fdd15b26e8e2 (patch)
tree77efb0adcfd7acaf32ee77b16e22f74cf0850210 /classes
parent6eef5801f5db9338c10d36cec0a98d90275cc7d3 (diff)
parent38c42da75031a12a7f12c9b816894859514d136b (diff)
downloadmeta-updater-134caccaddd5bc038885c05c0b31fdd15b26e8e2.tar.gz
Merge pull request #72 from advancedtelematic/bugfix/PRO-3141/rpi-sdimg
Remove unneeded image types
Diffstat (limited to 'classes')
-rw-r--r--classes/image_types_ota.bbclass2
-rw-r--r--classes/sota_raspberrypi.bbclass5
2 files changed, 3 insertions, 4 deletions
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index 306a3c0..8108d51 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -98,6 +98,8 @@ IMAGE_CMD_otaimg () {
98 HOME_TMP=`mktemp -d ${WORKDIR}/home-tmp-XXXXX` 98 HOME_TMP=`mktemp -d ${WORKDIR}/home-tmp-XXXXX`
99 tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota || true 99 tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota || true
100 mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true 100 mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
101 # Create /var/sota if it doesn't exist yet
102 mkdir -p ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota || true
101 mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ || true 103 mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/ || true
102 # Ensure that /var/local exists (AGL symlinks /usr/local to /var/local) 104 # Ensure that /var/local exists (AGL symlinks /usr/local to /var/local)
103 install -d ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/local 105 install -d ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/local
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 @@
1IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'image_types_uboot sdcard_image-rpi-ota', '', d)}" 1IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'image_types_uboot sdcard_image-rpi-ota', '', d)}"
2IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}" 2IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}"
3 3
4### both rpi-sdimg and rpi-sdimg-ota broken 4IMAGE_FSTYPES_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'wic rpi-sdimg', '', d)}"
5IMAGE_FSTYPES += "ext4.xz ext4.bmap tar.xz"
6
7IMAGE_FSTYPES_remove = "wic"
8 5
9KERNEL_IMAGETYPE_sota = "uImage" 6KERNEL_IMAGETYPE_sota = "uImage"
10PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot" 7PREFERRED_PROVIDER_virtual/bootloader_sota ?= "u-boot"