[oe-commits] Paul Eggleton : classes/buildhistory: tweak buildhistory_list_pkg_files

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 6f3992728613c39403ef59bbcf1cb67d9e8c526b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6f3992728613c39403ef59bbcf1cb67d9e8c526b

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Fri Aug 21 10:50:57 2015 +0100

classes/buildhistory: tweak buildhistory_list_pkg_files

* Avoid using ${...} for shell variables (since they could be
  expanded as bitbake variables if present)
* Use files-in-package.txt rather than files-in-<packagename>.txt; the
  file is already in a subdirectory named with the package name and this
  naming is consistent with that of files-in-image.txt.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/classes/buildhistory.bbclass | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 054a81f..3d459c7 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -439,16 +439,14 @@ buildhistory_list_files() {
 }
 
 buildhistory_list_pkg_files() {
-	file_prefix="files-in-"
-
 	# Create individual files-in-package for each recipe's package
 	for pkgdir in $(find ${PKGDEST}/* -maxdepth 0 -type d); do
-		pkgname=$(basename ${pkgdir})
-		outfolder="${BUILDHISTORY_DIR_PACKAGE}/${pkgname}"
-		outfile="${outfolder}/${file_prefix}${pkgname}.txt"
-		# Make sure the output folder, exist so we can create the files-in-$pkgname.txt file
-		if [ ! -d ${outfolder} ] ; then
-			bbdebug 2 "Folder ${outfolder} does not exist, file ${outfile} not created"
+		pkgname=$(basename $pkgdir)
+		outfolder="${BUILDHISTORY_DIR_PACKAGE}/$pkgname"
+		outfile="$outfolder/files-in-package.txt"
+		# Make sure the output folder exists so we can create the file
+		if [ ! -d $outfolder ] ; then
+			bbdebug 2 "Folder $outfolder does not exist, file $outfile not created"
 			continue
 		fi
 		buildhistory_list_files ${pkgdir} ${outfile}