From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750962531146137600 X-Received: by 2002:ac2:4650:: with SMTP id s16mr23460884lfo.32.1571830951967; Wed, 23 Oct 2019 04:42:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:251:: with SMTP id b17ls184498lfo.3.gmail; Wed, 23 Oct 2019 04:42:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqwyEqCR23zREhAkFkVBX2/TDGGj8xzKz7EZNVKtUQRxvWt9AQim7jNSEPd/J8BPUW7UBa5J X-Received: by 2002:a19:1ce:: with SMTP id 197mr5040466lfb.16.1571830951484; Wed, 23 Oct 2019 04:42:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571830951; cv=none; d=google.com; s=arc-20160816; b=T+wcmpCp0NH3HyAXqzCMmXFwWwKphTbwFESS7o+mIfvaNuSb0409u4HLBD54Q1Kwnx BpGcOAqYtfvTgUsG0mgESZstLjXdcm7B2baZmX+eN4aodoHbBr3gEJH3TgZCiexCJrSM LlRyNFBBfA2lqGHsXbRYSXQs4+lXXf7jFvG6tCqzq53Zg3IZorRXu3f+8hOPQLCoXXOF jESnct5WItOMlo0ldgTWdVhuShAutR2o0pp/E75mvjmh3WUBTivcg4yx05bzAkEFHuP9 3mSwvfaMet/bwP1utJv42AlxsYBaUVaUN0+V+abgRA8aAgckFZLsbKrY3/2xSaa+HOil hekQ== 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=wit84GD1ztvmRGjkAcoCZ5UpMcR5DpTemOwwUfa+LWY=; b=JTv6mAqJO8EBoRcasypTeUAS5VqPcceh3R+N276Qzj0IUXPmoQVIAufYVMZHtxIIsr 65aK5x7Crj2ygLjuxLYozemJHWWYtUYoxColnB56dE9/RgJgmojpL8cGfyyN0YX7DP5p CZ2dcK3VSx6hnf+Y/K8wYg0imK8Tv3TEEMFGGQTH9Ha5+/zE7t3+sf3HPGWDGX54Yw6Y iL5Mdj4MdC7VUv2UZacpNCCObN23u9GQreBGXlUQXdIUct2uHikTFZY8BgFzJ1hgBhXM ZN7U+4uqVNFY0I9bdDiKxgJYeZwXBfgzKfiT6SvW4c9JqMcbekUXzM9INn0csy60uma6 00hw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id k2si842094ljj.1.2019.10.23.04.42.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 04:42:31 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x9NBgURR002301 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 13:42:30 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.8]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9NBgUEL024249; Wed, 23 Oct 2019 13:42:30 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCHv2 9/9] bootstrap: fix debootstrap gpg issue when base-apt is not signed Date: Wed, 23 Oct 2019 13:42:27 +0200 Message-Id: <20191023114227.31308-10-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191023114227.31308-1-henning.schild@siemens.com> References: <20191023114227.31308-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 4fjLnUt6tSQd 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 bd35f72..5aaecd1 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="${@ bb.build.exec_func('isar_export_proxies', d)}" export IS_HOST debootstrap_args E -- 2.23.0