[elbe-devel] [PATCH] efilesystem: dont overwrite self.images in TargetFs.part_target()

Bastian Germann bage at linutronix.de
Wed Oct 16 14:15:42 CEST 2019


> <artifact> in normal finetuning adds an artifact to target.images.
> TargetFs.part_target() initialises that with the return value of do_hdimg()
> which just drops the images defined in finetuning.
> 
> use a temporary variable for the images, and append them to self.images,
> while setting up the packers.
> 
> Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>

Reviewed-by: Bastian Germann <bage at linutronix.de>

> ---
>  elbepack/efilesystem.py | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/elbepack/efilesystem.py b/elbepack/efilesystem.py
> index 9b17aa6e5..ef26c21bd 100644
> --- a/elbepack/efilesystem.py
> +++ b/elbepack/efilesystem.py
> @@ -357,13 +357,14 @@ class TargetFs(ChRootFilesystem):
>      def part_target(self, targetdir, grub_version, grub_fw_type=None):
>  
>          # create target images and copy the rfs into them
> -        self.images = do_hdimg(self.xml,
> -                               targetdir,
> -                               self,
> -                               grub_version,
> -                               grub_fw_type)
> -
> -        for i in self.images:
> +        hdimages = do_hdimg(self.xml,
> +                            targetdir,
> +                            self,
> +                            grub_version,
> +                            grub_fw_type)
> +
> +        for i in hdimages:
> +            self.images.append(i)
>              self.image_packers[i] = default_packer
>  
>          if self.xml.has("target/package/tar"):
> 



More information about the elbe-devel mailing list