!29 fix build fail caused by file format not recognized

From: @zhouwenpei
Reviewed-by: @overweight
Signed-off-by: @overweight
This commit is contained in:
openeuler-ci-bot 2021-07-31 01:50:54 +00:00 committed by Gitee
commit 6ae67c6fff
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 4c95454cd8f8ebdaf065b99ec89c7b0da743df37 Mon Sep 17 00:00:00 2001
From: zwx1052249 <zhouwenpei1@Huawei.com>
Date: Tue, 27 Jul 2021 10:15:46 +0800
Subject: [PATCH] fix build fail caused by file format not recognized
---
.../libeppic/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eppic-d84c3541035d95077aa8571f5d5c3e07c6ef510b/libeppic/Makefile b/eppic-d84c3541035d95077aa8571f5d5c3e07c6ef510b/libeppic/Makefile
index 8b97c87..1debebe 100644
--- a/eppic-d84c3541035d95077aa8571f5d5c3e07c6ef510b/libeppic/Makefile
+++ b/eppic-d84c3541035d95077aa8571f5d5c3e07c6ef510b/libeppic/Makefile
@@ -104,7 +104,7 @@ default: $(TARGETS)
$(CFILES): $(HFILES) eppic.tab.h
$(TARGETS): $(OFILES)
- $(AR) ccurl $(TARGETS) $(OFILES)
+ $(AR) rs $(TARGETS) $(OFILES)
clean:
-/bin/rm -f *.o $(TARGETS) $(LDIRT)
--
2.27.0

View File

@ -4,7 +4,7 @@
Name: kexec-tools Name: kexec-tools
Version: 2.0.20 Version: 2.0.20
Release: 6 Release: 7
License: GPLv2 License: GPLv2
Summary: The kexec/kdump userspace component Summary: The kexec/kdump userspace component
URL: https://www.kernel.org/ URL: https://www.kernel.org/
@ -107,6 +107,7 @@ Patch25: backport-PATCH-1-3-Use-vmcoreinfo-note-in-proc-kcore-for-mem-.patch
Patch26: backport-PATCH-2-3-arm64-Make-use-of-NUMBER-VA_BITS-in-vmcore.patch Patch26: backport-PATCH-2-3-arm64-Make-use-of-NUMBER-VA_BITS-in-vmcore.patch
Patch27: backport-PATCH-3-3-arm64-support-flipped-VA-and-52-bit-kernel.patch Patch27: backport-PATCH-3-3-arm64-support-flipped-VA-and-52-bit-kernel.patch
Patch28: backport-print-add-support-for-lockless-ringbuffer.patch Patch28: backport-print-add-support-for-lockless-ringbuffer.patch
Patch29: 0001-fix-build-fail-caused-by-file-format-not-recognized.patch
%description %description
kexec-tools provides /sbin/kexec binary that facilitates a new kexec-tools provides /sbin/kexec binary that facilitates a new
@ -166,6 +167,7 @@ tar -z -x -v -f %{SOURCE19}
%patch26 -p1 %patch26 -p1
%patch27 -p1 %patch27 -p1
%patch28 -p1 %patch28 -p1
%patch29 -p1
%build %build
autoreconf autoreconf
@ -351,6 +353,9 @@ done
%endif %endif
%changelog %changelog
* Tue Jul 27 2021 zhouwenpei <zhouwenpei1@huawei.com> - 2.0.20-7
- fix build fail caused by file format not recognized
* Sat Mar 27 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 2.0.20-6 * Sat Mar 27 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 2.0.20-6
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA