From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6752900179667451904 X-Received: by 2002:a50:ace1:: with SMTP id x88mr20772298edc.132.1572282095801; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:709:: with SMTP id w9ls1221941edx.11.gmail; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqw6H52TeC7rvOWNuoHyZ0YYliMVdAp591W9AsNiTtUvK3I2QOFi1gf0Pet5UTN+qtaLRum5 X-Received: by 2002:aa7:cd68:: with SMTP id ca8mr21304320edb.58.1572282095202; Mon, 28 Oct 2019 10:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572282095; cv=none; d=google.com; s=arc-20160816; b=li88F6hfp0yuYUrVoEBUjCQt9ddfrNNqdoW2LLD2JOl6xiJz0N4bdvwutZPv1Gbk6j SqxBWBSu/EmQQ91y4a2A/WRL1LEKA6knV0LOl5c/5Ojy7o6D6dOfzXQsI7lYo3ncemTX DARsHe7Htz285PwVRZ2l5m5uU9d+zzdUY/uTUlEur7GmgL03RIY3wyikm7q2Qu+hfShg Oegv2i9HvciDUYZaNIAIZFi8WiTDZfSMe72JD3VcicT37uLV1J/opo3MT18HIe/Y8V1/ 2IA0oKSfAI330N90FQhNddctbkJZ6vtnM9m8leRwillvB1DYjSC9j4z1wzRwmZFy09mD 7m8Q== 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=Rm2q6//7Eo+ytcdpRNZykNhg2tSnIwQU6yCCx/LALzE=; b=zlsKuMywf9FtTiovYybHRm+PwGW1A9KmW6Ki5bDwtvmiAb/VffhCxxVXnTt8avMIU7 TILeCI4UAQLhclDfSBPS5jGJNVJxAeaURJw0/Ub8z4v1yOLbEJXmfDqzgobb7f0GqdkW FMRcRNTa3Ay3lepjNgAGpxrsca/EmRqyGuzpeXG7VLF3mwbvkFTCoYk4gjLkkpkUPGOM GKYd+bjtUwQ85ifvY7aKr8knToVcOEVLfwSbndQ8in68DwoBBeV8dMuY2LRO+fyV6N8U Bf+UHlxrnYPXBeoJP2pvn+Z5v9HYvtHWRe+z7w5LEpakjEGU/57a1sfmkxhUdqtzX6XS DubQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id l37si293962edc.2.2019.10.28.10.01.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Oct 2019 10:01:35 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x9SH1YpB019133 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 28 Oct 2019 18:01:34 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.244]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9SH1YPB025390; Mon, 28 Oct 2019 18:01:34 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 05/17] base-apt: do not skip gpg check when it is signed Date: Mon, 28 Oct 2019 18:01:20 +0100 Message-Id: <20191028170132.28072-6-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191028170132.28072-1-henning.schild@siemens.com> References: <20191028170132.28072-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: HvN/16Fw1yTT From: Henning Schild We used to have "trusted=yes" hardcoded even for a signed base-apt. Make that flag depend on whether it is signed and generate that file with two echos, it is simple enough. Signed-off-by: Henning Schild --- .../isar-bootstrap/files/base-apt-sources | 2 -- .../isar-bootstrap/isar-bootstrap.inc | 16 ++++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 meta/recipes-core/isar-bootstrap/files/base-apt-sources diff --git a/meta/recipes-core/isar-bootstrap/files/base-apt-sources b/meta/recipes-core/isar-bootstrap/files/base-apt-sources deleted file mode 100644 index 2a4ab2c..0000000 --- a/meta/recipes-core/isar-bootstrap/files/base-apt-sources +++ /dev/null @@ -1,2 +0,0 @@ -deb [trusted=yes] file:///base-apt/{BASE_DISTRO} {BASE_DISTRO_CODENAME} main -deb-src [trusted=yes] file:///base-apt/{BASE_DISTRO} {BASE_DISTRO_CODENAME} main diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 5aaecd1..cc12378 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -12,8 +12,7 @@ SRC_URI = " \ file://isar-apt.conf \ file://isar-apt-fallback.conf \ file://locale \ - file://chroot-setup.sh \ - file://base-apt-sources" + file://chroot-setup.sh" PV = "1.0" DEBOOTSTRAP ?= "qemu-debootstrap" @@ -21,7 +20,6 @@ ROOTFSDIR = "${WORKDIR}/rootfs" APTPREFS = "${WORKDIR}/apt-preferences" APTSRCS = "${WORKDIR}/apt-sources" APTSRCS_INIT = "${WORKDIR}/apt-sources-init" -BASEAPTSRCS = "${WORKDIR}/base-apt-sources" DISTRO_BOOTSTRAP_KEYFILES = "" THIRD_PARTY_APT_KEYFILES = "" DEPLOY_ISAR_BOOTSTRAP ?= "" @@ -265,13 +263,15 @@ isar_bootstrap() { "${ROOTFSDIR}/etc/apt/preferences.d/bootstrap" mkdir -p "${ROOTFSDIR}/etc/apt/sources.list.d" if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then - sed -e "s#{BASE_DISTRO}#"${BASE_DISTRO}"#g" \ - -e "s#{BASE_DISTRO_CODENAME}#"${BASE_DISTRO_CODENAME}"#g" \ - -i ${BASEAPTSRCS} + line="file:///base-apt/${BASE_DISTRO} ${BASE_DISTRO_CODENAME} main" + if [ -z "${BASE_REPO_KEY}" ]; then + line="[trusted=yes] ${line}" + fi + echo "deb ${line}" > "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" + echo "deb-src ${line}" >> "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" + mkdir -p ${ROOTFSDIR}/base-apt sudo mount --bind ${REPO_BASE_DIR} ${ROOTFSDIR}/base-apt - install -v -m644 "${BASEAPTSRCS}" \ - "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" else install -v -m644 "${APTSRCS}" \ "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" -- 2.23.0