Re: [PATCH] wic: move out all files ending on "direct*"

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

On 08.04.21 10:05, [ext] Henning Schild wrote:
> wic can compress images, in which case they would have a suffix
> plus our new version of wic keeps individual partitions that might be
> valuable to some, they also have a suffix we used to not move out
> 

I vaguely recall some partition extraction classes for SWUpdate
scenarios - room for improvements, Quirin? Or are we using that feature
already?

Jan

> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  meta/classes/wic-img.bbclass | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass
> index 59dcd2b7c124..76606f882e79 100644
> --- a/meta/classes/wic-img.bbclass
> +++ b/meta/classes/wic-img.bbclass
> @@ -193,10 +193,11 @@ EOSUDO
>                ${WIC_CREATE_EXTRA_ARGS}
>  
>      sudo chown -R $(stat -c "%U" ${LAYERDIR_core}) ${LAYERDIR_core} ${LAYERDIR_isar} ${SCRIPTSDIR} || true
> -    WIC_DIRECT=$(ls -t -1 ${BUILDCHROOT_DIR}/$WICTMP/${IMAGE_FULLNAME}.wic/*.direct | head -1)
>      sudo chown -R $(id -u):$(id -g) ${BUILDCHROOT_DIR}/${WICTMP}
> -    mv -f ${WIC_DIRECT} ${WIC_IMAGE_FILE}
> -    mv -f ${WIC_DIRECT}.bmap ${WIC_IMAGE_FILE}.bmap
> +    find ${BUILDCHROOT_DIR}/${WICTMP} -type f -name "*.direct*" | while read f; do
> +        suffix=$(basename $f | sed 's/\(.*\)\(\.direct\)\(.*\)/\3/')
> +        mv -f ${f} ${WIC_IMAGE_FILE}${suffix}
> +    done
>      rm -rf ${BUILDCHROOT_DIR}/${WICTMP}
>      rm -rf ${IMAGE_ROOTFS}/../pseudo
>  }
> 

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux