keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regular.mk: deduplicate use/install2/fs

Browse Source 
We want every regular installer to know more than ext4 apparently.
This commit is contained in:
Michael Shigorin 2014-02-26 17:32:24 +04:00
parent 4ed4f324ab
commit 8017b0886d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
conf.d/regular.mk
View File

@ -37,7 +37,7 @@ 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 +installer +sysvinit +power \ distro/.regular-install: distro/.regular-bare +installer +sysvinit +power \
use/branding use/bootloader/grub use/luks use/branding use/bootloader/grub use/luks use/install2/fs
@$(call add,THE_LISTS,$(call tags,base regular)) @$(call add,THE_LISTS,$(call tags,base regular))
@$(call add,INSTALL2_BRANDING,alterator notes) @$(call add,INSTALL2_BRANDING,alterator notes)
@$(call add,THE_BRANDING,alterator) @$(call add,THE_BRANDING,alterator)
@ -109,15 +109,14 @@ distro/regular-rescue: distro/.regular-bare use/rescue/rw \
distro/regular-sysv-tde: distro/.regular-install-x11 \ distro/regular-sysv-tde: distro/.regular-install-x11 \
mixin/desktop-installer mixin/regular-tde \ mixin/desktop-installer mixin/regular-tde \
use/branding/complete use/net-eth/dhcp use/install2/fs \ use/branding/complete use/net-eth/dhcp \
use/efi/refind use/efi/shell use/rescue/base use/efi/refind use/efi/shell use/rescue/base
@$(call set,KFLAVOURS,led-ws) @$(call set,KFLAVOURS,led-ws)
@$(call add,RESCUE_LISTS,$(call tags,rescue misc)) @$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@$(call add,THE_PACKAGES,alterator-x11 htop k3b pm-utils) @$(call add,THE_PACKAGES,alterator-x11 htop k3b pm-utils)
@$(call add,THE_LISTS,$(call tags,base desktop)) @$(call add,THE_LISTS,$(call tags,base desktop))
distro/regular-server: distro/.regular-install \ distro/regular-server: distro/.regular-install use/server/mini use/rescue/base
use/install2/fs use/server/mini use/rescue/base
@$(call add,THE_LISTS,$(call tags,regular server)) @$(call add,THE_LISTS,$(call tags,regular server))
@$(call add,MAIN_PACKAGES,aptitude) @$(call add,MAIN_PACKAGES,aptitude)
@$(call set,INSTALLER,altlinux-server) @$(call set,INSTALLER,altlinux-server)