- added patch to fix crash when using qemu with NICs connected via socket

[packages/qemu.git] / qemu-DESTDIR.patch

diff --git a/qemu-DESTDIR.patch b/qemu-DESTDIR.patch
index 0492889f64f313254dc77fc39d4ce76718482d62..002c12b78fbf87e2fd4bd2b77c6858f8e18d1e78 100644 (file)
--- a/qemu-DESTDIR.patch
+++ b/qemu-DESTDIR.patch
@@ -1,32 +1,45 @@
---- qemu-0.5.2/Makefile~       2004-01-25 16:50:02.000000000 +0100
-+++ qemu-0.5.2/Makefile        2004-02-05 02:55:07.000000000 +0100
-@@ -36,12 +36,12 @@
-         done
+--- qemu-0.7.0/Makefile.orig   2005-04-27 22:52:05.000000000 +0200
++++ qemu-0.7.0/Makefile        2005-05-01 13:13:53.934977792 +0200
+@@ -54,21 +54,21 @@
+ common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
  
  install: all 
--      mkdir -p $(prefix)/bin
--      install -m 755 -s $(TOOLS) $(prefix)/bin
--      mkdir -p $(sharedir)
--      install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin $(sharedir)
--      mkdir -p $(mandir)/man1
--      install qemu.1 $(mandir)/man1
-+      mkdir -p $(DESTDIR)$(prefix)/bin
-+      install -m 755 -s $(TOOLS) $(DESTDIR)$(prefix)/bin
-+      mkdir -p $(DESTDIR)$(sharedir)
-+      install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin $(DESTDIR)$(sharedir)
-+      mkdir -p $(DESTDIR)$(mandir)/man1
-+      install qemu.1 $(DESTDIR)$(mandir)/man1
+-      mkdir -p "$(bindir)"
+-      install -m 755 -s $(TOOLS) "$(bindir)"
+-      mkdir -p "$(datadir)"
++      mkdir -p "$(DESTDIR)$(bindir)"
++      install -m 755 $(TOOLS) "$(DESTDIR)$(bindir)"
++      mkdir -p "$(DESTDIR)$(datadir)"
+       install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
+                        pc-bios/vgabios-cirrus.bin \
+                        pc-bios/ppc_rom.bin \
+                        pc-bios/proll.elf \
+-                       pc-bios/linux_boot.bin "$(datadir)"
+-      mkdir -p "$(docdir)"
+-      install -m 644 qemu-doc.html  qemu-tech.html "$(docdir)"
++                       pc-bios/linux_boot.bin "$(DESTDIR)$(datadir)"
++      mkdir -p "$(DESTDIR)$(docdir)"
++      install -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
+ ifndef CONFIG_WIN32
+-      mkdir -p "$(mandir)/man1"
+-      install qemu.1 qemu-img.1 "$(mandir)/man1"
+-      mkdir -p "$(datadir)/keymaps"
+-      install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(datadir)/keymaps"
++      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
        for d in $(TARGET_DIRS); do \
-       make -C $$d $@ || exit 1 ; \
-         done
---- qemu-0.5.2/Makefile.target~        2004-02-05 02:53:15.000000000 +0100
-+++ qemu-0.5.2/Makefile.target 2004-02-05 02:55:26.000000000 +0100
-@@ -275,7 +275,7 @@
-       rm -f *.o  *.a *~ $(PROGS) gen-op.h opc.h op.h
+       $(MAKE) -C $$d $@ || exit 1 ; \
+--- qemu-0.6.0/Makefile.target.orig    2004-10-16 12:43:34.780448720 +0200
++++ qemu-0.6.0/Makefile.target 2004-10-16 12:45:08.871144760 +0200
+@@ -340,7 +340,7 @@
  
  install: all 
--      install -m 755 -s $(PROGS) $(prefix)/bin
-+      install -m 755 -s $(PROGS) $(DESTDIR)$(prefix)/bin
+ ifneq ($(PROGS),)
+-      install -m 755 -s $(PROGS) "$(bindir)"
++      install -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
+ endif
  
  ifneq ($(wildcard .depend),)
- include .depend