0.5.7-alt1

- distro tweaks
hide intermediate distro targets
2012-03-12 22:15:06 +02:00 · 2012-03-12 22:07:18 +02:00 · 2012-03-12 11:52:44 +02:00 · 2012-03-12 11:52:44 +02:00 · 2012-03-12 11:49:48 +02:00 · 2012-03-07 16:00:40 +02:00
16 changed files with 83 additions and 29 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.5.6
+Version: 0.5.7
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -59,6 +59,9 @@ cp -a * %buildroot%mpdir
 %doc README QUICKSTART

 %changelog
+* Mon Mar 12 2012 Michael Shigorin <mike@altlinux.org> 0.5.7-alt1
+- distro tweaks
+
 * Mon Feb 20 2012 Michael Shigorin <mike@altlinux.org> 0.5.6-alt1
 - minor fixups

--- a/.gear/tags/5f2dbc6d511b0a0a39799983df054a249298dd8c
+++ b/.gear/tags/5f2dbc6d511b0a0a39799983df054a249298dd8c
@@ -0,0 +1,6 @@
+object a8e70fd4e667a95fb429c3b77a2f45eca0da7859
+type commit
+tag v0.5.6
+tagger Michael Shigorin <mike@altlinux.org> 1329770647 +0200
+
+fixups
--- a/.gear/tags/e5d47eac6dd50887d577d7d00f8c52bc39d6cc26
+++ b/.gear/tags/e5d47eac6dd50887d577d7d00f8c52bc39d6cc26
@@ -1,6 +0,0 @@
-object 0ad3c6b8bdce770de398b33b75d4bf50ddcdd0ef
-type commit
-tag v0.5.5
-tagger Michael Shigorin <mike@altlinux.org> 1328541031 +0200
-
-live.hooks
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-e5d47eac6dd50887d577d7d00f8c52bc39d6cc26 v0.5.5
+5f2dbc6d511b0a0a39799983df054a249298dd8c v0.5.6
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -1,22 +1,24 @@
 # desktop distributions
 ifeq (distro,$(IMAGE_CLASS))

-distro/desktop-base: distro/.installer \
+distro/.desktop-base: distro/.installer \
 	use/syslinux/ui-vesamenu use/x11/xorg
 	@$(call set,INSTALLER,desktop)

-distro/desktop-mini: distro/desktop-base \
+distro/.desktop-mini: distro/.desktop-base \
 	use/lowmem use/x11/xdm use/power/acpi/button \
 	use/cleanup/alterator

-distro/icewm: distro/desktop-mini
+distro/icewm: distro/.desktop-mini
 	@$(call add,BASE_LISTS,$(call tags,icewm desktop))

-distro/ltsp-icewm: distro/icewm use/ltsp use/firmware
-	@$(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/tde: distro/.desktop-mini use/x11/kdm
+	@$(call add,BASE_LISTS, \
+		$(call tags,(base || desktop) && (network || tde)))
+
+distro/ltsp-icewm: distro/icewm use/ltsp/base
+
+distro/ltsp-tde: distro/tde use/ltsp/base

 distro/desktop-systemd: distro/icewm use/systemd

--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -10,7 +10,7 @@ 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-x11: distro/live use/live/autologin use/power/acpi/button
+distro/.live-x11: distro/live use/firmware use/power/acpi/button

 distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
 	@$(call add,LIVE_PACKAGES,livecd-isomd5sum)
@@ -30,7 +30,7 @@ distro/live-builder: distro/.base use/repo/main \
 distro/live-install: distro/.base use/live/base use/syslinux/localboot.cfg
 	@$(call add,LIVE_PACKAGES,live-install)

-distro/live-icewm: distro/.live-x11
+distro/live-icewm: distro/.live-x11 use/live/autologin
 	@$(call add,LIVE_LISTS, \
 		$(call tags,(base || desktop) && (live || network || icewm)))

@@ -38,12 +38,16 @@ distro/live-razorqt: distro/.live-x11 use/x11/lightdm use/syslinux/ui-vesamenu
 	@$(call add,LIVE_LISTS, \
 		$(call tags,(base || desktop) && (live || network || razorqt)))

+distro/live-tde: distro/.live-x11 use/x11/kdm use/syslinux/ui-vesamenu
+	@$(call add,LIVE_LISTS, \
+		$(call tags,(base || desktop) && (live || network || tde)))
+
 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-webkiosk: distro/.live-x11 use/live/hooks
+distro/live-webkiosk: distro/.live-x11 use/live/autologin use/live/hooks
 	@$(call add,LIVE_PACKAGES,livecd-webkiosk)
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)

