Re: [PATCH v2] classes/isar-image: Replace the apt sources file with the original

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

On 18.12.18 18:03, Maxim Yu. Osipov wrote:
> At the final stage of image generation replace the local apt sources
> file used for bootstrapping with the original APT sources list
> defined via DISTRO_APT_SOURCES variable.
> 
> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
> ---
>   meta/classes/isar-image.bbclass | 6 ++++++
>   1 file changed, 6 insertions(+)
> 
> diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass
> index 81738ff..4992800 100644
> --- a/meta/classes/isar-image.bbclass
> +++ b/meta/classes/isar-image.bbclass
> @@ -66,7 +66,13 @@ isar_image_cleanup() {
>       if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then
>           sudo umount -l ${IMAGE_ROOTFS}/base-apt
>           sudo rmdir ${IMAGE_ROOTFS}/base-apt
> +        # Replace the local apt we bootstrapped with the
> +        # APT sources initially defined in DISTRO_APT_SOURCES
> +        sudo rm -f "${IMAGE_ROOTFS}/etc/apt/sources.list.d/base-apt.list"
> +        sudo mv "${IMAGE_ROOTFS}/etc/apt/sources-list" \
> +                "${IMAGE_ROOTFS}/etc/apt/sources.list.d/bootstrap.list"
>       fi
> +    sudo rm -f "${IMAGE_ROOTFS}/etc/apt/sources-list"

As I'm counting 3 further sudos here, and actually every other command in 
isar_image_cleanup has that prefix as well: Why not just do

sudo sh -c ' \
     cmd1
     cmd2
     ...
     '

like elsewhere?

This case would actually need

sudo isar_image_cleanup() {
     ...
}

if bitbake had that.

Jan

>   }
>   
>   do_rootfs() {
> 

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