diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2012-04-01 00:06:42 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-01 12:39:20 +0100 |
| commit | 479ae1e9b74aa2f04fb5da2f3541c3de0aa9de87 (patch) | |
| tree | e69b18db949b24aeb4adca2428b7fe69aa547b92 | |
| parent | c97f7f4e4ecd6c431712059c34ebc17b68b055ae (diff) | |
| download | openembedded-core-contrib-479ae1e9b74aa2f04fb5da2f3541c3de0aa9de87.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.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/buildhistory.bbclass | 10 |
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() { echo $pkgsize $pkg >> ${BUILDHISTORY_DIR_IMAGE}/installed-package-sizes.tmp fi - deps=`list_package_depends $pkg | sort | uniq` + deps=`list_package_depends $pkg` for dep in $deps ; do - echo "$pkg OPP $dep;" | sed -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' | sed 's:OPP:->:g' >> ${BUILDHISTORY_DIR_IMAGE}/depends.dot + echo "$pkg OPP $dep;" | sed -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' | sed 's:OPP:->:g' done - recs=`list_package_recommends $pkg | sort | uniq` + recs=`list_package_recommends $pkg` for rec in $recs ; do - 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 + echo "$pkg OPP $rec [style=dotted];" | sed -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' | sed 's:OPP:->:g' done - done + done | sort | uniq >> ${BUILDHISTORY_DIR_IMAGE}/depends.dot echo "}" >> ${BUILDHISTORY_DIR_IMAGE}/depends.dot cat ${BUILDHISTORY_DIR_IMAGE}/installed-package-sizes.tmp | sort -n -r | awk '{print $1 "\tKiB " $2}' > ${BUILDHISTORY_DIR_IMAGE}/installed-package-sizes.txt |