summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2014-01-09 11:18:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-10 15:16:50 +0000
commit54ee3874246acd09076bbc7aca4b6f54a29aa44b (patch)
tree98f34f16bbeb1cae211befb3e656b6c8317da20c
parent7be3064bf565b308dec80254da2964883be5f1b1 (diff)
downloadpoky-54ee3874246acd09076bbc7aca4b6f54a29aa44b.tar.gz
qemu: Remove stray .git files after unpacking
The qemu tarball ships some extraneous .git metadata in the dtc/ and pixman/ subfolders, containing a reference to the path "../.git/modules" which doesn't exist. The presence of these files will confuse git if it happens to recurse into the qemu source folder during an operation on some parent directory, for example "git clean" at a higher level. Avoid that problem (mostly) by removing them immediately after the sources are unpacked. (From OE-Core rev: cd962b790d5d15985a5a436169d6b2e3b0db0b2d) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu_1.7.0.bb8
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu_1.7.0.bb b/meta/recipes-devtools/qemu/qemu_1.7.0.bb
index d5265bcf57..c0e8b5523e 100644
--- a/meta/recipes-devtools/qemu/qemu_1.7.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_1.7.0.bb
@@ -11,6 +11,14 @@ SRC_URI[sha256sum] = "31f333a85f2d14c605a77679904a9668eaeb1b6dc7da53a1665230f46b
11 11
12COMPATIBLE_HOST_class-target_mips64 = "null" 12COMPATIBLE_HOST_class-target_mips64 = "null"
13 13
14do_sanitize_sources() {
15 # These .git files point to a nonexistent path "../.git/modules" and will confuse git
16 # if it tries to recurse into those directories.
17 rm -f ${S}/dtc/.git ${S}/pixman/.git
18}
19
20addtask sanitize_sources after do_unpack before do_patch
21
14do_install_append() { 22do_install_append() {
15 # Prevent QA warnings about installed ${localstatedir}/run 23 # Prevent QA warnings about installed ${localstatedir}/run
16 if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi 24 if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi