From e2dadd361b3728e4c3aac2a7e40dac8cebbd5406 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Fri, 31 Oct 2014 16:36:07 +0200 Subject: qemu: upgrade to 2.1.2 Mainly a bug fix release. - Patch 0001-Back-porting-security-fix-CVE-2014-5388.patch removed, included upstream. Signed-off-by: Cristian Iorga Signed-off-by: Ross Burton --- ...1-Back-porting-security-fix-CVE-2014-5388.patch | 30 ---------------------- meta/recipes-devtools/qemu/qemu_2.1.0.bb | 28 -------------------- meta/recipes-devtools/qemu/qemu_2.1.2.bb | 27 +++++++++++++++++++ 3 files changed, 27 insertions(+), 58 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/files/0001-Back-porting-security-fix-CVE-2014-5388.patch delete mode 100644 meta/recipes-devtools/qemu/qemu_2.1.0.bb create mode 100644 meta/recipes-devtools/qemu/qemu_2.1.2.bb diff --git a/meta/recipes-devtools/qemu/files/0001-Back-porting-security-fix-CVE-2014-5388.patch b/meta/recipes-devtools/qemu/files/0001-Back-porting-security-fix-CVE-2014-5388.patch deleted file mode 100644 index ec541fa668..0000000000 --- a/meta/recipes-devtools/qemu/files/0001-Back-porting-security-fix-CVE-2014-5388.patch +++ /dev/null @@ -1,30 +0,0 @@ -Prevent out-of-bounds array access on -acpi_pcihp_pci_status. - -Upstream-Status: Backport - -Signed-off-by: Gonglei -Signed-off-by: Sona Sarmadi ---- -v2: - - change commit message. - - add 'Reviewed-by' ---- - hw/acpi/pcihp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c -index fae663a..34dedf1 100644 ---- a/hw/acpi/pcihp.c -+++ b/hw/acpi/pcihp.c -@@ -231,7 +231,7 @@ static uint64_t pci_read(void *opaque, hwaddr addr, unsigned int size) - uint32_t val = 0; - int bsel = s->hotplug_select; - -- if (bsel < 0 || bsel > ACPI_PCIHP_MAX_HOTPLUG_BUS) { -+ if (bsel < 0 || bsel >= ACPI_PCIHP_MAX_HOTPLUG_BUS) { - return 0; - } - --- -1.7.12.4 diff --git a/meta/recipes-devtools/qemu/qemu_2.1.0.bb b/meta/recipes-devtools/qemu/qemu_2.1.0.bb deleted file mode 100644 index a82d0529b9..0000000000 --- a/meta/recipes-devtools/qemu/qemu_2.1.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -require qemu.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ - file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" - -SRC_URI += "file://configure-fix-Darwin-target-detection.patch \ - file://qemu-enlarge-env-entry-size.patch \ - file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \ - file://0001-Back-porting-security-fix-CVE-2014-5388.patch \ - " -SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" -SRC_URI[md5sum] = "6726977292b448cbc7f89998fac6983b" -SRC_URI[sha256sum] = "397e23184f4bf613589a8fe0c6542461dc2afdf17ed337e97e6fd2f31e8f8802" - -COMPATIBLE_HOST_class-target_mips64 = "null" - -do_sanitize_sources() { - # These .git files point to a nonexistent path "../.git/modules" and will confuse git - # if it tries to recurse into those directories. - rm -f ${S}/dtc/.git ${S}/pixman/.git -} - -addtask sanitize_sources after do_unpack before do_patch - -do_install_append() { - # Prevent QA warnings about installed ${localstatedir}/run - if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi -} diff --git a/meta/recipes-devtools/qemu/qemu_2.1.2.bb b/meta/recipes-devtools/qemu/qemu_2.1.2.bb new file mode 100644 index 0000000000..0e20605919 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu_2.1.2.bb @@ -0,0 +1,27 @@ +require qemu.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ + file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" + +SRC_URI += "file://configure-fix-Darwin-target-detection.patch \ + file://qemu-enlarge-env-entry-size.patch \ + file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \ + " +SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" +SRC_URI[md5sum] = "0ff197c4ed4b695620bc4734e77c888f" +SRC_URI[sha256sum] = "fd10f5e45cf5a736fa5a3e1c279ae9821534e700beb7d1aab88a07648a394885" + +COMPATIBLE_HOST_class-target_mips64 = "null" + +do_sanitize_sources() { + # These .git files point to a nonexistent path "../.git/modules" and will confuse git + # if it tries to recurse into those directories. + rm -f ${S}/dtc/.git ${S}/pixman/.git +} + +addtask sanitize_sources after do_unpack before do_patch + +do_install_append() { + # Prevent QA warnings about installed ${localstatedir}/run + if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi +} -- cgit 1.2.3-korg