From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6665315485614080000 X-Received: by 2002:a2e:85cd:: with SMTP id h13mr544064ljj.8.1551949685518; Thu, 07 Mar 2019 01:08:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:550a:: with SMTP id j10ls1629lfk.8.gmail; Thu, 07 Mar 2019 01:08:04 -0800 (PST) X-Google-Smtp-Source: APXvYqzIDg2RgcnuMTjAFTO0gcVQXC618TwBsBCTnXYdAimdxzc1VyRHBmoosC29oqHtntV9IHkD X-Received: by 2002:a19:c502:: with SMTP id w2mr723156lfe.15.1551949684832; Thu, 07 Mar 2019 01:08:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551949684; cv=none; d=google.com; s=arc-20160816; b=IGTtwgt41W/CrMMan37z4VzckPFCnpKXVVV6z3BgUfHvoXUo9kkDs4vnRrBP6yIELv 9UzhL1kPM3Zh17EPzfR+ziT6KSoee679oo36CFyFwbP+a2x7Kf5ORLHS+IJ96qtssuQc kg/GwogZkwVhEnwRLcvltpdPSsyX9C162Oev79gs/22WDP1pag2yQwy4VKk5OSkbOurg dVoYNlJQj40ctQZkofqI3vRPFPfn2AQZJwLjERye38nLFC6eLKkFg/vbAzg+0qOPnYbp yutEdqe3KN99g1NJwSwTrnTVoYrzM9v3hydQGKq9kF5XYNpg07yTSeaLrbcdbUTTYPd4 Ux4w== 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:content-description :mime-version:references:message-id:subject:cc:to:from:date; bh=0O2Yy2WPksOIk2JFnXdc0/ESqjORbZZodw74Ya4gB/g=; b=1AR2r3Jk0SajkyUGhtDOIRtv5QV8k90e74j7jaeMaaveNRPEmYpBS+bd9gmmIsXr2K RAdoZNaEmy4t/YModJDm9V8KDnTxmJV9uQmOM4yi5fp8xCA37dnNBMomJ5tFWdbepmBt 97DhBtJIDvejLVYVqaBepy3BL8crJdQSGPCOD48u63TeIMjwBfcvWRkubQhoDLrXJo+k sayeDQyL8kXWGHFgo27uX/0oAvROhJ/qZ7UeqGYbPgvutGJzP2mMAJt89f/YFN4wRLZT BPHfRnkxXK9rktG6BJftdehFhG39jrZJYHWsmI+gEaSDO6Zcio+hIeXZpeGVtQrv9FJP ymug== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id n21si187610lfl.2.2019.03.07.01.08.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 01:08:04 -0800 (PST) Received-SPF: pass (google.com: domain of andreas.reichel.ext@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 andreas.reichel.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x279838M008521 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 7 Mar 2019 10:08:04 +0100 Received: from iiotirae (golem.ppmd.siemens.net [139.25.69.17]) by mail2.sbs.de (8.15.2/8.15.2) with SMTP id x27983Pk027005; Thu, 7 Mar 2019 10:08:03 +0100 Date: Thu, 7 Mar 2019 10:06:17 +0100 From: Andreas Reichel To: Henning Schild Cc: isar-users@googlegroups.com Subject: Re: [PATCH v3 4/6] Use apt-key to generate apt-keyring Message-ID: <20190307090616.GA10773@iiotirae> References: <20190306162619.826-1-andreas.reichel.ext@siemens.com> <20190306162619.826-5-andreas.reichel.ext@siemens.com> <20190306183312.644b9069@md1za8fc.ad001.siemens.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Description: message Content-Disposition: inline In-Reply-To: <20190306183312.644b9069@md1za8fc.ad001.siemens.net> User-Agent: Mutt/1.11.3 (2019-02-01) X-TUID: a29iy4oQUWx2 On Wed, Mar 06, 2019 at 06:33:12PM +0100, Henning Schild wrote: > Am Wed, 6 Mar 2019 17:26:16 +0100 > schrieb "[ext] Andreas J. Reichel" : > > > From: Andreas Reichel > > > > Use apt-key instead of manually calling gpg. > > > > Signed-off-by: Andreas Reichel > > --- > > meta/classes/isar-bootstrap-helper.bbclass | 12 ++++++++++++ > > meta/classes/isar-image.bbclass | 1 + > > .../isar-bootstrap/isar-bootstrap-host.bb | 2 +- > > .../isar-bootstrap/isar-bootstrap.inc | 15 > > +++++++-------- 4 files changed, 21 insertions(+), 9 deletions(-) > > > > diff --git a/meta/classes/isar-bootstrap-helper.bbclass > > b/meta/classes/isar-bootstrap-helper.bbclass index d780b85..1f24037 > > 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) > > @@ -119,6 +120,16 @@ setup_root_file_system() { > > export LANG=C > > export LANGUAGE=C > > export LC_ALL=C > > + > > + if [ -d ${TMPDIR}/aptkeys ]; then > > + for keyfile in ${TMPDIR}/aptkeys/* > > + do > > + kfn="$(basename $keyfile)" > > + cp $keyfile "$ROOTFSDIR/tmp/$kfn" > > + sudo -E chroot "$ROOTFSDIR" /usr/bin/apt-key add > > "/tmp/$kfn" > > + rm "$ROOTFSDIR/tmp/$kfn" > > + done > > + fi > > sudo -E chroot "$ROOTFSDIR" /usr/bin/apt-get update \ > > -o Dir::Etc::sourcelist="sources.list.d/isar-apt.list" \ > > -o Dir::Etc::sourceparts="-" \ > > @@ -128,6 +139,7 @@ setup_root_file_system() { > > sudo -E chroot "$ROOTFSDIR" /usr/bin/dpkg --add-architecture > > ${DISTRO_ARCH} sudo -E chroot "$ROOTFSDIR" /usr/bin/apt-get update > > fi > > + sudo -E chroot "$ROOTFSDIR" /usr/bin/apt-key update > > sudo -E chroot "$ROOTFSDIR" \ > > /usr/bin/apt-get ${APT_ARGS} --download-only $PACKAGES \ > > ${IMAGE_TRANSIENT_PACKAGES} > > 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 > > 98c5c6b..8002a53 100644 --- > > a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ > > b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -23,10 +23,8 > > @@ APTSRCS = "${WORKDIR}/apt-sources" APTSRCS_INIT = > > "${WORKDIR}/apt-sources-init" BASEAPTSRCS = > > "${WORKDIR}/base-apt-sources" APTKEYFILES = "" > > -APTKEYRING = "${WORKDIR}/apt-keyring.gpg" > > -DEBOOTSTRAP_KEYRING = "" > > DEPLOY_ISAR_BOOTSTRAP ?= "" > > -DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" > > +DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales gnupg2" > > When i talked about the OVERRIDES i meant also adding gnupg2 depending > on a condition. And that condition would probably be, if > DISTRO_APT_KEYS is non-empty. > Pardon, my fault... > DISTRO_APT_KEYS != "" && OVERRIDES += "gnupg-support" > DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg-support = " gnupg2" > > > DISTRO_APT_PREMIRRORS ?= "${@ "http://ftp\.(\S+\.)?debian.org > > file:///${REPO_BASE_DIR} \n" if > > bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) else "" }" > > @@ -43,7 +41,6 @@ python () { if own_pub_key: > > aptkeys += own_pub_key.split() > > > > - d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}") > > for key in aptkeys: > > d.appendVar("SRC_URI", " %s" % key) > > fetcher = bb.fetch2.Fetch([key], d) > > @@ -171,13 +168,17 @@ def get_distro_components_argument(d, is_host): > > else: > > return "" > > > > +APTKEYTMPDIR := "${TMPDIR}/aptkeys" > > + > > +do_generate_keyring[cleandirs] = "${APTKEYTMPDIR}" > > do_generate_keyring[dirs] = "${DL_DIR}" > > do_generate_keyring[vardeps] += "DISTRO_APT_KEYS" > > do_generate_keyring() { > > if [ -n "${@d.getVar("APTKEYFILES", True) or ""}" ]; then > > + chmod 777 "${APTKEYTMPDIR}" > > for keyfile in ${@d.getVar("APTKEYFILES", True)}; do > > - gpg --no-default-keyring --keyring "${APTKEYRING}" \ > > - --no-tty --homedir "${DL_DIR}" --import "$keyfile" > > + cp "$keyfile" "${APTKEYTMPDIR}"/"$(basename "$keyfile")" > > + sudo apt-key --keyring "${ISARKEYRING}" add "$keyfile" > > This whole switching from gpg to "sudo chroot apt-key" would make a > nice stand-alone patch, but i do not feel strong about that. > I argue against that because I have a use case where I need all of this. And I don't like small patches wandering around the mailing lists without being merged. Andreas > Henning > > > done > > fi > > } > > @@ -219,7 +220,6 @@ isar_bootstrap() { > > if [ ${IS_HOST} ]; then > > ${DEBOOTSTRAP} $debootstrap_args \ > > ${@get_distro_components_argument(d, > > True)} \ > > - ${DEBOOTSTRAP_KEYRING} \ > > "${@get_distro_suite(d, True)}" \ > > "${ROOTFSDIR}" \ > > "${@get_distro_source(d, True)}" > > @@ -228,7 +228,6 @@ isar_bootstrap() { > > "${DEBOOTSTRAP}" $debootstrap_args \ > > --arch="${DISTRO_ARCH}" \ > > ${@get_distro_components_argument(d, > > False)} \ > > - ${DEBOOTSTRAP_KEYRING} \ > > "${@get_distro_suite(d, False)}" \ > > "${ROOTFSDIR}" \ > > "${@get_distro_source(d, False)}" > -- Andreas Reichel Dipl.-Phys. (Univ.) Software Consultant Andreas.Reichel@tngtech.com, +49-174-3180074 TNG Technology Consulting GmbH, Betastr. 13a, 85774 Unterfoehring Geschaeftsfuehrer: Henrik Klagges, Dr. Robert Dahlke, Gerhard Mueller Sitz: Unterfoehring * Amtsgericht Muenchen * HRB 135082