[gnome-continuous-yocto/gnomeostree-3.28-rocko: 741/8267] kexec-tools: update to 2.0.12

[Emmanuele Bassi <ebassi src gnome org>]

commit 7183a89934ee57c4ef400bef6a975d1595f892a3
Author: Alexander Kanavin <alexander kanavin linux intel com>
Date:   Fri Jun 3 12:14:57 2016 +0300

    kexec-tools: update to 2.0.12
    
    Drop kexec-tools-Refine-kdump-device_tree-sort.patch, it's
    merged upstream.
    
    (From OE-Core rev: 4a0eed2b44777f4b794e3972912ba51381417b7f)
    
    Signed-off-by: Alexander Kanavin <alexander kanavin linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-kernel/kexec/kexec-tools.inc          |    4 ++
 ...kexec-tools-Refine-kdump-device_tree-sort.patch |   48 --------------------
 ...kexec-tools_2.0.11.bb => kexec-tools_2.0.12.bb} |    6 +-
 3 files changed, 7 insertions(+), 51 deletions(-)
---
diff --git a/meta/recipes-kernel/kexec/kexec-tools.inc b/meta/recipes-kernel/kexec/kexec-tools.inc
index 758a3a7..bdfe024 100644
--- a/meta/recipes-kernel/kexec/kexec-tools.inc
+++ b/meta/recipes-kernel/kexec/kexec-tools.inc
@@ -22,6 +22,10 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|fre
 INSANE_SKIP_${PN} = "arch"
 
 do_compile_prepend() {
+    # Remove the prepackaged config.h from the source tree as it overrides
+    # the same file generated by configure and placed in the build tree
+    rm -f ${S}/include/config.h
+
     # Remove the '*.d' file to make sure the recompile is OK
     for dep in `find ${B} -type f -name '*.d'`; do
         dep_no_d="`echo $dep | sed 's#.d$##'`"
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb
similarity index 84%
rename from meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb
rename to meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb
index c1c97af..59376c8 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb
@@ -2,7 +2,7 @@ require kexec-tools.inc
 export LDFLAGS = "-L${STAGING_LIBDIR}"
 EXTRA_OECONF = " --with-zlib=yes"
 
-SRC_URI += "file://kexec-tools-Refine-kdump-device_tree-sort.patch \
+SRC_URI += " \
             file://kexec-aarch64.patch \
             file://kexec-x32.patch \
             file://0002-powerpc-change-the-memory-size-limit.patch \
@@ -10,8 +10,8 @@ SRC_URI += "file://kexec-tools-Refine-kdump-device_tree-sort.patch \
             file://0001-vmcore-dmesg-Define-_GNU_SOURCE.patch \
          "
 
-SRC_URI[md5sum] = "86de066859f289048f1b286af6f03f78"
-SRC_URI[sha256sum] = "84f652ebf1de3f7b9de757a50cdbf6d5639d88c1d5b5ef9f525edde5ef9590c2"
+SRC_URI[md5sum] = "10ddaae0e86af54407b164a1f5a39cc3"
+SRC_URI[sha256sum] = "cc7b60dad0da202004048a6179d8a53606943062dd627a2edba45a8ea3a85135"
 
 PACKAGES =+ "kexec kdump vmcore-dmesg"