Skip to content

M
mkimage-profiles
Commit e7df892b authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

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
parent 47518390
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
conf.d/server.mk
View file @ e7df892b
......@@ -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)
......
features.in/install2/config.mk
View file @ e7df892b
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment