From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by mail.openembedded.org (Postfix) with ESMTP id 5DB5365FF6; Mon, 16 Jun 2014 03:02:55 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.14.5/8.14.5) with ESMTP id s5G32sMv007037 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Sun, 15 Jun 2014 20:02:54 -0700 (PDT) Received: from [128.224.162.204] (128.224.162.204) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.3.169.1; Sun, 15 Jun 2014 20:02:49 -0700 Message-ID: <539E5E56.20209@windriver.com> Date: Mon, 16 Jun 2014 11:02:46 +0800 From: Chong Lu User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: Martin Jansa , References: <20140613113218.C57E750446@opal.openembedded.org> <20140615225618.GL2428@jama> In-Reply-To: <20140615225618.GL2428@jama> X-Originating-IP: [128.224.162.204] Cc: openembedded-commits@lists.openembedded.org Subject: Re: [oe-commits] Chong Lu : kexec-tools: Refine kdump device_tree sort X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jun 2014 03:02:59 -0000 Content-Type: multipart/alternative; boundary="------------070504010807040800060006" --------------070504010807040800060006 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit On 06/16/2014 06:56 AM, Martin Jansa wrote: > FYI: this will probably break > meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb > > because it doesn't have kexec-tools directory in FILESPATH > > WARNING: Unable to get checksum for kexec-tools-klibc SRC_URI entry > kexec-tools-Refine-kdump-device_tree-sort.patch: file could not be found OK, I will send a new patch to fix this issue. Best Regards Chong > > On Fri, Jun 13, 2014 at 11:32:18AM +0000, git@git.openembedded.org wrote: >> Module: openembedded-core.git >> Branch: master >> Commit: c8722b510f779cd20757477a7f7a7a2a35b9a9c5 >> URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c8722b510f779cd20757477a7f7a7a2a35b9a9c5 >> >> Author: Chong Lu >> Date: Tue Jun 10 18:13:39 2014 +0800 >> >> 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. >> >> Signed-off-by: Yang Wei >> Signed-off-by: Chong Lu >> Signed-off-by: Saul Wold >> Signed-off-by: Richard Purdie >> >> --- >> >> meta/recipes-kernel/kexec/kexec-tools.inc | 3 +- >> ...kexec-tools-Refine-kdump-device_tree-sort.patch | 82 ++++++++++++++++++++++ >> 2 files changed, 84 insertions(+), 1 deletion(-) >> >> diff --git a/meta/recipes-kernel/kexec/kexec-tools.inc b/meta/recipes-kernel/kexec/kexec-tools.inc >> index 50b448c..6a690c6 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 \ >> file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09" >> DEPENDS = "zlib xz" >> >> -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz" >> +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \ >> + file://kexec-tools-Refine-kdump-device_tree-sort.patch" >> >> inherit autotools-brokensep >> >> 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 0000000..ab1fe96 >> --- /dev/null >> +++ b/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch >> @@ -0,0 +1,82 @@ >> +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 >> +Signed-off-by: Chong Lu >> +--- >> + kexec/arch/ppc/fs2dt.c | 13 ++++++++++--- >> + kexec/fs2dt.c | 13 ++++++++++--- >> + 2 files changed, 20 insertions(+), 6 deletions(-) >> + >> +diff --git a/kexec/arch/ppc/fs2dt.c b/kexec/arch/ppc/fs2dt.c >> +index 4121c7d..cc04b04 100644 >> +--- a/kexec/arch/ppc/fs2dt.c >> ++++ b/kexec/arch/ppc/fs2dt.c >> +@@ -296,6 +296,9 @@ static int comparefunc(const void *dentry1, const void *dentry2) >> + { >> + 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 *dentry1, const void *dentry2) >> + * 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/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 >> + >> >> -- >> _______________________________________________ >> Openembedded-commits mailing list >> Openembedded-commits@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-commits > > --------------070504010807040800060006 Content-Type: text/html; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit
On 06/16/2014 06:56 AM, Martin Jansa wrote:
FYI: this will probably break
meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb

because it doesn't have kexec-tools directory in FILESPATH

WARNING: Unable to get checksum for kexec-tools-klibc SRC_URI entry
kexec-tools-Refine-kdump-device_tree-sort.patch: file could not be found
OK, I will send a new patch to fix this issue.

Best Regards
Chong

On Fri, Jun 13, 2014 at 11:32:18AM +0000, git@git.openembedded.org wrote:

Module: openembedded-core.git
Branch: master
Commit: c8722b510f779cd20757477a7f7a7a2a35b9a9c5
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c8722b510f779cd20757477a7f7a7a2a35b9a9c5

Author: Chong Lu <Chong.Lu@windriver.com>
Date:   Tue Jun 10 18:13:39 2014 +0800

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.

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>

---

 meta/recipes-kernel/kexec/kexec-tools.inc          |  3 +-
 ...kexec-tools-Refine-kdump-device_tree-sort.patch | 82 ++++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/kexec/kexec-tools.inc b/meta/recipes-kernel/kexec/kexec-tools.inc
index 50b448c..6a690c6 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 \
                     file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09"
 DEPENDS = "zlib xz"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz"
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \
+           file://kexec-tools-Refine-kdump-device_tree-sort.patch"
 
 inherit autotools-brokensep
 
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 0000000..ab1fe96
--- /dev/null
+++ b/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch
@@ -0,0 +1,82 @@
+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(-)
+
+diff --git a/kexec/arch/ppc/fs2dt.c b/kexec/arch/ppc/fs2dt.c
+index 4121c7d..cc04b04 100644
+--- a/kexec/arch/ppc/fs2dt.c
++++ b/kexec/arch/ppc/fs2dt.c
+@@ -296,6 +296,9 @@ static int comparefunc(const void *dentry1, const void *dentry2)
+ {
+ 	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 *dentry1, const void *dentry2)
+ 	 * 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/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
+

-- 
_______________________________________________
Openembedded-commits mailing list
Openembedded-commits@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-commits


      

      

      

    

    

  


--------------070504010807040800060006--