From 5698e0be46718ac32888ae2ee13423d370018a07 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@linux.intel.com>
Date: Mon, 10 Nov 2008 17:43:32 +0000
Subject: Fix qemu build on 2.6.27

Linux 2.6.27 removed linux/dirent.h, which qemu was included. Change this to
include dirent.h.
---
 meta/packages/qemu/qemu-0.9.1+svn/fix-dirent.patch | 20 ++++++++++++++++++++
 meta/packages/qemu/qemu_svn.bb                     |  5 +++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 meta/packages/qemu/qemu-0.9.1+svn/fix-dirent.patch

(limited to 'meta')

diff --git a/meta/packages/qemu/qemu-0.9.1+svn/fix-dirent.patch b/meta/packages/qemu/qemu-0.9.1+svn/fix-dirent.patch
new file mode 100644
index 0000000000..9282ac4779
--- /dev/null
+++ b/meta/packages/qemu/qemu-0.9.1+svn/fix-dirent.patch
@@ -0,0 +1,20 @@
+Index: trunk/linux-user/syscall.c
+===================================================================
+--- trunk.orig/linux-user/syscall.c	2008-11-10 10:58:07.000000000 +0000
++++ trunk/linux-user/syscall.c	2008-11-10 11:00:37.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <dirent.h>
+ #include <time.h>
+ #include <sys/types.h>
+ #include <sys/ipc.h>
+@@ -76,7 +77,6 @@
+ #include <linux/cdrom.h>
+ #include <linux/hdreg.h>
+ #include <linux/soundcard.h>
+-#include <linux/dirent.h>
+ #include <linux/kd.h>
+ 
+ #include "qemu.h"
diff --git a/meta/packages/qemu/qemu_svn.bb b/meta/packages/qemu/qemu_svn.bb
index 42cbc11a95..3de26cd397 100644
--- a/meta/packages/qemu/qemu_svn.bb
+++ b/meta/packages/qemu/qemu_svn.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 DEPENDS = "zlib"
 PV = "0.9.1+svnr${SRCREV}"
-PR = "r12"
+PR = "r13"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-0.9.1+svn/"
 
@@ -34,7 +34,8 @@ SRC_URI = "\
     file://fix_brk.patch;patch=1 \
     file://fix_protection_bits.patch;patch=1 \
     file://revert_arm_tcg.patch.gz;patch=1;minrev=4242 \
-    file://qemu-n800-support.patch;patch=1"
+    file://qemu-n800-support.patch;patch=1 \
+    file://fix-dirent.patch;patch=1"
 
 S = "${WORKDIR}/trunk"
 
-- 
cgit v1.2.3