Remove sdcard_image-rpi-gdp.bbclass 65/9765/2
authorLeon Anavi <leon.anavi@konsulko.com>
Mon, 19 Jun 2017 15:03:48 +0000 (18:03 +0300)
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tue, 20 Jun 2017 09:50:34 +0000 (09:50 +0000)
Remove class sdcard_image-rpi-gdp. Historically it
was added during the initial porting of AGL to
Raspberry Pi and it had been taken from GENIVI
Development Platform. It is not needed anymore.

Bug-AGL: SPEC-409

Change-Id: I3f78b5fd92b08962c4a1fe07753627ae81da23ec
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9765
Reviewed-by: Matt Ranostay <matt.ranostay@konsulko.com>
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
meta-agl-bsp/classes/sdcard_image-rpi-gdp.bbclass [deleted file]

diff --git a/meta-agl-bsp/classes/sdcard_image-rpi-gdp.bbclass b/meta-agl-bsp/classes/sdcard_image-rpi-gdp.bbclass
deleted file mode 100644 (file)
index 725ada8..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-inherit sdcard_image-rpi
-
-IMAGE_CMD_rpi-sdimg () {
-
-       # Get rootfs size
-       if echo "${SDIMG_ROOTFS_TYPE}" | egrep -q "*\.xz"
-       then
-               ROOTPART_SIZE=`xz -l --robot ${SDIMG_ROOTFS} | grep "^file" | cut -f`
-       else
-               ROOTPART_SIZE=`du -Lb ${SDIMG_ROOTFS} | cut -f1`
-       fi
-
-       ROOTPART_SIZE=$(expr ${ROOTPART_SIZE} / 1024)
-
-       # just in case our file system block size is not a multiple of 1KiB
-       if [ $(expr ${ROOTPART_SIZE} % 1024) != 0 ];
-       then
-               ROOTPART_SIZE=$(expr ${ROOTPART_SIZE} + 1)
-       fi
-
-       # Align partitions
-       BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
-       BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
-       SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTPART_SIZE)
-
-       echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTPART_SIZE KiB"
-
-       # Check if we are building with device tree support
-       DTS="${@get_dts(d, None)}"
-
-       # Initialize sdcard image file
-       dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE}
-
-       # Create partition table
-       parted -s ${SDIMG} mklabel msdos
-       # Create boot partition and mark it as bootable
-       parted -s ${SDIMG} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT})
-       parted -s ${SDIMG} set 1 boot on
-       # Create rootfs partition to the end of disk
-       parted -s ${SDIMG} -- unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) -1s
-       parted ${SDIMG} print
-
-       # Create a vfat image with boot files
-       BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
-       rm -f ${WORKDIR}/boot.img
-       mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
-       mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
-       case "${KERNEL_IMAGETYPE}" in
-       "uImage")
-               mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.img ::${SDIMG_KERNELIMAGE}
-               mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::uImage
-               ;;
-       *)
-               if test -n "${DTS}"; then
-                       # Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' string and will be put in a dedicated folder
-                       DT_OVERLAYS="${@split_overlays(d, 0)}"
-                       DT_ROOT="${@split_overlays(d, 1)}"
-
-                       # Copy board device trees to root folder
-                       for DTB in ${DT_ROOT}; do
-                               DTB_BASE_NAME=`basename ${DTB} .dtb`
-
-                               mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::${DTB_BASE_NAME}.dtb
-                       done
-
-                       # Copy device tree overlays to dedicated folder
-                       mmd -i ${WORKDIR}/boot.img overlays
-                       for DTB in ${DT_OVERLAYS}; do
-                               DTB_EXT=${DTB##*.}
-                               DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
-
-                               mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.${DTB_EXT} ::overlays/${DTB_BASE_NAME}.${DTB_EXT}
-                       done
-               fi
-               mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::${SDIMG_KERNELIMAGE}
-               ;;
-       esac
-
-       if [ -n ${FATPAYLOAD} ] ; then
-               echo "Copying payload into VFAT"
-               for entry in ${FATPAYLOAD} ; do
-                               # add the || true to stop aborting on vfat issues like not supporting .~lock files
-                               mcopy -i ${WORKDIR}/boot.img -s -v ${IMAGE_ROOTFS}$entry :: || true
-               done
-       fi
-
-       # Add stamp file
-       echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${WORKDIR}/image-version-info
-       mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}//image-version-info ::
-
-       # Burn Partitions
-       dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-       # If SDIMG_ROOTFS_TYPE is a .xz file use xzcat
-       if echo "${SDIMG_ROOTFS_TYPE}" | egrep -q "*\.xz"
-       then
-               xzcat ${SDIMG_ROOTFS} | dd of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-       else
-               dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-       fi
-
-       # Optionally apply compression
-       case "${SDIMG_COMPRESSION}" in
-       "gzip")
-               gzip -k9 "${SDIMG}"
-               ;;
-       "bzip2")
-               bzip2 -k9 "${SDIMG}"
-               ;;
-       "xz")
-               xz -k "${SDIMG}"
-               ;;
-       esac
-}