buildhistory: filter out the unexpected prefix for native/cross sysroots

For various technical reasons, native and cross builds have a prefix that
includes the full path to the sysroot.  As these are stripped away before the
files are used in the sysroot, we should also filter them out of the
buildhistory report.  This both removes noise when sharing a buildhistory
repository between different build directories, and improves the accuracy of the
reports.

(From OE-Core rev: 8bf53fbb62749b5d77c246fab6e1246b93f8c50f)

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

1 files changed, 12 insertions, 1 deletions

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 5bf2726810..f986f7c794 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -65,9 +65,20 @@ BUILDHISTORY_PRESERVE = "latest latest_srcrev sysroot"
 PATCH_GIT_USER_EMAIL ?= "buildhistory@oe"
 PATCH_GIT_USER_NAME ?= "OpenEmbedded"
 
+#
+# Write out the contents of the sysroot
+#
 buildhistory_emit_sysroot() {
         mkdir --parents ${BUILDHISTORY_DIR_PACKAGE}
-        buildhistory_list_files_no_owners ${SYSROOT_DESTDIR} ${BUILDHISTORY_DIR_PACKAGE}/sysroot
+        case ${CLASSOVERRIDE} in
+        class-native|class-cross|class-crosssdk)
+                BASE=${SYSROOT_DESTDIR}/${STAGING_DIR_NATIVE}
+                ;;
+        *)
+                BASE=${SYSROOT_DESTDIR}
+                ;;
+        esac
+        buildhistory_list_files_no_owners $BASE ${BUILDHISTORY_DIR_PACKAGE}/sysroot
 }
 
 #