[oe-commits] Koen Kooi : testlab: only use basename for license info to avoid diff churn

git at git.openembedded.org git at git.openembedded.org
Tue Dec 6 07:46:20 UTC 2011


Module: meta-openembedded.git
Branch: master
Commit: 084fc20cd5377827a7f5a16e5f7179b89fd26886
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=084fc20cd5377827a7f5a16e5f7179b89fd26886

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Tue Dec  6 08:41:58 2011 +0100

testlab: only use basename for license info to avoid diff churn

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 meta-oe/classes/testlab.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta-oe/classes/testlab.bbclass b/meta-oe/classes/testlab.bbclass
index b26e2a1..c097e9e 100644
--- a/meta-oe/classes/testlab.bbclass
+++ b/meta-oe/classes/testlab.bbclass
@@ -69,7 +69,7 @@ if [ -e  ${IMAGE_ROOTFS}/etc/opkg ] && [ "${ONLINE_PACKAGE_MANAGEMENT}" = "full"
 	done | grep "\.ipk" | sed -e s:${DEPLOY_DIR_IPK}::g | sort -n -r | awk '{print $1 "\tKiB " $2}' > ${TESTLAB_DIR}/installed-package-sizes.txt
 
 	for file in $(cat ${TESTLAB_DIR}/installed-packages.txt) ; do
-		echo "`find ${DEPLOY_DIR_IPK} -name "$file" | xargs opkg-list-fields | grep ^License | sed -e 's/^.*:[ \t]*//g'`" '=' $file
+		echo "`find ${DEPLOY_DIR_IPK} -name "$file" | xargs opkg-list-fields | grep ^License | sed -e 's/^.*:[ \t]*//g'`" '=' $(echo $file | awk -F_ '{print $1}')
 	done | awk -F= '{printf("%50s:%s\n", $1, $2)}' > ${TESTLAB_DIR}/installed-package-licenses.txt
 	# Log results to a git controlled directory structure than can be pushed to a remote location
 	if [ "${TESTLABLOG}" = "remote" ] && [ -n "${TESTLABREMOTEDIR}" ] ; then





More information about the Openembedded-commits mailing list