[elbe-devel] [PATCH 4/5] rfs: convert repo.pub to a keyring and use that

[Torben Hohn]

On Fri, Jan 08, 2021 at 12:09:54PM +0100, Bastian Germann wrote:
> Am 17.12.20 um 14:32 schrieb Torben Hohn:
> > it should probably not reside in the RFS root.
> > maybe /etc/apt/trusted.gpg.d/elbe-cdrom.gpg ?
> 
> Hm.. Why then change the filename beforehand (elbe-keyring.gpg) and not
> fixing its creation?

I am not sure i understand what you mean.
But i guess, that PATCH 1 and 4 should be folded.

Is that ok with you ?

Are you ok with putting the keyring to
/etc/apt/trusted.gpg.d/elbe-cdrom.gpg ?

> 
> > 
> > Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>
> > ---
> >   elbepack/rfs.py | 8 ++++++--
> >   1 file changed, 6 insertions(+), 2 deletions(-)
> > 
> > diff --git a/elbepack/rfs.py b/elbepack/rfs.py
> > index 28fdce188..cf8ec6046 100644
> > --- a/elbepack/rfs.py
> > +++ b/elbepack/rfs.py
> > @@ -229,8 +229,8 @@ class BuildEnv:
> >                   strapcmd, arch, suite, self.rfs.path, primary_mirror)
> >           else:
> >               if self.xml.has("project/mirror/cdrom"):
> > -                keyring = ' --keyring="%s/targetrepo/repo.pub"' % (
> > -                    self.rfs.fname("cdrom"))
> > +                keyring = ' --keyring="%s"' % (
> > +                    self.rfs.fname('/elbe.keyring'))
> >               else:
> >                   keyring = ''
> > @@ -239,6 +239,10 @@ class BuildEnv:
> >           try:
> >               self.cdrom_mount()
> > +            if keyring:
> > +                do('apt-key --keyring "%s" add "%s/targetrepo/repo.pub"' % (
> > +                    self.rfs.fname('/elbe.keyring'),
> > +                    self.rfs.fname("cdrom")))
> >               do(cmd)
> >               ui = "/usr/share/elbe/qemu-elbe/" + self.xml.defs["userinterpr"]
> > 
> _______________________________________________
> elbe-devel mailing list
> elbe-devel at linutronix.de
> https://lists.linutronix.de/mailman/listinfo/elbe-devel

-- 
Torben Hohn
Linutronix GmbH | Bahnhofstrasse 3 | D-88690 Uhldingen-Mühlhofen
Phone: +49 7556 25 999 18; Fax.: +49 7556 25 999 99

Hinweise zum Datenschutz finden Sie hier (Informations on data privacy 
can be found here): https://linutronix.de/kontakt/Datenschutz.php

Linutronix GmbH | Firmensitz (Registered Office): Uhldingen-Mühlhofen | 
Registergericht (Registration Court): Amtsgericht Freiburg i.Br., HRB700 
806 | Geschäftsführer (Managing Directors): Heinz Egger, Thomas Gleixner