[OE-core] [PATCH 17/25] qemu: update to version 2.1.2

[Kai Kang]

Update qemu from 2.1.0 to version 2.1.2.

* Remove backport patch 0001-Back-porting-security-fix-CVE-2014-5388.patch
* Remove task do_sanitize_sources that no directory .git in submodules any more

Signed-off-by: Kai Kang <kai.kang at windriver.com>
---
 ...1-Back-porting-security-fix-CVE-2014-5388.patch | 30 ----------------------
 .../qemu/{qemu_2.1.0.bb => qemu_2.1.2.bb}          | 19 +++++---------
 2 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 meta/recipes-devtools/qemu/files/0001-Back-porting-security-fix-CVE-2014-5388.patch
 rename meta/recipes-devtools/qemu/{qemu_2.1.0.bb => qemu_2.1.2.bb} (55%)

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 ec541fa..0000000
--- 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 <arei.gonglei at huawei.com>
-Signed-off-by: Sona Sarmadi <sona.sarmadi at enea.com>
----
-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.2.bb
similarity index 55%
rename from meta/recipes-devtools/qemu/qemu_2.1.0.bb
rename to meta/recipes-devtools/qemu/qemu_2.1.2.bb
index a82d052..b4e1cab 100644
--- a/meta/recipes-devtools/qemu/qemu_2.1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.1.2.bb
@@ -1,26 +1,19 @@
 require qemu.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
-                    file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
+                    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"
+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
+COMPATIBLE_HOST_class-target_mips = "null"
 
 do_install_append() {
     # Prevent QA warnings about installed ${localstatedir}/run
-- 
1.9.1