diff options
author | Ross Burton <ross.burton@intel.com> | 2019-07-09 00:46:43 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-10 09:56:22 +0100 |
commit | f74e8081ad229b07b19b205d73748e56b5b73d5e (patch) | |
tree | 9583300c0fea049d8a8077bb77d242be6381c727 /meta/classes/buildhistory.bbclass | |
parent | b184dfe4af6b8c56b7182cd1c463f74657892dcb (diff) | |
download | openembedded-core-contrib-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>
Diffstat (limited to 'meta/classes/buildhistory.bbclass')
-rw-r--r-- | meta/classes/buildhistory.bbclass | 16 |
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" buildhistory_emit_sysroot() { mkdir --parents ${BUILDHISTORY_DIR_PACKAGE} - buildhistory_list_files ${SYSROOT_DESTDIR} ${BUILDHISTORY_DIR_PACKAGE}/sysroot + buildhistory_list_files_no_owners ${SYSROOT_DESTDIR} ${BUILDHISTORY_DIR_PACKAGE}/sysroot } # @@ -537,6 +537,20 @@ buildhistory_list_files() { fi | sort -k5 | sed 's/ * -> $//' > $2 ) } +buildhistory_list_files_no_owners() { + # List the files in the specified directory, but exclude date/time etc. + # Also don't output the ownership data, but instead output just - - so + # that the same parsing code as for _list_files works. + # 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 - - %10s %p -> %l\n"' + if [ "$3" = "fakeroot" ] ; then + eval ${FAKEROOTENV} ${FAKEROOTCMD} "$find_cmd" + else + eval "$find_cmd" + fi | sort -k5 | sed 's/ * -> $//' > $2 ) +} + buildhistory_list_pkg_files() { # Create individual files-in-package for each recipe's package for pkgdir in $(find ${PKGDEST}/* -maxdepth 0 -type d); do |