From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6798458144026525696 X-Received: by 2002:ac2:4307:: with SMTP id l7mr2225861lfh.37.1583935069512; Wed, 11 Mar 2020 06:57:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:95c8:: with SMTP id y8ls387934ljh.2.gmail; Wed, 11 Mar 2020 06:57:48 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvDp5VJD0fQ8o/hjZsTf7JIIE6fUvkeVDtNsoTRXkHmfSdtigousb5jUvN0nRS0s9w3iHzD X-Received: by 2002:a2e:3210:: with SMTP id y16mr2244476ljy.49.1583935068761; Wed, 11 Mar 2020 06:57:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583935068; cv=none; d=google.com; s=arc-20160816; b=zQzjV7s/GoOGaY5PVAMJUcs1QphFDitjqnRU77Q/1RqtdYZRzK0Pm41cfYiNffLpCR r214MFY+bIxgUNtDreWovKCt4xMV7KCHno3snUtnPpc+kDv33s8AZRzamh6XcpCIjeUJ Hiek6EodO7Ws/mvF/t60lJkr9gsYcYrFKf9N5tofmyoxhMjtHjhMY5prqnKAh04zkurU 8k/mVSDwb0xOqBU2yeDUe+EerqNsuaONcXy/pkPK1wqC8daqDSacOG3HzjWZZxayItQs N0lP1e5je0gWfa0LW82mPcF60ZKRxy1pHfPchMZ3YCYQmYYIuDwnPylgBi0nCzxjmcz4 SLhA== 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=PXP4QJ5dPwpD44Hhp0Rh0d/OrZYI8zItHvxDyhRmG7c=; b=LUFC+wuAg90GwbOQLD6bmCmzm58s5j1KG1GIJCYepAnZYuLXpf3E1X5yTjFaPTgLKZ 9qrdJSYp64YWL8vJrPbwy5lmH7v71HbAla/m72mpwNjhif8CAeiMzqMdvYF19QYSVeLF cDRGWUeosjzWnsv/pkv8fkpzLL8S3G8HPXyvSjfQbN40yQDtJCMTjLNIsA7XZhvxaqX8 gtJPn/3laNCqsTfkgO+QJ8qf0mC/RTwCKm6xeH+rtLde8s20uuKzG+s855KoY+WdyqZq EJMB9aIs3We+dSGPos8ld9/46I56VB9EsLPaRs9b0PWtrvo5Ce4bhmlzdwOldhMtiGe7 GjkA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id j11si90340lfe.4.2020.03.11.06.57.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Mar 2020 06:57:48 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@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 quirin.gylstorff@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=Quirin.Gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 02BDvmGN022017 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 11 Mar 2020 14:57:48 +0100 Received: from md2dvrtc.fritz.box ([167.87.45.234]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02BDvlAG012115; Wed, 11 Mar 2020 14:57:47 +0100 From: "Q. Gylstorff" To: isar-users@googlegroups.com Cc: Quirin Gylstorff Subject: [PATCH v3] isar-bootstrap: Remove apt-transport-https Date: Wed, 11 Mar 2020 14:57:47 +0100 Message-Id: <20200311135747.25520-1-Quirin.Gylstorff@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200310230935.683dd29d@md1za8fc.ad001.siemens.net> References: <20200310230935.683dd29d@md1za8fc.ad001.siemens.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: xNgzG9DdARs/ From: Quirin Gylstorff Since apt 1.5 apt-transport-https is part of apt. This package is no longer needed. If Debian stretch is used as distro base re-add 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