From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6717496001358200832 X-Received: by 2002:a5d:540e:: with SMTP id g14mr5153637wrv.346.1565002732446; Mon, 05 Aug 2019 03:58:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:448b:: with SMTP id j11ls24491927wrq.3.gmail; Mon, 05 Aug 2019 03:58:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqwNCCel54/mEtzqadfVOLJ+4PE8AN+iH1Nfiq+PqJIuKzxNAG15Tcg2fqWztcB42vtd7PKR X-Received: by 2002:a5d:4403:: with SMTP id z3mr82367854wrq.29.1565002732059; Mon, 05 Aug 2019 03:58:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565002732; cv=none; d=google.com; s=arc-20160816; b=yG+r+9KgZtXh3t3HGQbUikOj1ps/bsMSraALIQVvF0lVen4y1UFlRYFMWChPasC9aF fqZfd+BBSe619/dVesd78SnNxljzcPv+JpbWy8Uu9lb2+LmTm5m3Tz9IRpAUCA5CW1Fh DLnG+bgnZJrEbfoYUeDJnxAOajlolBq/03kmescgWI6WBRRETncFDmfzLRAD7HRL4UkB Z5EWO5Z3j5yS1876JbJ2gRRcukl9+GiZ/rCCbE7OF9i+quSjpvVB1Vuk0Q/D7XothiZT DoBHJgDQr1NsF1mhy/a8QJ6s22UwTmtao2T49JxYwOjRuZrk5R0wj2IpKcTIMDBH1Kwi l9HA== 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=tFggSKgDBLPj2DG5CtrYiczXC8nRCu5OiiwJj2HCBZs=; b=tr4s1N/aKvcdrQwON586LHAZvqLQb9diiiu/jqdsCKJPmE0/107ZH7PN+ULEN4YVOR LBufKzbJIqpxqOOcvylecSn4//uaAHG/c3ft5klioMc5U43LuTlYxHtfKyp4Lytwqvym 3br8Y7wkpSNK4M21NobNZdBT/NEq2HuHqcVGTjoddojySWwpFIK8DgP6FZYCX49sAIew QWLGcAEtEVyKK1b+jFaH56wH8jqHmuZQyR9jAGURju63yGNcSQUeop3CUCxKksB00rGd FW8NIyKJJQQd0hQ5m/BogDPVZ7HOHFQy9Ckbj3ml+scnOOnD/AM6a3yVwpbiTyRMZbQm x9IA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=pYSFex1z; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::42d 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-x42d.google.com (mail-wr1-x42d.google.com. [2a00:1450:4864:20::42d]) by gmr-mx.google.com with ESMTPS id a10si4442876wmm.2.2019.08.05.03.58.52 for (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Mon, 05 Aug 2019 03:58:52 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::42d as permitted sender) client-ip=2a00:1450:4864:20::42d; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=pYSFex1z; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::42d 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-x42d.google.com with SMTP id p13so9378583wru.10 for ; Mon, 05 Aug 2019 03:58:52 -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=tFggSKgDBLPj2DG5CtrYiczXC8nRCu5OiiwJj2HCBZs=; b=pYSFex1zqJiVNq92h5FMzwv+gRqByH7z4jQEHNs3RE3QKT/QxSHWVIWMIIAjP2AbOr Nq2vPY5W+oz9sYKcYwQ32g6w1CMiFUdsm18bd2T/QM5OHNkOVRUQH8In8oE4E/ux0xnh 2zVoRCa8P6xU9HcZTNHq2++7LwlRbca7meYKjXaMXDyKZnB/4pU/MLcnJGkWZuXxnTL5 u9vvzraAmGyfQCquP+Abz2UPk+zho0Jac0uot0ExL0yO12iCvMm76G7UfAuwH1JyKdpg SsIvvqbozLNlv0bpufBbpfRWS/nIHcYMpXCISqBXCQJJvVZTa0aUZqsiDiBB/Pq/As8e O7Eg== 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=tFggSKgDBLPj2DG5CtrYiczXC8nRCu5OiiwJj2HCBZs=; b=AsjlxQB9CkGJp5HlQmg/JL///PhJvVA3btPVwjnpEJpW9aMEE8eq/odSejeZlklvM7 dJNoCKLBXrIMvqBCfOO4diblcsf8o901YVkgSbUssvm6hnNNMtOGRI+gqh0VWxqtSpBE m2ny0FfM6NHKbUG1E6s+rKV7o1/uhw1E0+BTjWbheDp+W1CD6Z7XLg8gNE53iMXe64hG fupCGsXcC86h7rvj4qRE8Irp0xWYLq/G2tLL6e6sF0C1GMqdk3W+jJoVwt3hjX0Ne9Gh 5Rx0C+qsIF0gGeAherU0UBmGOM6OsXzF7SF2ZUEwv1aGqZjkv+ypy7dMUYPSoYZFh2aF acEg== X-Gm-Message-State: APjAAAUIUrl17V5ql+94AzRrnErCXEGb1mn7HE2CzwE0eOA4eDRXKgJG T7u6vzVshipm2t3vmODptM9i1iwOn5c= X-Received: by 2002:a5d:498f:: with SMTP id r15mr26189279wrq.353.1565002731433; Mon, 05 Aug 2019 03:58:51 -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 q18sm103866054wrw.36.2019.08.05.03.58.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 05 Aug 2019 03:58:50 -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: Mon, 5 Aug 2019 16:28:43 +0530 Message-Id: <20190805105843.12319-1-Vijaikumar_Kangarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190801133818.3915d525@md1za8fc.ad001.siemens.net> References: <20190801133818.3915d525@md1za8fc.ad001.siemens.net> X-TUID: v66VCsgNFOtE From: Vijai Kumar K 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 --- 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