summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-07-09 00:46:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-10 09:56:22 +0100
commitf74e8081ad229b07b19b205d73748e56b5b73d5e (patch)
tree9583300c0fea049d8a8077bb77d242be6381c727
parentb184dfe4af6b8c56b7182cd1c463f74657892dcb (diff)
downloadpoky-f74e8081ad229b07b19b205d73748e56b5b73d5e.tar.gz
buildhistory: don't output ownership for the sysroot
As the sysroot isn't ran inside pseudo the ownership is whoever is running the builds. In a setup where multiple builders all contribute to a shared buildhistory writing the ownership data isn't useful, so just replace it with "- -". (From OE-Core rev: fadb7ae78876a7cf25c48481ff4ed3131e53415f) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/buildhistory.bbclass16
1 files changed, 15 insertions, 1 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index baa7c8e279..5bf2726810 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -67,7 +67,7 @@ PATCH_GIT_USER_NAME ?= "OpenEmbedded"
67 67
68buildhistory_emit_sysroot() { 68buildhistory_emit_sysroot() {
69 mkdir --parents ${BUILDHISTORY_DIR_PACKAGE} 69 mkdir --parents ${BUILDHISTORY_DIR_PACKAGE}
70 buildhistory_list_files ${SYSROOT_DESTDIR} ${BUILDHISTORY_DIR_PACKAGE}/sysroot 70 buildhistory_list_files_no_owners ${SYSROOT_DESTDIR} ${BUILDHISTORY_DIR_PACKAGE}/sysroot
71} 71}
72 72
73# 73#
@@ -537,6 +537,20 @@ buildhistory_list_files() {
537 fi | sort -k5 | sed 's/ * -> $//' > $2 ) 537 fi | sort -k5 | sed 's/ * -> $//' > $2 )
538} 538}
539 539
540buildhistory_list_files_no_owners() {
541 # List the files in the specified directory, but exclude date/time etc.
542 # Also don't output the ownership data, but instead output just - - so
543 # that the same parsing code as for _list_files works.
544 # This is somewhat messy, but handles where the size is not printed for device files under pseudo
545 ( cd $1
546 find_cmd='find . ! -path . -printf "%M - - %10s %p -> %l\n"'
547 if [ "$3" = "fakeroot" ] ; then
548 eval ${FAKEROOTENV} ${FAKEROOTCMD} "$find_cmd"
549 else
550 eval "$find_cmd"
551 fi | sort -k5 | sed 's/ * -> $//' > $2 )
552}
553
540buildhistory_list_pkg_files() { 554buildhistory_list_pkg_files() {
541 # Create individual files-in-package for each recipe's package 555 # Create individual files-in-package for each recipe's package
542 for pkgdir in $(find ${PKGDEST}/* -maxdepth 0 -type d); do 556 for pkgdir in $(find ${PKGDEST}/* -maxdepth 0 -type d); do