From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750962531146137600 X-Received: by 2002:aa7:c694:: with SMTP id n20mr5369292edq.87.1573152967038; Thu, 07 Nov 2019 10:56:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:55b:: with SMTP id k27ls886079eja.5.gmail; Thu, 07 Nov 2019 10:56:06 -0800 (PST) X-Google-Smtp-Source: APXvYqwm2THLw6W6C1MzLigDayuU548A7TwrkQ9Iai6tiOoFdSf+mIXgK+UqtsbENN0j6lcNAADD X-Received: by 2002:a17:906:378d:: with SMTP id n13mr4673148ejc.260.1573152966581; Thu, 07 Nov 2019 10:56:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573152966; cv=none; d=google.com; s=arc-20160816; b=c6Wl87EZLYfblYN2zzAxXwaq768JyOgZVoQ7mcalrrF4rVjywqZ+vveiV2tmlOQoEi 2kedyc9s2b3fe7pf8ieBMQfIYTFR1sBYoFnKrkVmv3LUiLUWdI79PqjrPtqXqcbZyzJ7 A/n9SLmhYyUeCg1SyDb6WN29v9U92GEgBzXkMl1hDT7m/ewi9UY2Eqtf0Vp9H1XoF6Mp rMOltwO9c7aaz8jR9uaSEOSoe/WmStvkQdC6Yiiiluxs+ZEdYe7fvAV6ZOYY/9vTGPXk LNxyVM957sgZ603qIQbjcYqL+0CACG+WZ6LRte7oMcy78B2hM2srJ3sPjyZN1jcYJqRK 8vWw== 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=TTwDNmK7JNlJbN4cP/GdRMVwS0PU/NFD4rzmvHFUOkY=; b=vKB3fe4aka9A6jP6se5LO/IMmKtlI8wtGLJGXsDJFN3VqsbWHEDQECPdYLL5dIQHNV wodHLsjW2tj6Za4ukP1O27xULRQCN4IeS2s8kizq5xcKY7z5mM3DnYs2iZJ0sHXyuc51 AJ/yiKuO8jT6NCcSkqrJw5E5hyoV1FzkbLomWmVLIJT3UoUD4ni5Ljqj/PnUqiPo9GX5 JVORsRJaTtdK0rmci3djdX2r4y/a5LcNowO4V6M/ppSelGgBiQWZZcs8weEJV3twwe+/ gLizQADzPdRr/jV3LyMmkMKVMVzdh8f/oxcZfOTUoLQWzH6R1SWkZba3ydcVIrSvg4cH uGsQ== 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 l37si288828edc.2.2019.11.07.10.56.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Nov 2019 10:56:06 -0800 (PST) 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 mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id xA7Iu5Nw021627 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 7 Nov 2019 19:56:06 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.0.32]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id xA7Iu5AE030558; Thu, 7 Nov 2019 19:56:05 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Baurzhan Ismagulov , chombourger@gmail.com, Henning Schild Subject: [PATCHv3 8/9] bootstrap: fix debootstrap gpg issue when base-apt is not signed Date: Thu, 7 Nov 2019 19:56:02 +0100 Message-Id: <20191107185603.9077-9-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191107185603.9077-1-henning.schild@siemens.com> References: <20191107185603.9077-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: C0nnGJwo8MfC From: Henning Schild DISTRO_BOOTSTRAP_KEYRING will not exist if DISTRO_BOOTSTRAP_KEYFILES is empty. So the debootstrap argument will not work. Simplify the logic to depend on the existance of the keyring-file. Signed-off-by: Henning Schild --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 203a557..b506f30 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -231,14 +231,10 @@ isar_bootstrap() { shift done debootstrap_args="--verbose --variant=minbase --include=${DISTRO_BOOTSTRAP_BASE_PACKAGES}" - if [ ! "x${DISTRO_BOOTSTRAP_KEYS}" = "x" ] || \ - [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then + if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then debootstrap_args="$debootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}" - fi - if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then - if [ -z "${BASE_REPO_KEY}" ] ; then - debootstrap_args="$debootstrap_args --no-check-gpg" - fi + else + debootstrap_args="$debootstrap_args --no-check-gpg" fi E="${@ isar_export_proxies(d)}" export IS_HOST debootstrap_args E -- 2.23.0