0.4.3.2-alt1

- mkimage version required/checked
image.in/Makefile: mkimage version check
2011-11-08 00:08:30 +02:00 · 2011-11-08 00:07:38 +02:00 · 2011-11-07 14:56:09 +02:00 · 2011-11-07 12:28:09 +02:00 · 2011-11-07 11:50:23 +02:00 · 2011-11-07 00:08:29 +02:00
6 changed files with 37 additions and 3 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.4.3
+Version: 0.4.3.2
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -13,6 +13,7 @@ Packager: Michael Shigorin <mike@altlinux.org>
 BuildArch: noarch
 Requires: rsync git-core
 Requires: time schedutils
+Requires: mkimage >= 0.2.0

 %define mpdir %_datadir/%name
 %add_findreq_skiplist %mpdir/*.in/*
@@ -53,11 +54,20 @@ mkdir -p %buildroot%mpdir
 cp -a * %buildroot%mpdir

 %files
-%mpdir/*
+%mpdir/
 %doc doc/
 %doc README QUICKSTART

 %changelog
+* Tue Nov 08 2011 Michael Shigorin <mike@altlinux.org> 0.4.3.2-alt1
+- mkimage version required/checked
+
+* Mon Nov 07 2011 Michael Shigorin <mike@altlinux.org> 0.4.3.1-alt1
+- CLEAN by default unless DEBUG
+
+* Mon Nov 07 2011 Michael Shigorin <mike@altlinux.org> 0.4.3-alt2
+- include %mpdir/ itself as well
+
 * Mon Nov 07 2011 Michael Shigorin <mike@altlinux.org> 0.4.3-alt1
 - enhancements to logging
 - NICE variable: employ nice(1) and ionice(1) if available
--- a/.gear/tags/cfd4133492d16bfd2fc31a83d5df43f78fb15da1
+++ b/.gear/tags/cfd4133492d16bfd2fc31a83d5df43f78fb15da1
@@ -0,0 +1,6 @@
+object a91acf3de735965e0b32ab3edfc633c543f7dd3e
+type commit
+tag v0.4.3
+tagger Michael Shigorin <mike@altlinux.org> 1320617277 +0200
+
+graduate tweaks
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+cfd4133492d16bfd2fc31a83d5df43f78fb15da1 v0.4.3
--- a/doc/variables.txt
+++ b/doc/variables.txt
@@ -26,7 +26,7 @@
  + экономия RAM+swap при сборке в tmpfs, иначе места на диске
  + очистка рабочего каталога после успешной сборки очередной стадии
  + может помешать использовать некоторые варианты отладки
-  + значение: любая строка, по умолчанию пусто
+  + значение: любая строка; по умолчанию пусто при DEBUG, иначе 1
  + см. ../lib/clean.mk

 - DEBUG
--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -4,10 +4,23 @@ GLOBAL_BUILDDIR ?= $(shell pwd)
 CURRENT_LINK := mkimage-profiles
 OUT_LINK := out

+# there were mkimage fixes induced by mkimage-profile development
+MKI_VER_MINIMAL = 0.1.7
+MKI_VER_OPTIMAL = 0.2.0
+
 include distcfg.mk
 include functions.mk
 include $(MKIMAGE_PREFIX)/config.mk

+ifeq (-,$(shell rpmvercmp $(MKI_VERSION) $(MKI_VER_MINIMAL) | tr -d [0-9]))
+$(info error: mkimage-$(MKI_VERSION) is too old, please upgrade)
+$(error mkimage is too old, $(MKI_VER_MINIMAL) is minimal supported version)
+endif
+ifeq (-,$(shell rpmvercmp $(MKI_VERSION) $(MKI_VER_OPTIMAL) | tr -d [0-9]))
+$(info warning: mkimage-$(MKI_VERSION) is suboptimal, consider upgrading)
+$(warning consider upgrading mkimage to $(MKI_VER_OPTIMAL) or better)
+endif
+
 # reconstruct instead of passing yet another variable
 IMAGE_LINK := $(IMAGE_NAME).$(IMAGE_TYPE)
 IMAGE_OUTFILE := $(IMAGE_NAME)-$(DATE)-$(ARCH).$(IMAGE_TYPE)
--- a/lib/clean.mk
+++ b/lib/clean.mk
@@ -5,6 +5,10 @@

 # tmpfs-sparing extra rule: cleanup workdir after completing each stage
 # (as packed results are saved this only lowers RAM pressure)
+# NB: it's useful enough to be enabled by default in DEBUG abscence
+ifndef DEBUG
+CLEAN ?= 1
+endif
 ifdef CLEAN
 export GLOBAL_CLEAN_WORKDIR = clean-current
 ifdef DEBUG
Author	SHA1	Message	Date
Michael Shigorin	6782808223	0.4.3.2-alt1 - mkimage version required/checked	2011-11-08 00:08:30 +02:00
Michael Shigorin	7a8ac9e7e0	image.in/Makefile: mkimage version check There's a recommended version (0.2.0+ currently) and also the minimal version, 0.1.7, which received the important fixes. It was proposed by nice antique@ folks IIRC. Unfortunately the "suboptimal version" warning is pretty modest, and "minimal version" error will be apparent with DEBUG enabled; still the latter will terminate the downstream build and leave a clear message in build.log at any rate.	2011-11-08 00:07:38 +02:00
Michael Shigorin	b3e4d9af0c	0.4.3.1-alt1 - CLEAN by default unless DEBUG	2011-11-07 14:56:09 +02:00
Michael Shigorin	ab70588f94	CLEAN by default (unless DEBUG) CLEAN is so useful and fiddling with .work chroots does demand knowledge (hsh-shell is handy btw); so unless we really get our hands dirty, let's spare ours preciouss tmpfss.	2011-11-07 12:28:09 +02:00
Michael Shigorin	4313629aac	0.4.3-alt2 - include %mpdir/ itself as well	2011-11-07 11:50:23 +02:00
Michael Shigorin	0301f08e87	gear-store-tags	2011-11-07 00:08:29 +02:00
				`@@ -0,0 +1 @@`
				`cfd4133492d16bfd2fc31a83d5df43f78fb15da1 v0.4.3`