1 files changed, 4 insertions, 37 deletions
diff --git a/meta/packages/qemu/qemu_git.bb b/meta/packages/qemu/qemu_git.bb
index dc5db9730..346e9a394 100644
--- a/meta/packages/qemu/qemu_git.bb
+++ b/meta/packages/qemu/qemu_git.bb
@@ -1,9 +1,9 @@
-LICENSE = "GPL"
-DEPENDS = "zlib"
+require qemu.inc
+
 PV = "0.12.0+git${SRCREV}"
-PR = "r5"
+PR = "r6"
 
-FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
+FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/:${FILE_DIRNAME}/qemu-0.12/"
 
 SRC_URI = "\
     git://git.sv.gnu.org/qemu.git;protocol=git \
@@ -16,36 +16,3 @@ SRC_URI = "\
 
 S = "${WORKDIR}/git"
 
-EXTRA_OECONF = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu,mips-linux-user,mips-softmmu --disable-werror --disable-vnc-tls"
-#EXTRA_OECONF += "--disable-sdl"
-
-inherit autotools
-
-# For our gl powered QEMU you need libGL and SDL headers
-do_configure_prepend_virtclass-native() {
-    libgl='no'
-    libsdl='no'
-
-    test -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so && libgl='yes'
-    test -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so && libgl='yes'
-
-    test -e /usr/lib/pkgconfig/sdl.pc -o -e /usr/lib64/pkgconfig/sdl.pc && libsdl='yes'
-
-    if [ "$libsdl" != 'yes' -o "$libgl" != 'yes' ]; then
-       echo "You need libGL.so and libGLU.so to exist in your library path and the development headers for SDL installed to build qemu-native.
-       Ubuntu package names are: libgl1-mesa-dev, libglu1-mesa-dev and libsdl1.2-dev"
-       exit 1;
-    fi
-}
-
-do_configure() {
-    ${S}/configure --prefix=${prefix} ${EXTRA_OECONF}
-    chmod a+x ${S}/target-i386/beginend_funcs.sh
-}
-
-SRC_URI_append_virtclass-nativesdk = " file://glflags.patch;patch=1"
-DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk"
-RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk"
-EXTRA_OECONF_virtclass-nativesdk = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu,mips-linux-user,mips-softmmu --disable-vnc-tls --cc=${HOST_PREFIX}gcc"
-
-BBCLASSEXTEND = "native nativesdk"