diff options
Diffstat (limited to 'meta/recipes-devtools/qemu')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 12 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_1.2.0.bb | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 28ff76089d..95556ba8f7 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -9,8 +9,8 @@ QEMU_TARGETS ?= "arm i386 mips mipsel mips64 mips64el ppc sh4 x86_64" | |||
9 | require qemu-targets.inc | 9 | require qemu-targets.inc |
10 | 10 | ||
11 | SDL ?= "--disable-sdl" | 11 | SDL ?= "--disable-sdl" |
12 | SDL_virtclass-native ?= "" | 12 | SDL_class-native ?= "" |
13 | SDL_virtclass-nativesdk ?= "" | 13 | SDL_class-nativesdk ?= "" |
14 | 14 | ||
15 | EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370 ${SDL} --disable-curl --disable-vnc-jpeg --disable-bluez" | 15 | EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa --audio-card-list=ac97,es1370 ${SDL} --disable-curl --disable-vnc-jpeg --disable-bluez" |
16 | 16 | ||
@@ -40,10 +40,10 @@ do_install () { | |||
40 | 40 | ||
41 | PACKAGECONFIG ??= "" | 41 | PACKAGECONFIG ??= "" |
42 | 42 | ||
43 | DEPENDS_virtclass-native = "zlib-native alsa-lib-native glib-2.0-native" | 43 | DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native" |
44 | DEPENDS_virtclass-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0" | 44 | DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0" |
45 | RDEPENDS_virtclass-nativesdk = "nativesdk-libsdl" | 45 | RDEPENDS_class-nativesdk = "nativesdk-libsdl" |
46 | EXTRA_OECONF_virtclass-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ | 46 | EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ |
47 | --disable-curl \ | 47 | --disable-curl \ |
48 | " | 48 | " |
49 | 49 | ||
diff --git a/meta/recipes-devtools/qemu/qemu_1.2.0.bb b/meta/recipes-devtools/qemu/qemu_1.2.0.bb index 5cc142a624..af5eb0349c 100644 --- a/meta/recipes-devtools/qemu/qemu_1.2.0.bb +++ b/meta/recipes-devtools/qemu/qemu_1.2.0.bb | |||
@@ -20,11 +20,11 @@ SRC_URI[sha256sum] = "c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e | |||
20 | 20 | ||
21 | PR = "r4" | 21 | PR = "r4" |
22 | 22 | ||
23 | SRC_URI_append_virtclass-nativesdk = "\ | 23 | SRC_URI_append_class-nativesdk = "\ |
24 | file://relocatable_sdk.patch \ | 24 | file://relocatable_sdk.patch \ |
25 | " | 25 | " |
26 | 26 | ||
27 | do_configure_prepend_virtclass-nativesdk() { | 27 | do_configure_prepend_class-nativesdk() { |
28 | if [ "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then | 28 | if [ "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then |
29 | # Undo the -lX11 added by linker-flags.patch | 29 | # Undo the -lX11 added by linker-flags.patch |
30 | sed -i 's/-lX11//g' Makefile.target | 30 | sed -i 's/-lX11//g' Makefile.target |
@@ -45,7 +45,7 @@ do_install_append() { | |||
45 | } | 45 | } |
46 | # END of qemu-mips workaround | 46 | # END of qemu-mips workaround |
47 | 47 | ||
48 | do_configure_prepend_virtclass-native() { | 48 | do_configure_prepend_class-native() { |
49 | # Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed | 49 | # Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed |
50 | sed -i 's/-lX11//g' Makefile.target | 50 | sed -i 's/-lX11//g' Makefile.target |
51 | } | 51 | } |