0.8.3-alt1

- make-3.82 support - fixed live image boot to some extent (see #27640, #27852)
80-make-initfs: fixed silly thinko
2012-10-15 23:34:36 +03:00 · 2012-10-15 17:04:18 +03:00 · 2012-10-15 16:03:58 +03:00 · 2012-10-10 16:18:35 +03:00 · 2012-10-10 12:06:55 +03:00 · 2012-10-10 12:00:17 +03:00
29 changed files with 101 additions and 29 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.8.1
+Version: 0.8.3
 Release: alt1

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

 %changelog
+* Mon Oct 15 2012 Michael Shigorin <mike@altlinux.org> 0.8.3-alt1
+- make-3.82 support
+- fixed live image boot to some extent (see #27640, #27852)
+
+* Mon Sep 24 2012 Michael Shigorin <mike@altlinux.org> 0.8.2-alt1
+- fixed build with recent make-initrd-propagator
+
 * Mon Sep 03 2012 Michael Shigorin <mike@altlinux.org> 0.8.1-alt1
 - misc fixes

--- a/.gear/tags/8e161378cc7ad174898a8d51697730334b1b712a
+++ b/.gear/tags/8e161378cc7ad174898a8d51697730334b1b712a
@@ -0,0 +1,6 @@
+object b44705d25baf5b0f0c0abb526d42c42b312026e9
+type commit
+tag v0.8.2
+tagger Michael Shigorin <mike@altlinux.org> 1348509116 +0400
+
+propagator joy
--- a/.gear/tags/d21fc0e7ffbe1e99ade184ab13b5fe649a103610
+++ b/.gear/tags/d21fc0e7ffbe1e99ade184ab13b5fe649a103610
@@ -1,6 +0,0 @@
-object d1bbbbc10be5df925dd677f7956ed06821192866
-type commit
-tag v0.8.0
-tagger Michael Shigorin <mike@altlinux.org> 1344884693 +0300
-
-stage2@live
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-d21fc0e7ffbe1e99ade184ab13b5fe649a103610 v0.8.0
+8e161378cc7ad174898a8d51697730334b1b712a v0.8.2
--- a/9
+++ b/9
@@ -39,13 +39,13 @@ Most docs are in Russian, welcome to learn it or ask for English.
  + базовые комплекты помещены в подкаталогах под sub.in/;
    их наборы скриптов могут расширяться фичами
 - фичи:
-  + накопительный список собирается в $(FEATURES)
  + законченные блоки функциональности (или наборы таковых)
  + описываются в индивидуальных features.in/*/config.mk
  + могут требовать другие фичи, а также субпрофили
+  + накопительный список собирается в $(FEATURES)
  + при сборке $(BUILDDIR) содержимое фич добавляется в профиль
 - списки пакетов (*_LISTS):
-  + просьба по возможности избегать дублирования
+  + просьба по возможности избегать дублирования (см. bin/pkgdups)
 - индивидуальные пакеты (*_PACKAGES): см. тж. conf.d/README

 Результат:
@@ -62,3 +62,8 @@ Most docs are in Russian, welcome to learn it or ask for English.
  + params.txt: переменные, указываемые при запуске сборки
  + pkglists.txt: формирование состава образа
  + features.txt: обзор подключаемых особенностей
+
+Удачи; что не так -- пишите.
+
+-- 
+Michael Shigorin <mike@altlinux.org>
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -11,7 +11,7 @@ distro/.desktop-network: distro/.desktop-mini +vmguest
 	@$(call add,BASE_LISTS, \
 		$(call tags,(base || desktop) && (l10n || network)))

-distro/icewm: distro/.desktop-network use/lowmem +icewm; @:
+distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
 distro/tde: distro/.desktop-mini +tde; @:
 distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:
--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -25,6 +25,9 @@ distro/live-gns3: distro/live-icewm
 distro/server-systemd: distro/server-mini use/systemd
 	@$(call set,KFLAVOURS,std-def)

+distro/server-test: distro/server-mini use/relname
+	@$(call set,RELNAME,Test-Server)
+
 # tiny network-only server-ovz installer (stage2 comes over net too)
 distro/server-ovz-netinst: distro/.base sub/stage1 use/stage2 \
 	use/syslinux/ui/menu use/syslinux/localboot.cfg use/memtest
--- a/features.in/bootloader/README
+++ b/features.in/bootloader/README
@@ -11,4 +11,7 @@
 произведена ещё одна попытка переключения на grub, то в конфигурации
 останется lilo как последняя "новая" цель с точки зрения make.

+При необходимости всё-таки "пересилить" последнее изменение можно
+	@$(call set,BASE_BOOTLOADER,grub_или_lilo)
+
 Реализация экспериментальная (нужно модуляризовать installer-steps).
--- a/features.in/install2/config.mk
+++ b/features.in/install2/config.mk
@@ -17,3 +17,15 @@ use/install2/kms: use/stage2/kms
 # see also use/vmguest/kvm; qxl included in xorg pkglist
 use/install2/kvm:
 	@$(call add,INSTALL2_PACKAGES,spice-vdagent xorg-drv-qxl)
+
+# filesystems handling
+use/install2/fs: use/install2/xfs use/install2/jfs use/install2/reiserfs; @:
+
+use/install2/xfs:
+	@$(call add,INSTALL2_PACKAGES,xfsprogs)
+
+use/install2/jfs:
+	@$(call add,INSTALL2_PACKAGES,jfsutils)
+
+use/install2/reiserfs:
+	@$(call add,INSTALL2_PACKAGES,reiserfsprogs)
--- a/features.in/relname/README
+++ b/features.in/relname/README
@@ -0,0 +1,4 @@
+Эта фича меняет содержимое файла /etc/altlinux-release в соответствии
+с установленной переменной RELNAME, что изменяет пункты загрузки GRUB.
+
+Применяется при необходимости перекрыть внесенный брендингом текст.
--- a/features.in/relname/config.mk
+++ b/features.in/relname/config.mk
@@ -0,0 +1,3 @@
+use/relname:
+	@$(call add_feature)
+	@$(call xport,RELNAME)
--- a/features.in/relname/stage2/image-scripts.d/91-relname
+++ b/features.in/relname/stage2/image-scripts.d/91-relname
@@ -0,0 +1,20 @@
+#!/bin/sh -ef
+# create a postinstall script to perform the change afterwards
+
+if [ -z "$GLOBAL_RELNAME" ]; then
+	echo "** warning: relname feature enabled but RELNAME not set" >&2
+	exit 0
+fi
+
+if [ -n "$GLOBAL_VERBOSE" ]; then
+	echo "** Change /etc/altlinux-release contents to the release name" >&2
+fi
+
+SCRIPT="/usr/share/install2/postinstall.d/91-relname"
+cat > "$SCRIPT" << EOF
+#!/bin/sh
+a= . install2-init-functions
+exec_chroot sh -c 'echo "$GLOBAL_RELNAME" > /etc/altlinux-release'
+exec_chroot sh -c 'grub-mkconfig -o /boot/grub/grub.cfg >&/dev/null ||:'
+EOF
+chmod +x "$SCRIPT"
--- a/features.in/stage2/stage1/scripts.d/10-initrd-base
+++ b/features.in/stage2/stage1/scripts.d/10-initrd-base
@@ -2,5 +2,5 @@
 # prepare base make-initrd configuration for stage1
 # see also http://www.altlinux.org/Make-initrd-propagator

-sed -i 's/AUTODETECT/#AUTODETECT/' /etc/initrd.mk
+sed -i 's/AUTODETECT/#&/' /etc/initrd.mk
 echo 'FEATURES += propagator' >> /etc/initrd.mk
--- a/features.in/stage2/stage1/scripts.d/80-make-initfs
+++ b/features.in/stage2/stage1/scripts.d/80-make-initfs
@@ -1,6 +1,8 @@
-#!/bin/sh -efu
+#!/bin/sh -efux
 # NB: /etc/initrd.mk carefully prepared by earlier scripts

+verbose() { [ -n "$GLOBAL_VERBOSE" ] && echo "** 80-make-initfs: $@" >&2; }
+
 kver="$(rpm -qa 'kernel-image*' \
 	    --qf '%{installtime} %{version}-%{name}-%{release}\n' \
 	| sort -n \
@@ -12,15 +14,25 @@ MAKE_INITRD_OPTS="--no-checks -k $kver"
 MAKE_INITRD_VER="`make-initrd -V \
 	| sed -rn 's/^make-initrd version ([0-9.]+)/\1/p'`"

+# make-initrd >= 0.7.8
 if [ "`rpmvercmp "$MAKE_INITRD_VER" "0.7.8"`" != "-1" ]; then
 	MAKE_INITRD_OPTS="$MAKE_INITRD_OPTS --no-depmod"
 fi

+[ -z "$GLOBAL_VERBOSE" ] || MAKE_INITRD_OPTS="$MAKE_INITRD_OPTS -v"
+
 if make-initrd $MAKE_INITRD_OPTS; then
-	gzip < /boot/initrd-$kver.img > $(getconf LIBDIR)/propagator/initfs
+	pdir="$(getconf LIBDIR)/propagator"
+	if [ -d "$pdir" ]; then		# p5/t6
+		verbose "$pdir exists"
+		gzip < /boot/initrd-$kver.img > "$pdir"/initfs
+	else
+		verbose "$pdir missing, no-op"
+	fi
 else
 	exit 1
 fi

 [ -h /boot/vmlinuz ] || ln -s vmlinuz-$kver /boot/vmlinuz
 [ -h /boot/initrd.img ] || ln -s initrd-$kver.img /boot/initrd.img
+:
--- a/features.in/syslinux/cfg.in/01gfxboot.cfg
+++ b/features.in/syslinux/cfg.in/01gfxboot.cfg
@@ -1,3 +1,3 @@
 ui gfxboot bootlogo message
-menu title ALT Linux (@mkimage-profiles@)
+menu title @relname@
 prompt 0
--- a/features.in/syslinux/cfg.in/01menu.cfg
+++ b/features.in/syslinux/cfg.in/01menu.cfg
@@ -1,3 +1,3 @@
 ui menu.c32
-menu title ALT Linux (@mkimage-profiles@)
+menu title @relname@
 prompt 0
--- a/features.in/syslinux/cfg.in/01prompt.cfg
+++ b/features.in/syslinux/cfg.in/01prompt.cfg
@@ -1,2 +1,2 @@
-say ALT Linux (@mkimage-profiles@)
+say @relname@
 prompt 1
--- a/features.in/syslinux/cfg.in/01vesamenu.cfg
+++ b/features.in/syslinux/cfg.in/01vesamenu.cfg
@@ -1,3 +1,3 @@
 ui vesamenu
-menu title ALT Linux (@mkimage-profiles@)
+menu title @relname@
 prompt 0
--- a/features.in/syslinux/cfg.in/20install2.cfg
+++ b/features.in/syslinux/cfg.in/20install2.cfg
@@ -1,5 +1,5 @@
 label linux
-  menu label ^Install @distro@
+  menu label ^Install @relname@
  kernel alt0/vmlinuz
  append initrd=alt0/full.cz changedisk fastboot showopts automatic=method:cdrom ramdisk_size=@altinst_size@ vga=0x314 @bootargs@

--- a/features.in/syslinux/cfg.in/20netinstall2.cfg
+++ b/features.in/syslinux/cfg.in/20netinstall2.cfg
@@ -1,5 +1,5 @@
 label netinst
-  menu label Install server-ovz via inter^net
+  menu label Install @relname@ via inter^net
  kernel alt0/vmlinuz
  append initrd=alt0/full.cz fastboot showopts automatic=method:http,network:dhcp,server:ftp.linux.kiev.ua,directory:/pub/Linux/ALT/people/mike/iso/mkimage-profiles/netinst/server-ovz/x86_64 quiet=1 ramdisk_size=131072 vga=0x314
  ### hardwired parameters and strings should become dynamic someday
--- a/features.in/syslinux/config.mk
+++ b/features.in/syslinux/config.mk
@@ -3,6 +3,7 @@ use/syslinux: sub/stage1
 	@$(call add_feature)
 	@$(call add,STAGE1_PACKAGES,syslinux)
 	@$(call try,META_SYSTEM_ID,SYSLINUX)
+	@$(call set,RELNAME,ALT Linux ($(IMAGE_NAME)))

 # UI is overwritten
 use/syslinux/ui/%: use/syslinux
--- a/features.in/syslinux/generate.mk
+++ b/features.in/syslinux/generate.mk
@@ -49,9 +49,12 @@ cfg = $(wildcard cfg.in/??$(1).cfg)

 all: debug timeout
 	@### proper text branding should be implemented
-	@sed -i 's,@mkimage-profiles@,$(IMAGE_NAME),' $(DSTDIR)/*.cfg
 	@echo $(SYSLINUX_MODULES) > $(DSTDIR)/modules.list
 	@echo $(SYSLINUX_FILES) > $(DSTDIR)/syslinux.list
+	@sed -i \
+		-e 's,@mkimage-profiles@,$(IMAGE_NAME),' \
+		-e 's,@relname@,$(RELNAME),' \
+		$(DSTDIR)/*.cfg

 # integerity check
 timeout: distro
--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -52,7 +52,7 @@ GLOBAL_TARGET := $(ARCH)
 GLOBAL_HSH_APT_CONFIG := $(wildcard $(APTCONF))

 # the lib/build-*.mk comes from features.in/build-*/lib
-include lib/*.mk
+include $(sort $(wildcard lib/*.mk))
 include $(MKIMAGE_PREFIX)/targets.mk

 # specified only for the final image (target-specific)
--- a/lib/clean.mk
+++ b/lib/clean.mk
@@ -51,11 +51,9 @@ distclean: clean

 # builddir existing outside read-only metaprofile is less ephemeral
 # than BUILDDIR variable is -- usually it's unneeded afterwards
-# so just zap it unless DEBUG has been requested (moreso for multi
-# image builds, UI based ones, and readonly metaprofile; or CHECK)
 postclean: build-image
 	@{ \
-	if [ "0$(DEBUG)" -lt 2 -a -z "$(CHECK)" ] && \
+	if [ "0$(DEBUG)" -lt 2 -a -z "$(CHECK)$(REPORT)" ] && \
 	     [ "$(NUM_TARGETS)" -gt 1 \
 	       -o -n "$(__frontend)" \
 	       -o ! -L "$(SYMLINK)" ]; then \
--- a/main.mk
+++ b/main.mk
@@ -30,7 +30,7 @@ export MKIMAGE_PROFILES := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
 -include $(HOME)/.mkimage/profiles.mk

 # most of the actual work done elsewhere
-include lib/*.mk
+include $(sort $(wildcard lib/*.mk))
 include conf.d/*.mk
 include features.in/*/config.mk

--- a/pkg.in/lists/ovz-server
+++ b/pkg.in/lists/ovz-server
@@ -2,6 +2,7 @@ vzctl
 vzdump
 #vzautolimit
 #vzfree
+vzquota
 #vzvalidate
 htop
 yabeda
--- a/sub.in/main/Makefile
+++ b/sub.in/main/Makefile
@@ -29,7 +29,7 @@ IMAGE_PACKAGES = $(call map,list, \
 		 $(SYSTEM_PACKAGES) $(COMMON_PACKAGES) \
 		 $(THE_PACKAGES) $(BASE_PACKAGES) $(MAIN_PACKAGES)

-include lib/*.mk
+-include $(sort $(wildcard lib/*.mk))

 MKI_DESTDIR = ALTLinux/RPMS.main
 MKI_PACK_RESULTS = data
--- a/sub.in/stage1/Makefile
+++ b/sub.in/stage1/Makefile
@@ -41,7 +41,7 @@ CHROOT_PACKAGES = $(STAGE1_PACKAGES) $(SYSTEM_PACKAGES)
 # pass for use/stage2
 GLOBAL_SQUASHFS := $(SQUASHFS)

-include lib/*.mk
+-include $(sort $(wildcard lib/*.mk))

 # scripts prepare bootloader configuration, too
 # NB: we pass tested squashfs options for ../stage2/Makefile to include
--- a/sub.in/stage2/Makefile
+++ b/sub.in/stage2/Makefile
@@ -37,7 +37,7 @@ IMAGE_PACKAGES_REGEXP += $(call kpackages, \
 			 $(STAGE2_KMODULES) $(STAGE2_KMODULES_REGEXP), \
 			 $(STAGE1_KFLAVOUR))

-include lib/*.mk
+-include $(sort $(wildcard lib/*.mk))

 # see also scripts.d/99-elf-stats
 ifdef GLOBAL_SQUASHFS_SORT
Author	SHA1	Message	Date
Michael Shigorin	7a50acb5c4	0.8.3-alt1 - make-3.82 support - fixed live image boot to some extent (see #27640, #27852)	2012-10-15 23:34:36 +03:00
Michael Shigorin	90b8fd49f4	80-make-initfs: fixed silly thinko The added pdir check was a hillarious(tm) overlooked bug indeed: I tried to put .../initfs/initfs instead of .../initfs as the result. Duly spotted by torabora@, thanks a lot. Still the kmod+propagator+kernel-image combo needed some tweaking too, see #27640	2012-10-15 17:04:18 +03:00
Michael Shigorin	944e0341c5	stage2: brevity fix A tiny bit less cut-n-paste. :)	2012-10-15 16:03:58 +03:00
Michael Shigorin	6f5be91827	make-3.82 adaptation The issue actually hit image.in/Makefile: "metadata" target in features.in/metadata/lib/50-metadata.mk wasn't reached even if features.in/build-distro/lib/90-build-distro.mk would ACK that the "whatever" actions included "metadata"; thus Metadata/pkg-groups.tar wasn't created and the installer silently failed to install the .base system. Let's armour the rest of the cases where the order of inclusion might be important as well.	2012-10-10 16:18:35 +03:00
Michael Shigorin	718a50b9d0	relname: tweak the fix/diagnostics The culprit would be that $RELNAME isn't really set there ($GLOBAL_RELNAME is), and sh -u will treat that as error.	2012-10-10 12:06:55 +03:00
Mike Radyuk	78684bfef3	fix RELNAME script and README	2012-10-10 12:00:17 +03:00
Mike Radyuk	cc623bc56b	fix typo in RELNAME variable	2012-10-09 00:13:02 +03:00
Michael Shigorin	64536f62d1	bootloader README: a note on overriding It's pretty ugly but dropping the current way means losing the dependency tracking which is critical to get the required alterator module into install2.	2012-10-01 23:28:24 +03:00
Michael Shigorin	91053b9daf	gear-store-tags	2012-09-24 21:52:10 +04:00
Michael Shigorin	b44705d25b	0.8.2-alt1 - fixed build with recent make-initrd-propagator	2012-09-24 21:21:49 +04:00
Michael Shigorin	12a2fc983c	80-make-initfs: fix for current make-initrd* Thanks mithraen@ for spotting, boyarsh@ for explaining, and legion@ for hearty support :) The problem would manifest itself like this: /.host/script.sh: line 20: /usr/lib64/propagator/initfs: \ No such file or directory mki-scripts: .../stage1/scripts.d/80-make-initfs: unable to run script.	2012-09-24 21:20:49 +04:00
Michael Shigorin	30d0340d56	install2: added convenient filesystems support Thanks Serg Markov for bringing my attention to this: http://www.opennet.ru/openforum/vsluhforumID3/86552.html#61 While the official distros might skip some filesystems for support reasons there's no reason for community distros to do so either. Let's try that with icewm.iso... NB: installer has a misfeature of dropping jfs/reiserfs support in runtime unless "expertmode" magic word is on the kernel bootargs string (#27763, #17368).	2012-09-24 11:07:49 +04:00
Michael Shigorin	2f357e44d6	clean.mk: skip if REPORT requested either The problem would manifest itself like this: ..:..:.. cleaning up after build sed: can't read .../build.log: No such file or directory	2012-09-24 11:07:45 +04:00
Michael Shigorin	a2b89e6647	ovz-server: add vzquota Asked for by torabora@; indeed.	2012-09-23 11:46:52 +04:00
Michael Shigorin	56b3147eac	README: minor readability fixes Should be a tiny bit better this way.	2012-09-22 17:37:14 +04:00
Michael Shigorin	d5cf1ff3eb	renamed menuitem-grub feature to relname Its immediate purpose was influencing the GRUB boot menu but the implemented mechanism is actually a part of the long planned text branding and might be further merged into branding when hierarchical features finally chime in. So let's get the naming straight before it breeds.	2012-09-12 20:12:41 +03:00
Michael Shigorin	f44908ca78	proofreading of the merged commits File contents should be correct.	2012-09-12 19:39:42 +03:00
Mike Radyuk	8233aa8424	added menuitem-grub feature	2012-09-12 19:23:55 +03:00
Mike Radyuk	a35b5fbc21	added MENUITEM variable	2012-09-12 19:19:37 +03:00
Michael Shigorin	c3a1b4a934	gear-store-tags	2012-09-03 20:22:54 +03:00