[oe-commits] org.oe.dev testlab.bbclass: opkg is using a different output format, account for that,

[koen commit]

testlab.bbclass: opkg is using a different output format, account for that,

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 4d43ab58fc4f4986ece87cba9814bd2c1a63434d
ViewMTN: http://monotone.openembedded.org/revision/info/4d43ab58fc4f4986ece87cba9814bd2c1a63434d
Files:
1
classes/testlab.bbclass
Diffs:

#
# mt diff -r3cb278173a15bedfbc4933dfb497f8b232b8b5c1 -r4d43ab58fc4f4986ece87cba9814bd2c1a63434d
#
#
#
# patch "classes/testlab.bbclass"
#  from [c3d610ac3c54bb4174b19e9905964f8a4064cc07]
#    to [5b201781b52cc5d7ecac3f2a8def33b8a8bd00d5]
#
============================================================
--- classes/testlab.bbclass	c3d610ac3c54bb4174b19e9905964f8a4064cc07
+++ classes/testlab.bbclass	5b201781b52cc5d7ecac3f2a8def33b8a8bd00d5
@@ -32,7 +32,7 @@ if [ -e  ${IMAGE_ROOTFS}/etc/opkg ] ; th
 	echo -e "digraph depends {\n    node [shape=plaintext]" > ${TESTLAB_DIR}/depends.dot
 
 	for pkg in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} list_installed | awk '{print $1}') ; do 
-    		opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | grep Filename | awk -F: '{print $2}'  >> ${TESTLAB_DIR}/installed-packages.txt
+		opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | awk '/Package/ {printf $2"_"} /Version/ {printf $2"_"} /Archi/ {print $2".ipk"}'  >> ${TESTLAB_DIR}/installed-packages.txt
 
     		for depends in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o  ${IMAGE_ROOTFS} info $pkg | grep Depends) ; do 
         		echo "$pkg OPP $depends;" | grep -v "(" | grep -v ")" | grep -v Depends | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot
@@ -57,7 +57,7 @@ if [ -e  ${IMAGE_ROOTFS}/etc/opkg ] ; th
 	#dot -Tpng -o ${TESTLAB_DIR}/image-dependencies-nokernel-nolibc-noupdate-nomodules.png ${TESTLAB_DIR}/depends-nokernel-nolibc-noupdate-nomodules.dot
 
 	for file in $(cat ${TESTLAB_DIR}/installed-packages.txt) ; do 
-     		du -k $(find ${DEPLOY_DIR_IPK} -name "$file") 
+     		du -k $(find ${DEPLOY_DIR_IPK} -name "$file") | head -n1
 	done | grep "\.ipk" | sed -e s:${DEPLOY_DIR_IPK}::g | sort -n -r | awk '{print $1 "\tKiB " $2}' > ${TESTLAB_DIR}/installed-package-sizes.txt
 fi
 }