1.0.1-alt0.M70T.1

- important bugfix: THE_PACKAGES weren't getting through to .base (backported from 1.1.14)
metadata: fix THE_PACKAGES processing
2013-11-25 21:06:01 +04:00 · 2013-11-25 09:33:54 +04:00 · 2013-06-17 14:03:30 +04:00
5 changed files with 25 additions and 18 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,6 +1,6 @@
 Name: mkimage-profiles
-Version: 1.0.0
-Release: alt1
+Version: 1.0.1
+Release: alt0.M70T.1

 Summary: ALT Linux based distribution metaprofile
 License: GPLv2+
@@ -78,6 +78,10 @@ cp -a * %buildroot%mpdir
 %doc %docs/*

 %changelog
+* Mon Nov 25 2013 Michael Shigorin <mike@altlinux.org> 1.0.1-alt0.M70T.1
+- important bugfix: THE_PACKAGES weren't getting through to .base
+  (backported from 1.1.14)
+
 * Mon Jun 17 2013 Michael Shigorin <mike@altlinux.org> 1.0.0-alt1
 - 1.0

--- a/.gear/tags/5f4103e2678b4db8760eda8622f094f694f9cdcd
+++ b/.gear/tags/5f4103e2678b4db8760eda8622f094f694f9cdcd
@@ -0,0 +1,6 @@
+object 5ffd07c65e360561c7a04f41aff746d9caa165cd
+type commit
+tag v1.0.0
+tagger Michael Shigorin <mike@altlinux.org> 1371463392 +0400
+
+1.0
--- a/.gear/tags/c00468bd4033aa25fe1bb5af8c874b02bb492969
+++ b/.gear/tags/c00468bd4033aa25fe1bb5af8c874b02bb492969
@@ -1,6 +0,0 @@
-object 57b368d75d54ef23b7d8b564e826efcb11e6a4d7
-type commit
-tag v0.9.16
-tagger Michael Shigorin <mike@altlinux.org> 1370880061 +0400
-
-1.0pre
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-c00468bd4033aa25fe1bb5af8c874b02bb492969 v0.9.16
+5f4103e2678b4db8760eda8622f094f694f9cdcd v1.0.0
--- a/features.in/metadata/lib/50-metadata.mk
+++ b/features.in/metadata/lib/50-metadata.mk
@@ -9,22 +9,25 @@ WHATEVER += metadata
 # handle these too
 DOT_BASE += $(BASE_PACKAGES_REGEXP)

-# args: name, suffix, command
-define dump-THEM
-if [ -n "$($(1)_$(2))" ]; then echo -e "\n## $(1)_$(2)"; $(3) $($(1)_$(2)); fi;
+# args: type, name
+define dump
+if [ -n "$($(2)_$(1))" ]; then \
+	echo -e "\n## $(2)_$(1)"; \
+	case "$(1)" in \
+	PACKAGES) echo "$($(2)_$(1))";; \
+	LISTS) cat $($(2)_$(1));; \
+	esac; \
+fi;
 endef

-dump-PACKAGES = $(call dump-THEM,$(1),PACKAGES,echo)
-dump-LISTS = $(call dump-THEM,$(1),LISTS,cat)
-
 # BASE_PACKAGES, BASE_LISTS and whatever else goes into base install;
 # thus construct requisite .base packagelist for alterator-pkg
 metadata-.base:
 	@cd $(call list,/); \
 	{ \
-		echo "## generated by features.in/metadata/lib/metadata.mk"; \
-		$(foreach p,SYSTEM COMMON THE BASE,$(call dump-PACKAGES,$(p))) \
-		$(foreach l,THE BASE,$(call dump-LISTS,$(l))) \
+		echo "## generated by features.in/metadata/lib/50-metadata.mk";\
+		$(foreach p,SYSTEM COMMON THE BASE,$(call dump,PACKAGES,$(p))) \
+		$(foreach l,THE BASE,$(call dump,LISTS,$(l))) \
 		if [ -n "$(DOT_BASE)" ]; then \
 			echo -e "\n## DOT_BASE\n$(DOT_BASE)"; \
 		fi; \