diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-02-01 11:25:25 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-03-14 18:43:09 +0000 |
commit | e40cae0619e83b9cad2c4c904992697c0eb39a40 (patch) | |
tree | 7cf96acc30835f9ec10207134c80f7ad614bd735 /classes | |
parent | 9dfd6b40ffd5c371aa711ccea651e929bee63c97 (diff) |
Update image creation recipes, appends etc. to be poky 2.2 compliant
DEPLOY_DIR_IMAGE macro has been replaced with IMGDEPLOYDIR in poky 2.2.
Update all instances to make image creation work.
Change-Id: I3740730ded84650d3a3a51b85c77ed4fef863a8a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/bootfs-image.bbclass | 10 | ||||
-rw-r--r-- | classes/deploy-conf.bbclass | 2 | ||||
-rw-r--r-- | classes/image-hdd.bbclass | 6 | ||||
-rw-r--r-- | classes/image_dd.bbclass | 8 | ||||
-rw-r--r-- | classes/image_types_sdcard.bbclass | 22 | ||||
-rw-r--r-- | classes/qbsp-image.bbclass | 8 | ||||
-rw-r--r-- | classes/qbsp.bbclass | 2 |
7 files changed, 29 insertions, 29 deletions
diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass index a0563ce1..c7a25ae7 100644 --- a/classes/bootfs-image.bbclass +++ b/classes/bootfs-image.bbclass @@ -44,15 +44,15 @@ fakeroot do_bootfs () { src=`echo $item | awk -F':' '{ print $1 }'` dst=`echo $item | awk -F':' '{ print $2 }'` - install -D -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/bootfs/$dst + install -D -m 0755 ${IMGDEPLOYDIR}/$src ${S}/bootfs/$dst done cd ${S}/bootfs - rm -f ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz + rm -f ${IMGDEPLOYDIR}/${BOOTFS_NAME}.tar.gz ${IMGDEPLOYDIR}/${BOOTFS_LINK_NAME}.tar.gz - mkdir -p ${DEPLOY_DIR_IMAGE} - tar czvf ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz . - ln -s ${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz + mkdir -p ${IMGDEPLOYDIR} + tar czvf ${IMGDEPLOYDIR}/${BOOTFS_NAME}.tar.gz . + ln -s ${BOOTFS_NAME}.tar.gz ${IMGDEPLOYDIR}/${BOOTFS_LINK_NAME}.tar.gz } addtask bootfs before do_rootfs diff --git a/classes/deploy-conf.bbclass b/classes/deploy-conf.bbclass index 61df5dc5..228b1e20 100644 --- a/classes/deploy-conf.bbclass +++ b/classes/deploy-conf.bbclass @@ -33,7 +33,7 @@ DEPLOY_CONF_NAME ?= "${MACHINE}" DEPLOY_CONF_TYPE ?= "Boot2Qt" IMAGE_CMD_conf() { - cat > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.conf <<EOF + cat > ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.conf <<EOF [${DEPLOY_CONF_TYPE} | ${DEPLOY_CONF_NAME}] platform=${MACHINE} os=linux diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass index 1391be14..d12f3bf7 100644 --- a/classes/image-hdd.bbclass +++ b/classes/image-hdd.bbclass @@ -36,9 +36,9 @@ SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200" inherit image_types image-vm create_hdd_image () { - cd ${DEPLOY_DIR_IMAGE} - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd - ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd + cd ${IMGDEPLOYDIR} + rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdd + ln -s ${IMAGE_NAME}.hdddirect ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.hdd } python do_hddimg() { diff --git a/classes/image_dd.bbclass b/classes/image_dd.bbclass index cdb10546..e0addf79 100644 --- a/classes/image_dd.bbclass +++ b/classes/image_dd.bbclass @@ -31,7 +31,7 @@ DESCRIPTION = "The base class for building images that can be deployed with GNU coreutils dd tool." inherit image_types -IMAGE="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" +IMAGE="${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.img" # Boot partition size [in KiB] BOOT_SPACE ?= "8192" @@ -53,7 +53,7 @@ EXPORT_FUNCTIONS do_populate_boot IMAGE_CMD_dd() { - ROOTFS="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" + ROOTFS="${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext3" # Align boot partition and calculate total binary image size BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1) @@ -80,7 +80,7 @@ IMAGE_CMD_dd() { dd if=${WORKDIR}/boot.img of=${IMAGE} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync dd if=${ROOTFS} of=${IMAGE} conv=notrunc seek=1 bs=$(expr ${BOOT_SPACE_ALIGNED} \* 1024 + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img - ln -s ${IMAGE_NAME}.rootfs.img ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img + rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img + ln -s ${IMAGE_NAME}.rootfs.img ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img } diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass index 6c0850fb..28fe3e14 100644 --- a/classes/image_types_sdcard.bbclass +++ b/classes/image_types_sdcard.bbclass @@ -28,31 +28,31 @@ ############################################################################ IMAGE_ROOTFS_EXTRA_SPACE = "100000" -SDCARD_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" +SDCARD_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext3" SDCARD_GENERATION_COMMAND ?= "generate_imx_sdcard" IMAGE_CMD_sdcard_append() { parted -s ${SDCARD} set 1 boot on - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img - ln -s ${IMAGE_NAME}.rootfs.sdcard ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img + rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img + ln -s ${IMAGE_NAME}.rootfs.sdcard ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img } IMAGE_CMD_rpi-sdimg_append() { - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img - ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img + rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img + ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img } build_hddimg_append() { - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img - ln -s ${IMAGE_NAME}.hddimg ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img + rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img + ln -s ${IMAGE_NAME}.hddimg ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img } IMAGE_DEPENDS_tegraflash_append = " parted-native:do_populate_sysroot" create_tegraflash_pkg_prepend() { # Create partition table - SDCARD=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.img - SDCARD_ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext3 + SDCARD=${IMGDEPLOYDIR}/${IMAGE_NAME}.img + SDCARD_ROOTFS=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext3 SDCARD_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + $ROOTFS_SIZE + ${IMAGE_ROOTFS_ALIGNMENT}) dd if=/dev/zero of=${SDCARD} bs=1 count=0 seek=$(expr 1024 \* ${SDCARD_SIZE}) @@ -63,6 +63,6 @@ create_tegraflash_pkg_prepend() { dd if=${SDCARD_ROOTFS} of=${SDCARD} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img - ln -s ${IMAGE_NAME}.img ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.img + rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img + ln -s ${IMAGE_NAME}.img ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img } diff --git a/classes/qbsp-image.bbclass b/classes/qbsp-image.bbclass index 13fb3657..9ea3cd8d 100644 --- a/classes/qbsp-image.bbclass +++ b/classes/qbsp-image.bbclass @@ -40,14 +40,14 @@ fakeroot do_qbsp_image () { src=`echo $item | awk -F':' '{ print $1 }'` dst=`echo $item | awk -F':' '{ print $2 }'` - install -D -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/qbsp/$dst + install -D -m 0755 ${IMGDEPLOYDIR}/$src ${S}/qbsp/$dst done cd ${S}/qbsp - 7zr a ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.7z . + 7zr a ${IMGDEPLOYDIR}/${IMAGE_NAME}.7z . - rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.7z - ln -s ${IMAGE_NAME}.7z ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.7z + rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z + ln -s ${IMAGE_NAME}.7z ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z } IMAGE_POSTPROCESS_COMMAND += "do_qbsp_image;" diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass index a13db659..2dd42d0b 100644 --- a/classes/qbsp.bbclass +++ b/classes/qbsp.bbclass @@ -122,7 +122,7 @@ prepare_qbsp() { patch_installer_files ${COMPONENT_PATH}/meta mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images - 7zr x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/ + 7zr x ${IMGDEPLOYDIR}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/ cd ${B}/images 7zr a ${COMPONENT_PATH}/data/image.7z * |