regular.mk: add luks to .regular-install

distro/.regular-install depends on use/luks now too; this isn't a hard decision but so far looks good given the overall functionality range and balance within regular builds.

regular.mk: add luks to .regular-install
9ff4d968 · Michael Shigorin · e329617c · 9ff4d968
Commit 9ff4d968 authored Nov 18, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

regular.mk conf.d/regular.mk +3 -3

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -37,8 +37,8 @@ distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
 distro/.regular-sysv: distro/.regular-base +sysvinit; @:
 distro/.regular-sysv-gtk: distro/.regular-sysv use/x11/lightdm/gtk; @:

-distro/.regular-install: distro/.regular-bare \
-	use/branding use/bootloader/grub +installer +sysvinit +power
+distro/.regular-install: distro/.regular-bare +installer +sysvinit +power \
+	use/branding use/bootloader/grub use/luks
 	@$(call add,INSTALL2_BRANDING,alterator notes)
 	@$(call add,THE_BRANDING,alterator)

@@ -111,7 +111,7 @@ distro/regular-sysv-tde: distro/.regular-install-x11 \
 	use/net-eth/dhcp use/install2/fs use/efi/refind; @:

 distro/regular-server: distro/.regular-install \
-	use/install2/fs use/server/mini use/luks
+	use/install2/fs use/server/mini
 	@$(call add,THE_LISTS,$(call tags,(base || server) && regular))
 	@$(call set,INSTALLER,altlinux-server)