simply.mk, slinux: optimize for reuse

...by moving reference to a package list that *deducts* packages from a feature (that should lend itself for reuse) to a particular distribution's configuration (that can have some specific polish). The problem was that basing junior on slinux feature while adding some KDE/Qt-based packages to it failed miserably in a hard-to-debug manner: adding every package that's been requested but not installed by hand suddenly made it build, see also http://altlinux.org/mkimage/debug [ru]

simply.mk, slinux: optimize for reuse
6047c714 · Michael Shigorin · 3c4bc85f · 6047c714 · 6047c714
Commit 6047c714 authored Feb 29, 2016 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

simply.mk conf.d/simply.mk +1 -1

config.mk features.in/slinux/config.mk +0 -1

No files found.
--- a/conf.d/simply.mk
+++ b/conf.d/simply.mk
@@ -3,7 +3,7 @@
 ifeq (distro,$(IMAGE_CLASS))

 distro/live-simply: distro/.livecd-install use/slinux/full
-	@$(call add,THE_LISTS,slinux/live-install)
+	@$(call add,THE_LISTS,slinux/live-install slinux/live)

 distro/simply: distro/.installer use/slinux/full
 	@$(call set,INSTALLER,simply-linux)

--- a/features.in/slinux/config.mk
+++ b/features.in/slinux/config.mk
@@ -9,7 +9,6 @@ use/slinux/base: use/slinux use/x11/gdm2.20 +pulse
 	@$(call add,THE_LISTS,slinux/$(ARCH))
 	@$(call add,THE_LISTS,slinux/games)
 	@$(call add,THE_LISTS,slinux/graphics)
-	@$(call add,THE_LISTS,slinux/live)
 	@$(call add,THE_LISTS,slinux/misc)
 	@$(call add,THE_LISTS,slinux/misc-dvd)
 	@$(call add,THE_LISTS,slinux/multimedia)