From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6759579508225867776 X-Received: by 2002:a1c:a404:: with SMTP id n4mr15243263wme.135.1573837247394; Fri, 15 Nov 2019 09:00:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:6085:: with SMTP id u127ls16219430wmb.5.gmail; Fri, 15 Nov 2019 09:00:46 -0800 (PST) X-Google-Smtp-Source: APXvYqyK0UUNZcz2RfqA5uNLfbTUkJZDL4/UgTmJFGP/DLTEH+mSwhNWJE7ErxiKQswy7GQ1mWWu X-Received: by 2002:a1c:28d4:: with SMTP id o203mr16149589wmo.147.1573837246582; Fri, 15 Nov 2019 09:00:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573837246; cv=none; d=google.com; s=arc-20160816; b=VbucuwjuYsELuPrc7lc35Cb57ifDczq3yrhwEAWb78bKT5d7CuxJWIjm/Nub4bIRit mKrMyrzR/b3yCH0MeXs3NGeIuOY03cEpLv+92nOu83w+Fdxfdq5WrUgT3tywN4K1njlZ /0pTpikH+Br7K+X8armXlEOkGU4WtWheHJbZ3sEYnuZg2AgNLOjKvlmetWzYyurWGETU tmlpLA/BQZPP9X+isaB8VupFYGu2L7mDHEh4scyUnwzxnMwEzWWXO3vzlcO/whjAJy8q 5gdhTMRlFGEwT4wdsK+eRhHGkFiCcmlvPIXW0x1GtKaOYsMqZyK5E8AxsdU1xKIzdxQj boGw== 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=HWWm2n4qaFRB3UX8g4Afg+shMUT1q192O4TL8OJABqU=; b=Vbz1pqT0BPA2QZIHx+3nvDJlPDzJwbfJKcu25muZIGYVtTcq8E1PJBNXVwXJ8GQ4XB xcmIpUBY/C17C0Z3i8SyYnGgzOxgRylU6T9QWhmviD6/JSNlZsSb+UNgqbwCjyUbZbrn xymYtF4zgaS6R/TScGh6a2dAs01b1/kwuWND5NzkoyzmKCIpheAZeIShV0f4PRZMMLJ/ noBg3AGd8PwYjEM1W+9pyAjmd+3S4XCpOsgWWbkVGUkCDJ55QUOW9P0LllcLoyWWec8k Jjoe+7qeNZULYOobKeU0/Bm+I2500kJJLLAbkJQuvFPgIBsG0KTKceaZG7UVLeGpWduZ zjJA== 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 h2si578722wre.0.2019.11.15.09.00.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Nov 2019 09:00:46 -0800 (PST) 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 xAFH0kau025287 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 15 Nov 2019 18:00:46 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.65]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xAFH0jQr016955; Fri, 15 Nov 2019 18:00:46 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Henning Schild Subject: [PATCH 2/2] bootstrap: really fix gpg bootstrap when not signed Date: Fri, 15 Nov 2019 18:00:44 +0100 Message-Id: <20191115170044.26683-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191115170044.26683-1-henning.schild@siemens.com> References: <20191115170044.26683-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: jHGZD6GtscpA From: Henning Schild ef5255a8f8006e6f4 fixed one case but broke another. The existance of the key file does not mean that it actually contains our bootstrap keys. It contains keys from multiple sources. Signed-off-by: Henning Schild --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index b506f30..7353abf 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -233,7 +233,9 @@ isar_bootstrap() { debootstrap_args="--verbose --variant=minbase --include=${DISTRO_BOOTSTRAP_BASE_PACKAGES}" if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then debootstrap_args="$debootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}" - else + fi + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ] && [ -z "${BASE_REPO_KEY}" ] + then debootstrap_args="$debootstrap_args --no-check-gpg" fi E="${@ isar_export_proxies(d)}" -- 2.23.0