regular.mk: regular-server refactoring

distro/.regular-install is now factored out to be reused in tde based installer (and potentially more images later on). This implies sysvinit at the moment which might change too but looks just fine right now.

regular.mk: regular-server refactoring
b5b96931 · Michael Shigorin · f8bdbdd6 · b5b96931
Commit b5b96931 authored Nov 13, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 6 deletions

regular.mk conf.d/regular.mk +9 -6

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -32,9 +32,15 @@ distro/.regular-desktop: distro/.regular-base \
 	@$(call set,KFLAVOURS,std-def)

 distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
-distro/.regular-sysv: distro/.regular-base use/init/sysv; @:
+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 +installer +sysvinit +power
+	@$(call add,INSTALL2_BRANDING,alterator notes)
+	@$(call add,THE_BRANDING,alterator)
+	@$(call set,INSTALLER,desktop)
+
 distro/regular-icewm: distro/.regular-sysv-gtk +icewm
 	@$(call add,LIVE_LISTS,$(call tags,regular icewm))
 	@$(call set,KFLAVOURS,un-def)
@@ -96,12 +102,9 @@ distro/regular-rescue: distro/.regular-bare use/rescue/rw \
 	@$(call set,KFLAVOURS,un-def)
 	@$(call add,RESCUE_PACKAGES,gpm)

-distro/regular-server: distro/.regular-bare +installer +sysvinit +power \
-	use/install2/fs use/bootloader/lilo use/firmware use/server/mini \
-	use/branding use/luks
+distro/regular-server: distro/.regular-install \
+	use/install2/fs use/bootloader/lilo use/server/mini use/luks
 	@$(call add,THE_LISTS,$(call tags,(base || server) && regular))
 	@$(call set,INSTALLER,altlinux-server)
-	@$(call add,INSTALL2_BRANDING,alterator notes)
-	@$(call add,THE_BRANDING,alterator)

 endif