diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-05 11:14:36 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-05 11:39:10 +0100 |
commit | fa62058503f5a086837d9839213738049413ad9e (patch) | |
tree | b5f6c873a4902be4eb9db63e8965ef7dc5f0c0c2 | |
parent | d37e927035699e8a7dcdffa687a6adda06fee4e9 (diff) | |
download | poky-fa62058503f5a086837d9839213738049413ad9e.tar.gz |
qemu: Clean up various QA warnings, add approproate INSANE_SKIP for firmware files, ensure files aren't stripped
(From OE-Core rev: 1c43b7ea6152aaad42159ce8071a4014b00f75fc)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 11 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_0.14.0.bb | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 18073eb4fc..ac8a3eb10d 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -38,10 +38,17 @@ do_configure_prepend_virtclass-native() { | |||
38 | } | 38 | } |
39 | 39 | ||
40 | do_configure() { | 40 | do_configure() { |
41 | ${S}/configure --prefix=${prefix} ${EXTRA_OECONF} | 41 | ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --disable-strip ${EXTRA_OECONF} |
42 | chmod a+x ${S}/target-i386/beginend_funcs.sh | 42 | chmod a+x ${S}/target-i386/beginend_funcs.sh |
43 | } | 43 | } |
44 | 44 | ||
45 | do_install () { | ||
46 | export STRIP="true" | ||
47 | autotools_do_install | ||
48 | install -d ${D}${datadir}/qemu | ||
49 | install -m 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu | ||
50 | } | ||
51 | |||
45 | SRC_URI_append_virtclass-nativesdk = " file://glflags.patch" | 52 | SRC_URI_append_virtclass-nativesdk = " file://glflags.patch" |
46 | DEPENDS_virtclass-native = "zlib-native alsa-lib-native" | 53 | DEPENDS_virtclass-native = "zlib-native alsa-lib-native" |
47 | DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk" | 54 | DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk" |
@@ -53,3 +60,5 @@ BBCLASSEXTEND = "native nativesdk" | |||
53 | # Qemu target will not build in world build for ARM or Mips | 60 | # Qemu target will not build in world build for ARM or Mips |
54 | BROKEN_qemuarm = "1" | 61 | BROKEN_qemuarm = "1" |
55 | BROKEN_qemumips = "1" | 62 | BROKEN_qemumips = "1" |
63 | |||
64 | INSANE_SKIP_${PN} = "arch" | ||
diff --git a/meta/recipes-devtools/qemu/qemu_0.14.0.bb b/meta/recipes-devtools/qemu/qemu_0.14.0.bb index ccf5ee4f2d..de12f62072 100644 --- a/meta/recipes-devtools/qemu/qemu_0.14.0.bb +++ b/meta/recipes-devtools/qemu/qemu_0.14.0.bb | |||
@@ -30,9 +30,4 @@ SRC_URI = "\ | |||
30 | SRC_URI[md5sum] = "f9d145d5c09de9f0984ffe9bd1229970" | 30 | SRC_URI[md5sum] = "f9d145d5c09de9f0984ffe9bd1229970" |
31 | SRC_URI[sha256sum] = "ba21e84d7853217830e167dae9999cdbff481189c6a0bb600ac7fb7201453108" | 31 | SRC_URI[sha256sum] = "ba21e84d7853217830e167dae9999cdbff481189c6a0bb600ac7fb7201453108" |
32 | 32 | ||
33 | do_install_append () { | ||
34 | install -d ${D}${datadir}/qemu | ||
35 | install -m 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu | ||
36 | } | ||
37 | |||
38 | S = "${WORKDIR}/qemu-${PV}" | 33 | S = "${WORKDIR}/qemu-${PV}" |