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>
This commit is contained in:
Paul Eggleton 2013-08-15 18:04:38 +01:00 committed by Richard Purdie
parent 1e8e24358a
commit c5d2e9caca
1 changed files with 6 additions and 6 deletions

View File

@ -325,10 +325,10 @@ buildhistory_get_installed() {
fi fi
# Produce dependency graph # Produce dependency graph
# First, filter out characters that cause issues for dot # First, quote each name to handle characters that cause issues for dot
rootfs_list_installed_depends | sed -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' > $1/depends.tmp rootfs_list_installed_depends | sed 's:\([^| ]*\):"\1":g' > $1/depends.tmp
# Change delimiter from pipe to -> and set style for recommend lines # Change delimiter from pipe to -> and set style for recommend lines
sed -i -e 's:|: -> :' -e 's:\[REC\]:[style=dotted]:' -e 's:$:;:' $1/depends.tmp sed -i -e 's:|: -> :' -e 's:"\[REC\]":[style=dotted]:' -e 's:$:;:' $1/depends.tmp
# Add header, sorted and de-duped contents and footer and then delete the temp file # Add header, sorted and de-duped contents and footer and then delete the temp file
printf "digraph depends {\n node [shape=plaintext]\n" > $1/depends.dot printf "digraph depends {\n node [shape=plaintext]\n" > $1/depends.dot
cat $1/depends.tmp | sort | uniq >> $1/depends.dot cat $1/depends.tmp | sort | uniq >> $1/depends.dot
@ -354,10 +354,10 @@ buildhistory_get_installed() {
if [ "$2" != "sdk" ] ; then if [ "$2" != "sdk" ] ; then
# Produce some cut-down graphs (for readability) # Produce some cut-down graphs (for readability)
grep -v kernel_image $1/depends.dot | grep -v kernel_2 | grep -v kernel_3 > $1/depends-nokernel.dot grep -v kernel_image $1/depends.dot | grep -v kernel-2 | grep -v kernel-3 > $1/depends-nokernel.dot
grep -v libc6 $1/depends-nokernel.dot | grep -v libgcc > $1/depends-nokernel-nolibc.dot grep -v libc6 $1/depends-nokernel.dot | grep -v libgcc > $1/depends-nokernel-nolibc.dot
grep -v update_ $1/depends-nokernel-nolibc.dot > $1/depends-nokernel-nolibc-noupdate.dot grep -v update- $1/depends-nokernel-nolibc.dot > $1/depends-nokernel-nolibc-noupdate.dot
grep -v kernel_module $1/depends-nokernel-nolibc-noupdate.dot > $1/depends-nokernel-nolibc-noupdate-nomodules.dot grep -v kernel-module $1/depends-nokernel-nolibc-noupdate.dot > $1/depends-nokernel-nolibc-noupdate-nomodules.dot
fi fi
# add complementary package information # add complementary package information