* scripts/dgen.sh,rules/valgrind.make, rules/other/Toplevel.make:

	cleanup of valgrind
	introduced PACKAGE-<ARCH>-<LABEL>


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8179 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 10 insertions, 8 deletions

diff --git a/scripts/dgen.sh b/scripts/dgen.sh
index 676b833e0..50eb105f4 100755
--- a/scripts/dgen.sh
+++ b/scripts/dgen.sh
@@ -106,14 +106,16 @@ gen_map_all() {
     #                    +------+  +------+
     #                       3          2
     #
-    grep -e "^[^#]*PACKAGES-\$(PTXCONF_.*)[[:space:]]*+=" `< "${RULESFILES_ALL}"` > ${GEN_MAPS_ALL}
-		sed -e \
-		"s~^\([^:]*\):.*PACKAGES-\$(PTXCONF_\(.*\))[[:space:]]*+=[[:space:]]*\([^[:space:]]*\)~PTX_MAP_TO_FILENAME_\2=\"\1\"\nPTX_MAP_TO_package_\2=\"\3\"~" \
-		${GEN_MAPS_ALL} > "${PTX_MAP_ALL}"
-
-		sed -e \
-		"s~^\([^:]*\):.*PACKAGES-\$(PTXCONF_\(.*\))[[:space:]]*+=[[:space:]]*\([^[:space:]]*\)~PTX_MAP_TO_PACKAGE_\3=\2~" \
-		${GEN_MAPS_ALL} > "${PTX_MAP_ALL_MAKE}"
+    grep -e "^[^#]*PACKAGES-\$(PTXCONF_.*)[[:space:]]*+=" `< "${RULESFILES_ALL}"` | \
+        sed -e "s/\(.*PACKAGES-\)\(\$([^)]*)-\)\(\$([^)]*)\)\(.*\)/\1\3\4/" > ${GEN_MAPS_ALL}
+
+    sed -e \
+	"s~^\([^:]*\):.*PACKAGES-\$(PTXCONF_\(.*\))[[:space:]]*+=[[:space:]]*\([^[:space:]]*\)~PTX_MAP_TO_FILENAME_\2=\"\1\"\nPTX_MAP_TO_package_\2=\"\3\"~" \
+	${GEN_MAPS_ALL} > "${PTX_MAP_ALL}"
+
+    sed -e \
+	"s~^\([^:]*\):.*PACKAGES-\$(PTXCONF_\(.*\))[[:space:]]*+=[[:space:]]*\([^[:space:]]*\)~PTX_MAP_TO_PACKAGE_\3=\2~" \
+	${GEN_MAPS_ALL} > "${PTX_MAP_ALL_MAKE}"
 }