From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6665315485614080000 X-Received: by 2002:a1c:8003:: with SMTP id b3mr752227wmd.25.1551889694739; Wed, 06 Mar 2019 08:28:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4c47:: with SMTP id n7ls563455wrt.11.gmail; Wed, 06 Mar 2019 08:28:14 -0800 (PST) X-Google-Smtp-Source: APXvYqw0tl9lpWVG2xVPJuJk6IXLyV80QYbE5lzGKn/n0eQ+NQMzGOvvvtONfCRWxe1BfNpH+CFN X-Received: by 2002:adf:e412:: with SMTP id g18mr328073wrm.9.1551889694336; Wed, 06 Mar 2019 08:28:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551889694; cv=none; d=google.com; s=arc-20160816; b=vEX7Sn8jKIeI/4nhqB4eYpQw4/SZeYMPCUL9mGnd1Yq9+AIAUKKPAe67lHeG1Rm6OQ GfrBQrodciaT//tgdfCy4araYUKKswdKbzyXPBihNKI/OPsdiTR7nyOdTl1WS0LFeeii CBvEmGXleZuXM4DvQpnYwDbYMg/Mz93g57SNtQwQvbPoHa2yRO9Dg4HBs8zk5OMPfl+5 4+G6zleVkBRJYV1EduWsPSC7Fw2V8qNxmissCy12NJh2zM5v0ValrDGukhwxoZfPufw9 MlP+lXwvcWIMBu5usQT99YykRrJt66SjeRy1FMf34cGSt2+mKIZzQczDQq918NL8TH/q 5Xvw== 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:date:subject:cc:to:from; bh=hbaIizaBu9x6xNS791EA43VEuCDKj1rWvfpKUpmbYlk=; b=jpgORDo4MSetLDXz0wzwHyvsarX6vCt6jMWkTmNBCkH9+UWZiuC2HHZCThnt29XPPz +VkTvpt2cvygPTRcGkHmjeuktLdmk4ZxpUqGVt4Jlp6OXGYdtoSP5VlQB8WwoY2DuQSh YkAf4Ye2cXSJN3OdryjgSbXc0ilzex39Unn+GGXmGnyeNs5Ikj0RLEd6w3BalASkFw+c AJnpqs8EXxjp+3YjmA1f4E+3EcHj6Jk6ra7lqeYzN3vzfshy4Pjq2GVnEvcA+0HYBNa2 QQykOVVbcF6Q7SPLW8DSzi82g/3lDNHXqzam9XQRN5iWwKVZ8D0+UGBZ84FAgAq/zpXN /lRw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id 109si79149wrb.0.2019.03.06.08.28.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 08:28:14 -0800 (PST) Received-SPF: pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x26GSDEG026064 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 6 Mar 2019 17:28:13 +0100 Received: from localhost.localdomain (golem.ppmd.siemens.net [139.25.69.17]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id x26GSDvF010079; Wed, 6 Mar 2019 17:28:13 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v3 4/6] Use apt-key to generate apt-keyring Date: Wed, 6 Mar 2019 17:26:16 +0100 Message-Id: <20190306162619.826-5-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190306162619.826-1-andreas.reichel.ext@siemens.com> References: <20190306162619.826-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: HjhuWLJEAmWu 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" 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" 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)}" -- 2.21.0