From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6665315485307895808 X-Received: by 2002:adf:ee01:: with SMTP id y1mr698330wrn.10.1551970315300; Thu, 07 Mar 2019 06:51:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4141:: with SMTP id c1ls1291759wrq.4.gmail; Thu, 07 Mar 2019 06:51:55 -0800 (PST) X-Google-Smtp-Source: APXvYqz+7n6jmVNks/D6YRllwc7uDCDHDQeJJ6NRkvJOFaZv8Em/T/H+tm8nfXaIv2TlmFxIaAL5 X-Received: by 2002:adf:ce07:: with SMTP id p7mr666140wrn.24.1551970315027; Thu, 07 Mar 2019 06:51:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551970315; cv=none; d=google.com; s=arc-20160816; b=QPolznlGb1BF76okeMKXLE63h+QKAy5dWgh1KFF/nJS7wKjhDEhHmZjPiG8lRmMoW8 hEOe6Q7JmYDu8YIMRRsfBnf6+I68/Rke7VDl34AqzgdFqOov9S5IhEoNQhEaCmg+eIEh er11+qNbL8SzRDdFoyXr6/JvB5LHeflSVoMk58aLABZIo9dsbevN8mjP/zuyTIHFD3te 1qKBhqfG4TnBwCXHiWb/WMIeRw8tBnYDf5JzKPBt1/p6H3EucjiAy24r0S6y123adMl4 IQLnaTzXkCXnurvXUyNgIdXc4HJ5HQyhuspttQ8P2mljKYKAhG+YsfZGeFPC+OR8MlBH sgQg== 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=CPdJUaYy1ZmPjVUtNV+FBLe2FViLI6f54RO6R8BbX8k=; b=I4TV4CeF0yDED1ZpAJzNbcpMhKMw2kgspg7Y8JwakI/HtriTyNzcI2JbvbU5gVyxXy ldhQfF/DJ4VNRshFLSuFgP8P3gbZbC+IpUUqQwhbh1B1RdCJzTiMyAItOQNOY2bahT16 OqJz2IhxWN8y4nlARBD4qhpOVHxIKMQ72uDpQ4b2cwEduHXoLEf4gLMxWkvJAO5XvQDk MJIprVIENf7R6izAhGro6NHuRLdA3njV84LFjztAMKQvYmDG/6ACtUt1k1LaOsw2kAVI ikyjpb8eGZu8mM6xqVokPk+RYLpuYfAICAXrGMqREhyCA+xXZ4qkkFe7cjE9lGsr7opp 67Dw== 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 f185si233659wme.1.2019.03.07.06.51.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 06:51:55 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x27EpspY004524 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 7 Mar 2019 15:51:54 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.211]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x27EpsmT003715; Thu, 7 Mar 2019 15:51:54 +0100 Date: Thu, 7 Mar 2019 15:51:53 +0100 From: Henning Schild To: "[ext] Andreas J. Reichel" Cc: Subject: Re: [PATCH v4 5/6] Use apt-key to generate apt-keyring Message-ID: <20190307155153.0ec58eb2@md1za8fc.ad001.siemens.net> In-Reply-To: <20190307142304.14508-6-andreas.reichel.ext@siemens.com> References: <20190307142304.14508-1-andreas.reichel.ext@siemens.com> <20190307142304.14508-6-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: wdsbu2M4ESiw Am Thu, 7 Mar 2019 15:23:03 +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 | 2 ++ > meta/classes/isar-image.bbclass | 1 + > meta/conf/bitbake.conf | 1 + > .../isar-bootstrap/isar-bootstrap.inc | 32 > +++++++++++++++---- 4 files changed, 29 insertions(+), 7 deletions(-) > > diff --git a/meta/classes/isar-bootstrap-helper.bbclass > b/meta/classes/isar-bootstrap-helper.bbclass index d780b85..c5e39e9 > 100644 --- a/meta/classes/isar-bootstrap-helper.bbclass > +++ b/meta/classes/isar-bootstrap-helper.bbclass > @@ -119,6 +119,7 @@ setup_root_file_system() { > export LANG=C > export LANGUAGE=C > export LC_ALL=C > + > 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 +129,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/conf/bitbake.conf b/meta/conf/bitbake.conf > index 0e521bb..769ec9a 100644 > --- a/meta/conf/bitbake.conf > +++ b/meta/conf/bitbake.conf > @@ -62,6 +62,7 @@ DEBDISTRONAME = "isar" > # Isar apt repository paths > REPO_ISAR_DIR = "${DEPLOY_DIR}/isar-apt/apt" > REPO_ISAR_DB_DIR = "${DEPLOY_DIR}/isar-apt/db" > +ISARKEYRING = "/etc/apt/trusted.gpg.d/isar.gpg" > > # Base apt repository paths > REPO_BASE_DIR = "${DL_DIR}/base-apt/apt" > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index > dbc3938..2fb5c5b 100644 --- > a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ > b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -23,10 +23,9 > @@ 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_append_gnupg = ",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 +42,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) > @@ -158,6 +156,14 @@ def get_distro_needs_https_support(d, > is_host=False): else: > return "" > > +def get_distro_needs_gpg_support(d): > + apt_keys = d.getVar("HAVE_CUSTOM_APT_KEYS", False) > + if apt_keys: > + return "gnupg" > + return "" This will probably become DISTRO_APT_KEYS ... and in this series HAVE_CUSTOM_APT_KEYS does not even exist yet. Henning > +OVERRIDES_append = ":${@get_distro_needs_gpg_support(d)}" > + > def get_distro_source(d, is_host): > return get_distro_primary_source_entry(d, is_host)[0] > > @@ -171,13 +177,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" > done > fi > } > @@ -221,7 +231,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)}" > @@ -230,7 +239,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)}" > @@ -259,6 +267,16 @@ isar_bootstrap() { > mkdir -p "${ROOTFSDIR}/etc/apt/apt.conf.d" > install -v -m644 "${WORKDIR}/isar-apt.conf" \ > "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar.conf" > + 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 \ > + --keyring ${ISARKEYRING} add "/tmp/$kfn" > + rm "${ROOTFSDIR}/tmp/$kfn" > + done > + fi > > if [ "${@get_distro_suite(d, True)}" = "stretch" ] && > [ "${@get_host_release().split('.')[0]}" -lt "4" ]; then install -v > -m644 "${WORKDIR}/isar-apt-fallback.conf" \