From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a19:760c:: with SMTP id c12mr129367lff.48.1583877402905; Tue, 10 Mar 2020 14:56:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3188:: with SMTP id i8ls2035617lfe.4.gmail; Tue, 10 Mar 2020 14:56:42 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvUiwQQcI+9ACKYX7G0xjoRtR9g3acrYVakE6MZ7kPVy/gNp5ikZK3ft+lNrmOdkNkqNIAF X-Received: by 2002:a19:956:: with SMTP id 83mr103720lfj.145.1583877402219; Tue, 10 Mar 2020 14:56:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583877402; cv=none; d=google.com; s=arc-20160816; b=0XVSwR8XqGkK8N1wxHUb+PZtgXbwZum5AkE2uW6F7oV4g9Dsrm9YXCSstWbUGg9BDo fAsl26l7Sq43PsHjiIUPVOZKaHpD7bAYVd/4ynJ11t4Vs5tSRqc/cN+7eRNMtimABVoZ sDZ3Vx21uFgBBNlwzJvtnljBI8Xjj8kyCK7XhvQf6yqpvX/obvLQcChM005rn8m0XbiW 4pi/jMUifmPVcebJfGpgk2JgcBKKXY/Xp3isw3/iAvW7PW8RsQJ8T7GxOczXYTBNM7D+ /Y1jKcMtiT7uKI/E9qpJz4IJHdtd9c6ko+ZyZzf38BLxnVXuFs5MLOE5uc4nOLG+WaZA H03A== 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=GH2V68H7W56YVqhooHhlX18hwRtWB3O3SouIYDmWy60DTniSUxT5tDZjEM5ElOl7c5 HvRoCPjiJgKiFcU0kHRH4mOUYxCukHm5uAVDm1jPAEtRo8B7S0lJClsCifUapHz8OCU3 Pz1bclL2q03LLy7JfpajkClpHdsSyq3yOGxhlRTxc+dfEv8FGnQpBBaOALYChu/WEZNG c3fVLYDirpCBWIFtT2mhSPLuLsGW9Sv+PJFYp6IrmT26f2dfdgKOg3aPVNDjfiwGASxF BxF4uhpA3JxQ17yxs5R4/TtkgI0F6TMFQsgFeHY03hn1n9HDAFDS4E3ZBtMts/hl6ZLe 0Gow== 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 t3si9736lfq.5.2020.03.10.14.56.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2020 14:56:42 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 02ALuemO005778 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Mar 2020 22:56:40 +0100 Received: from localhost.localdomain ([139.22.36.172]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02ALub5o026985; Tue, 10 Mar 2020 22:56:40 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv5 06/29] base-apt: do not skip gpg check when it is signed Date: Tue, 10 Mar 2020 22:56:08 +0100 Message-Id: <20200310215631.24859-7-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200310215631.24859-1-henning.schild@siemens.com> References: <20200310215631.24859-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 2CPuLII8eihQ 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