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
24 changed files with 74 additions and 39 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.5.5
+Version: 0.5.6
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -59,6 +59,9 @@ 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
--- a/.gear/tags/9e3e95942c73c5a2cca794e28935e6257cb37bc9
+++ b/.gear/tags/9e3e95942c73c5a2cca794e28935e6257cb37bc9
@@ -1,6 +0,0 @@
-object 8473fda02d9c0e194ac54a95159ebf49df8a0ace
-type commit
-tag v0.5.4
-tagger Michael Shigorin <mike@altlinux.org> 1326746252 +0200
-
-apt-get install hasher
--- 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 @@
-9e3e95942c73c5a2cca794e28935e6257cb37bc9 v0.5.4
+e5d47eac6dd50887d577d7d00f8c52bc39d6cc26 v0.5.5
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -1,13 +1,13 @@
 # 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))
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -1,6 +1,10 @@
 # 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
@@ -30,7 +34,7 @@ distro/live-icewm: distro/.live-x11
 	@$(call add,LIVE_LISTS, \
 		$(call tags,(base || desktop) && (live || network || icewm)))

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

--- 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/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/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/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
@@ -47,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
@@ -1,10 +1,12 @@
 ltsp-server
 ltsp-server-basic

-alterator-ltsconf
+#alterator-ltsconf
+#alterator-standalone

 alsa-plugins
 alsa-plugins-pulse
+aplay

 syslinux
 mkisofs
--- 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/base+server+disk
+++ b/pkg.in/lists/tagged/base+server+disk
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