Patchwork image.bbclass: Ensure ${S} is cleaned at the start of rootfs generation

login
register
mail settings
Submitter Richard Purdie
Date May 11, 2012, 4:51 p.m.
Message ID <1336755114.2494.237.camel@ted>
Download mbox | patch
Permalink /patch/27465/
State Accepted
Commit 363424cdc78cafa278008f973c2b4288297ebf8c
Headers show

Comments

Richard Purdie - May 11, 2012, 4:51 p.m.
Some image classes such as bootimg save files into ${S} as part of rootfs
generation. For correctness we should therefore clean this at the start of
image generation to ensure reproducibility.

I found this issue when some files I thought should disappear from my rootfs
would not disappear.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 907c59b..9557433 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -131,6 +131,7 @@  PSEUDO_PASSWD = "${IMAGE_ROOTFS}"
 do_rootfs[nostamp] = "1"
 do_rootfs[dirs] = "${TOPDIR}"
 do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock"
+do_rootfs[cleandirs] += "${S}"
 do_build[nostamp] = "1"
 
 # Must call real_do_rootfs() from inside here, rather than as a separate