From b4cb437c6595ff8ac13506e502fe04b1a60c4e04 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 9 May 2006 18:38:19 +0000
Subject: Merge packages changes from OE into poky.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 openembedded/packages/qemu/files/nodocs_cvs.patch  | 44 ++++++++++++++++++++++
 .../packages/qemu/files/qemu_nodocs_cvs.patch      | 44 ----------------------
 openembedded/packages/qemu/qemu-native_cvs.bb      |  1 -
 openembedded/packages/qemu/qemu_cvs.bb             |  4 +-
 4 files changed, 46 insertions(+), 47 deletions(-)
 create mode 100644 openembedded/packages/qemu/files/nodocs_cvs.patch
 delete mode 100644 openembedded/packages/qemu/files/qemu_nodocs_cvs.patch

(limited to 'openembedded/packages/qemu')

diff --git a/openembedded/packages/qemu/files/nodocs_cvs.patch b/openembedded/packages/qemu/files/nodocs_cvs.patch
new file mode 100644
index 000000000..b52d860fb
--- /dev/null
+++ b/openembedded/packages/qemu/files/nodocs_cvs.patch
@@ -0,0 +1,44 @@
+Index: qemu/Makefile
+===================================================================
+--- qemu.orig/Makefile	2006-04-18 11:11:37.000000000 +0100
++++ qemu/Makefile	2006-04-18 11:14:34.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 \
+@@ -51,11 +51,11 @@
+ 			video.x proll.elf linux_boot.bin; do \
+ 		$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
+ 	done
+-	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"
+ 	for x in $(KEYMAPS); do \
+ 		$(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
+@@ -122,10 +122,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/files/qemu_nodocs_cvs.patch b/openembedded/packages/qemu/files/qemu_nodocs_cvs.patch
deleted file mode 100644
index b52d860fb..000000000
--- a/openembedded/packages/qemu/files/qemu_nodocs_cvs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: qemu/Makefile
-===================================================================
---- qemu.orig/Makefile	2006-04-18 11:11:37.000000000 +0100
-+++ qemu/Makefile	2006-04-18 11:14:34.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 \
-@@ -51,11 +51,11 @@
- 			video.x proll.elf linux_boot.bin; do \
- 		$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
- 	done
--	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"
- 	for x in $(KEYMAPS); do \
- 		$(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
-@@ -122,10 +122,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-native_cvs.bb b/openembedded/packages/qemu/qemu-native_cvs.bb
index 090c1408a..976d2d664 100644
--- a/openembedded/packages/qemu/qemu-native_cvs.bb
+++ b/openembedded/packages/qemu/qemu-native_cvs.bb
@@ -12,4 +12,3 @@ python __anonymous() {
         data.setVar('EXTRA_OECONF', " --cc=gcc-3.3", d)
 
 }
-
diff --git a/openembedded/packages/qemu/qemu_cvs.bb b/openembedded/packages/qemu/qemu_cvs.bb
index 4a2dc1316..5ebc18c6a 100644
--- a/openembedded/packages/qemu/qemu_cvs.bb
+++ b/openembedded/packages/qemu/qemu_cvs.bb
@@ -2,8 +2,8 @@ LICENSE = "GPL"
 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://qemu_nodocs_cvs.patch;patch=1"
+           file://nodocs_cvs.patch;patch=1 \
+           file://configure.patch;patch=1"
 
 S = "${WORKDIR}/qemu"
 
-- 
cgit v1.2.3