Merge branch 'openEuler-24.03-LTS' of gitee.com:src-openeuler/kexec-tools into openEuler-24.03-LTS

Signed-off-by: zhangzikang <zhangzikang@kylinos.cn>

add-secure-compile-options-for-makedumpfile.patch

@@ -10,10 +10,10 @@ Signed-off-by: pengyeqing <pengyeqing@huawei.com>
  Makefile | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/makedumpfile-1.6.7/Makefile b/makedumpfile-1.6.7/Makefile
+diff --git a/makedumpfile-1.7.4/Makefile b/makedumpfile-1.7.4/Makefile
 index 612b9d0..180a64f 100644
---- a/makedumpfile-1.7.3/Makefile
-+++ b/makedumpfile-1.7.3/Makefile
+--- a/makedumpfile-1.7.4/Makefile
++++ b/makedumpfile-1.7.4/Makefile
 @@ -10,9 +10,10 @@ endif
  
  CFLAGS_BASE := $(CFLAGS) -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \

kexec-tools.spec

@@ -1,10 +1,10 @@
 %global eppic_ver e8844d3793471163ae4a56d8f95897be9e5bd554
 %global eppic_shortver %(c=%{eppic_ver}; echo ${c:0:7})
-%global mkdf_ver 1.7.3
+%global mkdf_ver 1.7.4
 
 Name: kexec-tools
 Version: 2.0.26
-Release: 7
+Release: 8
 License: GPLv2
 Summary: The kexec/kdump userspace component
 URL:     https://www.kernel.org/
@@ -299,9 +299,12 @@ done
 %endif
 
 %changelog
-* Wed Jul 24 2024 zhangzikang <zhangzikang@kylinos.cn> - 2.0.26-7
+* Wed Aug 14 2024 zhangzikang <zhangzikang@kylinos.cn> - 2.0.26-8
 - Fix "grep: warning: stray \ before -"
 
+* Tue Jul 30 2024 chenhaixiang <chenhaixiang3@huawei.com> - 2.0.26-7
+- update makedumpfile to makedumpfile-1.7.4
+
 * Mon Jul 8 2024 chenhaixiang <chenhaixiang3@huawei.com> - 2.0.26-6
 - Undo the deletion of rd.lvm.lv in cmdline