From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6741460933745311744 X-Received: by 2002:a17:902:b787:: with SMTP id e7mr7038926pls.134.1569618688452; Fri, 27 Sep 2019 14:11:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:9893:: with SMTP id s19ls906232plp.5.gmail; Fri, 27 Sep 2019 14:11:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqxqkQ/MRUQ9qSYCNN69Iqdzv7yomXzoQ01WusDZ8SsDrGBTElUDcrOq/Sdf4wqjEmXwLCV0 X-Received: by 2002:a17:902:6545:: with SMTP id d5mr7049831pln.333.1569618688127; Fri, 27 Sep 2019 14:11:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569618688; cv=none; d=google.com; s=arc-20160816; b=W9LIMLGvfZkFkQDEHdoWJ9jx//vp9x97Ie3MtV0mYVQEGUL47sRFoj9g7fG0Uc4r5L K5WsYjJOQt59I5ZcQZcO1gA7TFwveV9ca+PpWxBQwowv9pqsxRAWg80doVLJVcA7BRMr M6vL7OgYtkn6lcUn+jkf9NWGR7JSSR4dR1rnX1aS/n68n4q7rZUxRK2WQj8UrjvBH1yC gixwo3RlwdSMr/tdvycaNsqeFyMzna/rwzpameox7k+vhhCNNbssQonzdjeHL9M4jC03 6yTmhUWhNqJkMMB5qZ+3NluQIOkUqyR2Gcvs6v/rkeLU8aox75rZ9UlcfxEPWzP813Ag uKzw== 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=Nk//0fi8o4ZRoyyJ3csoxPiXUEgMBoIo+dRCSLePK+M=; b=LlMe/aAS7o3RLH4TqB2za8Hbkpl0NBFH1OUGcpiPBmTTHc/Gha8L4HqfaMjie5X6gf E0VDqcWT1yGP1QwuTHeOzc6uJYnUliZ03H/KEGt45YfF/vH8IkjV2V+RxB+7zvn/OOwM x0KO8ThaNSofR+J1mSDJooRV06Mr2jssEMAW9mp8sY2a77/zvPNTyv9SnS+5a8HWSDX3 Wta03H5Iw/gxFqo4JsYPI5BfuzdowzVM0Bq7baqxqkl0YBn40p4ojdbtcCeT7ZS6+VUh 2UtVN5pjefmoMkPNIi7NICrCbAtvuTpwVWHfcpmVXxVod5FbAaZrJtyS53m9vd/XCwxK o8wA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=J36tt2BO; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::62b 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-pl1-x62b.google.com (mail-pl1-x62b.google.com. [2607:f8b0:4864:20::62b]) by gmr-mx.google.com with ESMTPS id z22si893273pju.2.2019.09.27.14.11.28 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 27 Sep 2019 14:11:28 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::62b as permitted sender) client-ip=2607:f8b0:4864:20::62b; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=J36tt2BO; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::62b as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-pl1-x62b.google.com with SMTP id d22so1544439pll.7 for ; Fri, 27 Sep 2019 14:11:28 -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=Nk//0fi8o4ZRoyyJ3csoxPiXUEgMBoIo+dRCSLePK+M=; b=J36tt2BOcjCaUmSxNWsWshwD3Bhg2M4DqtezHuskRjidGrtb3Kp6oriGOY2K+ArDi3 foHtXtm3zsE5N6iW49HVDYNVa9r8wBDJ/IqbyNkkSYXjIaShVogkBrrY3s89m5bVTeS9 8Bc0mdTrCVLm1YhlO+kK9kNjK3Aq/iXfrSG2aByDv4lPQ29ozKEI3iFuq4O/4JTZzIJd GtUKJUKlEh8TadVXu1/9+X5qIE3siR/JcyAS2TLUMkLksdq823kBTlA7o6iMNR7ttHnq vbC2K/fNRkTIUYzgbMQtZ/8uEWcjJ3oKF/VCjztCV37NFdN4uhsOIX3j+RH28YEqU6lc WalQ== 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=Nk//0fi8o4ZRoyyJ3csoxPiXUEgMBoIo+dRCSLePK+M=; b=V2TUs5PDV3SyrW/yyEhtkJVsSjtvbxeQVpIi241t+dvEjgfBk/iSiUx7D7XPni9hd/ //k8iRDIy+e+XmfJ87zaJ+28JmGisOXMFBXfifKn9P1Z3yU7ivp+YNgptnku5IDZcI+L whT5bgTNZ0/pJoUMnW3sb55jK3YrMuWGMaS/ZdPYBHR0UetYkYAQXfClNUwPwRdamYvK pcQvrURTJrnP+uT4bZQrmQyV1/xK7qI35W3HESbcPmPPZJXPSM7gqFkrpw5ChcWto3CO 55N2DvVgxCqio5K4iuF+v+1NUYqR620mSzijS/L0cs9Z+oKHUVVGG8abwZVPOxk8/twR S/lg== X-Gm-Message-State: APjAAAW5Ce9LsVkYW/EmIT2LILBsLlj4pAUxauDdWVr1wJsMIEIhspqa 4uB+do9vZXbbKAiByjYohQQZce3Ka6Y= X-Received: by 2002:a17:902:9896:: with SMTP id s22mr6783514plp.207.1569618687509; Fri, 27 Sep 2019 14:11:27 -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 y2sm3525511pfe.126.2019.09.27.14.11.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 14:11:27 -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, Amy_Fong@mentor.com, Vijai Kumar K Subject: [PATCH] base-apt: Use gpg keyid instead of yes Date: Sat, 28 Sep 2019 02:41:12 +0530 Message-Id: <20190927211112.29379-1-Vijaikumar_Kangarajan@mentor.com> X-Mailer: git-send-email 2.17.1 X-TUID: C8b2bx5mksHJ 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 --- 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 74189f1..c74be86 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=$(cat ${key} | gpg --keyid-format 0xlong --with-colons - 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_build -- 2.17.1