diff options
author | Andrea Adami <andrea.adami@gmail.com> | 2018-05-14 00:17:30 +0200 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-05-17 08:32:26 -0700 |
commit | e22a87046f51e40972d732377505e62f9940d874 (patch) | |
tree | c92282737f71711b9cb65cb9f3566f4d46ff5a3a /meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2 | |
parent | b4d849f5dbd7c0919e6fc64ece4394dee911e4cd (diff) | |
download | meta-openembedded-e22a87046f51e40972d732377505e62f9940d874.tar.gz |
kexec-tools-klibc: upgrade from v. 2.0.2 to 2.0.17
This version does support aarch64.
Ad klibc-specific patchset and track the git repository
to get the (many) fixes for the warnings.
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2')
16 files changed, 0 insertions, 372 deletions
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch deleted file mode 100644 index a7600b301..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 86b962e7c0de43b20b6210d059e4855ce87078bc Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 13 Jul 2017 16:20:08 -0700 | ||
4 | Subject: [PATCH] Adjust the order of headers to fix build for musl | ||
5 | |||
6 | Fixes | ||
7 | kexec/ifdown.c:33:16: error: storage size of 'ifc' isn't known | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | kexec/ifdown.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/kexec/ifdown.c b/kexec/ifdown.c | ||
15 | index 2215798..e13f777 100644 | ||
16 | --- a/kexec/ifdown.c | ||
17 | +++ b/kexec/ifdown.c | ||
18 | @@ -16,8 +16,8 @@ char *v_ifdown = "@(#)ifdown.c 1.11 02-Jun-1998 miquels@cistron.nl"; | ||
19 | #include <sys/time.h> | ||
20 | #include <errno.h> | ||
21 | |||
22 | -#include <net/if.h> | ||
23 | #include <netinet/in.h> | ||
24 | +#include <net/if.h> | ||
25 | |||
26 | #define MAX_IFS 64 | ||
27 | |||
28 | -- | ||
29 | 2.13.2 | ||
30 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/arm_crashdump.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/arm_crashdump.patch deleted file mode 100644 index 0ff61e543..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/arm_crashdump.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | --- a/kexec/arch/arm/crashdump-arm.c | ||
2 | +++ b/kexec/arch/arm/crashdump-arm.c | ||
3 | @@ -20,7 +20,7 @@ | ||
4 | * along with this program; if not, write to the Free Software | ||
5 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
6 | */ | ||
7 | -#include <elf.h> | ||
8 | +#include "../../../include/elf.h" | ||
9 | #include <errno.h> | ||
10 | #include <stdio.h> | ||
11 | #include <stdlib.h> | ||
12 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/cflags_static.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/cflags_static.patch deleted file mode 100644 index 35100a3b4..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/cflags_static.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | --- a/Makefile.in | ||
2 | +++ b/Makefile.in | ||
3 | @@ -46,7 +46,7 @@ | ||
4 | # where necessary. | ||
5 | CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -I$(srcdir)/util_lib/include \ | ||
6 | -Iinclude/ | ||
7 | -CFLAGS = @CFLAGS@ -fno-strict-aliasing -Wall -Wstrict-prototypes | ||
8 | +CFLAGS = @CFLAGS@ -static -fno-strict-aliasing -Wall -Wstrict-prototypes | ||
9 | PURGATORY_EXTRA_CFLAGS = @PURGATORY_EXTRA_CFLAGS@ | ||
10 | ASFLAGS = @ASFLAGS@ | ||
11 | LDFLAGS = @LDFLAGS@ | ||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch deleted file mode 100644 index ccbb24d0d..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From 37737527725e465833be649101c4a6f8352c5d5e Mon Sep 17 00:00:00 2001 | ||
2 | From: Tyler Hall <tylerwhall@gmail.com> | ||
3 | Date: Tue, 7 Feb 2012 18:50:05 -0500 | ||
4 | Subject: Fix out-of-tree build | ||
5 | |||
6 | Use automatic variables for prerequisites when copying man pages and | ||
7 | include a makefile relative to $(srcdir). | ||
8 | |||
9 | Backported to 2.0.2-klibc | ||
10 | |||
11 | Signed-off-by: Tyler Hall <tylerwhall@gmail.com> | ||
12 | Signed-off-by: Simon Horman <horms@verge.net.au> | ||
13 | |||
14 | diff --git a/kdump/Makefile b/kdump/Makefile | ||
15 | index 1e2b72c..5dfa928 100644 | ||
16 | --- a/kdump/Makefile | ||
17 | +++ b/kdump/Makefile | ||
18 | @@ -22,7 +22,7 @@ $(KDUMP): $(KDUMP_OBJS) | ||
19 | |||
20 | $(KDUMP_MANPAGE): kdump/kdump.8 | ||
21 | $(MKDIR) -p $(MANDIR)/man8 | ||
22 | - cp kdump/kdump.8 $(KDUMP_MANPAGE) | ||
23 | + cp $^ $(KDUMP_MANPAGE) | ||
24 | echo:: | ||
25 | @echo "KDUMP_SRCS $(KDUMP_SRCS)" | ||
26 | @echo "KDUMP_DEPS $(KDUMP_DEPS)" | ||
27 | diff --git a/kexec/Makefile b/kexec/Makefile | ||
28 | index 2137cab..8c815b5 100644 | ||
29 | --- a/kexec/Makefile | ||
30 | +++ b/kexec/Makefile | ||
31 | @@ -82,7 +82,7 @@ $(KEXEC): CPPFLAGS+=-I$(srcdir)/kexec/arch/$(ARCH)/include | ||
32 | |||
33 | $(KEXEC_MANPAGE): kexec/kexec.8 | ||
34 | @$(MKDIR) -p $(MANDIR)/man8 | ||
35 | - cp kexec/kexec.8 $(KEXEC_MANPAGE) | ||
36 | + cp $^ $(KEXEC_MANPAGE) | ||
37 | echo:: | ||
38 | @echo "KEXEC_SRCS $(KEXEC_SRCS)" | ||
39 | @echo "KEXEC_DEPS $(KEXEC_DEPS)" | ||
40 | diff --git a/kexec/arch/ppc/Makefile b/kexec/arch/ppc/Makefile | ||
41 | index 3dba7cf..41242a5 100644 | ||
42 | --- a/kexec/arch/ppc/Makefile | ||
43 | +++ b/kexec/arch/ppc/Makefile | ||
44 | @@ -1,7 +1,7 @@ | ||
45 | # | ||
46 | # kexec ppc (linux booting linux) | ||
47 | # | ||
48 | -include kexec/arch/ppc/libfdt/Makefile.libfdt | ||
49 | +include $(srcdir)/kexec/arch/ppc/libfdt/Makefile.libfdt | ||
50 | |||
51 | ppc_KEXEC_SRCS = kexec/arch/ppc/kexec-ppc.c | ||
52 | ppc_KEXEC_SRCS += kexec/arch/ppc/kexec-elf-ppc.c | ||
53 | |||
54 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ifdown_errno.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ifdown_errno.patch deleted file mode 100644 index 7f8cddd35..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ifdown_errno.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | --- a/kexec/ifdown.c | ||
2 | +++ b/kexec/ifdown.c | ||
3 | @@ -14,7 +14,7 @@ | ||
4 | #include <sys/ioctl.h> | ||
5 | #include <sys/socket.h> | ||
6 | #include <sys/time.h> | ||
7 | -#include <sys/errno.h> | ||
8 | +#include <errno.h> | ||
9 | |||
10 | #include <net/if.h> | ||
11 | #include <netinet/in.h> | ||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-elf-rel.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-elf-rel.patch deleted file mode 100644 index c666afcac..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-elf-rel.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | --- a/kexec/kexec-elf-rel.c | ||
2 | +++ b/kexec/kexec-elf-rel.c | ||
3 | @@ -4,7 +4,7 @@ | ||
4 | #include <stdio.h> | ||
5 | #include <errno.h> | ||
6 | #include <stdlib.h> | ||
7 | -#include "elf.h" | ||
8 | +#include "../include/elf.h" | ||
9 | #include <boot/elf_boot.h> | ||
10 | #include "kexec.h" | ||
11 | #include "kexec-elf.h" | ||
12 | |||
13 | --- a/kexec/arch/arm/kexec-elf-rel-arm.c | ||
14 | +++ b/kexec/arch/arm/kexec-elf-rel-arm.c | ||
15 | @@ -1,5 +1,5 @@ | ||
16 | #include <stdio.h> | ||
17 | -#include <elf.h> | ||
18 | +#include "../../../include/elf.h" | ||
19 | #include "../../kexec.h" | ||
20 | #include "../../kexec-elf.h" | ||
21 | |||
22 | |||
23 | --- a/kexec/arch/i386/kexec-elf-rel-x86.c | ||
24 | +++ b/kexec/arch/i386/kexec-elf-rel-x86.c | ||
25 | @@ -1,5 +1,5 @@ | ||
26 | #include <stdio.h> | ||
27 | -#include <elf.h> | ||
28 | +#include "../../../include/elf.h" | ||
29 | #include "../../kexec.h" | ||
30 | #include "../../kexec-elf.h" | ||
31 | |||
32 | |||
33 | --- a/kexec/arch/ppc/kexec-elf-rel-ppc.c | ||
34 | +++ b/kexec/arch/ppc/kexec-elf-rel-ppc.c | ||
35 | @@ -1,5 +1,5 @@ | ||
36 | #include <stdio.h> | ||
37 | -#include <elf.h> | ||
38 | +#include "../../../include/elf.h" | ||
39 | #include "../../kexec.h" | ||
40 | #include "../../kexec-elf.h" | ||
41 | |||
42 | |||
43 | --- a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c | ||
44 | +++ b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c | ||
45 | @@ -1,5 +1,5 @@ | ||
46 | #include <stdio.h> | ||
47 | -#include <elf.h> | ||
48 | +#include "../../../include/elf.h" | ||
49 | #include <string.h> | ||
50 | #include "../../kexec.h" | ||
51 | #include "../../kexec-elf.h" | ||
52 | |||
53 | --- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c | ||
54 | +++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c | ||
55 | @@ -1,5 +1,5 @@ | ||
56 | #include <stdio.h> | ||
57 | -#include <elf.h> | ||
58 | +#include "../../../include/elf.h" | ||
59 | #include "../../kexec.h" | ||
60 | #include "../../kexec-elf.h" | ||
61 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-syscall.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-syscall.patch deleted file mode 100644 index 081de1bb5..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-syscall.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | --- a/kexec/kexec-syscall.h | ||
2 | +++ b/kexec/kexec-syscall.h | ||
3 | @@ -2,7 +2,7 @@ | ||
4 | #define KEXEC_SYSCALL_H | ||
5 | |||
6 | #define __LIBRARY__ | ||
7 | -#include <syscall.h> | ||
8 | +/*#include <syscall.h>*/ | ||
9 | #include <sys/syscall.h> | ||
10 | #include <unistd.h> | ||
11 | |||
12 | @@ -23,6 +23,7 @@ | ||
13 | #define LINUX_REBOOT_CMD_KEXEC 0x45584543 | ||
14 | |||
15 | #ifndef __NR_kexec_load | ||
16 | +/* | ||
17 | #ifdef __i386__ | ||
18 | #define __NR_kexec_load 283 | ||
19 | #endif | ||
20 | @@ -61,19 +62,21 @@ | ||
21 | #ifndef __NR_kexec_load | ||
22 | #error Unknown processor architecture. Needs a kexec_load syscall number. | ||
23 | #endif | ||
24 | +*/ | ||
25 | #endif /*ifndef __NR_kexec_load*/ | ||
26 | |||
27 | struct kexec_segment; | ||
28 | - | ||
29 | +/* | ||
30 | static inline long kexec_load(void *entry, unsigned long nr_segments, | ||
31 | struct kexec_segment *segments, unsigned long flags) | ||
32 | { | ||
33 | return (long) syscall(__NR_kexec_load, entry, nr_segments, segments, flags); | ||
34 | } | ||
35 | - | ||
36 | +*/ | ||
37 | static inline long kexec_reboot(void) | ||
38 | { | ||
39 | - return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); | ||
40 | + //return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); | ||
41 | + return __reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0); | ||
42 | } | ||
43 | |||
44 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch deleted file mode 100644 index 56cdfb08d..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | --- a/purgatory/arch/ppc/crt.S | ||
2 | +++ b/purgatory/arch/ppc/crt.S | ||
3 | @@ -249,6 +249,7 @@ | ||
4 | * | ||
5 | */ | ||
6 | |||
7 | +/* already defined in misc.S | ||
8 | _GLOBAL(__lshrdi3) | ||
9 | subfic 6,5,32 | ||
10 | srw 4,4,5 # LSW = count > 31 ? 0 : LSW >> count | ||
11 | @@ -259,5 +260,7 @@ | ||
12 | srw 3,3,5 # MSW = MSW >> count | ||
13 | or 4,4,7 # LSW |= t2 | ||
14 | blr | ||
15 | +*/ | ||
16 | + | ||
17 | #endif | ||
18 | #endif | ||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_flags.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_flags.patch deleted file mode 100644 index 41fc1168f..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_flags.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | --- a/purgatory/Makefile | ||
2 | +++ b/purgatory/Makefile | ||
3 | @@ -47,7 +47,7 @@ | ||
4 | $(PURGATORY): CC=$(TARGET_CC) | ||
5 | $(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \ | ||
6 | $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ | ||
7 | - -Os -fno-builtin -ffreestanding | ||
8 | + -Os -fno-builtin -ffreestanding -nostdinc | ||
9 | |||
10 | $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ | ||
11 | -I$(srcdir)/purgatory/include \ | ||
12 | @@ -61,7 +61,8 @@ | ||
13 | |||
14 | $(PURGATORY): $(PURGATORY_OBJS) | ||
15 | $(MKDIR) -p $(@D) | ||
16 | - $(CC) $(LDFLAGS) -o $@ $^ | ||
17 | +# $(CC) $(LDFLAGS) -o $@ $^ | ||
18 | + $(LD) $(LDFLAGS) -o $@ $^ | ||
19 | |||
20 | # $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB) | ||
21 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_string.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_string.patch deleted file mode 100644 index 5710561b1..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_string.patch +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | --- a/purgatory/string.c | ||
2 | +++ b/purgatory/string.c | ||
3 | @@ -1,5 +1,5 @@ | ||
4 | #include <stddef.h> | ||
5 | -#include <string.h> | ||
6 | +/* #include <string.h> */ | ||
7 | |||
8 | size_t strnlen(const char *s, size_t max) | ||
9 | { | ||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sha256.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sha256.patch deleted file mode 100644 index 85bf7aa4f..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sha256.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | --- a/util_lib/include/sha256.h | ||
2 | +++ b/util_lib/include/sha256.h | ||
3 | @@ -1,7 +1,8 @@ | ||
4 | #ifndef SHA256_H | ||
5 | #define SHA256_H | ||
6 | |||
7 | -#include <sys/types.h> | ||
8 | +//#include <sys/types.h> | ||
9 | +#include <stddef.h> | ||
10 | #include <stdint.h> | ||
11 | |||
12 | typedef struct | ||
13 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sysconf_nrprocessors.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sysconf_nrprocessors.patch deleted file mode 100644 index 04a97e6bc..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sysconf_nrprocessors.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | --- a/kexec/crashdump-elf.c | ||
2 | +++ b/kexec/crashdump-elf.c | ||
3 | @@ -47,7 +47,8 @@ | ||
4 | if (xen_present()) | ||
5 | nr_cpus = xen_get_nr_phys_cpus(); | ||
6 | else | ||
7 | - nr_cpus = sysconf(_SC_NPROCESSORS_CONF); | ||
8 | + /*nr_cpus = sysconf(_SC_NPROCESSORS_CONF);*/ | ||
9 | + nr_cpus = 1; | ||
10 | |||
11 | if (nr_cpus < 0) { | ||
12 | return -1; | ||
13 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_basename.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_basename.patch deleted file mode 100644 index 77a1c01a1..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_basename.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | --- a/kexec/arch/i386/x86-linux-setup.c | ||
2 | +++ b/kexec/arch/i386/x86-linux-setup.c | ||
3 | @@ -280,9 +280,9 @@ static int add_edd_entry(struct x86_linu | ||
4 | memset(edd_info, 0, sizeof(struct edd_info)); | ||
5 | |||
6 | /* extract the device number */ | ||
7 | - if (sscanf(basename(sysfs_name), "int13_dev%hhx", &devnum) != 1) { | ||
8 | + if (sscanf(strrchr(sysfs_name,'/') + 1, "int13_dev%hhx", &devnum) != 1) { | ||
9 | fprintf(stderr, "Invalid format of int13_dev dir " | ||
10 | - "entry: %s\n", basename(sysfs_name)); | ||
11 | + "entry: %s\n", strrchr(sysfs_name,'/') + 1); | ||
12 | return -1; | ||
13 | } | ||
14 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_kexec_test.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_kexec_test.patch deleted file mode 100644 index 9500bd604..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_kexec_test.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | --- a/Makefile.in | ||
2 | +++ b/Makefile.in | ||
3 | @@ -106,8 +106,8 @@ | ||
4 | |||
5 | MAN_PAGES:= kexec/kexec.8 | ||
6 | MAN_PAGES+= kdump/kdump.8 | ||
7 | -BINARIES_i386:= $(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test | ||
8 | -BINARIES_x86_64:=$(SBINDIR)/kexec $(PKGLIBDIR)/kexec_test | ||
9 | +BINARIES_i386:= $(SBINDIR)/kexec | ||
10 | +BINARIES_x86_64:=$(SBINDIR)/kexec | ||
11 | BINARIES:=$(SBINDIR)/kexec $(SBINDIR)/kdump $(BINARIES_$(ARCH)) | ||
12 | |||
13 | TARGETS:=$(BINARIES) $(MAN_PAGES) | ||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch deleted file mode 100644 index a497c9a63..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | --- a/purgatory/arch/i386/pic.c | ||
2 | +++ b/purgatory/arch/i386/pic.c | ||
3 | @@ -16,7 +16,7 @@ | ||
4 | * along with this program; if not, write to the Free Software | ||
5 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
6 | */ | ||
7 | -#include <sys/io.h> | ||
8 | +#include "include/arch/io.h" | ||
9 | #include <purgatory.h> | ||
10 | #include "purgatory-x86.h" | ||
11 | |||
12 | |||
13 | --- a/purgatory/arch/i386/vga.c | ||
14 | +++ b/purgatory/arch/i386/vga.c | ||
15 | @@ -1,4 +1,4 @@ | ||
16 | -#include <sys/io.h> | ||
17 | +#include "include/arch/io.h" | ||
18 | #include <purgatory.h> | ||
19 | #include "purgatory-x86.h" | ||
20 | |||
21 | |||
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch deleted file mode 100644 index cad695154..000000000 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | --- a/kexec/arch/i386/x86-linux-setup.c | ||
2 | +++ b/kexec/arch/i386/x86-linux-setup.c | ||
3 | @@ -176,6 +176,8 @@ static int file_scanf(const char *dir, c | ||
4 | FILE *fp; | ||
5 | int retno; | ||
6 | char filename[PATH_MAX]; | ||
7 | + long line_size = MAX_LINE; | ||
8 | + char *line; | ||
9 | |||
10 | snprintf(filename, PATH_MAX, "%s/%s", dir, file); | ||
11 | filename[PATH_MAX-1] = 0; | ||
12 | @@ -186,7 +188,14 @@ static int file_scanf(const char *dir, c | ||
13 | } | ||
14 | |||
15 | va_start(argptr, scanf_line); | ||
16 | - retno = vfscanf(fp, scanf_line, argptr); | ||
17 | + | ||
18 | + line = xmalloc(sizeof(line) * line_size); | ||
19 | + while(fgets(line, sizeof(line), fp) != NULL ) { | ||
20 | + line_size += MAX_LINE; | ||
21 | + line = xrealloc(line,line_size); | ||
22 | + } | ||
23 | + retno = vsscanf(line, scanf_line, argptr); | ||
24 | + | ||
25 | va_end(argptr); | ||
26 | |||
27 | fclose(fp); | ||