install2: potentially cleanup crypto bits as well

These are only needed for alterator-vm when making LUKS encrypted partitions; ideally the extra libraries would be omitted automatically when luks isn't included.

install2: potentially cleanup crypto bits as well
e75d647b · Michael Shigorin · 791a236a · e75d647b · e75d647b
Commit e75d647b authored Mar 22, 2014 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

config.mk features.in/install2/config.mk +5 -0

90-install2-cleanup-bloat ...stall2/install2/image-scripts.d/90-install2-cleanup-bloat +0 -3

No files found.
--- a/features.in/install2/config.mk
+++ b/features.in/install2/config.mk
@@ -53,3 +53,8 @@ use/install2/reiserfs:
 # when VNC installation is less welcome than a few extra megs
 use/install2/cleanup/vnc:
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,x11vnc xorg-xvfb)
+
+# conflicts with luks feature
+use/install2/cleanup/crypto:
+	@$(call add,INSTALL2_CLEANUP_PACKAGES,gnupg libgpg-error)
+	@$(call add,INSTALL2_CLEANUP_PACKAGES,libgcrypt* libgnutls*)
--- a/features.in/install2/install2/image-scripts.d/90-install2-cleanup-bloat
+++ b/features.in/install2/install2/image-scripts.d/90-install2-cleanup-bloat
@@ -23,9 +23,6 @@ rpmquery -a cpp\* gcc\* perl-base file ipv6calc \
 	make make-initrd \
 | xargs -r rpmi -e --nodeps --

-### TODO: unless LUKS luks feature is requested we can also drop
-###       gnupg libgcrypt libgnutls\* libgpg-error
-
 rpmquery -a bind-utils libbind \
 | xargs -r rpmi -e --