0.8.3-alt1

- make-3.82 support
- fixed live image boot to some extent (see #27640, #27852)

.gear/mkimage-profiles.spec

@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.8.2
+Version: 0.8.3
 Release: alt1
 
 Summary: ALT Linux based distribution metaprofile
@@ -61,6 +61,10 @@ 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
 

.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

.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

.gear/tags/list

@@ -1 +1 @@
-0b4d10bca81f0d7c10b3710a8ea3cff7fa9b51dd v0.8.1
+8e161378cc7ad174898a8d51697730334b1b712a v0.8.2

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 \

features.in/bootloader/README

@@ -11,4 +11,7 @@
 произведена ещё одна попытка переключения на grub, то в конфигурации
 останется lilo как последняя "новая" цель с точки зрения make.
 
+При необходимости всё-таки "пересилить" последнее изменение можно
+	@$(call set,BASE_BOOTLOADER,grub_или_lilo)
+
 Реализация экспериментальная (нужно модуляризовать installer-steps).

features.in/relname/README

@@ -1,4 +1,4 @@
 Эта фича меняет содержимое файла /etc/altlinux-release в соответствии
-с установленной переменной MENUTITLE, что изменяет пункты загрузки GRUB.
+с установленной переменной RELNAME, что изменяет пункты загрузки GRUB.
 
 Применяется при необходимости перекрыть внесенный брендингом текст.

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'"
+	echo "** Change /etc/altlinux-release contents to the release name" >&2
-fi >&2
+fi
 
 SCRIPT="/usr/share/install2/postinstall.d/91-relname"
 cat > "$SCRIPT" << EOF

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

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
+:

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)

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
 

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

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

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