[elbe-devel] [PATCH 4/4] Export elbe-keyring.gpg even if not building from cdrom

[Torben Hohn]

On Wed, Jun 26, 2019 at 12:57:56PM +0200, dion at linutronix.de wrote:
> From: Olivier Dion <dion at linutronix.de>
> 
> Signed-off-by: Olivier Dion <dion at linutronix.de>

Reviewed-by: Torben Hohn <torben.hohn at linutronix.de>

> ---
>  elbepack/init/Makefile.mako | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/elbepack/init/Makefile.mako b/elbepack/init/Makefile.mako
> index aeec6b51..39e1cd55 100644
> --- a/elbepack/init/Makefile.mako
> +++ b/elbepack/init/Makefile.mako
> @@ -72,13 +72,11 @@ all: .stamps/stamp-install-initial-image
>  % if opt.devel:
>  	cp .elbe-in/elbe-devel.tar.bz2 tmp-tree/
>  % endif
> -% if opt.cdrom:
>  	mkdir -p tmp-tree/usr/share/keyrings
>  	-cp .elbe-in/*.gpg tmp-tree/usr/share/keyrings
>  	mkdir -p tmp-tree/usr/lib/base-installer.d
>  	echo 'mkdir -p /target/etc/apt/trusted.gpg.d/; cp /usr/share/keyrings/elbe-keyring.gpg /target/etc/apt/trusted.gpg.d/' > tmp-tree/usr/lib/base-installer.d/10copyelbekeyring
>  	chmod 755 tmp-tree/usr/lib/base-installer.d/*
> -% endif
>  	mkdir -p .elbe-gen
>  	gzip -cd .elbe-in/initrd.gz >.elbe-gen/initrd-preseeded
>  	cd tmp-tree && find . | cpio -H newc -o --append -F ../.elbe-gen/initrd-preseeded
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> 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