From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6717496001358200832 X-Received: by 2002:a17:906:4d88:: with SMTP id s8mr64978812eju.225.1564045827204; Thu, 25 Jul 2019 02:10:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:b61d:: with SMTP id b29ls11594462ede.8.gmail; Thu, 25 Jul 2019 02:10:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqysHlISw8fZmROprPImyNtOp/nF/FuI4fAkQAaDNT2Q9M9tUNaKVCY0ekJsqSeh10W4IAwn X-Received: by 2002:a50:f7c6:: with SMTP id i6mr75214781edn.51.1564045826673; Thu, 25 Jul 2019 02:10:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564045826; cv=none; d=google.com; s=arc-20160816; b=NtpRmqURNCZva6ZdIwMTyhHjiGhU6FrihpQFTCO89zaxvOvPJ7rFyjcmEPLMisE0SR K94YO8PQtucW2BhaxoVRJ6LJ6N8uH26b7xyqzdnRg6n5nr8OJhIcWmuHOomh4fxkUpnC 7kO3fLdBEwCFIpEQdejg7aCrJo72j3Eoz+hN5KlFlmbHAFHGJcn7mIUw4+jpLAs1Zj5e dUYdHFcYmEem06wUBzaaeGvHwA1zJAN5NZM4ST6RkLDudPbaFy4wYnNKYNBvZAvgDz3u wkakQV9DJl0/z02YB1J1mRA9rVk+AohhhfaB54+IvBR55EBkzolPEbtxh64DmfZtn3Gy TENg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=u/KWT7ywFMUCvPCG19G9GlUJPOMl8HnuVS7wUa6HGSk=; b=e5ZeyTsZ/lSVz+tsbV3Np759+ZBIsLH2ZqlonDeSV2O+mlJnR/PN2PSWhbXIavJh3E /mrnQfvfGSCUkDLXaAk8KcwKEQ0BUvGYgfzsC2m/3rtQLCbavbg0lBfroAuZhTwE9Kq0 lUz6y0scCiXvhd62J7XuydW607XGVEFk+LOETqkG2v/b7ONWTzYsjXOUiYv0HT73Pc7N w14SAoPc0escORroGyN77o7UWrG9SkIFSZFEtCug9R1l3fVGZtoV9pTyuXCQbmxXrpHk 5jM+bqb3R2a/W5mpyZcjMCVnPIFTx+Wsmh45UKftJMOH4tmVIIgUCotil9RFQmzHrmrS QRSw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id k51si2813268edd.0.2019.07.25.02.10.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jul 2019 02:10:26 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x6P9APEZ006596 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 25 Jul 2019 11:10:25 +0200 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x6P9APNe017773; Thu, 25 Jul 2019 11:10:25 +0200 Subject: Re: [PATCH v2] export GNUGPHOME for reprepro To: vijaikumar.kanagarajan@gmail.com, isar-users@googlegroups.com, henning.schild@siemens.com, claudius.heine.ext@siemens.com Cc: Vijai Kumar K References: <6fc7018b-f58d-99e7-a384-2925ffd86772@denx.de> <20190725090808.4192-1-Vijaikumar_Kangarajan@mentor.com> From: Jan Kiszka Message-ID: <4e00bf54-6b30-b87a-bc09-dce4adca35e8@siemens.com> Date: Thu, 25 Jul 2019 11:10:25 +0200 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20190725090808.4192-1-Vijaikumar_Kangarajan@mentor.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: Ug07Zp9WMbR+ On 25.07.19 11:08, vijaikumar.kanagarajan@gmail.com wrote: > From: Vijai Kumar K > > 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 > --- > 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