Re: [PATCH v2] export GNUGPHOME for reprepro

[Jan Kiszka <jan.kiszka@siemens.com>]

On 25.07.19 11:08, vijaikumar.kanagarajan@gmail.com wrote:
> From: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> 
> Changes in v2 (address comments from Claudius)
> - use -n instead of ! -z
> 
>> 8------------------------------------------------------8<

Comments have to go below the "---" separator. The above is too easy to get
merged as-is on "git am".

Jan

> 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>
> ---
>  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             | 3 +++
>  5 files changed, 16 insertions(+)
> 
> diff --git a/meta/classes/base-apt-helper.bbclass b/meta/classes/base-apt-helper.bbclass
> index ba768da..ee43216 100644
> --- a/meta/classes/base-apt-helper.bbclass
> +++ b/meta/classes/base-apt-helper.bbclass
> @@ -30,6 +30,10 @@ populate_base_apt() {
>              compare_pkg_md5sums "$package" "$isar_package" && continue
>          fi
>  
> +        if [ -n "${GNUPGHOME}" ]; then
> +            export GNUPGHOME="${GNUPGHOME}"
> +        fi
> +
>          # Check if this package is already in base-apt
>          isar_package=$(find ${REPO_BASE_DIR}/${BASE_DISTRO} -name $base_name)
>          if [ -n "$isar_package" ]; then
> 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..cc9ebcf 100755
> --- a/scripts/isar-buildenv-internal
> +++ b/scripts/isar-buildenv-internal
> @@ -67,4 +67,7 @@ BBPATH="${BUILDDIR}"
>  export BBPATH
>  
>  BB_ENV_EXTRAWHITE="BUILDDIR ISARROOT http_proxy https_proxy ftp_proxy no_proxy"
> +if [ -n "${GNUPGHOME}" ]; then
> +	BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE} GNUPGHOME"
> +fi
>  export BB_ENV_EXTRAWHITE
> 

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