Skip to content

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

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...
parent fdf8baf7
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
conf.d/regular.mk
View file @ 2c6a37d4
......@@ -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 \
......
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