summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Lu <Chong.Lu@windriver.com>2014-06-10 18:13:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-13 12:31:39 +0100
commit60846a0ce2dfbf9a87d4f84f04738851dfbba598 (patch)
tree6c7a6c301d1703ef7c415adcd30de60198ac93b7
parentf51c639f99a92e808c0fa35839416c5c075a8bd8 (diff)
downloadpoky-60846a0ce2dfbf9a87d4f84f04738851dfbba598.tar.gz
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. (From OE-Core rev: c8722b510f779cd20757477a7f7a7a2a35b9a9c5) Signed-off-by: Yang Wei <Wei.Yang@windriver.com> Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools.inc3
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch82
2 files changed, 84 insertions, 1 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools.inc b/meta/recipes-kernel/kexec/kexec-tools.inc
index 50b448caed..6a690c6a7e 100644
--- a/meta/recipes-kernel/kexec/kexec-tools.inc
+++ b/meta/recipes-kernel/kexec/kexec-tools.inc
@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \
8 file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09" 8 file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09"
9DEPENDS = "zlib xz" 9DEPENDS = "zlib xz"
10 10
11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz" 11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \
12 file://kexec-tools-Refine-kdump-device_tree-sort.patch"
12 13
13inherit autotools-brokensep 14inherit autotools-brokensep
14 15
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
new file mode 100644
index 0000000000..ab1fe96db2
--- /dev/null
+++ b/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
@@ -0,0 +1,82 @@
1kexec-tools: Refine kdump device_tree sort
2
3The commit b02d735bf was to rearrange the device-tree entries, and
4assumed that these entries are sorted in the ascending order. but
5acctually when I was validating kexec and kdump, the order of
6serial node still is changed. So the patch is to sort these entries
7by the directory name in ascending order.
8
9Upstream-Status: Pending
10
11Signed-off-by: Yang Wei <Wei.Yang@windriver.com>
12Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
13---
14 kexec/arch/ppc/fs2dt.c | 13 ++++++++++---
15 kexec/fs2dt.c | 13 ++++++++++---
16 2 files changed, 20 insertions(+), 6 deletions(-)
17
18diff --git a/kexec/arch/ppc/fs2dt.c b/kexec/arch/ppc/fs2dt.c
19index 4121c7d..cc04b04 100644
20--- a/kexec/arch/ppc/fs2dt.c
21+++ b/kexec/arch/ppc/fs2dt.c
22@@ -296,6 +296,9 @@ static int comparefunc(const void *dentry1, const void *dentry2)
23 {
24 char *str1 = (*(struct dirent **)dentry1)->d_name;
25 char *str2 = (*(struct dirent **)dentry2)->d_name;
26+ char* ptr1 = strchr(str1, '@');
27+ char* ptr2 = strchr(str2, '@');
28+ int len1, len2;
29
30 /*
31 * strcmp scans from left to right and fails to idetify for some
32@@ -303,9 +306,13 @@ static int comparefunc(const void *dentry1, const void *dentry2)
33 * Therefore, we get the wrong sorted order like memory@10000000 and
34 * memory@f000000.
35 */
36- if (strchr(str1, '@') && strchr(str2, '@') &&
37- (strlen(str1) > strlen(str2)))
38- return 1;
39+ if (ptr1 && ptr2) {
40+ len1 = ptr1 - str1;
41+ len2 = ptr2 - str2;
42+ if (!strncmp(str1, str2, len1 >len2 ? len1: len2) &&
43+ (strlen(str1) > strlen(str2)))
44+ return 1;
45+ }
46
47 return strcmp(str1, str2);
48 }
49diff --git a/kexec/fs2dt.c b/kexec/fs2dt.c
50index 5e6b98d..1c0345b 100644
51--- a/kexec/fs2dt.c
52+++ b/kexec/fs2dt.c
53@@ -475,6 +475,9 @@ static int comparefunc(const struct dirent **dentry1,
54 {
55 char *str1 = (*(struct dirent **)dentry1)->d_name;
56 char *str2 = (*(struct dirent **)dentry2)->d_name;
57+ char* ptr1 = strchr(str1, '@');
58+ char* ptr2 = strchr(str2, '@');
59+ int len1, len2;
60
61 /*
62 * strcmp scans from left to right and fails to idetify for some
63@@ -482,9 +485,13 @@ static int comparefunc(const struct dirent **dentry1,
64 * Therefore, we get the wrong sorted order like memory@10000000 and
65 * memory@f000000.
66 */
67- if (strchr(str1, '@') && strchr(str2, '@') &&
68- (strlen(str1) > strlen(str2)))
69- return 1;
70+ if (ptr1 && ptr2) {
71+ len1 = ptr1 - str1;
72+ len2 = ptr2 - str2;
73+ if (!strncmp(str1, str2, len1 >len2 ? len1: len2) &&
74+ (strlen(str1) > strlen(str2)))
75+ return 1;
76+ }
77
78 return strcmp(str1, str2);
79 }
80--
811.7.9.5
82