Re: [PATCH 2/2] sdk: Check if directories are mounted before unmounting

[Jan Kiszka <jan.kiszka@siemens.com>]

...because it generates an error otherwise?

On 27.09.18 13:10, Maxim Yu. Osipov wrote:
> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
> ---
>  meta/classes/image.bbclass | 14 +++++++++++++-
>  1 file changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 1db2394..3206877 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -98,6 +98,16 @@ addtask copy_boot_files before do_build after do_rootfs
>  do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}"
>  do_copy_boot_files[stamp-extra-info] = "${DISTRO}-${MACHINE}"
>  
> +is_mounted() {
> +    dir_dev=`stat -c '%D' "$1"`
> +    parent_dev=`stat -c '%D' "$1/.."`
> +    if [ $dir_dev != $parent_dev ]; then
> +        return 0
> +    else
> +        return 1
> +    fi
> +}
> +
>  SDKCHROOT_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/sdkchroot-${HOST_DISTRO}-${HOST_ARCH}"
>  
>  do_populate_sdk() {
> @@ -107,8 +117,10 @@ do_populate_sdk() {
>      # Purge apt cache to make image slimmer
>      sudo rm -rf ${SDKCHROOT_DIR}/rootfs/var/cache/apt/*
>  
> +    is_mounted ${SDKCHROOT_DIR}/rootfs/dev && sudo umount ${SDKCHROOT_DIR}/rootfs/dev
> +    is_mounted ${SDKCHROOT_DIR}/rootfs/proc && sudo umount ${SDKCHROOT_DIR}/rootfs/proc
> +
>      # Create SDK archive
> -    sudo umount ${SDKCHROOT_DIR}/rootfs/dev ${SDKCHROOT_DIR}/rootfs/proc

Wouldn't it suffice to append "|| true" then?

Jan

>      sudo tar -C ${SDKCHROOT_DIR} --transform="s|^rootfs|sdk-${DISTRO}-${DISTRO_ARCH}|" \
>          -c rootfs | xz -T0 > ${DEPLOY_DIR_IMAGE}/sdk-${DISTRO}-${DISTRO_ARCH}.tar.xz
>  
> 

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux