* [PATCH] isar-bootstrap: Remove apt-transport-https @ 2020-02-28 11:29 Q. Gylstorff 2020-03-10 14:02 ` Henning Schild 0 siblings, 1 reply; 8+ messages in thread From: Q. Gylstorff @ 2020-02-28 11:29 UTC (permalink / raw) To: isar-users; +Cc: Quirin Gylstorff, Jan Kiszka From: Quirin Gylstorff <quirin.gylstorff@siemens.com> Since apt 1.5 apt-transport-https is part of apt[1]. This package is no longer needed. For https transport in a distribution older than Debian 10 (buster) append the Distro configuration with: DISTRO_BOOTSTRAP_BASE_PACKAGES_append = ",apt-transport-https" [1]: https://packages.debian.org/buster/apt-transport-https Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 16b4395..d1fbb81 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 = ",ca-certificates" HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list" python () { -- 2.20.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] isar-bootstrap: Remove apt-transport-https 2020-02-28 11:29 [PATCH] isar-bootstrap: Remove apt-transport-https Q. Gylstorff @ 2020-03-10 14:02 ` Henning Schild 2020-03-10 16:07 ` [PATCH v2] " Q. Gylstorff 0 siblings, 1 reply; 8+ messages in thread From: Henning Schild @ 2020-03-10 14:02 UTC (permalink / raw) To: [ext] Q. Gylstorff; +Cc: isar-users, Jan Kiszka Good catch but a serious user interface break you are suggesting here. I would suggest a backward compatible solution. And if you do not find one, a big fat entry in RECIPE-API-CHANGELOG.md Henning On Fri, 28 Feb 2020 12:29:43 +0100 "[ext] Q. Gylstorff" <Quirin.Gylstorff@siemens.com> wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > Since apt 1.5 apt-transport-https is part of apt[1]. This > package is no longer needed. For https transport in > a distribution older than Debian 10 (buster) > append the Distro configuration with: > DISTRO_BOOTSTRAP_BASE_PACKAGES_append = ",apt-transport-https" > > [1]: https://packages.debian.org/buster/apt-transport-https > > Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com> > --- > meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index > 16b4395..d1fbb81 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 = > ",ca-certificates" HOST_DISTRO_APT_SOURCES += > "conf/distro/${HOST_DISTRO}.list" python () { ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] isar-bootstrap: Remove apt-transport-https 2020-03-10 14:02 ` Henning Schild @ 2020-03-10 16:07 ` Q. Gylstorff 2020-03-10 22:09 ` Henning Schild 0 siblings, 1 reply; 8+ messages in thread From: Q. Gylstorff @ 2020-03-10 16:07 UTC (permalink / raw) To: isar-users; +Cc: Quirin Gylstorff, Henning Schild From: Quirin Gylstorff <quirin.gylstorff@siemens.com> 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 <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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] isar-bootstrap: Remove apt-transport-https 2020-03-10 16:07 ` [PATCH v2] " Q. Gylstorff @ 2020-03-10 22:09 ` Henning Schild 2020-03-11 13:51 ` Gylstorff Quirin ` (2 more replies) 0 siblings, 3 replies; 8+ messages in thread From: Henning Schild @ 2020-03-10 22:09 UTC (permalink / raw) To: Q. Gylstorff; +Cc: isar-users On Tue, 10 Mar 2020 17:07:04 +0100 "Q. Gylstorff" <Quirin.Gylstorff@siemens.com> wrote: > From: Quirin Gylstorff <quirin.gylstorff@siemens.com> > > 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" I think that commit comment might be wrong now. > 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" > + That works, given "stretch" is the only Debian/Raspbian suite that still needs that package. So it is good to merge. I still like the idea of eventually supporting Ubuntu/Mint or other Debian-based distros. Matching on a Debian name would be wrong in that context but is fine here. Can we find the difference based on the version instead of a suite-name? It is not too relevant, but that spot might be hard to find if we ever support other distros. Henning > def get_distro_needs_https_support(d, is_host=False): > if get_distro_have_https_source(d, is_host): > return "https-support" ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] isar-bootstrap: Remove apt-transport-https 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 ` [PATCH v3] " Q. Gylstorff 2 siblings, 0 replies; 8+ messages in thread From: Gylstorff Quirin @ 2020-03-11 13:51 UTC (permalink / raw) To: Henning Schild; +Cc: isar-users On 3/10/20 11:09 PM, Henning Schild wrote: > I still like the idea of eventually supporting Ubuntu/Mint or other > Debian-based distros. Matching on a Debian name would be wrong in that > context but is fine here. Can we find the difference based on the > version instead of a suite-name? > It is not too relevant, but that spot might be hard to find if we ever > support other distros. The code name is in this case the easiest way out as we already need it for bootstraping with debootstrap. With a version number we only move that problem as it is it could happen that more than one Debian based distro reuse a already existing version number. Most distros have a code name and it is currently unique. Quirin ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] isar-bootstrap: Remove apt-transport-https 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 ` [PATCH v3] " Q. Gylstorff 2 siblings, 0 replies; 8+ messages in thread From: Gylstorff Quirin @ 2020-03-11 13:51 UTC (permalink / raw) To: Henning Schild; +Cc: isar-users On 3/10/20 11:09 PM, Henning Schild wrote: > On Tue, 10 Mar 2020 17:07:04 +0100 > "Q. Gylstorff" <Quirin.Gylstorff@siemens.com> wrote: > >> From: Quirin Gylstorff <quirin.gylstorff@siemens.com> >> >> 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" > > I think that commit comment might be wrong now. oops - I sent a new one. > >> 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" >> + > > That works, given "stretch" is the only Debian/Raspbian suite that still > needs that package. So it is good to merge. > > I still like the idea of eventually supporting Ubuntu/Mint or other > Debian-based distros. Matching on a Debian name would be wrong in that > context but is fine here. Can we find the difference based on the > version instead of a suite-name? > It is not too relevant, but that spot might be hard to find if we ever > support other distros. > > Henning > >> def get_distro_needs_https_support(d, is_host=False): >> if get_distro_have_https_source(d, is_host): >> return "https-support" > -- Quirin Gylstorff Siemens AG Corporate Technology Research in Digitalization and Automation Smart Embedded Systems CT RDA IOT SES-DE Otto-Hahn-Ring 6 81739 Muenchen, Germany Mobile: +49 173 3746683 mailto:quirin.gylstorff@siemens.com www.siemens.com/ingenuityforlife Siemens Aktiengesellschaft: Chairman of the Supervisory Board: Jim Hagemann Snabe; Managing Board: Joe Kaeser, Chairman, President and Chief Executive Officer; Roland Busch, Lisa Davis, Klaus Helmrich, Cedrik Neike, Michael Sen, Ralf P. Thomas; Registered offices: Berlin and Munich, Germany; Commercial registries: Berlin Charlottenburg, HRB 12300, Munich, HRB 6684; WEEE-Reg.-No. DE 23691322 Important notice: This e-mail and any attachment thereof contain corporate proprietary information. If you have received it by mistake, please notify us immediately by reply e-mail and delete this e-mail and its attachments from your system. Thank you. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3] isar-bootstrap: Remove apt-transport-https 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 2020-04-06 5:57 ` Baurzhan Ismagulov 2 siblings, 1 reply; 8+ messages in thread From: Q. Gylstorff @ 2020-03-11 13:57 UTC (permalink / raw) To: isar-users; +Cc: Quirin Gylstorff 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3] isar-bootstrap: Remove apt-transport-https 2020-03-11 13:57 ` [PATCH v3] " Q. Gylstorff @ 2020-04-06 5:57 ` Baurzhan Ismagulov 0 siblings, 0 replies; 8+ messages in thread From: Baurzhan Ismagulov @ 2020-04-06 5:57 UTC (permalink / raw) To: isar-users On Wed, Mar 11, 2020 at 02:57:47PM +0100, Q. Gylstorff wrote: > 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. Thanks, applied to next so that it works today. I also think we should find a way not to depend on the Debian-specific release name in the code. With kind regards, Baurzhan. ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-04-06 5:57 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-02-28 11:29 [PATCH] isar-bootstrap: Remove apt-transport-https 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 ` [PATCH v3] " Q. Gylstorff 2020-04-06 5:57 ` Baurzhan Ismagulov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox