ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-19 21:17:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kexec/util/bin-to-hex needs to be HOST_CC, not LD (issue #173)

Browse Source
This commit is contained in:
Trammell Hudson 2017-04-08 13:20:40 -04:00
parent 9fb1f247ad
commit c262de30a4
Failed to extract signature
1 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
patches/kexec-2.0.12.patch
View File

@ -1,6 +1,18 @@
diff -u --recursive /home/hudson/clean/kexec-tools-2.0.12/kexec/arch/i386/kexec-x86-common.c kexec-tools-2.0.12/kexec/arch/i386/kexec-x86-common.c
--- /home/hudson/clean/kexec-tools-2.0.12/kexec/arch/i386/kexec-x86-common.c 2015-11-29 18:52:07.000000000 -0500
+++ kexec-tools-2.0.12/kexec/arch/i386/kexec-x86-common.c 2017-01-28 14:46:48.765247188 -0500
diff -u --recursive ../clean/kexec-tools-2.0.12/include/config.h kexec-tools-2.0.12/include/config.h
--- ../clean/kexec-tools-2.0.12/include/config.h 2016-03-21 21:08:17.000000000 -0400
+++ kexec-tools-2.0.12/include/config.h 2017-04-08 11:28:01.644379416 -0400
@@ -11,7 +11,7 @@
/* #undef HAVE_LIBLZMA */
/* Define to 1 if you have the `xenctrl' library (-lxenctrl). */
-#define HAVE_LIBXENCTRL 1
+/* #undef HAVE_LIBXENCTRL */
/* Define to 1 if you have the `z' library (-lz). */
#define HAVE_LIBZ 1
diff -u --recursive ../clean/kexec-tools-2.0.12/kexec/arch/i386/kexec-x86-common.c kexec-tools-2.0.12/kexec/arch/i386/kexec-x86-common.c
--- ../clean/kexec-tools-2.0.12/kexec/arch/i386/kexec-x86-common.c 2015-11-29 18:52:07.000000000 -0500
+++ kexec-tools-2.0.12/kexec/arch/i386/kexec-x86-common.c 2017-04-08 11:28:00.688368402 -0400
@@ -24,6 +24,7 @@
#include <fcntl.h>
#include <stddef.h>
@ -42,9 +54,9 @@ diff -u --recursive /home/hudson/clean/kexec-tools-2.0.12/kexec/arch/i386/kexec-
memory_ranges++;
}
diff -u --recursive /home/hudson/clean/kexec-tools-2.0.12/Makefile.in kexec-tools-2.0.12/Makefile.in
--- /home/hudson/clean/kexec-tools-2.0.12/Makefile.in 2014-10-14 00:58:06.000000000 -0400
+++ kexec-tools-2.0.12/Makefile.in 2017-01-28 14:46:48.765247188 -0500
diff -u --recursive ../clean/kexec-tools-2.0.12/Makefile.in kexec-tools-2.0.12/Makefile.in
--- ../clean/kexec-tools-2.0.12/Makefile.in 2014-10-14 00:58:06.000000000 -0400
+++ kexec-tools-2.0.12/Makefile.in 2017-04-08 11:28:00.688368402 -0400
@@ -158,16 +158,16 @@
# kdump (read a crashdump from memory)
@ -65,9 +77,9 @@ diff -u --recursive /home/hudson/clean/kexec-tools-2.0.12/Makefile.in kexec-tool
SPEC=$(PACKAGE_NAME).spec
GENERATED_SRCS:= $(SPEC)
diff -u --recursive /home/hudson/clean/kexec-tools-2.0.12/purgatory/Makefile kexec-tools-2.0.12/purgatory/Makefile
--- /home/hudson/clean/kexec-tools-2.0.12/purgatory/Makefile 2015-04-30 01:05:17.000000000 -0400
+++ kexec-tools-2.0.12/purgatory/Makefile 2017-01-28 15:36:11.811188490 -0500
diff -u --recursive ../clean/kexec-tools-2.0.12/purgatory/Makefile kexec-tools-2.0.12/purgatory/Makefile
--- ../clean/kexec-tools-2.0.12/purgatory/Makefile 2015-04-30 01:05:17.000000000 -0400
+++ kexec-tools-2.0.12/purgatory/Makefile 2017-04-08 11:28:00.688368402 -0400
@@ -45,7 +45,6 @@
mkdir -p $(@D)
$(COMPILE.c) -o $@ $^
@ -76,3 +88,15 @@ diff -u --recursive /home/hudson/clean/kexec-tools-2.0.12/purgatory/Makefile kex
$(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \
$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
-Os -fno-builtin -ffreestanding \
diff -u --recursive ../clean/kexec-tools-2.0.12/util/Makefile kexec-tools-2.0.12/util/Makefile
--- ../clean/kexec-tools-2.0.12/util/Makefile 2010-07-29 05:22:16.000000000 -0400
+++ kexec-tools-2.0.12/util/Makefile 2017-04-08 11:32:33.267394444 -0400
@@ -2,7 +2,7 @@
$(BIN_TO_HEX): $(srcdir)/util/bin-to-hex.c
@$(MKDIR) -p $(@D)
- $(LINK.o) $(CFLAGS) -o $@ $^
+ $(BUILD_CC) $(BUILD_CFLAGS) -o $@ $^
$(BIN_TO_HEX): CC=$(BUILD_CC)
$(BIN_TO_HEX): CFLAGS=$(BUILD_CFLAGS)