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>

diff --git a/meta/recipes-devtools/qemu/qemu_1.7.0.bb b/meta/recipes-devtools/qemu/qemu_1.7.0.bb
index d5265bc..c0e8b55 100644 (file)
--- 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
 
 COMPATIBLE_HOST_class-target_mips64 = "null"
 
+do_sanitize_sources() {
+    # These .git files point to a nonexistent path "../.git/modules" and will confuse git
+    # if it tries to recurse into those directories.
+    rm -f ${S}/dtc/.git ${S}/pixman/.git
+}
+
+addtask sanitize_sources after do_unpack before do_patch
+
 do_install_append() {
     # Prevent QA warnings about installed ${localstatedir}/run
     if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi