server.mk: minor refactoring

There was no real reason to use/cleanup/x11-alterator downstream
every time instead of promoting it upstream to the common point.
This commit is contained in:
Michael Shigorin 2013-05-24 14:42:48 +04:00
parent 8a8f8064ce
commit 95900b2131

View File

@ -1,16 +1,16 @@
# server distributions # server distributions
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
distro/.server-base: distro/.installer use/syslinux/ui/menu use/memtest distro/.server-base: distro/.installer use/syslinux/ui/menu use/memtest \
use/cleanup/x11-alterator
@$(call add,BASE_LISTS,server-base openssh) @$(call add,BASE_LISTS,server-base openssh)
distro/server-nano: distro/.server-base \ distro/server-nano: distro/.server-base use/bootloader/lilo +power
use/cleanup/x11-alterator use/bootloader/lilo +power
@$(call add,BASE_LISTS,$(call tags,server network)) @$(call add,BASE_LISTS,$(call tags,server network))
@$(call add,BASE_PACKAGES,dhcpcd cpio) @$(call add,BASE_PACKAGES,dhcpcd cpio)
distro/server-mini: distro/.server-base use/server/mini use/kernel/net \ distro/server-mini: distro/.server-base use/server/mini use/kernel/net \
use/cleanup/x11-alterator use/efi use/stage2/net-eth use/efi use/stage2/net-eth
@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm) @$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \ distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \