0.5.7-alt1

- distro tweaks

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.5.4
+Version: 0.5.7
 Release: alt1
 
 Summary: ALT Linux based distribution metaprofile
@@ -59,6 +59,16 @@ 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
+
+* Mon Feb 06 2012 Michael Shigorin <mike@altlinux.org> 0.5.5-alt1
+- live-related tweaks (including live.hooks support)
+- terminal server and webkiosk images
+
 * Mon Jan 16 2012 Michael Shigorin <mike@altlinux.org> 0.5.4-alt1
 - better diags for initial deployment
 

.gear/tags/4d92978230ee015e53f81c2f29f4ec40d8bcc822

@@ -1,6 +0,0 @@
-object 672125b9e588b0a0bc6587680faf164da9f25af7
-type commit
-tag v0.5.3
-tagger Michael Shigorin <mike@altlinux.org> 1325530888 +0200
-
-main.mk

.gear/tags/5f2dbc6d511b0a0a39799983df054a249298dd8c

@@ -0,0 +1,6 @@
+object a8e70fd4e667a95fb429c3b77a2f45eca0da7859
+type commit
+tag v0.5.6
+tagger Michael Shigorin <mike@altlinux.org> 1329770647 +0200
+
+fixups

.gear/tags/list

@@ -1 +1 @@
-4d92978230ee015e53f81c2f29f4ec40d8bcc822 v0.5.3
+5f2dbc6d511b0a0a39799983df054a249298dd8c v0.5.6

conf.d/desktop.mk

@@ -1,17 +1,25 @@
 # desktop distributions
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/desktop-base: distro/installer use/repo/main \
-	use/syslinux/ui-vesamenu use/x11/xorg use/bootloader/grub
+distro/.desktop-base: distro/.installer \
+	use/syslinux/ui-vesamenu use/x11/xorg
 	@$(call set,INSTALLER,desktop)
 
-distro/desktop-mini: distro/desktop-base \
-	use/lowmem use/x11/xdm use/bootloader/lilo \
-	use/power/acpi/button use/cleanup/alterator
+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/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
 
 endif

conf.d/live.mk

@@ -1,11 +1,17 @@
 # live images
 ifeq (distro,$(IMAGE_CLASS))
 
+distro/syslinux: distro/.init \
+	use/syslinux/localboot.cfg use/syslinux/ui-vesamenu \
+	use/hdt use/memtest
+
 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-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)
 
@@ -24,17 +30,25 @@ 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 use/live/autologin
+distro/live-icewm: distro/.live-x11 use/live/autologin
 	@$(call add,LIVE_LISTS, \
 		$(call tags,(base || desktop) && (live || network || icewm)))
 
-distro/live-razorqt: distro/live use/live/autologin
+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/autologin use/live/hooks
+	@$(call add,LIVE_PACKAGES,livecd-webkiosk)
+	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
+
 endif

conf.d/server.mk

@@ -1,19 +1,18 @@
 # server distributions
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/server-base: distro/installer use/repo/main \
-	use/syslinux/ui-menu use/memtest use/bootloader/grub
+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)
 	@$(call add,BASE_LISTS,\
 		$(call tags,base && (server || network || security || pkg)))
-	@$(call add,BASE_LISTS,$(call tags,extra network))
+	@$(call add,BASE_LISTS,$(call tags,extra (server || network)))
 
-distro/server-systemd: distro/server-mini use/systemd
+distro/server-systemd: distro/server-mini use/systemd use/bootloader/lilo
 
 distro/server-ovz: distro/server-mini \
 	use/hdt use/rescue use/firmware/server use/power/acpi/button

doc/assumptions.txt

@@ -1,7 +1,7 @@
 предположения фрагментов кода об окружении
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-NB: пути приводятся от верхнего уровня
+NB: пути приводятся от верхнего уровня; проект в целом предполагает
+GNU make 3.81 (с использованием которого и разрабатывается).
 
 - pkg.in/lists/Makefile
   + ожидает, что названия пакаджлистов указываются в переменных

doc/variables.txt

@@ -65,6 +65,11 @@
   + значение: пусто (по умолчанию) либо любая строка
   + см. ../lib/build.mk
 
+- SAVE_PROFILE
+  + сохраняет архив сгенерированного профиля в .disk/
+  + значение: пусто (по умолчанию) либо любая строка
+  + см. ../image.in/Makefile
+
 пример
 ~~~~~~
 make DEBUG=1 CLEAN=1 distro/syslinux.iso

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).

features.in/bootloader/README

@@ -5,4 +5,10 @@
 систему (он НЕ должен требоваться пакету installer-distro-*)
 и требует пакет выбранного загрузчика.
 
+Обратите внимание: в процессе конфигурирования дистрибутива
+"переключение" загрузчика может происходить только в одну сторону
+-- если выставлен grub, произведено переключение на lilo и затем
+произведена ещё одна попытка переключения на grub, то в конфигурации
+останется lilo как последняя "новая" цель с точки зрения make.
+
 Реализация экспериментальная (нужно модуляризовать installer-steps).

features.in/bootloader/config.mk

@@ -1,5 +1,7 @@
 # TODO: invent something prettier (think "lilo+grub" -- or error out?)
 # - add,BASE_PACKAGES,alterator-$* is overly additive
+#   NB: due to make target becoming having been made,
+#       the last different one wins
 # - remember .base if adding yet another *_PACKAGES
 
 use/bootloader: use/install2 sub/main

features.in/install2/install2/image-scripts.d/10bootloader

@@ -1,5 +1,5 @@
 #!/bin/sh
-# FIXME: test run for installer-distro-altlinux-generic 6.0-alt2
 # NB: grub is currently the default in ALT Linux
 
-sed -i "s/^grub$/$GLOBAL_BASE_BOOTLOADER/" /usr/share/install2/installer-steps
+sed -ri "s/^(grub|lilo)$/$GLOBAL_BASE_BOOTLOADER/" \
+	/usr/share/install2/installer-steps

features.in/live/config.mk

@@ -11,3 +11,6 @@ use/live/x11: use/live/base use/x11/xorg use/x11/wacom use/virtualbox/guest
 #     *but* it only configures some of the *existing* means; let's add one
 use/live/autologin: use/live/x11
 	@$(call add,LIVE_PACKAGES,autologin xinit)
+
+use/live/hooks: use/live
+	@$(call add,LIVE_PACKAGES,livecd-run-hooks)

features.in/live/live/image-scripts.d/10-live-hooks

@@ -0,0 +1,5 @@
+#!/bin/sh
+# if we're configured for running live hooks,
+# there should be a place for them either
+
+chkconfig livecd-run-hooks on >&/dev/null && mkdir /live.hooks ||:

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"

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

features.in/live/live/image-scripts.d/50-etcnet-dhcp

@@ -1,6 +1,13 @@
 #!/bin/sh -efu
 # attempt to autoconfigure ethernet
 
+[ -x /sbin/dhcpcd -o -x /sbin/dhclient ] || {
+	echo "NOT configuring DHCP for eth0" >&2
+	exit 0
+}
+
+echo "configuring DHCP for eth0" >&2
+
 mkdir -p /etc/net/ifaces/eth0 && {
 	echo TYPE=eth
 	echo BOOTPROTO=dhcp

features.in/live/live/image-scripts.d/90-cleanup-boot

@@ -0,0 +1,6 @@
+#!/bin/sh
+# we don't really need the kernel in live root,
+# it's been booted already
+
+rm -f /boot/*
+:

features.in/live/stage1/files/index.html

@@ -0,0 +1,10 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="3;url=http://www.altlinux.org/">
+<title>Welcome to ALT Linux!</title>
+</head>
+<body>
+<h1>Welcome to ALT Linux!</h1>
+<p>You will be redirected to <a href="http://www.altlinux.org/">the home page</a> shortly.</p>
+</body>
+<html>

features.in/ltsp/README

@@ -0,0 +1,5 @@
+Эта фича обеспечивает добавление функций терминального сервера:
+- загрузку бездисковых тонких клиентов по сети;
+- предоставление им доступа к серверу приложений.
+
+На данный момент является совсем экспериментальной.

features.in/ltsp/config.mk

@@ -0,0 +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)

features.in/stage2/stage1/scripts.d/03-test-kernel

@@ -1,6 +1,9 @@
 #!/bin/sh
 # check relevant kernel features availability
 
+GZ_OPTS="-comp gzip"
+XZ_OPTS="-comp xz -b 524288 -noI"
+
 # test for installer-required filesystems support
 for opt in CONFIG_SQUASHFS CONFIG_AUFS_FS; do
 	if grep -q "^$opt=[my]$" /boot/config-*; then
@@ -16,7 +19,14 @@ done
 # squashfs options: not really neccessary but better than none
 # NB: this config file should be carried over into install2
 if grep -q '^CONFIG_SQUASHFS_XZ=y$' /boot/config-*; then
-	echo "PACK_SQUASHFS_OPTS=-comp xz -Xbcj x86" > /.image/squashcfg.mk
+	# TODO: figure out if it's generally worth it even on x86:
+	#       if binaries account for less than ~70% of blocks,
+	#       the decompression filter overhead might hurt
+	# NB: there are arm, powerpc and some other filters too
+	if grep -q "^CONFIG_X86" /boot/config-*; then
+		XZ_OPTS="$XZ_OPTS -Xbcj x86"
+	fi
+	echo "PACK_SQUASHFS_OPTS=$XZ_OPTS" > /.image/squashcfg.mk
 else
-	echo "PACK_SQUASHFS_OPTS=-comp gzip" >> /.image/squashcfg.mk
+	echo "PACK_SQUASHFS_OPTS=$GZ_OPTS" > /.image/squashcfg.mk
 fi

features.in/x11/config.mk

@@ -12,3 +12,10 @@ use/x11/runlevel5: use/x11/xorg
 ### xdm: see also #23108
 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)

image.in/Makefile

@@ -14,6 +14,9 @@ include functions.mk
 ifeq (,$(realpath $(MKIMAGE_PREFIX)/config.mk))
 $(error please apt-get install mkimage and have a look at QUICKSTART as well)
 endif
+
+include $(MKIMAGE_PREFIX)/config.mk
+
 ifeq (-,$(shell rpmvercmp $(MKI_VERSION) $(MKI_VER_MINIMAL) | tr -d [0-9]))
 $(info error: mkimage-$(MKI_VERSION) is too old, please upgrade)
 $(error mkimage is too old, $(MKI_VER_MINIMAL) is minimal supported version)
@@ -23,8 +26,6 @@ $(info warning: mkimage-$(MKI_VERSION) is suboptimal, consider upgrading)
 $(warning consider upgrading mkimage to $(MKI_VER_OPTIMAL) or better)
 endif
 
-include $(MKIMAGE_PREFIX)/config.mk
-
 # reconstruct instead of passing yet another variable
 IMAGE_LINK := $(IMAGE_NAME).$(IMAGE_TYPE)
 IMAGE_OUTFILE := $(IMAGE_NAME)-$(DATE)-$(ARCH).$(IMAGE_TYPE)
@@ -46,6 +47,13 @@ include $(MKIMAGE_PREFIX)/targets.mk
 pack-image: OUTDIR = $(IMAGEDIR)
 pack-image: imagedir
 
+copy-tree: $(SAVE_PROFILE:%=save-profile)
+
+save-profile:
+	@mkdir -p files/.disk; \
+	git archive --prefix=mkimage-profile/ HEAD \
+	| gzip -9 > files/.disk/profile.tgz
+
 .PHONY: imagedir postprocess debug
 
 imagedir:

lib/distro.mk

@@ -23,15 +23,12 @@ distro/.init: profile/bare
 distro/.base: distro/.init
 	@$(call set,KFLAVOURS,std-def)
 
-# bootloader test target
-distro/syslinux: distro/.init \
-	use/syslinux/localboot.cfg use/syslinux/ui-vesamenu \
-	use/hdt use/memtest
-
 # something marginally useful (as a network-only installer)
 # NB: doesn't carry stage3 thus cannot use/bootloader
 distro/installer: distro/.base use/install2 use/syslinux/localboot.cfg
 	@$(call set,INSTALLER,altlinux-generic)
 	@$(call set,STAGE1_KMODULES_REGEXP,drm.*)	# for KMS
 
+distro/.installer: distro/installer use/bootloader/grub use/repo/main
+
 endif

pkg.in/lists/Makefile

@@ -16,7 +16,16 @@ ifneq (,$(findstring install2,$(FEATURES)))
 DOTBASE := dot-base
 endif
 
-all: $(TARGET) $(GLOBAL_DEBUG) $(DOTBASE)
+all: $(TARGET) $(GLOBAL_DEBUG) $(DOTBASE) copy-lists copy-groups
+	@if type -t git >&/dev/null && cd $(TARGET); then \
+		if [ -n "`git status -s`" ]; then \
+			git add . && \
+			git commit -qam "requested $(SUFFIX) copied over"; \
+		fi; \
+		cd - >&/dev/null; \
+	fi
+
+copy-lists:
 	@# env | sort -u | grep _LISTS | xargs cp
 	@$(foreach V, \
 		$(filter %_LISTS,$(sort $(.VARIABLES))), \
@@ -24,6 +33,11 @@ all: $(TARGET) $(GLOBAL_DEBUG) $(DOTBASE)
 			$(shell cp --parents -at $(TARGET) \
 				-- $(value $V))))
 
+copy-groups:
+	@if [ -n "$(THE_GROUPS)$(MAIN_GROUPS)" ]; then \
+		cp -at $(TARGET) -- $(THE_GROUPS) $(MAIN_GROUPS); \
+	fi
+
 # args: name, suffix, command
 define dump-THEM
 if [ -n "$($(1)_$(2))" ]; then echo -e "\n## $(1)_$(2)"; $(3) $($(1)_$(2)); fi;
@@ -39,16 +53,6 @@ dot-base:
 		$(foreach p,SYSTEM COMMON THE BASE,$(call dump-PACKAGES,$(p))) \
 		$(foreach l,THE BASE,$(call dump-LISTS,$(l))) \
 	} | sed -re '/^[^[:space:]#]/ s/[[:space:]]+/\n/g' >$(TARGET)/.base
-	@if [ -n "$(THE_GROUPS)$(MAIN_GROUPS)" ]; then \
-		cp -at $(TARGET) -- $(THE_GROUPS) $(MAIN_GROUPS); \
-	fi
-	@if type -t git >&/dev/null && cd $(TARGET); then \
-		if [ -n "`git status -s`" ]; then \
-			git add . && \
-			git commit -qam "requested $(SUFFIX) copied over"; \
-		fi; \
-		cd - >&/dev/null; \
-	fi
 
 # do beforehand as foreach gets expanded before recipe execution
 $(TARGET):

pkg.in/lists/ltsp

@@ -0,0 +1,32 @@
+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
+#docs-issue-desktop_personal
+
+installer-feature-ltsp-stage3
+
+# Set available online repository and some useful utilites from /sbin
+installer-feature-symlinks-from-sbin
+installer-feature-online-repo
+
+####
+vim-console
+cpio

pkg.in/lists/ltsp-client

@@ -0,0 +1,5 @@
+ltsp-client
+ltsp-client-full
+ltsp-client-nxsession
+# ouch!
+mc

pkg.in/lists/ltsp-client.i586

@@ -0,0 +1,3 @@
+kernel-image-ltsp-client
+kernel-modules-drm-ltsp-client
+kernel-modules-alsa-ltsp-client

pkg.in/lists/ltsp-client.x86_64

@@ -0,0 +1,3 @@
+kernel-image-std-def
+kernel-modules-drm-std-def
+kernel-modules-alsa-std-def

pkg.in/lists/tagged/desktop+network

@@ -0,0 +1 @@
+firefox

pkg.in/lists/tagged/desktop+razorqt

@@ -1,4 +1,4 @@
-razorqt
+razor-qt
 arora
 qtfm
 qterminal

pkg.in/lists/tagged/desktop+razorqt+extra

@@ -16,3 +16,6 @@ qt4-settings
 qtparted
 tubularix
 smplayer
+
+# upstream recommended
+#ptbatterysystemtray

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

pkg.in/lists/tagged/rescue+extra

@@ -103,3 +103,6 @@ mc
 # Development/Debuggers
 strace
 sysstat
+
+# win32
+chntpw

pkg.in/lists/xorg

@@ -21,12 +21,13 @@ xorg-drv-wacom
 xorg-drv-wizardpen
 xorg-drv-qxl
 
+# #25044?
+xorg-dri-intel
+
 # for those who need these
 xorg-drv-keyboard
 xorg-drv-mouse
 
-#xorg-dri-*
-
 xauth
 xorg-utils
 #xorg-extensions*