summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-04-01 00:06:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-02 04:31:47 +0100
commit7e7600f0ffcca2fa670d0475d5a5d0c2194ec107 (patch)
tree608001dd5519050ebbc8a7ae47b1c39ce52415bb /meta/classes
parent869dfaee18d3f472d1df79388f972333d5ea2c2f (diff)
downloadpoky-7e7600f0ffcca2fa670d0475d5a5d0c2194ec107.tar.gz
buildhistory: remove duplicate entries from dot graph
There are various conditions that lead to duplicate entries in the dot graph which need to get fixed, but this patch is a catchall. A previous attempt to address this only works on rpm which gives a \n seperated output, opkg doesn't. Another benefit is that the sort order is now know, leading to less spurious diffs in buildhistory commits. (From OE-Core rev: 479ae1e9b74aa2f04fb5da2f3541c3de0aa9de87) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/buildhistory.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index f99aa7f690..386c32cc67 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -300,16 +300,16 @@ buildhistory_get_image_installed() {
300 echo $pkgsize $pkg >> ${BUILDHISTORY_DIR_IMAGE}/installed-package-sizes.tmp 300 echo $pkgsize $pkg >> ${BUILDHISTORY_DIR_IMAGE}/installed-package-sizes.tmp
301 fi 301 fi
302 302
303 deps=`list_package_depends $pkg | sort | uniq` 303 deps=`list_package_depends $pkg`
304 for dep in $deps ; do 304 for dep in $deps ; do
305 echo "$pkg OPP $dep;" | sed -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' | sed 's:OPP:->:g' >> ${BUILDHISTORY_DIR_IMAGE}/depends.dot 305 echo "$pkg OPP $dep;" | sed -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' | sed 's:OPP:->:g'
306 done 306 done
307 307
308 recs=`list_package_recommends $pkg | sort | uniq` 308 recs=`list_package_recommends $pkg`
309 for rec in $recs ; do 309 for rec in $recs ; do
310 echo "$pkg OPP $rec [style=dotted];" | sed -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' | sed 's:OPP:->:g' >> ${BUILDHISTORY_DIR_IMAGE}/depends.dot 310 echo "$pkg OPP $rec [style=dotted];" | sed -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' | sed 's:OPP:->:g'
311 done 311 done
312 done 312 done | sort | uniq >> ${BUILDHISTORY_DIR_IMAGE}/depends.dot
313 echo "}" >> ${BUILDHISTORY_DIR_IMAGE}/depends.dot 313 echo "}" >> ${BUILDHISTORY_DIR_IMAGE}/depends.dot
314 314
315 cat ${BUILDHISTORY_DIR_IMAGE}/installed-package-sizes.tmp | sort -n -r | awk '{print $1 "\tKiB " $2}' > ${BUILDHISTORY_DIR_IMAGE}/installed-package-sizes.txt 315 cat ${BUILDHISTORY_DIR_IMAGE}/installed-package-sizes.tmp | sort -n -r | awk '{print $1 "\tKiB " $2}' > ${BUILDHISTORY_DIR_IMAGE}/installed-package-sizes.txt