Re: [PATCH v2] isar-bootstrap: Remove apt-transport-https

[Gylstorff Quirin <quirin.gylstorff@siemens.com>]

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.