From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a50:ab5a:: with SMTP id t26mr12197706edc.380.1584779521119; Sat, 21 Mar 2020 01:32:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:2550:: with SMTP id j16ls4544369ejb.2.gmail; Sat, 21 Mar 2020 01:32:00 -0700 (PDT) X-Google-Smtp-Source: ADFU+vspV+V8Cfdar3+rgT96mCfuJxddQBUZUhA0QTVwKO4B0POVxCjoNoSsR+o2+ih8GlQ6xfJE X-Received: by 2002:a17:907:2501:: with SMTP id y1mr11796964ejl.362.1584779520585; Sat, 21 Mar 2020 01:32:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584779520; cv=none; d=google.com; s=arc-20160816; b=cXAw9yWKFERNm/5CyLAUVwihmTcHFSFytacdJIWxVQ7VOEDklx970t1XZuIFdGdpWH fl1mMvA0tiKRgnHCf/6M24NBKXfY49WBzMYpbhQ6BeOPFVFXMcLY4KPmgKKDSs7rTuS9 5JnTyCQbtldvlvriC9ockPNm8uDhE+KufVQPL8Htfbs5ylw3Mr0AXL+udkzX5Y8eXMVF 0qaMvxyiOn/OC1QE7GbY0cHGnBi55csAPwN+jq9xfqA6VKT+eQgnIwJFBx48GmuU4Hzh 4UfS5uZfYEQB2mk0n4+UmvvQYKTRFUlEUZ5/GmJlJsKbJnXlJr/6Z4Tze/XzLXs4bYLO y2sQ== 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=lf54Vaj49mwVTfnxrLxfiJZr8CAjyPx9kC+2vBeMoAatInanpiQO9p1TE7LLXmi7wp 9O9gIcwYxJHU5MNf1LAl8oy2iPvHe5BRuWAXEOlhHLZ7bnZW9Z6BzbsAcpsXmAdTmTRv N8yhNbRrV9UeUzhqu8GCbNuHJy1bgix4mtiAxsWiDit1JFlUt0oMBO+9RyD8BQCGdESK yH4diAQoyASHZjXpqny/OEHjiHdjC2O++0dqb8nEQJGRorag3lQrgTemFugxJlX2pKxd qVmFEfqr+I3CvGWo9hMlexI+GT3j2b9wd/ULLewr/DIh35DWjFCrkmy6d0wNEtchA5PU q/7g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id x7si468645ejw.0.2020.03.21.01.32.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 01:32:00 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 02L8VxWk001285 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 21 Mar 2020 09:31:59 +0100 Received: from localhost.localdomain ([139.22.32.253]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02L8VuGK021533; Sat, 21 Mar 2020 09:31:59 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv7 06/29] base-apt: do not skip gpg check when it is signed Date: Sat, 21 Mar 2020 09:31:25 +0100 Message-Id: <20200321083148.26160-7-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200321083148.26160-1-henning.schild@siemens.com> References: <20200321083148.26160-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: bSkjj6rU5py1 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