diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2014-01-23 10:11:05 -0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-28 11:32:15 +0000 |
| commit | b09e24449c1c9ae335732dd070eacf66777556a1 (patch) | |
| tree | b38de8ef2cbc109861c84aca2f210ac3c6f1cc8e /meta/classes/buildhistory.bbclass | |
| parent | 091d395e43836575587112ee1696a18c401505bb (diff) | |
| download | openembedded-core-b09e24449c1c9ae335732dd070eacf66777556a1.tar.gz openembedded-core-b09e24449c1c9ae335732dd070eacf66777556a1.tar.bz2 openembedded-core-b09e24449c1c9ae335732dd070eacf66777556a1.zip | |
buildhistory.bbclass: Improve robustness in image file listing
The filenames sometimes may have strange names. With the 'awk' script
it handled a limited number of spaces in the filename and a package
installing a file named "test file with spaces" would have its name
truncated.
This patch uses the find's printf formating to simplify the code and
properly handle this case. From a testing image, the only diff produced
is:
,----[ files-in-image.txt diff ]
| --rwxr-xr-x root root 0 ./usr/bin/test\ file\ with\
| +-rwxr-xr-x root root 0 ./usr/bin/test file with spaces
`----
The options used are available since findutils 4.2.5, released in 19
Nov 2004, making it available in all supported host distributions.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/buildhistory.bbclass')
| -rw-r--r-- | meta/classes/buildhistory.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index e9a9c3b4e5..545a42fe91 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -385,7 +385,7 @@ buildhistory_get_sdk_installed() { 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 - ( cd $1 && find . -ls | awk '{ if ( $7 ~ /[0-9]/ ) printf "%s %10-s %10-s %10s %s %s %s\n", $3, $5, $6, $7, $11, $12, $13 ; else printf "%s %10-s %10-s %10s %s %s %s\n", $3, $5, $6, 0, $10, $11, $12 }' | sort -k5 | sed 's/ *$//' > $2 ) + ( cd $1 && find . -printf "%M %-10u %-10g %10s %p -> %l\n" | sort -k5 | sed 's/ * -> $//' > $2 ) } |