elbepack: aptpkgutils: implement recursive package blacklisting in diet builds

elbepack/aptpkgutils.py

@@ -67,17 +67,21 @@ def getdeps(pkg):
             yield d.name
 
 
-def getalldeps(c, pkgname):
+def getalldeps(c, pkgname, blacklist=[]):
     retval = []
     togo = [pkgname]
 
     while togo:
         pp = togo.pop()
+        if pp in blacklist:
+            continue
         pkg = c[pp]
 
         for p in getdeps(pkg.candidate):
             if p in retval:
                 continue
+            if p in blacklist:
+                continue
             if p not in c:
                 continue
             retval.append(p)

elbepack/efilesystem.py

@@ -112,9 +112,13 @@ def extract_target(src, xml, dst, cache):
         arch = xml.text('project/buildimage/arch', key='arch')
 
         if xml.tgt.has('diet'):
+            if xml.has('target/pkg-blacklist/'):
+                blacklist = [p.et.text for p in xml.node('target/pkg-blacklist/target')]
             withdeps = []
             for p in pkglist:
-                deps = cache.get_dependencies(p)
+                if p in blacklist:
+                    continue
+                deps = cache.get_dependencies(p, blacklist)
                 withdeps += [d.name for d in deps]
                 withdeps += [p]
 

elbepack/rpcaptcache.py

@@ -224,8 +224,8 @@ def commit(self):
                           ElbeInstallProgress(fileno=sys.stdout.fileno()))
         self.cache.open(progress=ElbeOpProgress())
 
-    def get_dependencies(self, pkgname):
-        deps = getalldeps(self.cache, pkgname)
+    def get_dependencies(self, pkgname, blacklist):
+        deps = getalldeps(self.cache, pkgname, blacklist)
         return [APTPackage(self.cache[p]) for p in deps]
 
     def get_installed_pkgs(self, section='all'):

elbepack/schema/dbsfed.xsd

@@ -3094,6 +3094,13 @@ SPDX-FileCopyrightText: Linutronix GmbH
       </documentation>
     </annotation>
     <sequence>
+        <element name="target" type="rfs:pkg-list" minOccurs="0" maxOccurs="unbounded">
+          <annotation>
+            <documentation>
+              avoid installing the specified packages into the target
+            </documentation>
+          </annotation>
+        </element>
         <element name="sysroot" type="rfs:pkg-list" minOccurs="0" maxOccurs="unbounded">
           <annotation>
             <documentation>