From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6717496001358200832 X-Received: by 2002:a5d:4602:: with SMTP id t2mr79634187wrq.340.1564038917179; Thu, 25 Jul 2019 00:15:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4907:: with SMTP id x7ls13431984wrq.0.gmail; Thu, 25 Jul 2019 00:15:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqwNCb7ntHjXxejUS03eaWtntH0smvbjiKu63VLrbKhqBWRcohXrZwyw4Ye/E3OZzLSONuQR X-Received: by 2002:adf:f104:: with SMTP id r4mr597264wro.140.1564038916672; Thu, 25 Jul 2019 00:15:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564038916; cv=none; d=google.com; s=arc-20160816; b=GkfTXjyGhxgJ0FbvfsGqbkn6GXB5PMzW8Ih/VxA/99kme68nLl8SSTzC3UvhZf2MPf ByPNuaGxYKIGChYjMj2gflKG4G3s7Z1rye6yXbVvky39Evy2ukayI/RVgMG/AJ8TINCK zAFLZ/m9w9xsW5Um8sfzJIvfVtp9Yqqvo6ddAeFhkHTBpnS3LCAH12tCDI3850YHiqje SfArCt9dKfHwdgJl2id14CFfQlVf98ljzaG42BV7XL+rIpZCv3ELAvPdwVyZjvVMmPfp Erf9tBc5ox/64QB5h+PKt99N9MW5n4Q9G2il6OfuNkyYW3XzYxbgY1Vg45eCxoEyv+jq K2tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=f4jEquQAQO4R3ORuJ2B2EJRWec2jYZLBO+6H3hWJahk=; b=oDSbVdjgOKjKsb5Ay0js/YkyvpnX9RqAR5Frq7XVdFPVfimI3XfUqvtgx6V50jjgOA ZBeOrLsT3jvgyCgsesBkxJUktVbD6bnsASPFy2hwbzfHgueTb1eDLcSk4MIzScEixIlm 7WHPFbWi8+KLvYzEckZUkFyqoNGcD8AB2/SylVVDYIHBcJrIAxpzXoajVN0ys9oUpcCr G4Elsra12Xci3h5zhNYpZ67GxJMpAKeIA5VVAngZeW/ghjf2slZU1RRIG1eDn2czWYWX eODgG04IZJC/NPi73iZn962uYKiQWeumV8tLjsEMT8TRuuU7Zwvd2TZcjcasvky7LgpN vIDA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=coXFqHE2; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::443 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-x443.google.com (mail-wr1-x443.google.com. [2a00:1450:4864:20::443]) by gmr-mx.google.com with ESMTPS id a10si2644365wmm.2.2019.07.25.00.15.16 for (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jul 2019 00:15:16 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::443 as permitted sender) client-ip=2a00:1450:4864:20::443; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=coXFqHE2; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::443 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-x443.google.com with SMTP id c2so46294095wrm.8 for ; Thu, 25 Jul 2019 00:15:16 -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; bh=f4jEquQAQO4R3ORuJ2B2EJRWec2jYZLBO+6H3hWJahk=; b=coXFqHE2irjG80/b/yLG+Mi7iH/AJmjDb/Uq2ocf6t9pFFpaxAosbL2xxEUCK5K7Xb RSWiXp1flMhaNp37y3QMrPO2YwOj2+cfXrohVJhSidwX9Wdw/+TaOi16bS2G1oagDYF/ rQYQmQVk25iPz8pztKSsHAWHi5a5IwybikGx8GBOTj8TDwfGCCQfpINv0l7KfBt3WCjb cPLHWCy/ZEN85nLsXa7WD6CApDldEDRGXSoyKisAtXxC3azQ+N5eGpEZMLzBM+eEdd5N s1K5vI24AzBfq04A2H3fY2wbzSL76vSFJfzSva0B2q56HPZNES43RkKe+utRZqt3lYeA J4iA== 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; bh=f4jEquQAQO4R3ORuJ2B2EJRWec2jYZLBO+6H3hWJahk=; b=MU0pzt/wq/ZCoFgL+DNoMUy2uDZqIjoLc75wIoGjZeC0X1t+8Aacm/RtDDABJ8slY1 rLAuHqxZ8+ghUCXhkEKWkBzTcft+HUxioZcA4RSYI+418zK4HdnNEhuWSlqNZhG3AfFK MFARtnfBMEXOX4S2GeyF0rO9IzoF+HqyRNLFWXMYDjvfZ2f3V26m0l2lunwdlzaSG5uw 04Rzxdb8uDuYVjy+SdH/SxPZNbzApO+yPWSR+22IL4ujBykPJEeKeeq2QpY7KBVS6wU7 vv+RTr2iH/kbLpK+QQJ1useqdIT1B4uJj5Sds7WfMg3X1ZrAfiOFJrPDbiM97p/2MMvB kUiw== X-Gm-Message-State: APjAAAVZ5iNb27yIjtG9J5Nry6RET+Ro/pqj9sxRS6gwgoE0vZMuwH5L QNA61U8GYYS1oKQNHP9MSqlrxQrXOkI= X-Received: by 2002:a5d:48cf:: with SMTP id p15mr42856406wrs.151.1564038916048; Thu, 25 Jul 2019 00:15:16 -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 b8sm61857513wmh.46.2019.07.25.00.15.12 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 00:15:15 -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] export GNUGPHOME for reprepro Date: Thu, 25 Jul 2019 12:45:04 +0530 Message-Id: <20190725071504.24037-1-Vijaikumar_Kangarajan@mentor.com> X-Mailer: git-send-email 2.17.1 X-TUID: 2Fbudkn/pOLM 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 --- 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..a8f2a41 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 [ ! -z ${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..da13f86 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 [ ! -z ${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..ca40b6c 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 [ ! -z ${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..8f517fe 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 [ ! -z ${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..7637d41 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 [ ! -z ${GNUPGHOME} ]; then + BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE} GNUPGHOME" +fi export BB_ENV_EXTRAWHITE -- 2.17.1