From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6760694881479294976 X-Received: by 2002:a17:906:2518:: with SMTP id i24mr28258782ejb.4.1574096941140; Mon, 18 Nov 2019 09:09:01 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:b857:: with SMTP id ga23ls5838297ejb.6.gmail; Mon, 18 Nov 2019 09:09:00 -0800 (PST) X-Google-Smtp-Source: APXvYqwHjVhUFuKkHGffW76slsJya59inay9XktXjUfV/OzulmIS01v/ZKyjNgi9bG+Pd2r+51lS X-Received: by 2002:a7b:ce90:: with SMTP id q16mr19236wmj.172.1574096940480; Mon, 18 Nov 2019 09:09:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574096940; cv=none; d=google.com; s=arc-20160816; b=WRKH/DbEv7kFC4CNxI+pXGB/82ZgMTgqgT9FhicaFvhdg5b3LQ4GMaiUr8Fw0WMy5o JRcaGOtXLp4Fj8FyoCR6bw/rsQ4wDd0t99O9z+1N24B6Pm+m1jDw5Wy8qcwQ1r0++XYN TKBx+PuqVVhrA98PC0NzxJCTtrpZR6rQUEWXf/+NbLIaOEZX5cO0UEvbrR1hEWV27iLF aXbn5U/UJaiqp2vqCuxr/vFgIx1HsknvlCBaaR6XGg/g/CSzKuozyGXhIxCBAeJ5Kc3y 51iaOxR5OM0yHASLg1BVV2FjryTLRWtJRePg2J96lJuN6nKwHyD5WrjyfqVuKkDy6zy9 +4jg== 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:to:from; bh=xFkPpAAwvWzlGMpE7fNIHiJ+oNZmbbhgv5Bz0meD+uY=; b=kLtMnepjmUmG+XG9VXwHfhnCpUvJkkW6gxThygO9Cj3lrrNWrWU9ri3a7wCXBnutfl iOs0D5IaC8y14TBk7BO0aef5lTtp+cUrlVXeOdNyyZHr98036pX6DLti7nclfnPeD/pu pjpg2wu/GepCLZ4jljB8/Jq4ztO4PfRVqA1TfQmdYc5ottTAK0HTmXsn4lhKrkjKqdvk laOuSw2Lm+w5DHEanVnAQZFtJGyspksn5GBfgZvTTcyAr9Snr4wKsKBScO41Lp02m0zd 892VX29C/NCScgWIhUPtdv8Uq9AOBRRcWeI/tYqAkIgP5mOKWvGCho7ER17gdmv8BWKA U4DA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) smtp.mailfrom=ibr@radix50.net Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id s126si16345wme.1.2019.11.18.09.09.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Nov 2019 09:09:00 -0800 (PST) Received-SPF: neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) smtp.mailfrom=ibr@radix50.net Received: from yssyq.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id xAIH8xWv005166 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 18 Nov 2019 18:08:59 +0100 Received: from yssyq.m.ilbers.de (localhost [127.0.0.1]) by yssyq.m.ilbers.de (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTPS id xAIH8rJ2012925 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Mon, 18 Nov 2019 18:08:53 +0100 Received: (from ibr@localhost) by yssyq.m.ilbers.de (8.15.2/8.15.2/Submit) id xAIH8rxo012924 for isar-users@googlegroups.com; Mon, 18 Nov 2019 18:08:53 +0100 From: Baurzhan Ismagulov To: isar-users@googlegroups.com Subject: [PATCH v3 2/2] bootstrap: really fix gpg bootstrap when not signed Date: Mon, 18 Nov 2019 18:08:50 +0100 Message-Id: <20191118170850.12861-3-ibr@radix50.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191118170850.12861-1-ibr@radix50.net> References: <20191118170850.12861-1-ibr@radix50.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: x+KkA2n0dOiw From: Henning Schild ef5255a8f8006e6f4 fixed one case but broke another. The existence 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 | 3 ++- 1 file changed, 2 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..d614d9a 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -233,7 +233,8 @@ 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" -a -z "${BASE_REPO_KEY}" ]; then debootstrap_args="$debootstrap_args --no-check-gpg" fi E="${@ isar_export_proxies(d)}" -- 2.20.1