--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -1,10 +1,10 @@
 # server distributions
 ifeq (distro,$(IMAGE_CLASS))

-distro/server-base: distro/.installer use/syslinux/ui-menu use/memtest
+distro/.server-base: distro/.installer use/syslinux/ui-menu use/memtest
 	@$(call add,BASE_LISTS,server-base)

-distro/server-mini: distro/server-base use/cleanup/x11-alterator
+distro/server-mini: distro/.server-base use/cleanup/x11-alterator
 	@$(call set,KFLAVOURS,el-smp)
 	@$(call add,THE_KMODULES,e1000e igb)
 	@$(call add,STAGE1_KMODULES,e1000e igb)
--- a/features.in/README
+++ b/features.in/README
@@ -14,13 +14,10 @@
 после инициализации профиля (см. ../image.in/) и копирования
 субпрофилей (см. ../sub.in/).  Для каждой фичи, указанной
 в $(FEATURES), копируются подкаталоги сообразно субпрофилям,
-а также производится обработка {tagged/,}{image-,}scripts.d/;
-затем выполняется скрипт generate.sh и задействуется generate.mk
+а также производится обработка {image-,}scripts.d/; затем
+выполняется скрипт generate.sh и задействуется generate.mk
 (при их наличии).

-  NB: тегированные скрипты являются экспериментальными,
-      возможны недоработки и существенные изменения!
-
 Если фича дополняет хуками семейство целевых субпрофилей,
 построенных на одном базовом, можно воспользоваться подкаталогом
 с именем исходного базового субпрофиля (см. $src, $dst в Makefile).
--- a/features.in/live/live/image-scripts.d/30-users
+++ b/features.in/live/live/image-scripts.d/30-users
@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/bin/sh -x
 # * reset password for root
 # * add user `altlinux' (without password)

