0.6.8-alt1

- minor bugfixes
desktop: add glibc-locales, essentially
2012-05-28 22:13:50 +03:00 · 2012-05-26 15:10:20 +03:00 · 2012-05-26 14:08:19 +03:00 · 2012-05-25 16:55:54 +03:00 · 2012-05-21 21:30:37 +03:00
7 changed files with 39 additions and 17 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.6.7
+Version: 0.6.8
 Release: alt1

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

 %changelog
+* Mon May 28 2012 Michael Shigorin <mike@altlinux.org> 0.6.8-alt1
+- minor bugfixes
+
 * Mon May 21 2012 Michael Shigorin <mike@altlinux.org> 0.6.7-alt1
 - docs updates

--- a/.gear/tags/02fe7a7e583b570944eb332ca93eba03a6f0f11e
+++ b/.gear/tags/02fe7a7e583b570944eb332ca93eba03a6f0f11e
@@ -1,6 +0,0 @@
-object a4836609d986c3609ba52860ae60061d0cf0e514
-type commit
-tag v0.6.6
-tagger Michael Shigorin <mike@altlinux.org> 1337020642 +0300
-
-frontstart
--- a/.gear/tags/91bffd88341fa5c0516f7a663e8eb6f6235cbb2c
+++ b/.gear/tags/91bffd88341fa5c0516f7a663e8eb6f6235cbb2c
@@ -0,0 +1,6 @@
+object 128fc9d44d3bd99c631a31ad8941f3370bf62f50
+type commit
+tag v0.6.7
+tagger Michael Shigorin <mike@altlinux.org> 1337625023 +0300
+
+docsies
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-02fe7a7e583b570944eb332ca93eba03a6f0f11e v0.6.6
+91bffd88341fa5c0516f7a663e8eb6f6235cbb2c v0.6.7
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -7,7 +7,8 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
 distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:

 distro/.desktop-network: distro/.desktop-mini +vmguest
-	@$(call add,BASE_LISTS,$(call tags,(base || desktop) && network))
+	@$(call add,BASE_LISTS, \
+		$(call tags,(base || desktop) && (l10n || network)))

 distro/icewm: distro/.desktop-network use/lowmem +icewm; @:
 distro/tde: distro/.desktop-mini +tde; @:
--- a/features.in/stage2/stage1/scripts.d/80-make-initfs
+++ b/features.in/stage2/stage1/scripts.d/80-make-initfs
@@ -1,15 +1,26 @@
 #!/bin/sh -efu
 # NB: /etc/initrd.mk carefully prepared by earlier scripts

-kver="$(rpm -qa 'kernel-image*' --qf '%{installtime} %{version}-%{name}-%{release}\n' \
+kver="$(rpm -qa 'kernel-image*' \
+	    --qf '%{installtime} %{version}-%{name}-%{release}\n' \
 	| sort -n \
 	| tail -n 1 \
 	| cut -f 2 -d ' ' \
 	| sed 's/kernel-image-//')"

-make-initrd --no-checks -k $kver \
-&& gzip < /boot/initrd-$kver.img > $(getconf LIBDIR)/propagator/initfs \
-|| exit 1
+MAKE_INITRD_OPTS="--no-checks -k $kver"
+MAKE_INITRD_VER="`make-initrd -V \
+	| sed -rn 's/^make-initrd version ([0-9.]+)/\1/p'`"
+
+if [ "`rpmvercmp "$MAKE_INITRD_VER" "0.7.8"`" != "-1" ]; then
+	MAKE_INITRD_OPTS="$MAKE_INITRD_OPTS --no-depmod"
+fi
+
+if make-initrd $MAKE_INITRD_OPTS; then
+	gzip < /boot/initrd-$kver.img > $(getconf LIBDIR)/propagator/initfs
+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/lib/common.mk
+++ b/lib/common.mk
@@ -7,10 +7,17 @@ BUILD_LOG = build.log
 SYMLINK = build

 # brevity postprocessor; not exported, for toplevel use only
-SHORTEN = $(shell \
-	echo -n "| sed"; \
+SHORTEN = $(shell FILTER=; \
 	if [ -s "$(SYMLINK)" ]; then \
-		echo -n " -e 's,$(BUILDDIR),$(SYMLINK),'"; \
+		FILTER=" -e 's,$(BUILDDIR),$(SYMLINK),'"; \
+	fi; \
+	if [ -n "$$TMP" ]; then \
+		FILTER="$$FILTER -e 's,$$TMP,\$$TMP,'"; \
+	fi; \
+	if [ -n "$$HOME" ]; then \
+		FILTER="$$FILTER -e 's,$$HOME,~,'"; \
+	fi; \
+	if [ -n "$$FILTER" ]; then \
+		echo -n "| sed $$FILTER"; \
 	fi; \
-	echo -n " -e 's,$(TMP),\$$TMP,' -e 's,$(HOME),~,'"; \
 )
Author	SHA1	Message	Date
Michael Shigorin	ebeb52b5da	0.6.8-alt1 - minor bugfixes	2012-05-28 22:13:50 +03:00
Michael Shigorin	5c3d58b8e4	desktop: add glibc-locales, essentially The more or less basic desktop appeared to lack base locale support (starting with glibc-locales).	2012-05-26 15:10:20 +03:00
Michael Shigorin	860e20c62d	lib/common.mk: avoid using uninitialized variables It somehow managed to evade me that $(TMP) might be uninitialized; definitely should be checked before stuffing into sed substitution command. NB: this could be done in pure make but my take was less readable. Thanks shadowsbrother/gmail for hitting and reporting this.	2012-05-26 14:08:19 +03:00
Michael Shigorin	74e5734eae	80-make-initfs: optimize for newer make-initrd legion@ implemented skipping depmod call, and that's several more seconds for most of the images; let's shave these off if possible.	2012-05-25 16:55:54 +03:00
Michael Shigorin	3e7346f4e2	gear-store-tags	2012-05-21 21:30:37 +03:00