qemu: Fix nodocs patch and remove show cursor patch.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@346 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 45 insertions, 2 deletions

diff --git a/openembedded/packages/qemu/files/qemu_nodocs_cvs.patch b/openembedded/packages/qemu/files/qemu_nodocs_cvs.patch
new file mode 100644
index 0000000000..9d9d7d484c
--- /dev/null
+++ b/openembedded/packages/qemu/files/qemu_nodocs_cvs.patch
@@ -0,0 +1,44 @@
+Index: qemu/Makefile
+===================================================================
+--- qemu.orig/Makefile  2006-04-11 21:49:44.000000000 +0100
++++ qemu/Makefile       2006-04-12 16:02:28.000000000 +0100
+@@ -11,7 +11,7 @@
+ ifdef CONFIG_STATIC
+ LDFLAGS+=-static
+ endif
+-DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1
++DOCS=
+ 
+ all: dyngen$(EXESUF) $(TOOLS) $(DOCS)
+        for d in $(TARGET_DIRS); do \
+@@ -52,11 +52,11 @@
+                        pc-bios/ppc_rom.bin pc-bios/video.x \
+                        pc-bios/proll.elf \
+                        pc-bios/linux_boot.bin "$(DESTDIR)$(datadir)"
+-       mkdir -p "$(DESTDIR)$(docdir)"
+-       install -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
++#      mkdir -p "$(DESTDIR)$(docdir)"
++#      install -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
+ ifndef CONFIG_WIN32
+-       mkdir -p "$(DESTDIR)$(mandir)/man1"
+-       install qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
++#      mkdir -p "$(DESTDIR)$(mandir)/man1"
++#      install qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
+        mkdir -p "$(DESTDIR)$(datadir)/keymaps"
+        install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(DESTDIR)$(datadir)/keymaps"
+ endif
+@@ -121,10 +121,10 @@
+        $(datadir)/ppc_rom.bin \
+        $(datadir)/video.x \
+        $(datadir)/proll.elf \
+-       $(datadir)/linux_boot.bin \
+-       $(docdir)/qemu-doc.html \
+-       $(docdir)/qemu-tech.html \
+-       $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 )
++       $(datadir)/linux_boot.bin
++#      $(docdir)/qemu-doc.html \
++#      $(docdir)/qemu-tech.html \
++#      $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 )
+ 
+ ifneq ($(wildcard .depend),)
+ include .depend
diff --git a/openembedded/packages/qemu/qemu_cvs.bb b/openembedded/packages/qemu/qemu_cvs.bb
index cd203f951d..4a2dc13169 100644
--- a/openembedded/packages/qemu/qemu_cvs.bb
+++ b/openembedded/packages/qemu/qemu_cvs.bb
@@ -3,8 +3,7 @@ PV = "0.8.0+cvs${SRCDATE}"
 
 SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu \
            file://configure.patch;patch=1 \
-           file://no_docs.patch;patch=1 \
-           file://show_cursor.patch;patch=1"
+           file://qemu_nodocs_cvs.patch;patch=1"
 
 S = "${WORKDIR}/qemu"