Re: [OE-core] [PATCH] kexec-tools: Update to 2.0.14

[Alexander Kanavin]

On 12/21/2016 11:56 AM, zhe...@windriver.com wrote:

Remove kexec-aarch64.patch since it has been merged upstream
Remove kexec-x32.patch since it has been reverted upstream


You should also remove the actual files, not just drop them from the recipe.


Backport patches for kdump arm64 from:
https://git.linaro.org/people/takahiro.akashi/kexec-tools.git


If the patches are coming from a different repository, they are not a 
backport. Change the upstream-status to 'pending' please, or 'submitted 
(link)' if they have been submitted upstream.



 meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb|  37 
 meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb|  44 +


Please use git's rename detection when submitting patches, so we can see 
what is the difference between the two files.



Alex
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] kexec-tools: Update to 2.0.14

[zhe.he]

From: He Zhe 

Remove kexec-aarch64.patch since it has been merged upstream
Remove kexec-x32.patch since it has been reverted upstream
Backport patches for kdump arm64 from:
https://git.linaro.org/people/takahiro.akashi/kexec-tools.git

Signed-off-by: He Zhe 
---
 ...nd-the-semantics-of-kexec_iomem_for_each_.patch |  78 
 ...eneralize-and-rename-get_kernel_stext_sym.patch | 194 
 ...0003-arm64-identify-PHYS_OFFSET-correctly.patch |  76 
 .../0004-arm64-kdump-identify-memory-regions.patch | 202 +
 ...5-arm64-kdump-add-elf-core-header-segment.patch | 191 +++
 ...6-arm64-kdump-set-up-kernel-image-segment.patch | 137 ++
 .../0007-arm64-kdump-set-up-other-segments.patch   |  35 
 ...-add-DT-properties-to-crash-dump-kernel-s.patch | 150 +++
 ...-kdump-Add-support-for-binary-image-files.patch |  52 ++
 meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb|  37 
 meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb|  44 +
 11 files changed, 1159 insertions(+), 37 deletions(-)
 create mode 100644 
meta/recipes-kernel/kexec/kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch
 create mode 100644 
meta/recipes-kernel/kexec/kexec-tools/0002-kexec-generalize-and-rename-get_kernel_stext_sym.patch
 create mode 100644 
meta/recipes-kernel/kexec/kexec-tools/0003-arm64-identify-PHYS_OFFSET-correctly.patch
 create mode 100644 
meta/recipes-kernel/kexec/kexec-tools/0004-arm64-kdump-identify-memory-regions.patch
 create mode 100644 
meta/recipes-kernel/kexec/kexec-tools/0005-arm64-kdump-add-elf-core-header-segment.patch
 create mode 100644 
meta/recipes-kernel/kexec/kexec-tools/0006-arm64-kdump-set-up-kernel-image-segment.patch
 create mode 100644 
meta/recipes-kernel/kexec/kexec-tools/0007-arm64-kdump-set-up-other-segments.patch
 create mode 100644 
meta/recipes-kernel/kexec/kexec-tools/0008-arm64-kdump-add-DT-properties-to-crash-dump-kernel-s.patch
 create mode 100644 
meta/recipes-kernel/kexec/kexec-tools/0009-arm64-kdump-Add-support-for-binary-image-files.patch
 delete mode 100644 meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb
 create mode 100644 meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb

diff --git 
a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch
 
b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch
new file mode 100644
index 000..822f28c
--- /dev/null
+++ 
b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-exntend-the-semantics-of-kexec_iomem_for_each_.patch
@@ -0,0 +1,78 @@
+From 02eed0f8f2748fd7579f69e5373445b52b2b8754 Mon Sep 17 00:00:00 2001
+From: AKASHI Takahiro 
+Date: Mon, 17 Oct 2016 13:56:58 +0900
+Subject: [PATCH 1/9] kexec: exntend the semantics of kexec_iomem_for_each_line
+
+The current kexec_iomem_for_each_line() counts up all the lines for which
+a callback function returns zero(0) or positive, and otherwise it stops
+further scanning.
+This behavior is incovenient in some cases. For instance, on arm64, we want
+to count up "System RAM" entries, but need to skip "reserved" entries.
+
+So this patch extends the semantics so that we will continue to scan
+succeeding entries but not count lines for which a callback function
+returns positive.
+
+The current users of kexec_iomem_for_each_line(), arm, sh and x86, will not
+be affected by this change because
+* arm
+  The callback function only returns -1 or 0, and the return value of
+  kexec_iomem_for_each_line() will never be used.
+* sh, x86
+  The callback function may return (-1 for sh,) 0 or 1, but always returns
+  1 once we have reached the maximum number of entries allowed.
+  Even so the current kexec_iomem_for_each_line() counts them up.
+  This change actually fixes this bug.
+
+Upstream-Status: Backport 
[https://git.linaro.org/people/takahiro.akashi/kexec-tools.git]
+
+Signed-off-by: AKASHI Takahiro 
+Signed-off-by: He Zhe 
+---
+ kexec/kexec-iomem.c | 15 ++-
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/kexec/kexec-iomem.c b/kexec/kexec-iomem.c
+index 485a2e8..0a0277a 100644
+--- a/kexec/kexec-iomem.c
 b/kexec/kexec-iomem.c
+@@ -18,6 +18,9 @@
+  * Iterate over each line in the file returned by proc_iomem(). If match is
+  * NULL or if the line matches with our match-pattern then call the
+  * callback if non-NULL.
++ * If match is NULL, callback should return a negative if error.
++ * Otherwise the interation goes on, incrementing nr but only if callback
++ * returns 0 (matched).
+  *
+  * Return the number of lines matched.
+  */
+@@ -37,7 +40,7 @@ int kexec_iomem_for_each_line(char *match,
+   char *str;
+   int consumed;
+   int count;
+-  int nr = 0;
++  int nr = 0, ret;
+ 
+   fp = fopen(iomem, "r");
+   if