0.8.4-alt1

- worked around enhancements in current make-initrd-propagator (thus fixed live image boot, finally)
stage2: cope with current make-initrd-propagator
2012-10-16 12:17:28 +03:00 · 2012-10-16 12:16:39 +03:00 · 2012-10-15 23:35:17 +03:00 · 2012-10-15 23:34:36 +03:00 · 2012-10-15 17:04:18 +03:00 · 2012-10-15 16:03:58 +03:00
16 changed files with 47 additions and 22 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.8.2
+Version: 0.8.4
 Release: alt1

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

 %changelog
+* Tue Oct 16 2012 Michael Shigorin <mike@altlinux.org> 0.8.4-alt1
+- worked around enhancements in current make-initrd-propagator
+  (thus fixed live image boot, finally)
+
+* 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

--- a/.gear/tags/0b4d10bca81f0d7c10b3710a8ea3cff7fa9b51dd
+++ b/.gear/tags/0b4d10bca81f0d7c10b3710a8ea3cff7fa9b51dd
@@ -1,6 +0,0 @@
-object 061f299fa1349847539052cc4d0710925df61e16
-type commit
-tag v0.8.1
-tagger Michael Shigorin <mike@altlinux.org> 1346692968 +0300
-
-misc fixes
--- a/.gear/tags/d98aa48ec72b43a4a8ebe0b58524f19f046c9cad
+++ b/.gear/tags/d98aa48ec72b43a4a8ebe0b58524f19f046c9cad
@@ -0,0 +1,6 @@
+object 7a50acb5c486ff08daad4ef93743d98ff37cfb9a
+type commit
+tag v0.8.3
+tagger Michael Shigorin <mike@altlinux.org> 1350333297 +0300
+
+make-3.82
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-0b4d10bca81f0d7c10b3710a8ea3cff7fa9b51dd v0.8.1
+d98aa48ec72b43a4a8ebe0b58524f19f046c9cad v0.8.3
--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -26,7 +26,7 @@ distro/server-systemd: distro/server-mini use/systemd
 	@$(call set,KFLAVOURS,std-def)

 distro/server-test: distro/server-mini use/relname
-	@$(call set,RELNALE,Test-Server)
+	@$(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 \
--- 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/relname/README
+++ b/features.in/relname/README
@@ -1,4 +1,4 @@
 Эта фича меняет содержимое файла /etc/altlinux-release в соответствии
-с установленной переменной MENUTITLE, что изменяет пункты загрузки GRUB.
+с установленной переменной RELNAME, что изменяет пункты загрузки GRUB.

 Применяется при необходимости перекрыть внесенный брендингом текст.
--- a/features.in/relname/stage2/image-scripts.d/91-relname
+++ b/features.in/relname/stage2/image-scripts.d/91-relname
@@ -1,9 +1,14 @@
-#!/bin/sh -efu
+#!/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 '$RELNAME'"
-fi >&2
+	echo "** Change /etc/altlinux-release contents to the release name" >&2
+fi

 SCRIPT="/usr/share/install2/postinstall.d/91-relname"
 cat > "$SCRIPT" << EOF
--- a/features.in/stage2/config.mk
+++ b/features.in/stage2/config.mk
@@ -1,7 +1,7 @@
 # "1" is not a typo
 use/stage2: sub/stage1
 	@$(call add_feature)
-	@$(call add,STAGE1_PACKAGES,file make-initrd make-initrd-propagator)
+	@$(call add,STAGE1_PACKAGES,file make-initrd make-initrd-propagator propagator)

 use/stage2/kms:
 	@$(call add,STAGE1_KMODULES_REGEXP,drm.*)
--- 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,14 +14,20 @@ 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
-	pdir="$(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
@@ -27,3 +35,4 @@ fi

 [ -h /boot/vmlinuz ] || ln -s vmlinuz-$kver /boot/vmlinuz
 [ -h /boot/initrd.img ] || ln -s initrd-$kver.img /boot/initrd.img
+:
--- 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/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/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	939455e7a3	0.8.4-alt1 - worked around enhancements in current make-initrd-propagator (thus fixed live image boot, finally)	2012-10-16 12:17:28 +03:00
Michael Shigorin	aaddfb740c	stage2: cope with current make-initrd-propagator The issue that appeared pretty hard to diagnose occured to be the enhancement made in make-initrd-propagator=0.8.1-alt1.2 (that didn't hit Sisyphus until merged into 0.10-alt1) which drops propagator dependency. And that was optimized out in m-p, of course.	2012-10-16 12:16:39 +03:00
Michael Shigorin	b8d711a005	gear-store-tags	2012-10-15 23:35:17 +03:00
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