From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6717496001358200832 X-Received: by 2002:a2e:9b03:: with SMTP id u3mr25731057lji.15.1564045701433; Thu, 25 Jul 2019 02:08:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:7b01:: with SMTP id w1ls4053004lfc.5.gmail; Thu, 25 Jul 2019 02:08:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqyr6HyYf/vJkaLb136fQ6XGPKxAqxXmys9uJp8Ubg5kdqRbXlh7vFTfg659qen7EWvnN8WV X-Received: by 2002:a19:ae0d:: with SMTP id f13mr39794390lfc.123.1564045700895; Thu, 25 Jul 2019 02:08:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564045700; cv=none; d=google.com; s=arc-20160816; b=VsmOlNNno6pq2PICuT1Nt7b64ATmhwzoZFEoQ4VI/Q5S31A3WryIT3ioB/MYB1Pcgn WE+BBfJRXE6szEKrP0CzddoJ8DYMiCkuNrSLJhnvloHAiCECR53EYG/zSqjgSo75GocF LoETf4rvlg9Io5/+GuMVG03EUIoLUQ3B6PilU7qSEtnrvRwQQqkFcRRLwTG1hrJhgLGv +TmVFlBoMQ/3y2nBNwp+X10ly0+f3MIzI0d8IdIsb3MGoSvQuYOdZC7F92vCDB6NB29+ E93oQ6tCkoGEMQNbqHy/7ncy3CifhvjmlrznttXE/oXeJsRhxFpQZVL+gZp0goX2BP/k VG1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dtJtbnL9s1QeITwTGBeqTToBKw6FT3ms9HbQ55W84oY=; b=rILYAP94WgbIuk8kamIJG0MSgzuYN71QLiUkcyr2LODI4v0dBFt9gsTJMixvpL0stY hEiZ1Qu3gnHfpx91FrpAiGiKELZFNW4XQ0t4nb2BJ526pPpaDxPG2tt29nV8Lr5bvQ4n 6bZ24p87+WDMIQHFWkwi/wWtuqWsiBYBoTqZ3cs61DW2ziBd8gjKfPvfNsKEdImJRxWS kO2F7b0VuH0pUizqt8I50WMhJQtKjAxxn3HeN4bwNVVucaUE+xZdlGIyfO7vcbgVxOQc 7QwoVPS5PQlEHiKTS1j7hRZih7ZZUSKKolWSBYuYlPMw2CZDGL47GqMZYaBC7D7WRHAa TdyA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=lVEjinNj; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::444 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com. [2a00:1450:4864:20::444]) by gmr-mx.google.com with ESMTPS id q11si2360788ljg.2.2019.07.25.02.08.20 for (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jul 2019 02:08:20 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::444 as permitted sender) client-ip=2a00:1450:4864:20::444; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=lVEjinNj; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::444 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wr1-x444.google.com with SMTP id n9so49992450wru.0 for ; Thu, 25 Jul 2019 02:08:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dtJtbnL9s1QeITwTGBeqTToBKw6FT3ms9HbQ55W84oY=; b=lVEjinNjlqKnboWsJp2JNxPKb4Pwa8dBKSWCBzn9EbA7QsMmdyRjjFHeM/4+/Ylqh+ 3jK/k2/UYMLAYHEASnYY0t0v3kWXrcJ2k+j6F7THx52TOyEZEHSQgLXDts0Z8rmfehwk hqdt+4fqMoj+LYi1+GE6/OuAOi9n7DGKmmiwRna8jM7UUDlvjG7lmH/a4UmvGPXJs0ja Ytqff1bcYfDdSU0v63ahdytzMEqEEsKZMdyDVRzAYG6lX/sRicNJzo+xp3XLAk48Zhuz TzZUj7e5OKubsKWZ0Sqzuvrp7RSAADhrduSO1uyWyadJ6d8j/1SvP2HbYK40G/0nvfPi HFiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dtJtbnL9s1QeITwTGBeqTToBKw6FT3ms9HbQ55W84oY=; b=dGEto7Q4lM5Fb39TH4oxTX/BG4jrNQh9AeVfCliVKJZmmxfEP+/JFlo3PcShmcOqCU MWjY5ruCNUO8kclKqWeWfLCkMzPFYIv+h4yR6TONSVOTfcFDj9oSFZ9G5gfPBOBhLSXf pW5FPcCKvchsqToRKV92erVMnwqikOwC6Rk94xmgBrW9RHws911+sgoivpnq41IfuVI1 ExJNv0kYNxqAGwwfg8H3Rr/rqiUJSVHIHHs6ilgW809ngfDy4r2paBNt70xPObEmuR83 JVjbyLUagrXiPi0T9qwQo/YP82Pjbgkm7b17DvxaQxXYZX1zKEvYdbTqiuso7nls1gBe TZ8g== X-Gm-Message-State: APjAAAVg/ztahTIWis+YFTjStuqkucM+Hm7FdMHL0j0c16ZnFiRr6dvp 2XPNs8lXDz/s9ZJmmHWCP14LtxQPaAU= X-Received: by 2002:a5d:668e:: with SMTP id l14mr36515827wru.156.1564045700087; Thu, 25 Jul 2019 02:08:20 -0700 (PDT) Return-Path: Received: from chikyu.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id x83sm50955876wmb.42.2019.07.25.02.08.16 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 02:08:19 -0700 (PDT) From: vijaikumar.kanagarajan@gmail.com X-Google-Original-From: Vijaikumar_Kangarajan@mentor.com To: isar-users@googlegroups.com, henning.schild@siemens.com, claudius.heine.ext@siemens.com Cc: jan.kiszka@siemens.com, Vijai Kumar K Subject: [PATCH v2] export GNUGPHOME for reprepro Date: Thu, 25 Jul 2019 14:38:08 +0530 Message-Id: <20190725090808.4192-1-Vijaikumar_Kangarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <6fc7018b-f58d-99e7-a384-2925ffd86772@denx.de> References: <6fc7018b-f58d-99e7-a384-2925ffd86772@denx.de> X-TUID: i4qq7o9B/EkZ From: Vijai Kumar K Changes in v2 (address comments from Claudius) - use -n instead of ! -z >8------------------------------------------------------8< 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 -- 2.17.1