Adjust the patch since it was partially applied upstream (in a different form) but not completely since the ppc specific part was not applied.
Signed-off-by: Richard Purdie <[email protected]> --- ...kexec-tools-Refine-kdump-device_tree-sort.patch | 34 ---------------------- .../{kexec-tools_2.0.8.bb => kexec-tools_2.0.9.bb} | 4 +-- 2 files changed, 2 insertions(+), 36 deletions(-) rename meta/recipes-kernel/kexec/{kexec-tools_2.0.8.bb => kexec-tools_2.0.9.bb} (76%) 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 index ab1fe96..8bb4fc4 100644 --- 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 @@ -46,37 +46,3 @@ index 4121c7d..cc04b04 100644 return strcmp(str1, str2); } -diff --git a/kexec/fs2dt.c b/kexec/fs2dt.c -index 5e6b98d..1c0345b 100644 ---- a/kexec/fs2dt.c -+++ b/kexec/fs2dt.c -@@ -475,6 +475,9 @@ static int comparefunc(const struct dirent **dentry1, - { - 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 -@@ -482,9 +485,13 @@ static int comparefunc(const struct dirent **dentry1, - * 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); - } --- -1.7.9.5 - diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.8.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb similarity index 76% rename from meta/recipes-kernel/kexec/kexec-tools_2.0.8.bb rename to meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb index c478732..c0c2727 100644 --- a/meta/recipes-kernel/kexec/kexec-tools_2.0.8.bb +++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb @@ -6,8 +6,8 @@ SRC_URI += "file://kexec-tools-Refine-kdump-device_tree-sort.patch \ file://kexec-aarch64.patch \ " -SRC_URI[md5sum] = "45bd2bc676ae202579e4c185563126af" -SRC_URI[sha256sum] = "95083c707577154a2241c5af0985f1eb3412d1ba208ef91813e9158b0a901179" +SRC_URI[md5sum] = "4ecb7ab7ad9eb6ce413899bdb07a8426" +SRC_URI[sha256sum] = "c2c6d204fe0911ebd304c40100163237feca4c5a854a2cca382ee36916a573d8" PACKAGES =+ "kexec kdump vmcore-dmesg" -- 2.1.0 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
