1 files changed, 0 insertions, 99 deletions

diff --git a/classes/override_image_types_ota.inc b/classes/override_image_types_ota.inc
deleted file mode 100644
index da920c1..0000000
--- a/classes/override_image_types_ota.inc
+++ /dev/null
@@ -1,99 +0,0 @@
-# overrides meta-updater/classes/image_types_ota.bbclass
-# - add do_image_otaimg flags:
-#   - dirs, cleandirs: to avoid mktemp, rm, cd, and to also remove at clean
-# - override of IMAGE_CMD_otaimg
-#   - use the added flags
-#   - avoid untar-ing the ostree image, and use OSTREE_ROOTFS
-#   - IMGDEPLOYDIR, instead of DEPLOY_DIR_IMAGE
-
-OSTREE_REPO = "${WORKDIR}/ostree-repo"
-PHYS_SYSROOT = "${WORKDIR}/ota-sysroot"
-
-do_image_otaimg[dirs] = "${PHYS_SYSROOT}"
-do_image_otaimg[cleandirs] = "${PHYS_SYSROOT}"
-
-IMAGE_CMD_otaimg () {
-        if ${@bb.utils.contains('IMAGE_FSTYPES', 'otaimg', 'true', 'false', d)}; then
-                if [ -z "$OSTREE_REPO" ]; then
-                        bbfatal "OSTREE_REPO should be set in your local.conf"
-                fi
-
-                if [ -z "$OSTREE_OSNAME" ]; then
-                        bbfatal "OSTREE_OSNAME should be set in your local.conf"
-                fi
-
-                if [ -z "$OSTREE_BRANCHNAME" ]; then
-                        bbfatal "OSTREE_BRANCHNAME should be set in your local.conf"
-                fi
-
-                ostree admin --sysroot=${PHYS_SYSROOT} init-fs ${PHYS_SYSROOT}
-                ostree admin --sysroot=${PHYS_SYSROOT} os-init ${OSTREE_OSNAME}
-
-                mkdir -p ${PHYS_SYSROOT}/boot/loader.0
-                ln -s loader.0 ${PHYS_SYSROOT}/boot/loader
-
-                if [ "${OSTREE_BOOTLOADER}" = "grub" ]; then
-                        ln -s loader ${PHYS_SYSROOT}/boot/grub
-                        ln -s loader ${PHYS_SYSROOT}/boot/grub2
-                        touch ${PHYS_SYSROOT}/boot/grub/grub.cfg
-                elif [ "${OSTREE_BOOTLOADER}" = "u-boot" ]; then
-                        touch ${PHYS_SYSROOT}/boot/loader/uEnv.txt
-                else
-                        bberror "Invalid bootloader: ${OSTREE_BOOTLOADER}"
-                fi;
-
-                ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME})
-
-                ostree --repo=${PHYS_SYSROOT}/ostree/repo pull-local --remote=${OSTREE_OSNAME} ${OSTREE_REPO} ${ostree_target_hash}
-                export OSTREE_BOOT_PARTITION="/boot"
-                kargs_list=""
-                for arg in ${OSTREE_KERNEL_ARGS}; do
-                        kargs_list="${kargs_list} --karg-append=$arg"
-                done
-
-                ostree admin --sysroot=${PHYS_SYSROOT} deploy ${kargs_list} --os=${OSTREE_OSNAME} ${ostree_target_hash}
-
-                cp -a ${IMAGE_ROOTFS}/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
-                # Ensure the permissions are correctly set
-                chmod 700 ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota
-
-                cp -a ${OSTREE_ROOTFS}/var/local ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
-                cp -a ${OSTREE_ROOTFS}/usr/homedirs/home ${PHYS_SYSROOT}/ || true
-                # Ensure that /var/local exists (AGL symlinks /usr/local to /var/local)
-                install -d ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/local
-                # Set package version for the first deployment
-                target_version=${ostree_target_hash}
-                if [ -n "${GARAGE_TARGET_VERSION}" ]; then
-                        target_version=${GARAGE_TARGET_VERSION}
-                elif [ -e "${STAGING_DATADIR_NATIVE}/target_version" ]; then
-                        target_version=$(cat "${STAGING_DATADIR_NATIVE}/target_version")
-                fi
-                mkdir -p ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import
-                echo "{\"${ostree_target_hash}\":\"${GARAGE_TARGET_NAME}-${target_version}\"}" > ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota/import/installed_versions
-
-                # Calculate image type
-                OTA_ROOTFS_SIZE=$(calculate_size `du -ks ${PHYS_SYSROOT} | cut -f 1`  "${IMAGE_OVERHEAD_FACTOR}" "${IMAGE_ROOTFS_SIZE}" "${IMAGE_ROOTFS_MAXSIZE}" `expr ${IMAGE_ROOTFS_EXTRA_SPACE}` "${IMAGE_ROOTFS_ALIGNMENT}")
-
-                if [ $OTA_ROOTFS_SIZE -lt 0 ]; then
-                        exit -1
-                fi
-                eval local COUNT=\"0\"
-                eval local MIN_COUNT=\"60\"
-                if [ $OTA_ROOTFS_SIZE -lt $MIN_COUNT ]; then
-                        eval COUNT=\"$MIN_COUNT\"
-                fi
-
-                # create image
-                dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.otaimg seek=${OTA_ROOTFS_SIZE} count=${COUNT} bs=1024
-                mkfs.ext4 -O ^64bit ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.otaimg -L otaroot -d ${PHYS_SYSROOT}
-                rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg
-                ln -s ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.otaimg ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg
-                # for forward compatibility
-                rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ota-ext4
-                ln -s ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.otaimg ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ota-ext4
-        fi
-}
-
-IMAGE_TYPEDEP_otaimg = "ostree"