8 files changed, 9 insertions, 43 deletions

diff --git a/meta/packages/qemu/qemu-gcc3-check.inc b/meta/packages/qemu/qemu-gcc3-check.inc
deleted file mode 100644
index 81c3555b48..0000000000
--- a/meta/packages/qemu/qemu-gcc3-check.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-python __anonymous() {
-    from bb import which, data
-
-    path = data.getVar('PATH', d, 1)
-    oldOeConf = data.getVar('EXTRA_OECONF', d, 1)
-    if not oldOeConf: oldOeConf = ""
-    gcc3 = check_gcc3(d)
-    if gcc3:
-        data.setVar('EXTRA_OECONF', oldOeConf + " --cc=" + gcc3, d)
-}
-
diff --git a/meta/packages/qemu/qemu-native.inc b/meta/packages/qemu/qemu-native.inc
deleted file mode 100644
index 712da3532d..0000000000
--- a/meta/packages/qemu/qemu-native.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit native
-
-DEPENDS = "zlib-native"
diff --git a/meta/packages/qemu/qemu-native_0.9.1.bb b/meta/packages/qemu/qemu-native_0.9.1.bb
deleted file mode 100644
index e5a94a18d6..0000000000
--- a/meta/packages/qemu/qemu-native_0.9.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qemu_${PV}.bb
-require qemu-native.inc
-require qemu-gcc3-check.inc
-
-DEPENDS += "gcc3-native"
\ No newline at end of file
diff --git a/meta/packages/qemu/qemu-native_git.bb b/meta/packages/qemu/qemu-native_git.bb
deleted file mode 100644
index b2343ce8ae..0000000000
--- a/meta/packages/qemu/qemu-native_git.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require qemu_git.bb
-require qemu-native.inc
diff --git a/meta/packages/qemu/qemu-nativesdk.inc b/meta/packages/qemu/qemu-nativesdk.inc
deleted file mode 100644
index 3300efb96b..0000000000
--- a/meta/packages/qemu/qemu-nativesdk.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit nativesdk
-DEPENDS = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk"
-RDEPENDS = "libsdl-nativesdk"
diff --git a/meta/packages/qemu/qemu-nativesdk_0.9.1.bb b/meta/packages/qemu/qemu-nativesdk_0.9.1.bb
deleted file mode 100644
index fc647e8df0..0000000000
--- a/meta/packages/qemu/qemu-nativesdk_0.9.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require qemu_${PV}.bb
-require qemu-nativesdk.inc
-
-EXTRA_OECONF +="--target-list=arm-linux-user,arm-softmmu,i386-softmmu"
-
-DEPENDS += "gcc3-native"
-
-require qemu-gcc3-check.inc
diff --git a/meta/packages/qemu/qemu-nativesdk_git.bb b/meta/packages/qemu/qemu-nativesdk_git.bb
deleted file mode 100644
index ae7fdfcfe7..0000000000
--- a/meta/packages/qemu/qemu-nativesdk_git.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require qemu_git.bb
-require qemu-nativesdk.inc
-
-SRC_URI += "file://glflags.patch;patch=1"
-
-PR = "r4"
-
-EXTRA_OECONF +="--target-list=arm-linux-user,arm-softmmu,i386-softmmu --disable-vnc-tls --cc=${HOST_PREFIX}gcc"
diff --git a/meta/packages/qemu/qemu_git.bb b/meta/packages/qemu/qemu_git.bb
index dc640134ed..c4e48a9068 100644
--- a/meta/packages/qemu/qemu_git.bb
+++ b/meta/packages/qemu/qemu_git.bb
@@ -1,7 +1,7 @@
 LICENSE = "GPL"
 DEPENDS = "zlib"
 PV = "0.10.2+git${SRCREV}"
-PR = "r5"
+PR = "r6"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
 
@@ -17,9 +17,8 @@ SRC_URI = "\
 
 S = "${WORKDIR}/git"
 
+EXTRA_OECONF = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu --disable-gfx-check"
 #EXTRA_OECONF += "--disable-sdl"
-EXTRA_OECONF += "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu"
-EXTRA_OECONF += "--disable-gfx-check"
 
 inherit autotools
 
@@ -27,3 +26,10 @@ 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 --disable-vnc-tls --cc=${HOST_PREFIX}gcc"
+
+BBCLASSEXTEND = "native nativesdk"