From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a50:e046:: with SMTP id g6mr556551edl.172.1580481004115; Fri, 31 Jan 2020 06:30:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:c98d:: with SMTP id c13ls3040533edt.0.gmail; Fri, 31 Jan 2020 06:30:03 -0800 (PST) X-Google-Smtp-Source: APXvYqx9FKcYdgxtz+evX65pPmj5chvh3bOwnv2f67zC9eTnZdgMfLK37Slz0E1Watasbbatsc5M X-Received: by 2002:a05:6402:134d:: with SMTP id y13mr530679edw.39.1580481003272; Fri, 31 Jan 2020 06:30:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580481003; cv=none; d=google.com; s=arc-20160816; b=YxzFxGR2lR2cQT4gVXqJcdps2keqySmHEU4WOGlQnUHQaOxLyWWwmKn18+Go18Lzbu +GX0qNWCsy4Ne8fK+tcvZrSA+7Jj0SI7PSEBgyXfIYZ89odYnWF6JcKct39c1KYJLSA/ YQ43a78AoGmzN7HuU5ZzqT1ulC8MsvWlI7R4eqP+Jkx8SY/J3yN/NTExfXQjLehsAWAo AukHUx08KAEuuMWBc44UDad4C6nUZuawmLsOIrj3AysndJUFQop8RodWtj34VRd0C07X nrEgi70eE2hKxu6v3cNixXDMVsHnU4z/lT4/uQBFcjLoGI11K0bWg5r4CIvYEaEbBoMX HM/w== 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=w497KFjzewubWRFHEoek92nD8QF3x5jW/BENU5q/ooM=; b=NfBYzFF1vVv9I647FFSgbIKmTz41z29vfxpdT4Nuy8pE5FPnEHANdg9z1wFdv3OpuU 1iVPFRAzhBqvz6GphMQnZ37m2kVKymtgJYsA055lqJIUAPywk0Udlzo6QVP5cY5bYOl7 pAoKgPcp4XwgV9300QyKChkHFAvjFqpL0JckwSxzO8DN3r8xIR94EczlLihONPFFVQFz uR+HKavgLRbgMIj+sM0KIslb2SjWSg36ZeWpXDFWd42kAHxS9mJIEFfcd8Pm5QDtdp1n 0QARMLvPbocQmB5RTWyyKJxSiYu7/ZvvSCBqflGigB2xIUEUwXu31PDYW7XoFaLte7UD OSSQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id z20si362570ejx.1.2020.01.31.06.30.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jan 2020 06:30:03 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 00VEU2e2008675 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jan 2020 15:30:02 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.68.229]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00VEU1RK030231; Fri, 31 Jan 2020 15:30:02 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Henning Schild Subject: [PATCHv4 06/26] base-apt: do not skip gpg check when it is signed Date: Fri, 31 Jan 2020 15:29:40 +0100 Message-Id: <20200131143000.14873-7-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200131143000.14873-1-henning.schild@siemens.com> References: <20200131143000.14873-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: wxg/6SO1cfez 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 2a4ab2c4..00000000 --- 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 16b4395b..cf3df407 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 ?= "" @@ -266,13 +264,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 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.24.1