[elbe-devel] [PATCH 2/2] elbepack: rfs: fix building of Debian trixie images

[Thomas Weißschuh]

If the target uses trixie it won't have gpgv installed by default, using sqv instead.
The apt process from the (bookworm) initvm however does not support sqv.

Explicitly install gpgv (for now).
With the switch to a Debian trixie initvm this workaround can be removed.
The new version of apt will be backwards compatible with old targets.

Reported-by: Nam Cao <namcao at linutronix.de>
Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
 elbepack/rfs.py                  | 7 +++++++
 newsfragments/+trixie.bugfix.rst | 1 +
 2 files changed, 8 insertions(+)

diff --git a/elbepack/rfs.py b/elbepack/rfs.py
index a502e964638393f5ddf2ef55f6c3272ede243f36..ff95e7e5576efb550986e75ab6792e7b29f69190 100644
--- a/elbepack/rfs.py
+++ b/elbepack/rfs.py
@@ -183,6 +183,13 @@ class BuildEnv:
             include.extend([
                 i.strip() for i in self.xml.text('target/debootstrap/include').split(',')
             ])
+
+        # If the target uses trixie it won't have gpgv installed by default, using sqv instead.
+        # The apt process from the (bookworm) initvm however does not support sqv.
+        # Explicitly install gpgv (for now).
+        if suite == 'trixie':
+            include.append('gpgv')
+
         if include:
             strapcmd.extend(['--include', ','.join(include)])
 
diff --git a/newsfragments/+trixie.bugfix.rst b/newsfragments/+trixie.bugfix.rst
new file mode 100644
index 0000000000000000000000000000000000000000..c400720e6c170c065e33d82363ac97ff153b8ba5
--- /dev/null
+++ b/newsfragments/+trixie.bugfix.rst
@@ -0,0 +1 @@
+Fix building of Debian trixie images.

-- 
2.49.0