Patchwork buildhistory bbclass: avoid absolute paths for files-in-image.txt to avoid diff churn when relocating TMPDIR

login
register
mail settings
Submitter Koen Kooi
Date Dec. 6, 2011, noon
Message ID <1323172804-16070-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/16299/
State Accepted
Commit fb642d21111691b9302e16e984aff9d8fb18c431
Headers show

Comments

Koen Kooi - Dec. 6, 2011, noon
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/classes/buildhistory.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Paul Eggleton - Dec. 6, 2011, 1:03 p.m.
On Tuesday 06 December 2011 13:00:04 Koen Kooi wrote:
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  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 e4534e9..39f5ff6 100644
> --- a/meta/classes/buildhistory.bbclass
> +++ b/meta/classes/buildhistory.bbclass
> @@ -321,7 +321,7 @@ buildhistory_get_image_installed() {
>  buildhistory_get_imageinfo() {
>  	# List the files in the image, but exclude date/time etc.
>  	# This awk script is somewhat messy, but handles where the size is not
> printed for device files under pseudo -	find ${IMAGE_ROOTFS} -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 +	(
> 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 )
> 
>  	# Add some configuration information
>  	echo "${MACHINE}: ${IMAGE_BASENAME} configured for ${DISTRO}
> ${DISTRO_VERSION}" > ${BUILDHISTORY_DIR_IMAGE}/build-id

Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Richard Purdie - Dec. 6, 2011, 2:40 p.m.
On Tue, 2011-12-06 at 13:00 +0100, Koen Kooi wrote:
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/classes/buildhistory.bbclass |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index e4534e9..39f5ff6 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -321,7 +321,7 @@  buildhistory_get_image_installed() {
 buildhistory_get_imageinfo() {
 	# List the files in the image, but exclude date/time etc.
 	# This awk script is somewhat messy, but handles where the size is not printed for device files under pseudo
-	find ${IMAGE_ROOTFS} -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
+	( 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 )
 
 	# Add some configuration information
 	echo "${MACHINE}: ${IMAGE_BASENAME} configured for ${DISTRO} ${DISTRO_VERSION}" > ${BUILDHISTORY_DIR_IMAGE}/build-id