From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6723128764544319488 X-Received: by 2002:a05:600c:22c6:: with SMTP id 6mr10439342wmg.5.1565350397590; Fri, 09 Aug 2019 04:33:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c1d1:: with SMTP id a17ls157230wmj.1.experimental-gmail; Fri, 09 Aug 2019 04:33:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqwM+m6Ik0P84wt/GPfRspAI5Qy+o93c5HlfUKu6rcWFlfzhGDtqkGIi8t8yJpxtBbWQ7y/3 X-Received: by 2002:a7b:cf21:: with SMTP id m1mr11015773wmg.150.1565350397043; Fri, 09 Aug 2019 04:33:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565350397; cv=none; d=google.com; s=arc-20160816; b=SQJd4q2FldnwOsijtq2JJotww3GxDTCPRDEXcBUYrOVFPfWXGhuVWiEWHGpeVVVZDG dHReEZG/RO/2N3rMnzBChMQoKcTCzXgC0Wq+f8g8u4/THYVPMg4mU1TMU507Ss6Okzz4 LUBKFDOlpgJT1Y6ag1ZJG/sfeccNXe6G5gvaBzQUIzwojVh4Mp+lNuWUWF2WtUuWAglw eFfjhl44LqGzfMxnEWaYF9p5TA2igCSt4gpvhIA2YS1jFOoW/3d1uRfqacGPK67ynezP 32qEz2hR1C1HZxiUHaCVeEbIeFKVr0HIyLYOjoMBWoGtrTr8RJ/9chB8a0XEsEAbfG3L O5zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:cc:to; bh=k2t0DMn1frJPTc++xJchj/4+uk4dskrJI33ja+JK250=; b=Qi28lkN8S/AYLkB1c1MNPcHiQ82jGZb6Aq5+I+pMsgbvs2OkVQzeGrI8U1v1ERgmr+ BzlzeZz1Ene/eBBpF249mhvvvYNSFLHqIdL9jxAu/9vYNN9T0vP9bng3yTjviABtge8J g3wZR8RlMY3bBG31iNoDN4WD4unygTYUIRUEWG7AaVlGBnklmmOIgpaaOU8RL0vA9PJZ m1/DH245sXdpJowpc91MGgsKW1iJ9sVCLQO3t/xNK9apUM+d+PTySV6kEJ+ms0Y9Bx5s YgzRFwEyZqwzhuQuHWYQkAnzWtpEADtKUcyYQ3riPvUTkmzzK89RI4hPtBhk0mhmghvg 9mVw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id p23si235845wma.1.2019.08.09.04.33.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 04:33:17 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x79BXGbu022523 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 9 Aug 2019 13:33:16 +0200 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x79BXG03008537; Fri, 9 Aug 2019 13:33:16 +0200 To: isar-users Cc: Andreas Reichel , Quirin Gylstorff From: Jan Kiszka Subject: [PATCH] isar-bootstrap: Do not require https-support with custom bootstrap keys Message-ID: Date: Fri, 9 Aug 2019 13:33:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: pwykjLe326VH From: Jan Kiszka There is apparently no problem to solve here, custom repos with custom keyrings build fine without https-support by debootstrap. Reported-by: Quirin Gylstorff Signed-off-by: Jan Kiszka --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 7 ------- 1 file changed, 7 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index ff8ab01..45b1608 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -163,13 +163,6 @@ def get_distro_have_https_source(d, is_host=False): return any(source[2].startswith("https://") for source in generate_distro_sources(d, is_host)) def get_distro_needs_https_support(d, is_host=False): - distro_bootstrap_keys = d.getVar("DISTRO_BOOTSTRAP_KEYS", False) - if distro_bootstrap_keys and distro_bootstrap_keys != "": - # debootstrap falls back to https if there is no - # 'reliable' keyring, whatever that means, but it happened - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891009 - return "https-support" - if get_distro_have_https_source(d, is_host): return "https-support" else: -- 2.16.4