From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6662700470316826624 X-Received: by 2002:adf:f08c:: with SMTP id n12mr276623wro.7.1551284086539; Wed, 27 Feb 2019 08:14:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f350:: with SMTP id e16ls578491wrp.13.gmail; Wed, 27 Feb 2019 08:14:46 -0800 (PST) X-Google-Smtp-Source: APXvYqwPnoLWTP/K3uPfkV+sW3uVVzUyZt7E4jd2cD61T5KiOJS4GUcUqKhz8tTZNNuXXy4647o4 X-Received: by 2002:adf:ee01:: with SMTP id y1mr297258wrn.10.1551284085983; Wed, 27 Feb 2019 08:14:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551284085; cv=none; d=google.com; s=arc-20160816; b=X9mu6LusfvPxWBgg9IzmnEVgEGEfbcyhnat+lduORMybkBrWPzvD7Ycq8UPctQZX8F BNzIhfjMIgy9m1QITZcychX32/W8oNSf5AeuwC97j+RvsEg1pdOwfYoIagb4zeeSuoY4 2Rq44jkynZHBytVksejxvYpa6cezb4rZYT5PjWqy9DqyffMRQnLyoSUihWPcHLItktKv ouvIWVY5V3KjSwZ80tZS8Jc7udT7m9H1je+TtmaaYHqusEWJ2BUP6upLPw2zYQPC8H7w HSo+5i4vlmoRwyPg8WxHdUO1x+VCCpajUGyHfdhgDkh5FDbJpVYKq/f8knFbUa4eUsMT BqiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=sN/E7kvJSpcJava9ry6cRVSf61AYq5iD7cmvWsk7A/8=; b=1A+1XxdCpCyAJYXBJFU4bPuR4d3+2KjX9kCqAfRjsPD6Kq0ArJvot3CeFrRJAZceWG HHdX47IgVFXlLWcDlXH5JolDwOr9R/S8NhT7jQ7+Sun572yLfAawmMutbmc/3/0MgUge Q3tWbrOLlA/ysZ/CsnMcMM11+mBGi7vGZi/AJ0JCjody7Ao7/x7NFcRvCns65qvkuw6J ExnDdNv4KQhSLpoIu40QoLuYu9pxEerhXxxJCToIaCGC53wIMx21Wk6BMIzK5CtxQDQY WlsZowDPWSpALPK2E9vvK46U8rJ8KRv3jwrWiucxx3ECQH6+4G/MV2CS28pqrJN88K36 hOUQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id h16si79697wmb.1.2019.02.27.08.14.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Feb 2019 08:14:45 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x1RGEjtW024944 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 27 Feb 2019 17:14:45 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.171]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x1RGEjtS004267; Wed, 27 Feb 2019 17:14:45 +0100 Date: Wed, 27 Feb 2019 17:14:43 +0100 From: Henning Schild To: "[ext] Andreas J. Reichel" Cc: Subject: Re: [PATCH v2 3/3] Separate apt-key entries from default keyring Message-ID: <20190227171443.7bb07fc2@md1za8fc.ad001.siemens.net> In-Reply-To: <20190227151856.11594-4-andreas.reichel.ext@siemens.com> References: <20190227151856.11594-1-andreas.reichel.ext@siemens.com> <20190227151856.11594-4-andreas.reichel.ext@siemens.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: UcxiVfpS6lTx Is this fixing an issue introduced in p1? I guess you should just squash it ;). Henning Am Wed, 27 Feb 2019 16:18:56 +0100 schrieb "[ext] Andreas J. Reichel" : > From: Andreas Reichel > > Per default, apt-key add adds keys to /etc/apt/trusted.gpg. > However, when building without a container, we don't want to > contaminate the host. Therefore, we specify a keyring file > in /etc/apt/trusted.gpg.d directory named `isar.gpg`. This file can > be deleted after the build. > > This is necessary because we don't want to specify single keyrings > to debootstrap since we might need a mixture of several keyrings > as per default and would have to find all needed keyrings on the > system, export their keys and reimport into the build keyring, which > is more complicated and unneeded this way. > > Signed-off-by: Andreas Reichel > --- > meta/classes/isar-bootstrap-helper.bbclass | 1 + > meta/classes/isar-image.bbclass | 1 + > meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb | 2 +- > meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +- > 4 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/meta/classes/isar-bootstrap-helper.bbclass > b/meta/classes/isar-bootstrap-helper.bbclass index 26abf62..769cbef > 100644 --- a/meta/classes/isar-bootstrap-helper.bbclass > +++ b/meta/classes/isar-bootstrap-helper.bbclass > @@ -22,6 +22,7 @@ HOST_DISTRO ?= "debian-stretch" > HOST_ARCH ?= "${@get_deb_host_arch()}" > > HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list" > +ISARKEYRING = "/etc/apt/trusted.gpg.d/isar.gpg" > > def reverse_bb_array(d, varname): > array = d.getVar(varname, True) > diff --git a/meta/classes/isar-image.bbclass > b/meta/classes/isar-image.bbclass index cdd1651..4a89bd7 100644 > --- a/meta/classes/isar-image.bbclass > +++ b/meta/classes/isar-image.bbclass > @@ -82,6 +82,7 @@ isar_image_cleanup() { > fi > rm -f "${IMAGE_ROOTFS}/etc/apt/sources-list" > ' > + sudo rm -f "${ISARKEYRING}" > } > > do_rootfs() { > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb > b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb index > a793585..b70d2a8 100644 --- > a/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb +++ > b/meta/recipes-core/isar-bootstrap/isar-bootstrap-host.bb @@ -11,8 > +11,8 @@ WORKDIR = > "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${HOST_DISTRO}-${HOST_A > DEPLOY_ISAR_BOOTSTRAP = > "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}" > ISAR_BOOTSTRAP_LOCK = > "${DEPLOY_DIR_BOOTSTRAP}/${HOST_DISTRO}-${HOST_ARCH}.lock" -require > isar-bootstrap.inc inherit isar-bootstrap-helper +require > isar-bootstrap.inc do_generate_keyring[stamp-extra-info] = > "${DISTRO}-${DISTRO_ARCH}" > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index > 2ef3b1e..4613732 100644 --- > a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ > b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -179,7 > +179,7 @@ do_generate_keyring() { chmod 777 "${APTKEYTMPDIR}" > for keyfile in ${@d.getVar("APTKEYFILES", True)}; do > cp "$keyfile" "${APTKEYTMPDIR}"/"$(basename "$keyfile")" > - sudo apt-key add "$keyfile" > + sudo apt-key --keyring "${ISARKEYRING}" add "$keyfile" > done > fi > }