From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6741460933745311744 X-Received: by 2002:a2e:89c9:: with SMTP id c9mr20550767ljk.108.1571815497216; Wed, 23 Oct 2019 00:24:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9786:: with SMTP id y6ls171549lji.3.gmail; Wed, 23 Oct 2019 00:24:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqxJIy5tqgRnKMhHKLHS0gm/ryyP4FydaWsYUY/RCbhUNX1vNIM+tTLMCdkIFVuGd+gIMyYr X-Received: by 2002:a2e:9b55:: with SMTP id o21mr21275811ljj.52.1571815496217; Wed, 23 Oct 2019 00:24:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571815496; cv=none; d=google.com; s=arc-20160816; b=nUNL/ug1nTEjSrT3nJNHyKgNUsYJIZ4r/Bx6Jz4RX7zN8ViYAESbml7/xDjZCVrn5I eFq1HKV75UIsfPrtEqEjH7YKmnnHxnSfTPW3iCmJSJlwJdEKYAc8wlDWxkqvbV+VpNks mHSF5pl8moWtYh9KhGWRiVfESXDJZT4RTk9YmCglBwEPc1dX+Y1qcHSXHQGXDrjVU14/ NxHV/f64SqqwEd4iCApbNvZqOpcLMiPAkVYeP4LQ/rdxByzoohmKu1dd0aptQeNpUn5W PCPpm1dPp1YemYKKZblKFpyv0uV/yGOmOdbYVEsqMvzFUEBphq0LFSbjUwaAT77eohr3 SQ+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:date:from:dkim-signature; bh=iy4WpMaIv4KcibLi6A/zOmBe8THwb0SZ9UWAcDQqi7g=; b=c6mZxym7cZXJ1/5+emDeuo+HwfbreifIgi4b44kc38zOG5NONQXYwBNjpoN162SQC4 3QFyfCowStum6UVQM8g49Wi1QocDOXn2BkxYnOGAuKb6m95jHwZXH3Brs4dCha0gtLK8 7Ff+m9sqe2GvGsRdrl0KLnAmJ87cK+K2uinm8p3bdxxKrIrJAEmE5nOafWkneBnyLNSc dlrm8bqKQqkFjoJ85rjlwMDoDYJI/JlZ1q6nCBfV5rsaDP1CFh8052f7lY3z7PDiqYp5 7vNuy+Y0+ClnEfMZSvcBRRPK/D+NBvtGzwvyEMZCDZ2p+2htQQ5qgrOBwL+T+aQ+RAOo yH5Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="JH/w0wQZ"; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::42a 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-x42a.google.com (mail-wr1-x42a.google.com. [2a00:1450:4864:20::42a]) by gmr-mx.google.com with ESMTPS id y6si1273723lji.0.2019.10.23.00.24.56 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 23 Oct 2019 00:24:56 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::42a as permitted sender) client-ip=2a00:1450:4864:20::42a; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="JH/w0wQZ"; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::42a 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-x42a.google.com with SMTP id a11so4718588wra.6 for ; Wed, 23 Oct 2019 00:24:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=iy4WpMaIv4KcibLi6A/zOmBe8THwb0SZ9UWAcDQqi7g=; b=JH/w0wQZlhN+goerN3/7+SWRxa+NRzh1gnnB6IofFV7ldydvG9Lssu7xXgHB+ZP32g IuGurODrawfun5i4TKaKeSoate4P91n0GOlz0AEKXjDpudAsO/IqogVS8eANtd88PRpk bTj5kEdlSUygR4op3Mgxo17jVKKIovgaO2xJCaziCK7KIjTzzTkPzvJhm0BsD11kYnms DnzW1QOJuC6AvAjIl3z1+gJvKBO6enxAKf7idgXb+AXDbo3QM3b2ncKrwUDnA8yMBV6/ Mxob21gnJ72nOffrKRghOwDY6/6GQoeUZhrpSnG8eflWsuxaEKm0d9FehgIsQ+QpmCvH GIOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=iy4WpMaIv4KcibLi6A/zOmBe8THwb0SZ9UWAcDQqi7g=; b=Uk9kArsGE/Fve9aZDQqQmX84v2nOpWz3P8tUGtMXR7YSjjFCQeW3NS3c3G1fXKQ8RH qqzZLCiIh+Hj5S/xkcc4aImH34fhEWm0OLYdXCBQHDfYlhKj4UBxBv/r95aICUEP+eOZ mb+U3gfuBxMSOs7UKdbC2eeVmAcsMmGbEkD9HlxVsEmsWDvs2EEYZt29L0UA1fXto8Iv xyVW8As/FMpE00T/I0iwUHp7han3WuizNYA9/KkGyAsWg4QE9ffjX1fofUaqOW99esi+ ivqwPLc7g42xnGmx9yAn6VY4NOsS0anE7ZnJJDp8oFJiOpW5SAHNzluqZzX4QbhIUQbM pN/Q== X-Gm-Message-State: APjAAAUBMAZBUX6wW2Zejd8e/vP7BfQfiABOinrfVb4vn1YMKmIx2CVI zEkuQCruQdc8pm+llNWLJZY= X-Received: by 2002:adf:a157:: with SMTP id r23mr6666762wrr.51.1571815495466; Wed, 23 Oct 2019 00:24:55 -0700 (PDT) Return-Path: Received: from lightning (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id 37sm32510242wrc.96.2019.10.23.00.24.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Oct 2019 00:24:54 -0700 (PDT) From: Vijai Kumar K X-Google-Original-From: Vijai Kumar K Date: Wed, 23 Oct 2019 12:54:49 +0530 To: vijai kumar Cc: isar-users Subject: Re: [PATCH v2] base-apt: Use gpg keyid instead of yes Message-ID: <20191023072449.GB3125@lightning> References: <20191014183845.095f7182@md1za8fc.ad001.siemens.net> <20191015091723.14793-1-Vijaikumar_Kangarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-TUID: n7CBlzDZqxcd On Tue, Oct 15, 2019 at 02:19:36AM -0700, vijai kumar wrote: If there are no more review comments, can this be merged to next? Thanks, Vijai Kumar K > This v2 is also rebased on top of current next. Forgot to mention that. > > Thanks, > Vijai Kumar K > > On Tuesday, October 15, 2019 at 2:47:55 PM UTC+5:30, vijai kumar wrote: > > > > 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 > > > > > > -- > You received this message because you are subscribed to the Google Groups "isar-users" group. > To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/c20121db-766f-49e2-b64b-d25761d4f1bb%40googlegroups.com.