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

[dion at linutronix.de]

From: Olivier Dion <dion at linutronix.de>

Signed-off-by: Olivier Dion <dion 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