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

bage at linutronix.de bage at linutronix.de
Tue Feb 26 15:13:18 CET 2019


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>
---
 elbepack/elbeproject.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
index cef53296..9e2a9e99 100644
--- a/elbepack/elbeproject.py
+++ b/elbepack/elbeproject.py
@@ -251,7 +251,8 @@ 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")]
+        expl = self.xml.get_target_packages()
+        ignore_pkgs = [p.et.text for p in self.xml.node("debootstrappkgs") if p.et.text not in expl]
         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




More information about the elbe-devel mailing list