From a49e605a52a3bd6b688a16104fa9b5d17e06bcd5 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Thu, 20 May 2010 13:02:39 -0400
Subject: qemu: Updated to 0.12.0

Updated the metadata in the recipe, changed the git revision in
poky-default-revisions.inc, and pulled the qemu patches forward.
---
 meta/packages/qemu/qemu-git/no-strip.patch | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'meta/packages/qemu/qemu-git/no-strip.patch')

diff --git a/meta/packages/qemu/qemu-git/no-strip.patch b/meta/packages/qemu/qemu-git/no-strip.patch
index fc69b37e1..8a95a688b 100644
--- a/meta/packages/qemu/qemu-git/no-strip.patch
+++ b/meta/packages/qemu/qemu-git/no-strip.patch
@@ -1,22 +1,26 @@
---- qemu.orig/Makefile	2008-01-29 23:16:27.000000000 -0800
-+++ qemu-0.9.1/Makefile	2008-01-29 23:16:38.000000000 -0800
-@@ -174,7 +174,7 @@
+Index: qemu/Makefile
+===================================================================
+--- qemu.orig/Makefile	2010-05-11 17:17:06.416912704 -0400
++++ qemu/Makefile	2010-05-11 17:17:17.051812402 -0400
+@@ -300,7 +300,7 @@ endif
  install: all $(if $(BUILD_DOCS),install-doc)
- 	mkdir -p "$(DESTDIR)$(bindir)"
+ 	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
  ifneq ($(TOOLS),)
--	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
-+	$(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)"
+-	$(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
++	$(INSTALL_PROG) $(TOOLS) "$(DESTDIR)$(bindir)"
  endif
- 	mkdir -p "$(DESTDIR)$(datadir)"
- 	for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
---- qemu.orig/Makefile.target	2008-01-29 23:16:27.000000000 -0800
-+++ qemu-0.9.1/Makefile.target	2008-01-29 23:17:33.000000000 -0800
-@@ -632,7 +632,7 @@
+ ifneq ($(BLOBS),)
+ 	$(INSTALL_DIR) "$(DESTDIR)$(datadir)"
+Index: qemu/Makefile.target
+===================================================================
+--- qemu.orig/Makefile.target	2010-05-11 17:17:12.188784092 -0400
++++ qemu/Makefile.target	2010-05-11 17:17:17.052808122 -0400
+@@ -351,7 +351,7 @@ clean:
  
  install: all
  ifneq ($(PROGS),)
--	$(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
+-	$(INSTALL) -m 755 $(STRIP_OPT) $(PROGS) "$(DESTDIR)$(bindir)"
 +	$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
  endif
  
- ifneq ($(wildcard .depend),)
+ # Include automatically generated dependency files
-- 
cgit v1.2.3