0.5.6-alt1

- minor fixups
doc/assumptions.txt: specify minimal gmake version
2012-02-20 22:43:10 +02:00 · 2012-02-18 09:48:38 +02:00 · 2012-02-17 12:11:11 +02:00 · 2012-02-16 13:42:42 +02:00 · 2012-02-16 13:42:42 +02:00 · 2012-02-14 20:25:12 +02:00
38 changed files with 187 additions and 45 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.5.4
+Version: 0.5.6
 Release: alt1

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

 %changelog
+* 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

--- a/.gear/tags/4d92978230ee015e53f81c2f29f4ec40d8bcc822
+++ b/.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
--- a/.gear/tags/e5d47eac6dd50887d577d7d00f8c52bc39d6cc26
+++ b/.gear/tags/e5d47eac6dd50887d577d7d00f8c52bc39d6cc26
@@ -0,0 +1,6 @@
+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 @@
-4d92978230ee015e53f81c2f29f4ec40d8bcc822 v0.5.3
+e5d47eac6dd50887d577d7d00f8c52bc39d6cc26 v0.5.5
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -1,17 +1,23 @@
 # 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
+	use/lowmem use/x11/xdm use/power/acpi/button \
+	use/cleanup/alterator

 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/desktop-systemd: distro/icewm use/systemd

 endif
--- a/conf.d/live.mk
+++ b/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/live/autologin use/power/acpi/button
+
 distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
 	@$(call add,LIVE_PACKAGES,livecd-isomd5sum)

@@ -24,11 +30,11 @@ 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
 	@$(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)))

@@ -37,4 +43,8 @@ distro/live-rescue: distro/live-icewm
 	@$(call add,LIVE_LISTS, \
 		$(call tags,(base || extra) && (archive || rescue || network)))

+distro/live-webkiosk: distro/.live-x11 use/live/hooks
+	@$(call add,LIVE_PACKAGES,livecd-webkiosk)
+	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
+
 endif
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -1,8 +1,7 @@
 # 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
@@ -11,9 +10,9 @@ distro/server-mini: distro/server-base use/cleanup/x11-alterator
 	@$(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
--- a/doc/assumptions.txt
+++ b/doc/assumptions.txt
@@ -1,7 +1,7 @@
 предположения фрагментов кода об окружении
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-NB: пути приводятся от верхнего уровня
+NB: пути приводятся от верхнего уровня; проект в целом предполагает
+GNU make 3.81 (с использованием которого и разрабатывается).

 - pkg.in/lists/Makefile
  + ожидает, что названия пакаджлистов указываются в переменных
--- a/doc/variables.txt
+++ b/doc/variables.txt
@@ -65,6 +65,11 @@
  + значение: пусто (по умолчанию) либо любая строка
  + см. ../lib/build.mk

+- SAVE_PROFILE
+  + сохраняет архив сгенерированного профиля в .disk/
+  + значение: пусто (по умолчанию) либо любая строка
+  + см. ../image.in/Makefile
+
 пример
 ~~~~~~
 make DEBUG=1 CLEAN=1 distro/syslinux.iso
--- a/features.in/bootloader/README
+++ b/features.in/bootloader/README
@@ -5,4 +5,10 @@
 систему (он НЕ должен требоваться пакету installer-distro-*)
 и требует пакет выбранного загрузчика.

+Обратите внимание: в процессе конфигурирования дистрибутива
+"переключение" загрузчика может происходить только в одну сторону
+-- если выставлен grub, произведено переключение на lilo и затем
+произведена ещё одна попытка переключения на grub, то в конфигурации
+останется lilo как последняя "новая" цель с точки зрения make.
+
 Реализация экспериментальная (нужно модуляризовать installer-steps).
--- a/features.in/bootloader/config.mk
+++ b/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
--- a/features.in/install2/install2/image-scripts.d/10bootloader
+++ b/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
--- a/features.in/install2/install2/image-scripts.d/90+install2+cleanup+bloat
+++ b/features.in/install2/install2/image-scripts.d/90+install2+cleanup+bloat
--- a/features.in/install2/install2/image-scripts.d/90+install2+cleanup+docs
+++ b/features.in/install2/install2/image-scripts.d/90+install2+cleanup+docs
--- a/features.in/install2/install2/image-scripts.d/90+install2+cleanup+drivers
+++ b/features.in/install2/install2/image-scripts.d/90+install2+cleanup+drivers
--- a/features.in/install2/install2/image-scripts.d/90+install2+cleanup+l10n
+++ b/features.in/install2/install2/image-scripts.d/90+install2+cleanup+l10n
--- a/features.in/install2/tagged/image-scripts.d/.gitignore
+++ b/features.in/install2/tagged/image-scripts.d/.gitignore
--- a/features.in/live/config.mk
+++ b/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)
--- a/features.in/live/live/image-scripts.d/10-live-hooks
+++ b/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 ||:
--- a/features.in/live/live/image-scripts.d/50-etcnet-dhcp
+++ b/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
--- a/features.in/live/live/image-scripts.d/90-cleanup-boot
+++ b/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/*
+:
--- a/features.in/live/stage1/files/index.html
+++ b/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>
--- a/features.in/ltsp/README
+++ b/features.in/ltsp/README
@@ -0,0 +1,5 @@
+Эта фича обеспечивает добавление функций терминального сервера:
+- загрузку бездисковых тонких клиентов по сети;
+- предоставление им доступа к серверу приложений.
+
+На данный момент является совсем экспериментальной.
--- a/features.in/ltsp/config.mk
+++ b/features.in/ltsp/config.mk
@@ -0,0 +1,3 @@
+use/ltsp:
+	@$(call add,INSTALL2_PACKAGES,installer-feature-ltsp-stage2)
+	@$(call add,MAIN_LISTS,ltsp-client ltsp-client.$(ARCH))
--- a/features.in/stage2/stage1/scripts.d/03-test-kernel
+++ b/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
--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -12,3 +12,7 @@ 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)
+
+### : some set()-like thing might be better?
+use/x11/lightdm: use/x11/runlevel5
+	@$(call add,THE_PACKAGES,lightdm)
--- a/image.in/Makefile
+++ b/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:
--- a/lib/distro.mk
+++ b/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
--- a/pkg.in/lists/Makefile
+++ b/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):
--- a/pkg.in/lists/ltsp
+++ b/pkg.in/lists/ltsp
@@ -0,0 +1,27 @@
+ltsp-server
+ltsp-server-basic
+
+#alterator-ltsconf
+#alterator-standalone
+
+alsa-plugins
+alsa-plugins-pulse
+aplay
+
+syslinux
+mkisofs
+
+#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
--- a/pkg.in/lists/ltsp-client
+++ b/pkg.in/lists/ltsp-client
@@ -0,0 +1,5 @@
+ltsp-client
+ltsp-client-full
+ltsp-client-nxsession
+# ouch!
+mc
--- a/pkg.in/lists/ltsp-client.i586
+++ b/pkg.in/lists/ltsp-client.i586
@@ -0,0 +1,3 @@
+kernel-image-ltsp-client
+kernel-modules-drm-ltsp-client
+kernel-modules-alsa-ltsp-client
--- a/pkg.in/lists/ltsp-client.x86_64
+++ b/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
--- a/pkg.in/lists/tagged/desktop+razorqt
+++ b/pkg.in/lists/tagged/desktop+razorqt
@@ -1,4 +1,4 @@
-razorqt
+razor-qt
 arora
 qtfm
 qterminal
--- a/pkg.in/lists/tagged/desktop+razorqt+extra
+++ b/pkg.in/lists/tagged/desktop+razorqt+extra
@@ -16,3 +16,6 @@ qt4-settings
 qtparted
 tubularix
 smplayer
+
+# upstream recommended
+ptbatterysystemtray
--- a/pkg.in/lists/tagged/rescue+extra
+++ b/pkg.in/lists/tagged/rescue+extra
@@ -103,3 +103,6 @@ mc
 # Development/Debuggers
 strace
 sysstat
+
+# win32
+chntpw
--- a/pkg.in/lists/tagged/base+server+disk
+++ b/pkg.in/lists/tagged/base+server+disk
--- a/pkg.in/lists/xorg
+++ b/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*
Author	SHA1	Message	Date
Michael Shigorin	a8e70fd4e6	0.5.6-alt1 - minor fixups	2012-02-20 22:43:10 +02:00
Michael Shigorin	cff036c212	doc/assumptions.txt: specify minimal gmake version From what I've read so far, most of the code should run on 3.80; there seem to have been some bits that are dependent on 3.81 features, but there is not a bit that depends on 3.82+ features so far.	2012-02-18 09:48:38 +02:00
Michael Shigorin	482e7bc9f3	features.in/x11: add lightdm support It's preferred for Razor-qt's logout app to be able to turn the system off or reboot it; xdm lacks consolekit support. Thanks Alexander Sokoloff for the hint.	2012-02-17 12:11:11 +02:00
Michael Shigorin	e1ef65b410	live-razorqt: adapted for razor-qt 0.4.1 packages The main package has been renamed from razorqt to razor-qt to fit upstream brand better.	2012-02-16 13:42:42 +02:00
Michael Shigorin	a62cdfa69e	50-etcnet-dhcp: moved from dev to live feature If there's an ethernet interface, a DHCP client, and these can result in connectivity out-of-box, then it's rather a feature for almost any LiveCD. Thus the configuration script is moved from dev feature to live one with the addition of dhcpcd/dhclient test. This is asking for some more neat solution though...	2012-02-16 13:42:42 +02:00
Michael Shigorin	045ae269b2	updated ltsp pkglist alterator-ltsconf needs further testing, and aplay is handy for remote audio tests.	2012-02-14 20:25:12 +02:00
Michael Shigorin	345319805d	10bootloader: replace both grub and lilo As it happens, I've stumbled upon a successfully built image with alterator-grub in BASE and lilo in install2's installer-steps. Of course the installer bailed out after dealing with packages :-/ Thanks Leo-sp50 for pointing out the (hopefully) right direction.	2012-02-09 17:47:10 +02:00
Michael Shigorin	9c6824ea57	grub by default in "production" targets There's still an annoying problem (a race?) manifesting itself as installer bailing out between packages installation and lilo setup with X segfault in logs; while the culprit is not known yet, let's avoid that for most images by moving the bootloader request from the former "leaf" target (which noe became a "node") into an experimental server-systemd one. Thanks Leo-sp50 for bringing that to my attention again; see also http://forum.russ2.com/index.php?showtopic=3310&pid=31364&st=0&#entry31364	2012-02-09 09:41:12 +02:00
Michael Shigorin	62ab13cc77	distro/installer related graph cleanup As was duly noted by Leo-sp50, both server.mk and desktop.mk duplicate a few bits layered over bare distro/installer which happened to be both a dependency (thus should reduce redundancy) and a "real distro" target (well, it doesn't just work yet, need to provide networking and sources.list in install2 by hand). Fixed by moving a "node" to distro/.installer along with typical additions and leaving a bare installer as is by now; there's a need to get it working at least for DHCP/ftp.altlinux.org case.	2012-02-09 09:33:39 +02:00
Michael Shigorin	4355f401db	image.in/Makefile: introduced save-profile From now on, non-empty SAVE_PROFILE variable will indicate the need to carry the particular generated profile inside the image built from it. Thanks gns@ for this feature in liveflash.eeepc.	2012-02-07 22:21:33 +02:00
Michael Shigorin	3dd020338b	"untag" install2 tagged scripts So far the tagged scripts concept is too fragile, and these were used unconditionally anyways. features.in/Makefile is broken regarding copying tagged scripts right now...	2012-02-07 22:19:17 +02:00
Michael Shigorin	402b6e080b	pkg.in/lists/Makefile: fixed committing what's copied Was broken during dot-base introduction by wrong recipe split...	2012-02-06 21:49:31 +02:00
Michael Shigorin	ca67a20952	renamed base+server+disk pkglist to server+extra This is to fit base/extra separation better and to avoid lvm2 creeping into VE images.	2012-02-06 20:18:14 +02:00
Michael Shigorin	5c5c4a6a6b	gear-store-tags	2012-02-06 17:10:41 +02:00
Michael Shigorin	0ad3c6b8bd	0.5.5-alt1 - live-related tweaks (including live.hooks support) - terminal server and webkiosk images	2012-02-06 17:09:33 +02:00
Michael Shigorin	f044bdbc33	xorg: added xorg-dri-intel explicitly xorg-drv-intel doesn't pull it in at the moment: https://bugzilla.altlinux.org/25044	2012-02-06 13:14:35 +02:00
Michael Shigorin	202f473499	conf.d/live.mk: live-webkiosk += live.hooks Rather convenient for native flash images but can also be beneficial with usual ISO by editing one before burning it.	2012-02-06 12:58:20 +02:00
Michael Shigorin	97e1be6a31	features.in/live: introduced live.hooks support The implementation builds upon liveflash.eeepc by gns@; thanks <sol/codis.ru> who suggested adding it to live-webkiosk	2012-02-06 12:58:20 +02:00
Michael Shigorin	c39c100cdc	conf.d/live.mk: initial live-webkiosk This one starts up a Firefox session in kiosk mode (there are several extensions, I find hsv@'s one preferable) and tries to browse /image/index.html which corresponds to index.html in the image root (could be edited by means of e.g. isomaster).	2012-02-06 12:58:20 +02:00
Michael Shigorin	bc091ab919	conf.d/live.mk: factor commons into distro/.live-x11 It's rather unexpected that someone would do an X11 LiveCD without user autologin -- but even if that's the case, then this waypoint is just not used for it.	2012-02-06 12:58:20 +02:00
Michael Shigorin	8b39c4af27	lists/tagged/rescue+extra += chntpw Thanks ildar@ for the reminder: http://www.altlinux.org/Talk:ALT_Linux_5.0_Rescue	2012-02-06 12:58:20 +02:00
Michael Shigorin	6cd6a0ff0d	features.in/bootloader: mind the make Document the one-way nature of bootloader type switching.	2012-02-06 12:58:20 +02:00
Michael Shigorin	7a3ab55db4	image.in/Makefile: fixed thinko regression MKI_VERSION was tested against even before the config.mk that defines it got included. Ouch.	2012-02-06 12:58:20 +02:00
Michael Shigorin	0c97aaf80b	ltsp-icewm += firefox That way it's at least marginally useful...	2012-02-06 12:58:20 +02:00
Michael Shigorin	01a03d037b	features.in/ltsp: support x86_64 clients Courtesy of prividen@, there's actual x86_64 client support in ALTSP. Although led@ tells that it's i586 optimization that hurts on i686+ and should be replaced with either i486 or i686 for that matter...	2012-02-06 12:58:20 +02:00
Michael Shigorin	33fe8cbd1f	initial ltsp feature Sort of builds on current Sisyphus with ltsp-related packages fixed up in a pocket but the latter are rather in need of some proper face-lift.	2012-02-06 12:58:20 +02:00
Michael Shigorin	178a700e6e	03-test-kernel: tweak squashfs compression A larger block size was recommended by led@; gns@ seems to concur as the 512k value was borrowed from liveflash.eeepc profile (along with -noI). The other issue is with binary specific compressors: x86 was clearly assumed while the data for an educated guess are pretty handy. Please note that using filters incurs additional compression attempts for the utility to choose the best result.	2012-01-18 23:33:29 +02:00
Michael Shigorin	3fcbed3378	features.in/live: added 90-cleanup-boot script Spotted /boot/vmlinuz* in a live environment, and wondered why waste a few megs of potentially precious space...	2012-01-18 23:11:04 +02:00
Michael Shigorin	d9a0d305ee	gear-store-tags	2012-01-16 22:38:37 +02:00