summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-08-09 10:32:03 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-08-09 10:32:03 +0000
commita21e133e77926e931c33788864350f0183dbde7c (patch)
tree882e4f07fb4701aa989e457cd4ff7c8417d63274
parent0460e717e60bc11d00e222fd0b126702f9044f54 (diff)
downloadopenembedded-core-a21e133e77926e931c33788864350f0183dbde7c.tar.gz
openembedded-core-a21e133e77926e931c33788864350f0183dbde7c.tar.bz2
openembedded-core-a21e133e77926e931c33788864350f0183dbde7c.tar.xz
openembedded-core-a21e133e77926e931c33788864350f0183dbde7c.zip
qemu-native: unbreak on amd64 - patch taken from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2419 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch21
-rw-r--r--meta/packages/qemu/qemu_cvs.bb3
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch b/meta/packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch
new file mode 100644
index 000000000..8f5e9d8b4
--- /dev/null
+++ b/meta/packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch
@@ -0,0 +1,21 @@
+diff -Naru qemu-snapshot-2007-07-01_05.orig/linux-user/mmap.c qemu-snapshot-2007-07-01_05/linux-user/mmap.c
+--- qemu-snapshot-2007-07-01_05.orig/linux-user/mmap.c 2007-06-03 17:31:32.000000000 +0200
++++ qemu-snapshot-2007-07-01_05/linux-user/mmap.c 2007-07-02 14:00:30.000000000 +0200
+@@ -234,7 +234,7 @@
+ host_offset = offset & qemu_host_page_mask;
+ host_len = len + offset - host_offset;
+ host_start = (long)mmap(real_start ? g2h(real_start) : NULL,
+- host_len, prot, flags, fd, host_offset);
++ host_len, prot, (flags | MAP_32BIT), fd, host_offset);
+ if (host_start == -1)
+ return host_start;
+ /* update start so that it points to the file position at 'offset' */
+@@ -388,7 +388,7 @@
+ int prot;
+
+ /* XXX: use 5 args syscall */
+- new_addr = (long)mremap(g2h(old_addr), old_size, new_size, flags);
++ new_addr = (long)mremap(g2h(old_addr), old_size, new_size, (flags | MAP_32BIT));
+ if (new_addr == -1)
+ return new_addr;
+ new_addr = h2g(new_addr);
diff --git a/meta/packages/qemu/qemu_cvs.bb b/meta/packages/qemu/qemu_cvs.bb
index 3392b8804..740bf1258 100644
--- a/meta/packages/qemu/qemu_cvs.bb
+++ b/meta/packages/qemu/qemu_cvs.bb
@@ -1,7 +1,7 @@
LICENSE = "GPL"
DEPENDS = "zlib"
PV = "0.9.0+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
FILESDIR = "${WORKDIR}"
@@ -31,6 +31,7 @@ SRC_URI = "\
file://93-oh-pl110-rgb.patch;patch=1;pnum=0 \
file://qemu-0.9.0-nptl.patch;patch=1 \
file://qemu-0.9.0-nptl-update.patch;patch=1 \
+ file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 \
file://fix_segfault.patch;patch=1"
# svn://svn.o-hand.com/repos/misc/trunk/qemu-packaging/qemu;module=debian;proto=http;srcdate=20070119 \