[PATCH] isar-bootstrap: Do not require https-support with custom bootstrap keys

[PATCH] isar-bootstrap: Do not require https-support with custom bootstrap keys

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

There is apparently no problem to solve here, custom repos with custom
keyrings build fine without https-support by debootstrap.

Reported-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index ff8ab01..45b1608 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -163,13 +163,6 @@ 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 get_distro_needs_https_support(d, is_host=False):
-    distro_bootstrap_keys = d.getVar("DISTRO_BOOTSTRAP_KEYS", False)
-    if distro_bootstrap_keys and distro_bootstrap_keys != "":
-        # debootstrap falls back to https if there is no
-        # 'reliable' keyring, whatever that means, but it happened
-        # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891009
-        return "https-support"
-
     if get_distro_have_https_source(d, is_host):
         return "https-support"
     else:
-- 
2.16.4

Re: [PATCH] isar-bootstrap: Do not require https-support with custom bootstrap keys

[Baurzhan Ismagulov]

Hello Andreas,

On Fri, Aug 09, 2019 at 01:33:15PM +0200, Jan Kiszka wrote:
> There is apparently no problem to solve here, custom repos with custom
> keyrings build fine without https-support by debootstrap.
...
> --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> @@ -163,13 +163,6 @@ 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 get_distro_needs_https_support(d, is_host=False):
> -    distro_bootstrap_keys = d.getVar("DISTRO_BOOTSTRAP_KEYS", False)
> -    if distro_bootstrap_keys and distro_bootstrap_keys != "":
> -        # debootstrap falls back to https if there is no
> -        # 'reliable' keyring, whatever that means, but it happened
> -        # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891009
> -        return "https-support"
> -

Could you please comment on the motivation? What was your test case?

With kind regards,
Baurzhan.

Re: [PATCH] isar-bootstrap: Do not require https-support with custom bootstrap keys

[Andreas Reichel]

[-- Attachment #1: message --]
[-- Type: text/plain, Size: 1719 bytes --]

On Mon, Aug 12, 2019 at 11:09:52AM +0200, Baurzhan Ismagulov wrote:
> Hello Andreas,
> 
> On Fri, Aug 09, 2019 at 01:33:15PM +0200, Jan Kiszka wrote:
> > There is apparently no problem to solve here, custom repos with custom
> > keyrings build fine without https-support by debootstrap.
> ...
> > --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> > +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> > @@ -163,13 +163,6 @@ 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 get_distro_needs_https_support(d, is_host=False):
> > -    distro_bootstrap_keys = d.getVar("DISTRO_BOOTSTRAP_KEYS", False)
> > -    if distro_bootstrap_keys and distro_bootstrap_keys != "":
> > -        # debootstrap falls back to https if there is no
> > -        # 'reliable' keyring, whatever that means, but it happened
> > -        # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891009
> > -        return "https-support"
> > -
> 
> Could you please comment on the motivation? What was your test case?

I am sorry, I cannot add more than I already wrote as comment. If you
don't understand this bug neither (I didn't), and it does not happen
again, maybe try without this. If it doesn't break then fine.

Kind regards

> 
> With kind regards,
> Baurzhan.

-- 
Andreas Reichel 
Dipl.-Phys. (Univ.) 
Software Consultant

Andreas.Reichel@tngtech.com 
+49-174-3180074

TNG Technology Consulting GmbH, Betastr. 13a, 85774 Unterföhring
Geschäftsführer: Henrik Klagges, Dr. Robert Dahlke, Gerhard Müller
Sitz: Unterföhring * Amtsgericht München * HRB 135082

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] isar-bootstrap: Do not require https-support with custom bootstrap keys

[Henning Schild]

Am Mon, 12 Aug 2019 11:24:30 +0200
schrieb Andreas Reichel <Andreas.Reichel@tngtech.com>:

> On Mon, Aug 12, 2019 at 11:09:52AM +0200, Baurzhan Ismagulov wrote:
> > Hello Andreas,
> > 
> > On Fri, Aug 09, 2019 at 01:33:15PM +0200, Jan Kiszka wrote:  
> > > There is apparently no problem to solve here, custom repos with
> > > custom keyrings build fine without https-support by debootstrap.  
> > ...  
> > > --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> > > +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> > > @@ -163,13 +163,6 @@ 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 get_distro_needs_https_support(d, is_host=False):
> > > -    distro_bootstrap_keys = d.getVar("DISTRO_BOOTSTRAP_KEYS",
> > > False)
> > > -    if distro_bootstrap_keys and distro_bootstrap_keys != "":
> > > -        # debootstrap falls back to https if there is no
> > > -        # 'reliable' keyring, whatever that means, but it
> > > happened
> > > -        #
> > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891009
> > > -        return "https-support"
> > > -  
> > 
> > Could you please comment on the motivation? What was your test
> > case?  
> 
> I am sorry, I cannot add more than I already wrote as comment. If you
> don't understand this bug neither (I didn't), and it does not happen
> again, maybe try without this. If it doesn't break then fine.

This fallback path should only be taken when debootstrap is not called
with a USER_MIRROR. And it seems we do not ever have that case in Isar.
Maybe the problem appeared in intermediate manual steps. Or with some
older version of debootstrap.

Henning

> Kind regards
> 
> > 
> > With kind regards,
> > Baurzhan.  
> 

Re: [PATCH] isar-bootstrap: Do not require https-support with custom bootstrap keys

[Baurzhan Ismagulov]

On Fri, Aug 09, 2019 at 01:33:15PM +0200, Jan Kiszka wrote:
> There is apparently no problem to solve here, custom repos with custom
> keyrings build fine without https-support by debootstrap.

Applied to next, thanks.

With kind regards,
Baurzhan.