Skip to content

M
mkimage-profiles
Commit b5b96931 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

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.
parent f8bdbdd6
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
conf.d/regular.mk
View file @ b5b96931
...@@ -32,9 +32,15 @@ distro/.regular-desktop: distro/.regular-base \ ...@@ -32,9 +32,15 @@ distro/.regular-desktop: distro/.regular-base \
@$(call set,KFLAVOURS,std-def) @$(call set,KFLAVOURS,std-def)
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @: 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-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 distro/regular-icewm: distro/.regular-sysv-gtk +icewm
@$(call add,LIVE_LISTS,$(call tags,regular icewm)) @$(call add,LIVE_LISTS,$(call tags,regular icewm))
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
...@@ -96,12 +102,9 @@ distro/regular-rescue: distro/.regular-bare use/rescue/rw \ ...@@ -96,12 +102,9 @@ distro/regular-rescue: distro/.regular-bare use/rescue/rw \
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
@$(call add,RESCUE_PACKAGES,gpm) @$(call add,RESCUE_PACKAGES,gpm)
distro/regular-server: distro/.regular-bare +installer +sysvinit +power \ distro/regular-server: distro/.regular-install \
use/install2/fs use/bootloader/lilo use/firmware use/server/mini \ use/install2/fs use/bootloader/lilo use/server/mini use/luks
use/branding use/luks
@$(call add,THE_LISTS,$(call tags,(base || server) && regular)) @$(call add,THE_LISTS,$(call tags,(base || server) && regular))
@$(call set,INSTALLER,altlinux-server) @$(call set,INSTALLER,altlinux-server)
@$(call add,INSTALL2_BRANDING,alterator notes)
@$(call add,THE_BRANDING,alterator)
endif endif
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