summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIonut Radu <ionutx.radu@intel.com>2013-05-08 17:41:56 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-24 14:14:46 +0100
commit8f5abd28128bcb3612f397d7baadc16bc76ce7c7 (patch)
tree01f7d542afa594959237c891505779c91bcfc556
parent930c541868a17fbcfa3ef34c81f0ec06e33457d4 (diff)
downloadpoky-8f5abd28128bcb3612f397d7baadc16bc76ce7c7.tar.gz
qemu: Updated from 1.4.0 to 1.4.1
0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch and 3f08ffb4a4741d147634761dc053ed386243a0de.patch were backported in 1.4.1 (From OE-Core rev: d3fd92010a0b965fe1b7696f7c4e6c02d07f85dc) Signed-off-by: Ionut Radu <ionutx.radu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc1
-rw-r--r--meta/recipes-devtools/qemu/qemu_1.4.0.bb12
-rw-r--r--meta/recipes-devtools/qemu/qemu_1.4.1.bb10
3 files changed, 10 insertions, 13 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index bd7890d791..0a7dc4ed2c 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -26,7 +26,6 @@ SRC_URI = "\
26 file://larger_default_ram_size.patch \ 26 file://larger_default_ram_size.patch \
27 file://arm-bgr.patch \ 27 file://arm-bgr.patch \
28 file://Revert-vmware_vga-Add-back-some-info-in-local-state-.patch \ 28 file://Revert-vmware_vga-Add-back-some-info-in-local-state-.patch \
29 file://0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch \
30 file://0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch \ 29 file://0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch \
31 " 30 "
32 31
diff --git a/meta/recipes-devtools/qemu/qemu_1.4.0.bb b/meta/recipes-devtools/qemu/qemu_1.4.0.bb
deleted file mode 100644
index d968782566..0000000000
--- a/meta/recipes-devtools/qemu/qemu_1.4.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require qemu.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
5
6SRC_URI += "file://3f08ffb4a4741d147634761dc053ed386243a0de.patch \
7 file://fdt_header.patch \
8 "
9
10SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2"
11SRC_URI[md5sum] = "78f13b774814b6b7ebcaf4f9b9204318"
12SRC_URI[sha256sum] = "066297ed77408fb7588889c271a85cf3c259ad55c939315988e6062d7708eda8"
diff --git a/meta/recipes-devtools/qemu/qemu_1.4.1.bb b/meta/recipes-devtools/qemu/qemu_1.4.1.bb
new file mode 100644
index 0000000000..f59d28a1b9
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu_1.4.1.bb
@@ -0,0 +1,10 @@
1require qemu.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
5
6SRC_URI += "file://fdt_header.patch"
7
8SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2"
9SRC_URI[md5sum] = "eb2d696956324722b5ecfa46e41f9a75"
10SRC_URI[sha256sum] = "75063a9326221607de3599e89fb5af80f2d8080ddc55ca253fff113843432df1"