[PATCH] isar-bootstrap: Switch to gnupg as dependency, rather than obsolete gnupg2

[PATCH] isar-bootstrap: Switch to gnupg as dependency, rather than obsolete gnupg2

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

At this chance, also document it.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Replaces "user manual: Add conditional gnupg2 dependency"

 doc/user_manual.md                                  | 1 +
 meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/user_manual.md b/doc/user_manual.md
index c2657da..3e2b6d3 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -68,6 +68,7 @@ dosfstools
 dpkg-dev
 gettext-base
 git
+gnupg                         # if using custom / third-party repo keys
 mtools
 parted
 python3
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index 9ef5b76..215c41b 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -26,7 +26,7 @@ DISTRO_BOOTSTRAP_KEYFILES = ""
 THIRD_PARTY_APT_KEYFILES = ""
 DEPLOY_ISAR_BOOTSTRAP ?= ""
 DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales"
-DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg2"
+DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg"
 DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = ",apt-transport-https,ca-certificates"
 HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list"
 
-- 
2.16.4


-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux