stop abusing use/live/*

Some parts of *image* configuration started slipping down into the *feature* configuration, and that was wrong; fixed. Also introduced proper use/live/x11 (via use/x11/xorg with added wacom support for the sake of #26723/#26724) and rebased the pre-existing descendants onto it.

stop abusing use/live/*
c5e559b7 · Michael Shigorin · d6972a39 · c5e559b7 · c5e559b7 · c5e559b7
Commit c5e559b7 authored Dec 19, 2011 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 16 deletions

live.mk conf.d/live.mk +12 -7

config.mk features.in/live/config.mk +3 -9

config.mk features.in/x11/config.mk +3 -0

No files found.
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -5,13 +5,6 @@ distro/dos: distro/.init use/dos use/syslinux/ui-menu
 distro/rescue: distro/.base use/rescue use/syslinux/ui-menu
 distro/live: distro/.base use/live/base use/power/acpi/cpufreq
 distro/live-systemd: distro/.base use/live/base use/systemd
-distro/live-install: distro/.base use/live/install use/syslinux/localboot.cfg
-distro/live-icewm: distro/live use/live/icewm
-
-distro/live-rescue: distro/live-icewm
-	@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
-	@$(call add,LIVE_LISTS, \
-		$(call tags,(base || extra) && (archive || rescue || network)))

 distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
 	@$(call add,LIVE_PACKAGES,livecd-isomd5sum)
@@ -28,4 +21,16 @@ distro/live-builder: distro/.base use/repo/main \
 	@$(call add,MAIN_PACKAGES,file make-initrd make-initrd-propagator)
 	@$(call add,MAIN_PACKAGES,$(pkgs))

+distro/live-install: distro/.base use/live/base use/syslinux/localboot.cfg
+	@$(call add,LIVE_PACKAGES,live-install)
+
+distro/live-icewm: distro/live use/live/autologin
+	@$(call add,LIVE_LISTS, \
+		$(call tags,(base || desktop) && (live || network || icewm)))
+
+distro/live-rescue: distro/live-icewm
+	@$(call add,LIVE_LISTS,$(call tags,rescue && (fs || live || x11)))
+	@$(call add,LIVE_LISTS, \
+		$(call tags,(base || extra) && (archive || rescue || network)))
+
 endif
--- a/features.in/live/config.mk
+++ b/features.in/live/config.mk
@@ -5,15 +5,9 @@ use/live: use/stage2 sub/stage2/live
 use/live/base: use/live use/syslinux/ui-menu
 	@$(call add,LIVE_LISTS,$(call tags,base && (live || network)))

+use/live/x11: use/live/base use/x11/xorg use/x11/wacom use/virtualbox/guest
+
 # NB: there's an unconditional live/image-scripts.d/40-autologin script
 #     *but* it only configures some of the *existing* means; let's add one
-use/live/autologin: use/live/base
+use/live/autologin: use/live/x11
 	@$(call add,LIVE_PACKAGES,autologin xinit)
-
-use/live/icewm: use/live/autologin
-	@$(call add,LIVE_LISTS, \
-		$(call tags,(base || desktop) && (live || network || icewm)))
-
-# this is a manual installation script (text-based)
-use/live/install: use/live/base
-	@$(call add,LIVE_PACKAGES,live-install)
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -2,6 +2,9 @@ use/x11/xorg:
 	@$(call add,THE_LISTS,xorg)
 	@$(call add,THE_KMODULES,drm)

+use/x11/wacom: use/x11/xorg
+	@$(call add,THE_PACKAGES,xorg-drv-wacom)
+
 ### strictly speaking, runlevel5 should require a *dm, not vice versa
 use/x11/runlevel5: use/x11/xorg
 	@$(call add,THE_PACKAGES,installer-feature-runlevel5-stage3)