install2: remove target use/install2/cleanup/crypto

1. alterator-browser-qt5 does not start now without libgnutls 2. Successful remount with luks requires cryptsetup 3. There is no conflict with the luks feature for a long time

install2: remove target use/install2/cleanup/crypto
e7df892b · Anton Midyukov · 47518390 · e7df892b · e7df892b
Commit e7df892b authored Jul 04, 2023 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

server.mk conf.d/server.mk +1 -1

config.mk features.in/install2/config.mk +1 -6

No files found.
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -6,7 +6,7 @@ distro/.server-base: distro/.installer use/syslinux/ui/menu use/memtest \
 	@$(call add,BASE_LISTS,server-base openssh)

 distro/server-nano: distro/.server-base use/bootloader/lilo +power \
-	use/install2/cleanup/crypto use/install2/cleanup/vnc
+	use/install2/cleanup/vnc
 	@$(call add,BASE_LISTS,$(call tags,server network))
 	@$(call add,BASE_PACKAGES,dhcpcd cpio)


--- a/features.in/install2/config.mk
+++ b/features.in/install2/config.mk
@@ -145,11 +145,6 @@ use/install2/cleanup/dri:
 	@$(call set,INSTALL2_CLEANUP_DRI,yes)
 	@$(call xport,INSTALL2_CLEANUP_DRI)

-# conflicts with luks feature
-use/install2/cleanup/crypto:
-	@$(call add,INSTALL2_CLEANUP_PACKAGES,gnupg)
-	@$(call add,INSTALL2_CLEANUP_PACKAGES,libgnutls*)
-
 # leave only cirrus, fbdev, qxl, vesa in vm-targeted images
 use/install2/cleanup/x11-hwdrivers:
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-drv-ati xorg-drv-intel)
@@ -160,7 +155,7 @@ use/install2/cleanup/x11-hwdrivers:

 # massive purge of anything not critical to installer boot (l10n included!)
 use/install2/cleanup/everything: use/install2/cleanup/x11-hwdrivers \
-	use/install2/cleanup/vnc use/install2/cleanup/crypto
+	use/install2/cleanup/vnc
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,glibc-locales)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,libX11-locales alterator-l10n)
 	@$(call add,INSTALL2_CLEANUP_PACKAGES,kbd-data kbd console-scripts)