diff --git a/conf.d/desktop.mk b/conf.d/desktop.mk index 2be4be09..dccbf219 100644 --- a/conf.d/desktop.mk +++ b/conf.d/desktop.mk @@ -1,18 +1,18 @@ # desktop distributions ifeq (distro,$(IMAGE_CLASS)) -distro/desktop-base: distro/.installer \ +distro/.desktop-base: distro/.installer \ use/syslinux/ui-vesamenu use/x11/xorg @$(call set,INSTALLER,desktop) -distro/desktop-mini: distro/desktop-base \ +distro/.desktop-mini: distro/.desktop-base \ use/lowmem use/x11/xdm use/power/acpi/button \ use/cleanup/alterator -distro/icewm: distro/desktop-mini +distro/icewm: distro/.desktop-mini @$(call add,BASE_LISTS,$(call tags,icewm desktop)) -distro/tde: distro/desktop-mini use/x11/kdm +distro/tde: distro/.desktop-mini use/x11/kdm @$(call add,BASE_LISTS, \ $(call tags,(base || desktop) && (network || tde))) diff --git a/conf.d/server.mk b/conf.d/server.mk index ac28ec82..4b776bcd 100644 --- a/conf.d/server.mk +++ b/conf.d/server.mk @@ -1,10 +1,10 @@ # server distributions 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 @$(call add,BASE_LISTS,server-base) -distro/server-mini: distro/server-base use/cleanup/x11-alterator +distro/server-mini: distro/.server-base use/cleanup/x11-alterator @$(call set,KFLAVOURS,el-smp) @$(call add,THE_KMODULES,e1000e igb) @$(call add,STAGE1_KMODULES,e1000e igb)