correction bug pour le deployement de l'image pengwyn-sdimg
This commit is contained in:
@@ -46,7 +46,7 @@ SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${SDIMG_ROOTFS_TYPE}"
|
||||
# For the names of kernel artifacts
|
||||
inherit kernel-artifact-names
|
||||
|
||||
do_image_sdimg[depends] = " \
|
||||
do_image_pengwyn_sdimg[depends] = " \
|
||||
parted-native:do_populate_sysroot \
|
||||
mtools-native:do_populate_sysroot \
|
||||
dosfstools-native:do_populate_sysroot \
|
||||
@@ -55,7 +55,7 @@ do_image_sdimg[depends] = " \
|
||||
virtual/dtb:do_deploy \
|
||||
"
|
||||
|
||||
do_image_sdimg[recrdeps] = "do_build"
|
||||
do_image_pengwyn_sdimg[recrdeps] = "do_build"
|
||||
|
||||
# SD card image name
|
||||
SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.sdimg"
|
||||
@@ -121,111 +121,3 @@ IMAGE_CMD:pengwyn-sdimg () {
|
||||
fi
|
||||
}
|
||||
|
||||
#IMAGE_CMD:sdimg () {
|
||||
# # 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} + $ROOTFS_SIZE)
|
||||
#
|
||||
# echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB"
|
||||
#
|
||||
# # Check if we are building with device tree support
|
||||
# DTS="${@make_dtb_boot_files(d)}"
|
||||
#
|
||||
# # 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 -F32 -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
|
||||
# mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${BOOTFILES_DIR_NAME}/* ::/ || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${BOOTFILES_DIR_NAME}/* into boot.img"
|
||||
# if [ "${@bb.utils.contains("MACHINE_FEATURES", "armstub", "1", "0", d)}" = "1" ]; then
|
||||
# mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} ::/ || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} into boot.img"
|
||||
# fi
|
||||
# if test -n "${DTS}"; then
|
||||
# # Copy board device trees (including overlays)
|
||||
# # There is an assumption here - no DTB in other directories than root
|
||||
# # and root/overlays. mmd/mcopy are not very flexible tools.
|
||||
# mmd -i ${WORKDIR}/boot.img overlays
|
||||
# for entry in ${DTS} ; do
|
||||
# # Split entry at optional ';'
|
||||
# if [ $(echo "$entry" | grep -c \;) = "0" ] ; then
|
||||
# DEPLOY_FILE="$entry"
|
||||
# DEST_FILENAME="$entry"
|
||||
# else
|
||||
# DEPLOY_FILE="$(echo "$entry" | cut -f1 -d\;)"
|
||||
# DEST_FILENAME="$(echo "$entry" | cut -f2- -d\;)"
|
||||
# fi
|
||||
# mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${DEPLOY_FILE} ::${DEST_FILENAME} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${DEPLOY_FILE} into boot.img"
|
||||
# done
|
||||
# fi
|
||||
# if [ "${RPI_USE_U_BOOT}" = "1" ]; then
|
||||
# mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.bin ::${SDIMG_KERNELIMAGE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/u-boot.bin into boot.img"
|
||||
# mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/boot.scr ::boot.scr || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/boot.scr into boot.img"
|
||||
# if [ ! -z "${INITRAMFS_IMAGE}" -a "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then
|
||||
# mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin ::${KERNEL_IMAGETYPE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin into boot.img"
|
||||
# else
|
||||
# mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ::${KERNEL_IMAGETYPE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} into boot.img"
|
||||
# fi
|
||||
# else
|
||||
# if [ ! -z "${INITRAMFS_IMAGE}" -a "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then
|
||||
# mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin ::${SDIMG_KERNELIMAGE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin into boot.img"
|
||||
# else
|
||||
# mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ::${SDIMG_KERNELIMAGE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} into boot.img"
|
||||
# fi
|
||||
# fi
|
||||
#
|
||||
# # Add files (eg. hypervisor binaries) from the deploy dir
|
||||
# if [ -n "${DEPLOYPAYLOAD}" ] ; then
|
||||
# echo "Copying deploy file payload into VFAT"
|
||||
# for entry in ${DEPLOYPAYLOAD} ; do
|
||||
# # Split entry at optional ':' to enable file renaming for the destination
|
||||
# if [ $(echo "$entry" | grep -c :) = "0" ] ; then
|
||||
# DEPLOY_FILE="$entry"
|
||||
# DEST_FILENAME="$entry"
|
||||
# else
|
||||
# DEPLOY_FILE="$(echo "$entry" | cut -f1 -d:)"
|
||||
# DEST_FILENAME="$(echo "$entry" | cut -f2- -d:)"
|
||||
# fi
|
||||
# mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${DEPLOY_FILE} ::${DEST_FILENAME} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${DEPLOY_FILE} into boot.img"
|
||||
# done
|
||||
# fi
|
||||
#
|
||||
# if [ -n "${FATPAYLOAD}" ] ; then
|
||||
# echo "Copying payload into VFAT"
|
||||
# for entry in ${FATPAYLOAD} ; do
|
||||
# # use bbwarn instead of bbfatal to stop aborting on vfat issues like not supporting .~lock files
|
||||
# mcopy -v -i ${WORKDIR}/boot.img -s ${IMAGE_ROOTFS}$entry :: || bbwarn "mcopy cannot copy ${IMAGE_ROOTFS}$entry into boot.img"
|
||||
# done
|
||||
# fi
|
||||
#
|
||||
# # Add stamp file
|
||||
# echo "${IMAGE_NAME}" > ${WORKDIR}/image-version-info
|
||||
# mcopy -v -i ${WORKDIR}/boot.img ${WORKDIR}/image-version-info :: || bbfatal "mcopy cannot copy ${WORKDIR}/image-version-info into boot.img"
|
||||
#
|
||||
# # Deploy vfat partition
|
||||
# if [ "${SDIMG_VFAT_DEPLOY}" = "1" ]; then
|
||||
# cp ${WORKDIR}/boot.img ${IMGDEPLOYDIR}/${SDIMG_VFAT}
|
||||
# ln -sf ${SDIMG_VFAT} ${SDIMG_LINK_VFAT}
|
||||
# fi
|
||||
#
|
||||
# # Burn Partitions
|
||||
# dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
|
||||
# # 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)
|
||||
# else
|
||||
# dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
|
||||
# fi
|
||||
#}
|
||||
|
||||
Reference in New Issue
Block a user