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

[Bastian Germann]

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

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

diff --git a/debian/control b/debian/control
index 0748b969f1..053199a977 100644
--- a/debian/control
+++ b/debian/control
@@ -129,7 +129,7 @@ Depends: ${misc:Depends},
   python3-elbe-bin (= ${binary:Version}),
   python3-elbe-common (= ${binary:Version}),
   genisoimage,
-  gnupg,
+  gpg,
   mtd-utils,
   python3-apt,
   python3-junit.xml,
diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
index aec56f0a83..009f156ba6 100644
--- a/elbepack/elbeproject.py
+++ b/elbepack/elbeproject.py
@@ -882,14 +882,14 @@ class ElbeProject:
         if cross:
             do('pbuilder --create --buildplace "%s" '
                '--configfile "%s" --aptconfdir "%s" '
-               '--debootstrapopts --include="git,gnupg" %s;' %
+               '--debootstrapopts --include="git,gpg" %s;' %
                (os.path.join(self.builddir, "pbuilder_cross"),
                 os.path.join(self.builddir, "cross_pbuilderrc"),
                 os.path.join(self.builddir, "aptconfdir"),
                 no_check_gpg))
         else:
             do('pbuilder --create --configfile "%s" --aptconfdir "%s" '
-               '--debootstrapopts --include="git,gnupg" %s' %
+               '--debootstrapopts --include="git,gpg" %s' %
                (os.path.join(self.builddir, "pbuilderrc"),
                 os.path.join(self.builddir, "aptconfdir"),
                 no_check_gpg))
diff --git a/elbepack/rfs.py b/elbepack/rfs.py
index dd12e4f5a0..359a2550c1 100644
--- a/elbepack/rfs.py
+++ b/elbepack/rfs.py
@@ -192,7 +192,7 @@ class BuildEnv:
             strapcmd += " --variant=%s" % 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 += ", %s" % self.xml.text("target/debootstrap/include")
         strapcmd += " --include=\"%s\"" % includepkgs
-- 
2.30.2