From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6741460933745311744 X-Received: by 2002:a05:6402:21c2:: with SMTP id bi2mr32536338edb.8.1571131075529; Tue, 15 Oct 2019 02:17:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:ac25:: with SMTP id v34ls4039912edc.10.gmail; Tue, 15 Oct 2019 02:17:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqxPhpLrblnHNJjkywUqaPDy0yq90fG3uCYHtf9sI1ExFLOiq1pivfsO/Ztx6ke/4Ykc7Ofm X-Received: by 2002:a50:d70c:: with SMTP id t12mr32573104edi.252.1571131075107; Tue, 15 Oct 2019 02:17:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571131075; cv=none; d=google.com; s=arc-20160816; b=A6sIV/RSUBYnhrns8rhc373Cu/yR3vm5syA0jFz9qrD0bNTqAdTcNetrkw+X85GRYc TXI9E5PKS/IYoKqc6JPXZrc8EjoqCqCuf56Dt+dyOqEJVCDx90bELnEArBYGhta+N2NU JEr30kKyQVBFnb2ZCVYiRpjyOXb0yhqXWxbSD5yakm8S+eww636US0UtVxAjOHw/PMAy Y8+z81P6/AtgqMI+bjdH1axagPT86KjsB/e94QvjXDI/2A4mSiUeKeBi9YoFobOhWvoO HioDrJNDUY97uF7mH06vV9l+NtrQWrquR3lDjMwPL44SeZ1Ua6IAMSDCHaSDuYP/4YN1 cdFQ== 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=hIvadah9gc4QLNuuXrg/ag5udmgN+hyDhIegLLB843c=; b=P1pIdvHuqNDuINvhlOPoMopuR6JnnfXwFw+Fd8rmG1VX0X1n9+fDIUYlIC2sFgAbct neB1RB3/1g6IuRvNSOtRg9lg/6Umj4v0Fa9cuB5PkTqe5auF72rm8NwU4RauO9ATEkT3 bGv/dbrHMvIGvNuHx1OxI3g+nsE8LeAI3oENDxK+vFOqJfha/qriFhXzYLyrZRyY5iDK CImMjHN9t9ItrTHxXkbKSVXhDBVFcRfupo3melj3oeCRb58fXWIDIoBdTPSrnBlL8KY6 lbBgOvWeDFW6kr9Gao9aM/AqxKGcYbIqDtZvu7xbMNJoolH0LR9MPLk6jxivhAdCE3mS Iuvw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=sBENXEZG; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::436 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-x436.google.com (mail-wr1-x436.google.com. [2a00:1450:4864:20::436]) by gmr-mx.google.com with ESMTPS id b18si241943edr.1.2019.10.15.02.17.55 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Oct 2019 02:17:55 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::436 as permitted sender) client-ip=2a00:1450:4864:20::436; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=sBENXEZG; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::436 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-x436.google.com with SMTP id z9so22879089wrl.11 for ; Tue, 15 Oct 2019 02:17:55 -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=hIvadah9gc4QLNuuXrg/ag5udmgN+hyDhIegLLB843c=; b=sBENXEZGEEHOI6Ce1l96wm1U1n4mBqj1PK6sNAZ6enwlGlLEohjTZFXneKVeXbMaY7 e44RNciSrZRpwkHUx5i6Hx+wR9v3D1afuwcAdEKDnfcZtYXbS5jpXLwXi3KZJPTfVH7x gBG8eqNOGGTmo8GExXKi6su4G9lSDXiDYWLa5hG6yCKCqHJRdkck3KyU6YtM5Uy3sC// +cA0aKsOj0vCpzH+zpPrkPh/gzBXsBVI3UJfSGlOotZG4VdJQYJEHMxAyrB4pXNxjHoa xCZ9o3M4lZKzV4pI7fsqDdQkijlmthL95TaA6AFhH+TAgDu/25+FR4VQ86ChVhEk/P+h cbSA== 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=hIvadah9gc4QLNuuXrg/ag5udmgN+hyDhIegLLB843c=; b=Mzwj9dh4viLdwWmWTN3wC4H1MgsYm5Ecqd9/elI44jEWhkibFGqnDrpQE2dM845zk1 irmZJQKjCC6yUIEU5d1WcHs9Nz0YbYK0uS89dEMoH9Fh5Tijt9tltgtmuqflZBviWe5B PNHBfWytARC+ppdc1xYh9V91jQz4S+cNU4dSQH/kzOwCIohyfAmdtMoso1bhwXghfm4T 3/m15tmSoKG3eTxBrUnvEcfrM0UqD7LQ747QZzWMmC5Xr7LghkNWSEQMRZyw0LJhpG9x B3EwuqnvGWiTnI25zIrS/5eTHeR9l6w6JAgKuviBEFKRNPqO2I42K/mqF76VZZalJ5KZ 2jWQ== X-Gm-Message-State: APjAAAVaIQQf1ke9nPAXvfViP4A0xZhvsW3+JRVVGFnkhHH+//Ax0HoH ZPjfvJoDUpwm49lHo6WD6nPukjpZGPE= X-Received: by 2002:a5d:65c1:: with SMTP id e1mr28363912wrw.364.1571131074274; Tue, 15 Oct 2019 02:17:54 -0700 (PDT) Return-Path: Received: from lightning.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id y186sm41096789wmb.41.2019.10.15.02.17.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Oct 2019 02:17:53 -0700 (PDT) From: vijaikumar.kanagarajan@gmail.com X-Google-Original-From: Vijaikumar_Kangarajan@mentor.com To: isar-users@googlegroups.com, henning.schild@siemens.com Cc: Vijai Kumar K Subject: [PATCH v2] base-apt: Use gpg keyid instead of yes Date: Tue, 15 Oct 2019 14:47:23 +0530 Message-Id: <20191015091723.14793-1-Vijaikumar_Kangarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191014183845.095f7182@md1za8fc.ad001.siemens.net> References: <20191014183845.095f7182@md1za8fc.ad001.siemens.net> X-TUID: GGkd0FAIuvxJ From: Vijai Kumar K When using "SignWith: yes", reprepro uses the default gpg key of the system to sign the repo. The default gpg key might be different from what is specified in BASE_REPO_KEY, resulting in using a wrong key for signing. Derive and use the keyid from the keyfile supplied instead of a generic yes option. Suggested-by: Amy Fong Signed-off-by: Vijai Kumar K --- Changes in v2: - Address review comments from Henning. meta/recipes-devtools/base-apt/base-apt.bb | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index 6acd6e7..42ff782 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -4,6 +4,7 @@ SRC_URI = "file://distributions.in" BASE_REPO_KEY ?= "" +KEYFILES ?= "" CACHE_CONF_DIR = "${REPO_BASE_DIR}/${BASE_DISTRO}/conf" do_cache_config[dirs] = "${CACHE_CONF_DIR}" @@ -12,13 +13,18 @@ do_cache_config[lockfiles] = "${REPO_BASE_DIR}/isar.lock" # Generate reprepro config for current distro if it doesn't exist. Once it's # generated, this task should do nothing. -do_cache_config() { +repo_config() { if [ ! -e "${CACHE_CONF_DIR}/distributions" ]; then sed -e "s#{CODENAME}#"${BASE_DISTRO_CODENAME}"#g" \ ${WORKDIR}/distributions.in > ${CACHE_CONF_DIR}/distributions - if [ "${BASE_REPO_KEY}" ] ; then + if [ -n "${KEYFILES}" ]; then + option="" + for key in ${KEYFILES}; do + keyid=$(gpg --keyid-format 0xlong --with-colons ${key} 2>/dev/null | grep "^pub:" | awk -F':' '{print $5;}') + option="${option}${keyid} " + done # To generate Release.gpg - echo "SignWith: yes" >> ${CACHE_CONF_DIR}/distributions + echo "SignWith: ${option}" >> ${CACHE_CONF_DIR}/distributions fi fi @@ -35,4 +41,14 @@ do_cache_config() { fi } +python do_cache_config() { + for key in d.getVar('BASE_REPO_KEY').split(): + d.appendVar("SRC_URI", " %s" % key) + fetcher = bb.fetch2.Fetch([key], d) + filename = fetcher.localpath(key) + d.appendVar("KEYFILES", " %s" % filename) + + bb.build.exec_func('repo_config', d) +} + addtask cache_config after do_unpack before do_build -- 2.17.1