public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: "Q. Gylstorff" <Quirin.Gylstorff@siemens.com>
To: isar-users@googlegroups.com
Cc: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Subject: [PATCH v3] isar-bootstrap: Remove apt-transport-https
Date: Wed, 11 Mar 2020 14:57:47 +0100	[thread overview]
Message-ID: <20200311135747.25520-1-Quirin.Gylstorff@siemens.com> (raw)
In-Reply-To: <20200310230935.683dd29d@md1za8fc.ad001.siemens.net>

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

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 <quirin.gylstorff@siemens.com>
---
 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


  parent reply	other threads:[~2020-03-11 13:57 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-28 11:29 [PATCH] " Q. Gylstorff
2020-03-10 14:02 ` Henning Schild
2020-03-10 16:07   ` [PATCH v2] " Q. Gylstorff
2020-03-10 22:09     ` Henning Schild
2020-03-11 13:51       ` Gylstorff Quirin
2020-03-11 13:51       ` Gylstorff Quirin
2020-03-11 13:57       ` Q. Gylstorff [this message]
2020-04-06  5:57         ` [PATCH v3] " Baurzhan Ismagulov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200311135747.25520-1-Quirin.Gylstorff@siemens.com \
    --to=quirin.gylstorff@siemens.com \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox