summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-08-15 17:04:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-16 10:44:17 (GMT)
commitc5d2e9caca2827a6b763b51913e46f2b2c1df129 (patch)
tree7310eff561da82251ba652d70cd25bdd1de0f29d
parent1e8e24358a3b083e2dfad5ff183011545f406823 (diff)
downloadpoky-c5d2e9caca2827a6b763b51913e46f2b2c1df129.tar.gz
classes/buildhistory: avoid mangling names in dot graphs for images
We were mangling names here to avoid characters that are invalid for dot node names, but if you just quote all names that isn't necessary and we retain the original naming, allowing easy searching of the graph files. (From OE-Core rev: 99efdad886aa5063a68912846c00a46ba9b15536) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/buildhistory.bbclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index e3f9201..080f2c7 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -325,10 +325,10 @@ buildhistory_get_installed() {
325 fi 325 fi
326 326
327 # Produce dependency graph 327 # Produce dependency graph
328 # First, filter out characters that cause issues for dot 328 # First, quote each name to handle characters that cause issues for dot
329 rootfs_list_installed_depends | sed -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' > $1/depends.tmp 329 rootfs_list_installed_depends | sed 's:\([^| ]*\):"\1":g' > $1/depends.tmp
330 # Change delimiter from pipe to -> and set style for recommend lines 330 # Change delimiter from pipe to -> and set style for recommend lines
331 sed -i -e 's:|: -> :' -e 's:\[REC\]:[style=dotted]:' -e 's:$:;:' $1/depends.tmp 331 sed -i -e 's:|: -> :' -e 's:"\[REC\]":[style=dotted]:' -e 's:$:;:' $1/depends.tmp
332 # Add header, sorted and de-duped contents and footer and then delete the temp file 332 # Add header, sorted and de-duped contents and footer and then delete the temp file
333 printf "digraph depends {\n node [shape=plaintext]\n" > $1/depends.dot 333 printf "digraph depends {\n node [shape=plaintext]\n" > $1/depends.dot
334 cat $1/depends.tmp | sort | uniq >> $1/depends.dot 334 cat $1/depends.tmp | sort | uniq >> $1/depends.dot
@@ -354,10 +354,10 @@ buildhistory_get_installed() {
354 354
355 if [ "$2" != "sdk" ] ; then 355 if [ "$2" != "sdk" ] ; then
356 # Produce some cut-down graphs (for readability) 356 # Produce some cut-down graphs (for readability)
357 grep -v kernel_image $1/depends.dot | grep -v kernel_2 | grep -v kernel_3 > $1/depends-nokernel.dot 357 grep -v kernel_image $1/depends.dot | grep -v kernel-2 | grep -v kernel-3 > $1/depends-nokernel.dot
358 grep -v libc6 $1/depends-nokernel.dot | grep -v libgcc > $1/depends-nokernel-nolibc.dot 358 grep -v libc6 $1/depends-nokernel.dot | grep -v libgcc > $1/depends-nokernel-nolibc.dot
359 grep -v update_ $1/depends-nokernel-nolibc.dot > $1/depends-nokernel-nolibc-noupdate.dot 359 grep -v update- $1/depends-nokernel-nolibc.dot > $1/depends-nokernel-nolibc-noupdate.dot
360 grep -v kernel_module $1/depends-nokernel-nolibc-noupdate.dot > $1/depends-nokernel-nolibc-noupdate-nomodules.dot 360 grep -v kernel-module $1/depends-nokernel-nolibc-noupdate.dot > $1/depends-nokernel-nolibc-noupdate-nomodules.dot
361 fi 361 fi
362 362
363 # add complementary package information 363 # add complementary package information