summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-07 15:20:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-08 10:57:09 +0000
commit8653bf474e6f5a6b7fa1670d1e2e7f925c924f29 (patch)
tree25a595eff5d145976a74413ad02593feaa6cfb26 /meta
parent4255cb85a0be4d5e75da6b7a45d47a08b989f6b9 (diff)
downloadpoky-8653bf474e6f5a6b7fa1670d1e2e7f925c924f29.tar.gz
classes/buildhistory: sort image file list
Sort the contents of files-in-image.txt to avoid unnecessary changes showing up in the history due to reordering. (From OE-Core rev: 791ad7a522f6800114febd1605072202c1450356) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/buildhistory.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 69a9d02a5a..3964247445 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -310,7 +310,7 @@ buildhistory_get_image_installed() {
310buildhistory_get_imageinfo() { 310buildhistory_get_imageinfo() {
311 # List the files in the image, but exclude date/time etc. 311 # List the files in the image, but exclude date/time etc.
312 # This awk script is somewhat messy, but handles where the size is not printed for device files under pseudo 312 # This awk script is somewhat messy, but handles where the size is not printed for device files under pseudo
313 ( cd ${IMAGE_ROOTFS} && 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 }' > ${BUILDHISTORY_DIR_IMAGE}/files-in-image.txt ) 313 ( cd ${IMAGE_ROOTFS} && 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 > ${BUILDHISTORY_DIR_IMAGE}/files-in-image.txt )
314 314
315 # Record some machine-readable meta-information about the image 315 # Record some machine-readable meta-information about the image
316 echo -n > ${BUILDHISTORY_DIR_IMAGE}/image-info.txt 316 echo -n > ${BUILDHISTORY_DIR_IMAGE}/image-info.txt