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>
This commit is contained in:
parent
878ca63278
commit
7183a89934
|
@ -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$##'`"
|
||||
|
|
|
@ -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);
|
||||
}
|
|
@ -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"
|
||||
|
Loading…
Reference in New Issue