+NPG="nopasswdlogin"
+GRPLIST="users scanner audio radio proc cdrom cdwriter wheel fuse $NPG"
+
 verbose()
 {
    if [ -n "$GLOBAL_VERBOSE" ]; then
@@ -12,8 +15,9 @@ verbose()
 add_user()
 {
    verbose "Add $1 user"
+    groupadd -r "$NPG"
    local groups=
-    for g in users scanner audio radio proc cdrom cdwriter wheel fuse; do
+    for g in $GRPLIST; do
 	if groupmod $g 2>/dev/null; then
 	    if [ -n "$groups" ]; then
 		groups="$groups,$g"
--- a/features.in/live/live/image-scripts.d/40-autologin
+++ b/features.in/live/live/image-scripts.d/40-autologin
@@ -22,6 +22,15 @@ AUTOLOGIN=yes
 E_O_F
 fi

+# lightdm autologin
+LIGHTDM_CONF=/etc/lightdm/lightdm.conf
+if [ -f "$LIGHTDM_CONF" ]; then
+	sed -i \
+		-e "s/^#\(autologin-user=\).*$/\1$USER/" \
+		-e "s/^#\(autologin-user-timeout=0\)/\1/" \
+		"$LIGHTDM_CONF"
+fi
+
 # gdm2 autologin
 GDM_CONF=/etc/X11/gdm/custom.conf
 if [ -f "$GDM_CONF" ]; then
--- a/features.in/ltsp/config.mk
+++ b/features.in/ltsp/config.mk
@@ -1,3 +1,8 @@
 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/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -13,6 +13,9 @@ use/x11/runlevel5: use/x11/xorg
 use/x11/xdm: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,xdm installer-feature-no-xconsole)

+use/x11/kdm: use/x11/runlevel5
+	@$(call add,THE_PACKAGES,kdebase-kdm)
+
 ### : some set()-like thing might be better?
 use/x11/lightdm: use/x11/runlevel5
 	@$(call add,THE_PACKAGES,lightdm)
--- a/pkg.in/lists/ltsp
+++ b/pkg.in/lists/ltsp
@@ -1,16 +1,21 @@
 ltsp-server
 ltsp-server-basic
+openssh-server

 #alterator-ltsconf
 #alterator-standalone

 alsa-plugins
 alsa-plugins-pulse
+alsa-utils
 aplay
+mplayer

 syslinux
 mkisofs

+iftop
+
 #kde-settings-kded-no_media_popup

 #docs-install_ltsp
--- a/pkg.in/lists/tagged/desktop+network
+++ b/pkg.in/lists/tagged/desktop+network
@@ -0,0 +1 @@
+firefox
--- a/pkg.in/lists/tagged/desktop+razorqt+extra
+++ b/pkg.in/lists/tagged/desktop+razorqt+extra
@@ -18,4 +18,4 @@ tubularix
 smplayer

 # upstream recommended
-ptbatterysystemtray
+#ptbatterysystemtray
--- a/pkg.in/lists/tagged/desktop+tde
+++ b/pkg.in/lists/tagged/desktop+tde
@@ -0,0 +1,21 @@
+kdebase
+###kde-icon-theme-tango
+kde-icon-theme-nuvola
+tango-icon-theme-extras
+kkbswitch
+kdegraphics-ksnapshot
+kdegraphics-kview
+kdeutils-laptop
+kdepim-akregator
+gtk2-themes-qtcurve
+#kde-styles-qtcurve
+kdeutils-ark
+#kdebluetooth
+kdeutils-kcalc
+kdegraphics-kpdf
+kde-i18n-ru
+kdeaddons-konqueror
+#digikam
+#digikam-image-plugins
+kaffeine
+kdemultimedia-kmix
Author	SHA1	Message	Date
Michael Shigorin	3f85ed2b19	0.5.7-alt1 - distro tweaks	2012-03-12 22:15:06 +02:00
Michael Shigorin	a07959e2f5	hide intermediate distro targets There are pseudo-distro targets that are useful to combine the needed bits and pieces for a few more different end-user images but that are useless themselves (e.g. desktop-base wouldn't even start X session before someone would have installed a window manager). Let's just hide these under the hood so that `make help', `make everything' and potential frontends don't bother.	2012-03-12 22:07:18 +02:00
Michael Shigorin	af6b9940de	initial TDE distros A minimal live, tiny desktop system and a test LTSP installer; all of these work.	2012-03-12 11:52:44 +02:00
Michael Shigorin	71f44090c5	initial TDE (KDE3 descendant) support The package list taken from mkimage-profiles-desktop and trimmed down due to current TDE packaging difference as well as extras being defined elsewhere.	2012-03-12 11:52:44 +02:00
Michael Shigorin	872afb3c0c	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	2012-03-12 11:49:48 +02:00
Michael Shigorin	191388d7cf	tweak razor-qt extras list ptbatterysystemtray is a bit annoying out-of-box, should run only if battery found and should not throw up a dialog upfront for no real reason.	2012-03-07 16:00:40 +02:00
Michael Shigorin	70f2a70fca	conf.d/live.mk: autologin rehash If we have a supported display manager, we should rather autoconfigure that one for autologin instead of configuring autologin package: those tend to play better with "modern" session management in terms of runlevel control etc. xdm doesn't really differ though. TODO: maybe skip autologin package configuration if any dm found in the live image-script?	2012-03-07 15:57:07 +02:00
Michael Shigorin	dc9b706619	features.in/live: implemented lightdm autologin The main part is done as per https://wiki.archlinux.org/index.php/LightDM#Enable_Autologin; there's an issue that the lightdm developer insist that autologin user belongs to "nopasswdlogin" group though.	2012-03-07 15:57:07 +02:00
Michael Shigorin	50c27a1782	ltsp += alsa-utils alsamixer is useful :)	2012-03-07 14:21:57 +02:00
Michael Shigorin	3aaa45dd23	conf.d/live.mk: add firmware to all X11 livecds GPU firmware might have been missing otherwise...	2012-03-05 18:16:46 +02:00
Michael Shigorin	a0af945d7f	essentially added firefox to live-icewm (via a specially crafted pkglist name)	2012-03-05 18:16:46 +02:00
Michael Shigorin	a681b4bd98	features.in/README: un-document tagged scripts These are gone for now, this fix should have been done before.	2012-02-21 11:54:35 +02:00
Michael Shigorin	b7a395c012	gear-store-tags	2012-02-20 22:44:16 +02:00