[elbe-devel] [PATCH v2] sysroot: Install debootstrap packages in pkg-list

Manuel Traut manut at linutronix.de
Fri Mar 1 14:04:47 CET 2019


On 13:10 Fri 01 Mar     , bage at linutronix.de wrote:
> From: Bastian Germann <bage at linutronix.de>
> 
> If a package in the pkg-list is also in debootstrap the package's *-dev package
> is ignored in sysroot installation. Add a check for this case to prevent it.
> 
> Closes issue #142.
> 
> Signed-off-by: Bastian Germann <bage at linutronix.de>
Reviewed-by: Manuel Traut <manut at linutronix.de>

and merged into devel/elbe-3.0 - thanks for the (re)work!

> ---
>  elbepack/elbeproject.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
> index ea3ee02d..adb6c74a 100644
> --- a/elbepack/elbeproject.py
> +++ b/elbepack/elbeproject.py
> @@ -251,7 +251,9 @@ class ElbeProject (object):
>          self.install_packages(self.sysrootenv, buildenv=False)
>  
>          # ignore packages from debootstrap
> -        ignore_pkgs = [p.et.text for p in self.xml.node("debootstrappkgs")]
> +        tpkgs = self.xml.get_target_packages()
> +        bspkgs = self.xml.node("debootstrappkgs")
> +        ignore_pkgs = [p.et.text for p in bspkgs if p.et.text not in tpkgs]
>          ignore_dev_pkgs = []
>          if self.xml.has('target/pkg-blacklist/sysroot'):
>              ignore_dev_pkgs = [p.et.text for p in self.xml.node(
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> elbe-devel mailing list
> elbe-devel at linutronix.de
> https://lists.linutronix.de/mailman/listinfo/elbe-devel



More information about the elbe-devel mailing list