summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-08-22 20:31:50 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-08-22 20:31:50 +0000
commita503988c296bc863232cce143ec991340e8d4dd8 (patch)
treed6a2d08a45a861da7f89edffa9894df673807cba
parentbd5a009fca1657c7778884a3f04ba645077d86a5 (diff)
parentee8c7fff7a920cdd64f80b314509c20eded79ccd (diff)
merge of '27baa018f9f9e77156f5eb95353722f773cc651d'
and 'a61caf645adcb41a0f8ba344818d237040ae0bc9'
-rw-r--r--packages/qemu/files/no-strip.patch22
-rw-r--r--packages/qemu/qemu_20070613.bb5
2 files changed, 25 insertions, 2 deletions
diff --git a/packages/qemu/files/no-strip.patch b/packages/qemu/files/no-strip.patch
new file mode 100644
index 0000000000..59ed8771fe
--- /dev/null
+++ b/packages/qemu/files/no-strip.patch
@@ -0,0 +1,22 @@
+--- qemu.orig/Makefile
++++ qemu/Makefile
+@@ -68,7 +68,7 @@
+
+ install: all $(if $(BUILD_DOCS),install-doc)
+ mkdir -p "$(DESTDIR)$(bindir)"
+- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
++ $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)"
+ mkdir -p "$(DESTDIR)$(datadir)"
+ for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
+ video.x openbios-sparc32 pxe-ne2k_pci.bin \
+--- qemu.orig/Makefile.target
++++ qemu/Makefile.target
+@@ -655,7 +655,7 @@
+
+ install: all
+ ifneq ($(PROGS),)
+- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
++ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
+ endif
+
+ ifneq ($(wildcard .depend),)
diff --git a/packages/qemu/qemu_20070613.bb b/packages/qemu/qemu_20070613.bb
index 590641b84f..6584bcc3ed 100644
--- a/packages/qemu/qemu_20070613.bb
+++ b/packages/qemu/qemu_20070613.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
DEPENDS = "zlib"
SRCDATE = "20070613"
PV = "0.9.0+cvs${SRCDATE}"
-PR = "r4"
+PR = "r5"
FILESDIR = "${WORKDIR}"
@@ -34,7 +34,8 @@ SRC_URI = "\
file://qemu-0.9.0-nptl-update.patch;patch=1 \
file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 \
file://workaround_bad_futex_headers.patch;patch=1 \
- file://fix_segfault.patch;patch=1"
+ file://fix_segfault.patch;patch=1 \
+ file://no-strip.patch;patch=1"
# svn://svn.o-hand.com/repos/misc/trunk/qemu-packaging/qemu;module=debian;proto=http;srcdate=20070119 \
# file://debian/patches/21_net_soopts.patch;patch=1;pnum=0 \