summaryrefslogtreecommitdiffstats
path: root/meta/packages/qemu
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-05 13:48:10 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-13 12:15:25 +0000
commitb8def2104730f6d8dd1be386950aa3a14a1281c1 (patch)
tree01146973055bbb2b7709c64fd4f077e8c229b9f3 /meta/packages/qemu
parentffb23018b54932d0f127195f0265841d07b54b69 (diff)
downloadpoky-b8def2104730f6d8dd1be386950aa3a14a1281c1.tar.gz
qemu: Convert to BBCLASSEXTEND (git version only, drop 0.9.1 native/nativesdk versions)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/qemu')
-rw-r--r--meta/packages/qemu/qemu-gcc3-check.inc11
-rw-r--r--meta/packages/qemu/qemu-native.inc3
-rw-r--r--meta/packages/qemu/qemu-native_0.9.1.bb5
-rw-r--r--meta/packages/qemu/qemu-native_git.bb2
-rw-r--r--meta/packages/qemu/qemu-nativesdk.inc3
-rw-r--r--meta/packages/qemu/qemu-nativesdk_0.9.1.bb8
-rw-r--r--meta/packages/qemu/qemu-nativesdk_git.bb8
-rw-r--r--meta/packages/qemu/qemu_git.bb12
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 @@
1python __anonymous() {
2 from bb import which, data
3
4 path = data.getVar('PATH', d, 1)
5 oldOeConf = data.getVar('EXTRA_OECONF', d, 1)
6 if not oldOeConf: oldOeConf = ""
7 gcc3 = check_gcc3(d)
8 if gcc3:
9 data.setVar('EXTRA_OECONF', oldOeConf + " --cc=" + gcc3, d)
10}
11
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 @@
1inherit native
2
3DEPENDS = "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 @@
1require qemu_${PV}.bb
2require qemu-native.inc
3require qemu-gcc3-check.inc
4
5DEPENDS += "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 @@
1require qemu_git.bb
2require 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 @@
1inherit nativesdk
2DEPENDS = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk"
3RDEPENDS = "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 @@
1require qemu_${PV}.bb
2require qemu-nativesdk.inc
3
4EXTRA_OECONF +="--target-list=arm-linux-user,arm-softmmu,i386-softmmu"
5
6DEPENDS += "gcc3-native"
7
8require 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 @@
1require qemu_git.bb
2require qemu-nativesdk.inc
3
4SRC_URI += "file://glflags.patch;patch=1"
5
6PR = "r4"
7
8EXTRA_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 @@
1LICENSE = "GPL" 1LICENSE = "GPL"
2DEPENDS = "zlib" 2DEPENDS = "zlib"
3PV = "0.10.2+git${SRCREV}" 3PV = "0.10.2+git${SRCREV}"
4PR = "r5" 4PR = "r6"
5 5
6FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/" 6FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
7 7
@@ -17,9 +17,8 @@ SRC_URI = "\
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
19 19
20EXTRA_OECONF = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu --disable-gfx-check"
20#EXTRA_OECONF += "--disable-sdl" 21#EXTRA_OECONF += "--disable-sdl"
21EXTRA_OECONF += "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu"
22EXTRA_OECONF += "--disable-gfx-check"
23 22
24inherit autotools 23inherit autotools
25 24
@@ -27,3 +26,10 @@ do_configure() {
27 ${S}/configure --prefix=${prefix} ${EXTRA_OECONF} 26 ${S}/configure --prefix=${prefix} ${EXTRA_OECONF}
28 chmod a+x ${S}/target-i386/beginend_funcs.sh 27 chmod a+x ${S}/target-i386/beginend_funcs.sh
29} 28}
29
30SRC_URI_append_virtclass-nativesdk = " file://glflags.patch;patch=1"
31DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk"
32RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk"
33EXTRA_OECONF_virtclass-nativesdk = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu --disable-vnc-tls --cc=${HOST_PREFIX}gcc"
34
35BBCLASSEXTEND = "native nativesdk"