[elbe-devel] [PATCH 3/3] elbepack: cdroms: add source packages from debootstrap to cdrom

[Thomas Weißschuh]

Binary packages installed during debootstrap are added to the binary
cdroms. As the same is not done for their source packages
"check-build cdrom" may fail.

Mismatches between debootstrap and apt installation can happen when the
security repositories contain updates, as those repositories are not
used by debootstrap.
For example currently this is the case with util-linux_2.36.1-8+deb11u1
and util-linux_2.36.1-8+deb11u2 in bullseye.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
 elbepack/cdroms.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/elbepack/cdroms.py b/elbepack/cdroms.py
index 7e318188b522..a12e247a7d05 100644
--- a/elbepack/cdroms.py
+++ b/elbepack/cdroms.py
@@ -66,6 +66,13 @@ def mk_source_cdrom(components, codename,
                            cache, pkg, version,
                            forbiddenPackages)
 
+        if component == 'main' and xml is not None:
+            for p in xml.node('debootstrappkgs'):
+                pkg = XMLPackage(p, None)
+                srcpkgs = cache.get_corresponding_source_packages([pkg])
+                for srcpkg, srcpkg_ver in srcpkgs:
+                    add_source_pkg(repo, component, cache, srcpkg, srcpkg_ver, forbiddenPackages)
+
     # elbe fetch_initvm_pkgs has downloaded all sources to
     # /var/cache/elbe/sources
     # use walk_files to scan it, and add all dsc files.

-- 
2.44.0