diff options
| -rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch | 48 | ||||
| -rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb (renamed from meta/recipes-kernel/kexec/kexec-tools_2.0.11.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 758a3a78b8..bdfe024a79 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/kexec-tools-Refine-kdump-device_tree-sort.patch b/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch deleted file mode 100644 index e198eb6e9a..0000000000 --- a/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch +++ /dev/null @@ -1,48 +0,0 @@ -kexec-tools: Refine kdump device_tree sort - -The commit b02d735bf was to rearrange the device-tree entries, and -assumed that these entries are sorted in the ascending order. but -acctually when I was validating kexec and kdump, the order of -serial node still is changed. So the patch is to sort these entries -by the directory name in ascending order. - -Upstream-Status: Pending - -Signed-off-by: Yang Wei <Wei.Yang@windriver.com> -Signed-off-by: Chong Lu <Chong.Lu@windriver.com> ---- - kexec/arch/ppc/fs2dt.c | 13 ++++++++++--- - kexec/fs2dt.c | 13 ++++++++++--- - 2 files changed, 20 insertions(+), 6 deletions(-) - -Index: kexec-tools-2.0.10/kexec/arch/ppc/fs2dt.c -=================================================================== ---- kexec-tools-2.0.10.orig/kexec/arch/ppc/fs2dt.c -+++ kexec-tools-2.0.10/kexec/arch/ppc/fs2dt.c -@@ -296,6 +296,9 @@ static int comparefunc(const void *dentr - { - char *str1 = (*(struct dirent **)dentry1)->d_name; - char *str2 = (*(struct dirent **)dentry2)->d_name; -+ char* ptr1 = strchr(str1, '@'); -+ char* ptr2 = strchr(str2, '@'); -+ int len1, len2; - - /* - * strcmp scans from left to right and fails to idetify for some -@@ -303,9 +306,13 @@ static int comparefunc(const void *dentr - * Therefore, we get the wrong sorted order like memory@10000000 and - * memory@f000000. - */ -- if (strchr(str1, '@') && strchr(str2, '@') && -- (strlen(str1) > strlen(str2))) -- return 1; -+ if (ptr1 && ptr2) { -+ len1 = ptr1 - str1; -+ len2 = ptr2 - str2; -+ if (!strncmp(str1, str2, len1 >len2 ? len1: len2) && -+ (strlen(str1) > strlen(str2))) -+ return 1; -+ } - - return strcmp(str1, str2); - } diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb index c1c97af9e8..59376c804a 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" |