[elbe-devel] [PATCH v3] Replace gnupg dependencies with gpg

[Bastian Germann]

The gnupg package has evolved to include more dependencies than gpg that
are not necessary on every target.
Depend on gpg instead to get rid of the additional dependencies.

Signed-off-by: Bastian Germann <bage at linutronix.de>
---
 elbepack/elbeproject.py | 4 ++--
 elbepack/rfs.py         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
index 26b20f7584..07d3ccd6a4 100644
--- a/elbepack/elbeproject.py
+++ b/elbepack/elbeproject.py
@@ -873,12 +873,12 @@ class ElbeProject:
                f'--buildplace "{os.path.join(self.builddir, "pbuilder_cross")}" '
                f'--configfile "{os.path.join(self.builddir, "cross_pbuilderrc")}" '
                f'--aptconfdir "{os.path.join(self.builddir, "aptconfdir")}" '
-               f'--debootstrapopts --include="git,gnupg" {no_check_gpg};')
+               f'--debootstrapopts --include="git,gpg" {no_check_gpg};')
         else:
             do('pbuilder --create '
                f'--configfile "{os.path.join(self.builddir, "pbuilderrc")}" '
                f'--aptconfdir "{os.path.join(self.builddir, "aptconfdir")}" '
-               f'--debootstrapopts --include="git,gnupg" {no_check_gpg}')
+               f'--debootstrapopts --include="git,gpg" {no_check_gpg}')
 
     def sync_xml_to_disk(self):
         try:
diff --git a/elbepack/rfs.py b/elbepack/rfs.py
index 770519a713..c8cc07736b 100644
--- a/elbepack/rfs.py
+++ b/elbepack/rfs.py
@@ -187,7 +187,7 @@ class BuildEnv:
             strapcmd += f" --variant={self.xml.text('target/debootstrap/variant')}"
 
         # Should we include additional packages into bootstrap?
-        includepkgs = "gnupg"  # These are the packages which are included in any case
+        includepkgs = "gpg"  # These are the packages which are included in any case
         if self.xml.has("target/debootstrap/include"):
             includepkgs += f", {self.xml.text('target/debootstrap/include')}"
         strapcmd += f" --include=\"{includepkgs}\""
-- 
2.30.2