buildhistory: simplify buildhistory_list_files()

Avoid duplicating shell code for the two cases, fakeroot/non-fakeroot.

(From OE-Core rev: c4a931df28f45f95f19a13062b8dc38db60da342)

Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index d1f3e6aa82..33eb1b00f6 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -519,12 +519,14 @@ buildhistory_get_sdk_installed_target() {
 
 buildhistory_list_files() {
         # List the files in the specified directory, but exclude date/time etc.
-        # This awk script is somewhat messy, but handles where the size is not printed for device files under pseudo
+        # This is somewhat messy, but handles where the size is not printed for device files under pseudo
+        ( cd $1
+        find_cmd='find . ! -path . -printf "%M %-10u %-10g %10s %p -> %l\n"'
         if [ "$3" = "fakeroot" ] ; then
-                ( cd $1 && ${FAKEROOTENV} ${FAKEROOTCMD} find . ! -path . -printf "%M %-10u %-10g %10s %p -> %l\n" | sort -k5 | sed 's/ * -> $//' > $2 )
+                eval ${FAKEROOTENV} ${FAKEROOTCMD} $find_cmd
         else
-                ( cd $1 && find . ! -path . -printf "%M %-10u %-10g %10s %p -> %l\n" | sort -k5 | sed 's/ * -> $//' > $2 )
-        fi
+                eval $find_cmd
+        fi | sort -k5 | sed 's/ * -> $//' > $2 )
 }
 
 buildhistory_list_pkg_files() {