Re: [PATCH v2 1/5] image: Unify path to image rootfs

[Henning Schild <henning.schild@siemens.com>]

Am Fri, 8 Sep 2017 18:56:02 +0300
schrieb Alexander Smirnov <asmirnov@ilbers.de>:

> Use dedicated variable to point to generated image rooot filesystem.

root

Henning

> Signed-off-by: Alexander Smirnov <asmirnov@ilbers.de>
> ---
>  meta-isar/classes/rpi-sdimg.bbclass              | 2 +-
>  meta-isar/recipes-core/images/isar-image-base.bb | 8 +++-----
>  meta/classes/ext4-img.bbclass                    | 8 ++++----
>  meta/classes/image.bbclass                       | 9 +++++----
>  4 files changed, 13 insertions(+), 14 deletions(-)
> 
> diff --git a/meta-isar/classes/rpi-sdimg.bbclass
> b/meta-isar/classes/rpi-sdimg.bbclass index 2614c41..91b09cd 100644
> --- a/meta-isar/classes/rpi-sdimg.bbclass
> +++ b/meta-isar/classes/rpi-sdimg.bbclass
> @@ -47,7 +47,7 @@ do_rpi_sdimg () {
>      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 ${S}/boot/* ::/
> +    mcopy -i ${WORKDIR}/boot.img -s ${IMAGE_ROOTFS}/boot/* ::/
>  
>      # Burn Partitions
>      dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1
> bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync diff
> --git a/meta-isar/recipes-core/images/isar-image-base.bb
> b/meta-isar/recipes-core/images/isar-image-base.bb index
> b679d97..94cbc9e 100644 ---
> a/meta-isar/recipes-core/images/isar-image-base.bb +++
> b/meta-isar/recipes-core/images/isar-image-base.bb @@ -18,8 +18,6 @@
> IMAGE_PREINSTALL += "apt \ dbus" 
>  WORKDIR = "${TMPDIR}/work/${PN}/${MACHINE}/${DISTRO}"
> -S = "${WORKDIR}/rootfs"
> -IMAGE_ROOTFS = "${S}"
>  
>  do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}"
>  
> @@ -46,12 +44,12 @@ do_rootfs() {
>      cd ${TOPDIR}
>  
>      # Create root filesystem
> -    sudo multistrap -a ${DISTRO_ARCH} -d "${S}" -f
> "${WORKDIR}/multistrap.conf" || true
> +    sudo multistrap -a ${DISTRO_ARCH} -d "${IMAGE_ROOTFS}" -f
> "${WORKDIR}/multistrap.conf" || true 
>      # Configure root filesystem
> -    sudo chroot ${S} /configscript.sh ${MACHINE_SERIAL}
> ${BAUDRATE_TTY} \
> +    sudo chroot ${IMAGE_ROOTFS} /configscript.sh ${MACHINE_SERIAL}
> ${BAUDRATE_TTY} \ ${ROOTFS_DEV}
> -    sudo rm ${S}/configscript.sh
> +    sudo rm ${IMAGE_ROOTFS}/configscript.sh
>  }
>  
>  addtask rootfs before do_populate
> diff --git a/meta/classes/ext4-img.bbclass
> b/meta/classes/ext4-img.bbclass index 8588626..f493037 100644
> --- a/meta/classes/ext4-img.bbclass
> +++ b/meta/classes/ext4-img.bbclass
> @@ -14,23 +14,23 @@ do_ext4_image() {
>  
>      rm -f ${EXT4_IMAGE_FILE}
>  
> -    ROOTFS_SIZE=`sudo du -sm ${S} |  awk '{print $1 +
> ${ROOTFS_EXTRA};}'`
> +    ROOTFS_SIZE=`sudo du -sm ${IMAGE_ROOTFS} |  awk '{print $1 +
> ${ROOTFS_EXTRA};}'` dd if=/dev/zero of=${EXT4_IMAGE_FILE} bs=1M
> count=${ROOTFS_SIZE} 
>      sudo mkfs.ext4 -F ${EXT4_IMAGE_FILE}
>  
>      mkdir -p ${WORKDIR}/mnt
>      sudo mount -o loop ${EXT4_IMAGE_FILE} ${WORKDIR}/mnt
> -    sudo cp -r ${S}/* ${WORKDIR}/mnt
> +    sudo cp -r ${IMAGE_ROOTFS}/* ${WORKDIR}/mnt
>      sudo umount ${WORKDIR}/mnt
>      rm -r ${WORKDIR}/mnt
>  
>      if [ -n "${KERNEL_IMAGE}" ]; then
> -        cp ${S}/boot/${KERNEL_IMAGE} ${DEPLOY_DIR_IMAGE}
> +        cp ${IMAGE_ROOTFS}/boot/${KERNEL_IMAGE} ${DEPLOY_DIR_IMAGE}
>      fi
>  
>      if [ -n "${INITRD_IMAGE}" ]; then
> -        cp ${S}/boot/${INITRD_IMAGE} ${DEPLOY_DIR_IMAGE}
> +        cp ${IMAGE_ROOTFS}/boot/${INITRD_IMAGE} ${DEPLOY_DIR_IMAGE}
>      fi
>  }
>  
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index a7f0d74..dff2705 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -6,6 +6,7 @@ INITRD_IMAGE ?= ""
>  
>  IMAGE_INSTALL ?= ""
>  IMAGE_TYPE    ?= "ext4-img"
> +IMAGE_ROOTFS   = "${WORKDIR}/rootfs"
>  
>  inherit ${IMAGE_TYPE}
>  
> @@ -14,15 +15,15 @@ do_populate[stamp-extra-info] =
> "${MACHINE}-${DISTRO}" # Install Debian packages, that were built
> from sources do_populate() {
>      if [ -n "${IMAGE_INSTALL}" ]; then
> -        sudo mkdir -p ${S}/deb
> +        sudo mkdir -p ${IMAGE_ROOTFS}/deb
>  
>          for p in ${IMAGE_INSTALL}; do
> -            sudo cp ${DEPLOY_DIR_DEB}/${p}_*.deb ${S}/deb
> +            sudo cp ${DEPLOY_DIR_DEB}/${p}_*.deb ${IMAGE_ROOTFS}/deb
>          done
>  
> -        sudo chroot ${S} /usr/bin/dpkg -i -R /deb
> +        sudo chroot ${IMAGE_ROOTFS} /usr/bin/dpkg -i -R /deb
>  
> -        sudo rm -rf ${S}/deb
> +        sudo rm -rf ${IMAGE_ROOTFS}/deb
>      fi
>  }
>