From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6798458144026525696 X-Received: by 2002:adf:eb48:: with SMTP id u8mr4544130wrn.283.1583934717047; Wed, 11 Mar 2020 06:51:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4441:: with SMTP id x1ls1071087wrr.4.gmail; Wed, 11 Mar 2020 06:51:56 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtmT8rVkvaSmCFkSjFhwhfjdKOZEjNL2c0MLn6SzZHb6DSfHLJ6iV4JgHWnWHl1tmuRdyzu X-Received: by 2002:adf:a4d2:: with SMTP id h18mr4756429wrb.90.1583934716431; Wed, 11 Mar 2020 06:51:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583934716; cv=none; d=google.com; s=arc-20160816; b=qPSbipCUjEYpI9zVQzNMNKZx7zu9JMfB0Meq2lFt49IycCvoGjxqv12/ZN0xn6tnu5 1H82FHYKC/jZeYPd7clYy6Ztwgj60LYruUy9EQV7M2e76r3w8hkLkjsduUHHBfMWxn38 UcCxXSDa+K+PdgBke/loMPxaeviVoLgM+DydveDnpHZqlswJicq7tbuJ2KF+bg/vuUW0 fdmWSsiKaDnV3mGJXVk0X9XNPbSv16k+bJ6noOWtbML2frT8eJJaMcHvzg6wFrt6ohP2 K2LhM0mmKgsp6LTUnDqxVhBJCr5ws7qdlwaSNTUoBfI7Fv/fSo2s4nlZaJ/+90XHQCDB Ly5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=0In6qVnAbWEMsPyKzqFheFi344Tlwgr9mDIlgwYizjE=; b=rwPzN2uHZUzgF7IVJ7X33q3If1/KHTKlouFjHLlnswBdr2SeSVOTCiJ5Ss7ujbryB1 hduG8uV/l8CZq2NLgxsD0qFNGyoOJ1xw6+cHDUQiepDVgYDr+fFJH2lcs+5GVTY9Al3c RmkO8Lc96KCWw50P6Rq2igAq44FJOqwDdDfIx4WjiPKi26E9SbOnBP4R7b/8bjb/AOwv 3khy7FeyJu/fZVBnXdBy2uw9RyDFPIB/xdHzlU7JDujDHWBF5k4VPSNH9zyDBX2izT9l f6Ti/ySlAfslSOhBImMo6aXpuVvSrJHEcQFYjc2UBeiQpL73x5x9cP+NrE63ZYXbV0CP +E8g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id f1si68073wme.1.2020.03.11.06.51.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Mar 2020 06:51:56 -0700 (PDT) Received-SPF: pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of quirin.gylstorff@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 02BDpue2023759 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 11 Mar 2020 14:51:56 +0100 Received: from [167.87.45.234] ([167.87.45.234]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 02BDpt8t007037; Wed, 11 Mar 2020 14:51:55 +0100 Subject: Re: [PATCH v2] isar-bootstrap: Remove apt-transport-https To: Henning Schild Cc: isar-users@googlegroups.com References: <20200310150204.0f64916b@md1za8fc.ad001.siemens.net> <20200310160704.7974-1-Quirin.Gylstorff@siemens.com> <20200310230935.683dd29d@md1za8fc.ad001.siemens.net> From: Gylstorff Quirin Message-ID: Date: Wed, 11 Mar 2020 14:51:55 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200310230935.683dd29d@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 6xjqDZlyNLGi On 3/10/20 11:09 PM, Henning Schild wrote: > On Tue, 10 Mar 2020 17:07:04 +0100 > "Q. Gylstorff" wrote: > >> 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" > > I think that commit comment might be wrong now. oops - I sent a new one. > >> 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" >> + > > 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.