0.6.2.2-alt0.M60T.1

- backported pkg/lists fix (and the commit before it)
pkg/lists: uncrustify Makefile
2015-02-02 23:51:33 +03:00 · 2015-02-02 23:50:41 +03:00 · 2015-02-02 23:50:26 +03:00 · 2014-03-25 00:00:25 +04:00
5 changed files with 18 additions and 15 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.6.2.1
+Version: 0.6.2.2
 Release: alt0.M60T.1

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

 %changelog
+* Mon Feb 02 2015 Michael Shigorin <mike@altlinux.org> 0.6.2.2-alt0.M60T.1
+- backported pkg/lists fix (and the commit before it)
+
 * Mon Mar 24 2014 Michael Shigorin <mike@altlinux.org> 0.6.2.1-alt0.M60T.1
 - altlinux-t6-server-ovz

--- a/.gear/tags/500eea7e501647e4e9fb90f59064539392ebc25c
+++ b/.gear/tags/500eea7e501647e4e9fb90f59064539392ebc25c
@@ -0,0 +1,6 @@
+object 71c4404c4e405b547040f81931c1b8a7ea82134b
+type commit
+tag v0.6.2.1
+tagger Michael Shigorin <mike@altlinux.org> 1395691214 +0400
+
+altlinux-t6-server-ovz
--- a/.gear/tags/5b441e948d3bca3360d062ec7a36cdfa348f67f7
+++ b/.gear/tags/5b441e948d3bca3360d062ec7a36cdfa348f67f7
@@ -1,6 +0,0 @@
-object 5347d342cca7ad1c23b866a81a70735b7b59616f
-type commit
-tag v0.6.2
-tagger Michael Shigorin <mike@altlinux.org> 1333380199 +0300
-
-webkiosk
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-5b441e948d3bca3360d062ec7a36cdfa348f67f7 v0.6.2
+500eea7e501647e4e9fb90f59064539392ebc25c v0.6.2.1
--- a/pkg.in/lists/Makefile
+++ b/pkg.in/lists/Makefile
@@ -25,13 +25,12 @@ all: $(TARGET) $(GLOBAL_DEBUG) $(DOTBASE) copy-lists copy-groups
 		cd - >&/dev/null; \
 	fi

+# env | sort -u | grep _LISTS | xargs cp
 copy-lists:
-	@# env | sort -u | grep _LISTS | xargs cp
-	@$(foreach V, \
-		$(filter %_LISTS,$(sort $(.VARIABLES))), \
-		$(if $(filter environment% file,$(origin $V)),\
-			$(shell cp --parents -at $(TARGET) \
-				-- $(value $V))))
+	@cp --parents -at $(TARGET) -- \
+		$(foreach V, \
+			$(filter %_LISTS,$(sort $(.VARIABLES))), \
+			$(if $(filter environment% file,$(origin $V)),$($V)))

 copy-groups:
 	@if [ -n "$(THE_GROUPS)$(MAIN_GROUPS)" ]; then \
@@ -63,4 +62,5 @@ debug:
 	@echo -e $(foreach V, \
 		$(filter %_LISTS,$(sort $(.VARIABLES))), \
 		$(if $(filter environment% file,$(origin $V)),\
-			$(shell echo '\\n"**"' $V: $(value $V)))) '\n'
+			$(shell echo '\\n"**"' $V: $($V)))) '\n'
+
Author	SHA1	Message	Date
Michael Shigorin	0950c70adc	0.6.2.2-alt0.M60T.1 - backported pkg/lists fix (and the commit before it)	2015-02-02 23:51:33 +03:00
Michael Shigorin	a0d39e2ed1	pkg/lists: uncrustify Makefile The problem with the changed piece of code is that it would - both call cp(1) multiple times if multiple *_LIST variables were non-empty (which is usually the case), and - try to evaluate stdout of the called commands as a shell script (which would be empty unless someone passed e.g. -v to that cp(1) but it's crazy to rely on things like this). So the functions should prepare arguments for a single copy command that is predictable and could be made verbose. Ouch.	2015-02-02 23:50:41 +03:00
Michael Shigorin	33d35de8fb	pkg/lists: tweak Makefile to expand variables The issue at hand is the hack to be employed in the init feature: @$(call add,THE_LISTS,$$(INIT_TYPE)) where INIT_TYPE is set separately; $(value $V) would leave that kind of substitution unmolested while we would actually need it done.	2015-02-02 23:50:26 +03:00
Michael Shigorin	51e0fb762e	gear-store-tags	2014-03-25 00:00:25 +04:00