From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6798458144026525696 X-Received: by 2002:a2e:9048:: with SMTP id n8mr2598679ljg.205.1583856438868; Tue, 10 Mar 2020 09:07:18 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:b24a:: with SMTP id n10ls2558935ljm.5.gmail; Tue, 10 Mar 2020 09:07:18 -0700 (PDT) X-Google-Smtp-Source: ADFU+vv1T2qmck3X9foNZmJ9gdrQyNZjlmO/mjrAi39lHGwPrnkeB2b1CPvOjobzF6ueYoEU6eNn X-Received: by 2002:a05:651c:1065:: with SMTP id y5mr11741031ljm.121.1583856438233; Tue, 10 Mar 2020 09:07:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583856438; cv=none; d=google.com; s=arc-20160816; b=bkPoOSllr1xI+ehD0SV1l5EqchN3QnBOO/EHTsreUwC7ZN5iV3KDERAtu2Nm7AGXWv SblUPxRrIZQSNk1lzT3IroxTyRJ6JI1bcA7EfeIa3tnbKlI+LFjnP+WBfQI5bseBYGUU yFRVdvCqdkq/xAyxtc9QPX+1JTSRJMqfDsiSwDj43XQONPaA/YPrGh/6ihXLg+SJ6rSN TO86Sxi6aKIZCgMq8gzfM7kRjOoS6Ds9MkqVGVBeUZfg7VuJWvgBe6UAp3XDk6ir5hM5 aO6Vgg2uY0c4T8ZInerRc5qyXwld9w4yuGB5YYUYu73ggozpwj/xoGiRZbHjlfnPRaiJ 28PA== 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=lkCKs5w59nHCrU5IKooVH5GEMABw2Oc7ZRqNs4WYg2g=; b=z5h/81KE5asN3NXQ9yiE8zmDBUdWulOCKBbCV8j/GEzQQ/KsCR0pBzI+IG3nAZHQMZ r0Xna4j8G7fooWmlXDRxRj8zP54JVhBN9b9b/TQ3x4hXwdayb1Q+8NrrmnmgJPdDuUwX R5v4jqB4eLZFyzXtmRwueQnblpovqFOP2UlifG5YqoAALg34mKIVc40IqZnaQwkKg3O+ TW6b6Syc+mQKYsHlwqiZ7TgtQey0QSKp34HTQt4t7EH3/RckAlTaa+SpjJr3kkUmbY6W KoGPO1bOcZge/AtezUZ+x9Imrz78EDdqb6mrOwwxmiObIcIdBVjhRGJXOcF5EizmIY4f eLDw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id s8si782553ljg.0.2020.03.10.09.07.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2020 09:07:18 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@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 quirin.gylstorff@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 02AG7HVM024132 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 10 Mar 2020 17:07:17 +0100 Received: from md2dvrtc.ad001.siemens.net ([139.25.68.236]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 02AG7HME010000; Tue, 10 Mar 2020 17:07:17 +0100 From: "Q. Gylstorff" To: isar-users@googlegroups.com Cc: Quirin Gylstorff , Henning Schild Subject: [PATCH v2] isar-bootstrap: Remove apt-transport-https Date: Tue, 10 Mar 2020 17:07:04 +0100 Message-Id: <20200310160704.7974-1-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200310150204.0f64916b@md1za8fc.ad001.siemens.net> References: <20200310150204.0f64916b@md1za8fc.ad001.siemens.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: ITxpGQWppLL5 From: Quirin Gylstorff Since apt 1.5 apt-transport-https is part of apt. This package is no longer needed. For distribution < buster append the Distro configuration with: DISTRO_BOOTSTRAP_BASE_PACKAGES_append = ",apt-transport-https" Signed-off-by: Quirin Gylstorff --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 16b4395..1aea973 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -27,7 +27,7 @@ THIRD_PARTY_APT_KEYFILES = "" DEPLOY_ISAR_BOOTSTRAP ?= "" DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg" -DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = ",apt-transport-https,ca-certificates" +DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = "${@https_support(d)}" HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list" python () { @@ -161,6 +161,12 @@ def get_distro_primary_source_entry(d, is_host=False): 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 https_support(d, is_host=False): + if get_distro_suite(d, is_host) == "stretch": + return ",apt-transport-https,ca-certificates" + else: + return ",ca-certificates" + def get_distro_needs_https_support(d, is_host=False): if get_distro_have_https_source(d, is_host): return "https-support" -- 2.20.1