[oe-commits] [openembedded-core] 16/26: buildhistory: filter out the unexpected prefix for native/cross sysroots

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 58138853b013cbcb13892344b7755ccfe59bb523
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Jul 9 00:46:50 2019 +0100

    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.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/buildhistory.bbclass | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 5bf2726..f986f7c 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 at 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
 }
 
 #

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.