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.

(From OE-Core rev: 6f3992728613c39403ef59bbcf1cb67d9e8c526b)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 6 insertions, 8 deletions

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 054a81fdfc..3d459c715a 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}