From 2c6a37d4a948531ee9baf6512a0575609f729eaf Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 17 Feb 2015 19:43:21 +0300 Subject: [PATCH] regular.mk: .regular-base -> .regular-wm There's considerable confusion accumulated over the expansion of regular builds with non-GUI targets: - bare meant quite a lot including wireless; - base meant GUI base actually, so rescue, server, and especially jeos images had to either cope with the bloat or start from scratch. Let's fix "base" first... --- conf.d/regular.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index da0f76d6..c58706fa 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -22,11 +22,11 @@ mixin/regular-desktop: use/x11/xorg use/sound use/xdg-user-dirs @$(call add,THE_BRANDING,alterator graphics indexhtml notes) # WM base target -distro/.regular-base: distro/.regular-x11 mixin/regular-desktop +distro/.regular-wm: distro/.regular-x11 mixin/regular-desktop # DE base target # TODO: use/plymouth/live when luks+plymouth is done, see also #28255 -distro/.regular-desktop: distro/.regular-base \ +distro/.regular-desktop: distro/.regular-wm \ use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind +systemd @$(call add,LIVE_LISTS,domain-client) @$(call add,THE_BRANDING,bootloader) @@ -34,7 +34,7 @@ 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 +sysvinit; @: +distro/.regular-sysv: distro/.regular-wm +sysvinit; @: distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \ use/x11/gdm2.20; @: @@ -101,7 +101,7 @@ mixin/regular-gnustep: use/x11/gnustep use/x11/gdm2.20 use/mediacheck \ distro/regular-gnustep: distro/.regular-sysv \ mixin/regular-wmaker mixin/regular-gnustep; @: -distro/regular-gnustep-systemd: distro/.regular-base +systemd \ +distro/regular-gnustep-systemd: distro/.regular-wm +systemd \ mixin/regular-wmaker mixin/regular-gnustep; @: distro/regular-xfce: distro/.regular-gtk \