From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6669723628337102848 X-Received: by 2002:ac2:4154:: with SMTP id c20mr2283039lfi.74.1553181448179; Thu, 21 Mar 2019 08:17:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9e18:: with SMTP id e24ls744924ljk.9.gmail; Thu, 21 Mar 2019 08:17:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqx5Zp1J7QgSVPss6UhmR7I07TL0ufMZpLtuB6SMMGPm0gehu7mYxmsdor7g9U0BYLAozaBr X-Received: by 2002:a2e:9c09:: with SMTP id s9mr2306290lji.83.1553181447622; Thu, 21 Mar 2019 08:17:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553181447; cv=none; d=google.com; s=arc-20160816; b=dnUUskEa2ZjlOVziYLj4xWQznXijb+Z3WhYoOyMCnZrYY8wWnUy2fLHAMg+SMkpbXC 1rdz1sFThEQ6G9Hf51PW8Vr7ab0oKk74nOsLLePXa4v1y3G9p1WcP0QYe1NqqeH6PN56 +AylyctGjfpGGingUAtV+oquAJuPWpJkwFAPT8WIavVha/owNPLYOgD4MhOHOWe2rdO3 P0kOuL2LJj5qcPVyEOUldsYdpro1vYWdOgaULX91Yf+Q4tM3gtfRG6uk8jHKPQCcImyU 3tUggAAgWWLl+EK4XYr+t61gcg+HYctK0WuV0GBtf3vmvsrBevKZs1sQp3ZbGlN1lg2s xxDA== 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=tpMuKAAxSw8HcNh3+spwXb+2GBUybiwOvjObxmXFQu8=; b=tkNSVKr/asz+iMlJsKurGtO2M5mtDNTLrqkxUwCpgNt4H0x5+gfcTKW/PqUnLuUhzM 9tyLpwooIRHZPwajEYL1hCjE6GZv41fCOzVbqUdRvpcj8XvkeruTu/2xcVzzAUN3k6Jz sKiNZWg2kSR7Vth3jTJ82foXSAsLwvgzwBXr+h8qOb5EqSfdQYKx2xaP0nKOZI8bZHkh 6sUIK45UhNqEerKwYnNFYAVSZVZTA9vZdkjIGcqGS8KypxAB9DocPWcSXggrPvlAEtGZ cmY0ToZUFPQoo/TxxeoNWvTZ/pW7+Wl1dZt8VYXw4VIlzij7EZxU+kkwPqmaujVNsvl4 XkZw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id y13si174962lfg.4.2019.03.21.08.17.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 08:17:27 -0700 (PDT) Received-SPF: pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of andreas.reichel.ext@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=andreas.reichel.ext@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x2LFHQAm007884 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 21 Mar 2019 16:17:26 +0100 Received: from localhost.localdomain (golem.ppmd.siemens.net [139.25.69.17]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id x2LFHQM8013389; Thu, 21 Mar 2019 16:17:26 +0100 From: "Andreas J. Reichel" To: isar-users@googlegroups.com Cc: Andreas Reichel Subject: [PATCH v8 5/7] If we use a custom keyring debootstrap may fall to https Date: Thu, 21 Mar 2019 16:15:24 +0100 Message-Id: <20190321151526.12001-6-andreas.reichel.ext@siemens.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190321151526.12001-1-andreas.reichel.ext@siemens.com> References: <20190321151526.12001-1-andreas.reichel.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: iInqLuTkuv5q From: Andreas Reichel See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891009 So if we have something in the distro bootstrap keyring, append https-support to OVERRIDES. Furthermore, the conditional append for https-support was missing in qemuamd64-stretch.conf, thus, remove this from all the distros and put it into the isar-bootstrap.inc. Furthermore, packages are comma-, not space-separated. Signed-off-by: Andreas Reichel --- meta-isar/conf/multiconfig/qemuamd64-buster.conf | 1 - meta-isar/conf/multiconfig/qemuamd64-jessie.conf | 1 - meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 8 ++++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf index 63df75c..da90993 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf @@ -18,4 +18,3 @@ QEMU_MACHINE ?= "q35" QEMU_CPU ?= "" QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/local/share/ovmf/OVMF.fd" -DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = " apt-transport-https ca-certificates" diff --git a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf index d1335ff..42c71df 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf @@ -15,4 +15,3 @@ QEMU_MACHINE ?= "pc" QEMU_CPU ?= "" QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##" -DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = " apt-transport-https ca-certificates" diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 835ad52..c6c3cde 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -27,6 +27,7 @@ THIRD_PARTY_APT_KEYFILES = "" DEPLOY_ISAR_BOOTSTRAP ?= "" DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg2" +DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = ",apt-transport-https,ca-certificates" DISTRO_APT_PREMIRRORS ?= "${@ "http://ftp\.(\S+\.)?debian.org file:///${REPO_BASE_DIR} \n" if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) else "" }" @@ -161,6 +162,13 @@ 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.21.0