refactored base part from distro/ltsp-icewm

ltsp-icewm used to be the only ALTSP (testbed) distro over here but now its terminal server part works good enough to seperate it from the UI part. A few additions to facilitate testing, tweaking and benchmarking: iftop, openssh-server, mplayer

refactored base part from distro/ltsp-icewm
872afb3c · Michael Shigorin · 191388d7 · 872afb3c · 872afb3c · 872afb3c
Commit 872afb3c authored Mar 08, 2012 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

desktop.mk conf.d/desktop.mk +1 -5

config.mk features.in/ltsp/config.mk +5 -0

ltsp pkg.in/lists/ltsp +4 -0

No files found.
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -12,11 +12,7 @@ distro/desktop-mini: distro/desktop-base \
 distro/icewm: distro/desktop-mini
 	@$(call add,BASE_LISTS,$(call tags,icewm desktop))
-distro/ltsp-icewm: distro/icewm use/ltsp use/firmware
+distro/ltsp-icewm: distro/icewm use/ltsp/base
-	@$(call add,BASE_LISTS,$(call tags,base network))
-	@$(call add,BASE_LISTS,ltsp)
-	@$(call add,BASE_PACKAGES,apt-repo)
-	@$(call add,BASE_PACKAGES,firefox)
 distro/desktop-systemd: distro/icewm use/systemd

--- a/features.in/ltsp/config.mk
+++ b/features.in/ltsp/config.mk
 use/ltsp:
 	@$(call add,INSTALL2_PACKAGES,installer-feature-ltsp-stage2)
 	@$(call add,MAIN_LISTS,ltsp-client ltsp-client.$(ARCH))
+	@$(call add,BASE_LISTS,ltsp)
+use/ltsp/base: use/ltsp use/firmware
+	@$(call add,BASE_LISTS,$(call tags,base network))
+	@$(call add,BASE_PACKAGES,apt-repo firefox)
--- a/pkg.in/lists/ltsp
+++ b/pkg.in/lists/ltsp
 ltsp-server
 ltsp-server-basic
+openssh-server
 #alterator-ltsconf
 #alterator-standalone
@@ -8,10 +9,13 @@ alsa-plugins
 alsa-plugins-pulse
 alsa-utils
 aplay
+mplayer
 syslinux
 mkisofs
+iftop
 #kde-settings-kded-no_media_popup
 #docs-install_ltsp