[PATCH v2] export GNUGPHOME for reprepro

[vijaikumar.kanagarajan@gmail.com]

From: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>

reprepro doesnot know about GNUPGHOME. If you trigger package feed
creation in a machine that has GNUPGHOME set, reprepro would not
know that it should use the new location and might use the keys it
find in the default ~/.gnupg directory.

Make GNUPGHOME available for reprepro.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---

Changes in v2:
- Implemented review comments from Henning.
  1. Moved export out of loop in base-apt-helper
  2. Removed condition check before adding to BB_ENV_EXTRAWHITE

 meta/classes/base-apt-helper.bbclass       | 4 ++++
 meta/classes/dpkg-base.bbclass             | 3 +++
 meta/recipes-devtools/base-apt/base-apt.bb | 3 +++
 meta/recipes-devtools/isar-apt/isar-apt.bb | 3 +++
 scripts/isar-buildenv-internal             | 2 +-
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/meta/classes/base-apt-helper.bbclass b/meta/classes/base-apt-helper.bbclass
index ba768da..81df45a 100644
--- a/meta/classes/base-apt-helper.bbclass
+++ b/meta/classes/base-apt-helper.bbclass
@@ -14,6 +14,10 @@ compare_pkg_md5sums() {
 populate_base_apt() {
     search_dir=$1
 
+    if [ -n "${GNUPGHOME}" ]; then
+        export GNUPGHOME="${GNUPGHOME}"
+    fi
+
     find $search_dir -name '*.deb' | while read package; do
         # NOTE: due to packages stored by reprepro are not modified, we can
         # use search by filename to check if package is already in repo. In
diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 3e6ba8c..e03f1d0 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -120,6 +120,9 @@ repo_clean() {
 
 # Install package to Isar-apt
 do_deploy_deb() {
+    if [ -n "${GNUPGHOME}" ]; then
+        export GNUPGHOME="${GNUPGHOME}"
+    fi
     repo_clean
     reprepro -b ${REPO_ISAR_DIR}/${DISTRO} \
              --dbdir ${REPO_ISAR_DB_DIR}/${DISTRO} \
diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb
index 1c0b4c6..488a44d 100644
--- a/meta/recipes-devtools/base-apt/base-apt.bb
+++ b/meta/recipes-devtools/base-apt/base-apt.bb
@@ -28,6 +28,9 @@ do_cache_config() {
     path_databases="${REPO_BASE_DB_DIR}/${BASE_DISTRO}"
 
     if [ ! -d "${path_databases}" ]; then
+        if [ -n "${GNUPGHOME}" ]; then
+            export GNUPGHOME="${GNUPGHOME}"
+        fi
         reprepro -b ${path_cache} \
                  --dbdir ${path_databases} \
                  export ${BASE_DISTRO_CODENAME}
diff --git a/meta/recipes-devtools/isar-apt/isar-apt.bb b/meta/recipes-devtools/isar-apt/isar-apt.bb
index a959691..e6f1753 100644
--- a/meta/recipes-devtools/isar-apt/isar-apt.bb
+++ b/meta/recipes-devtools/isar-apt/isar-apt.bb
@@ -20,6 +20,9 @@ do_cache_config() {
     path_databases="${REPO_ISAR_DB_DIR}/${DISTRO}"
 
     if [ ! -d "${path_databases}" ]; then
+        if [ -n "${GNUPGHOME}" ]; then
+            export GNUPGHOME="${GNUPGHOME}"
+        fi
         reprepro -b ${path_cache} \
                  --dbdir ${path_databases} \
                  export ${DEBDISTRONAME}
diff --git a/scripts/isar-buildenv-internal b/scripts/isar-buildenv-internal
index 2476d90..2186e40 100755
--- a/scripts/isar-buildenv-internal
+++ b/scripts/isar-buildenv-internal
@@ -66,5 +66,5 @@ export PATH
 BBPATH="${BUILDDIR}"
 export BBPATH
 
-BB_ENV_EXTRAWHITE="BUILDDIR ISARROOT http_proxy https_proxy ftp_proxy no_proxy"
+BB_ENV_EXTRAWHITE="BUILDDIR ISARROOT http_proxy https_proxy ftp_proxy no_proxy GNUPGHOME"
 export BB_ENV_EXTRAWHITE
-- 
2.17.1