kexec-tools: move to 2.0.2 and remove older versions

* binary for klibc static only tested on arm
* updated dietlibc version (not tested, dietlibc seems broken today...)

2 files changed, 0 insertions, 394 deletions

diff --git a/recipes/kexec-tools/kexec-tools-klibc-static-2.0.1/kexec-tools-2-headers.patch b/recipes/kexec-tools/kexec-tools-klibc-static-2.0.1/kexec-tools-2-headers.patch
deleted file mode 100644
index 091e12d9a8..0000000000
--- a/recipes/kexec-tools/kexec-tools-klibc-static-2.0.1/kexec-tools-2-headers.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Index: kexec-tools-2.0.1/purgatory/arch/arm/include/limits.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ kexec-tools-2.0.1/purgatory/arch/arm/include/limits.h	2006-02-06 18:28:37.031096672 +0100
-@@ -0,0 +1,58 @@
-+#ifndef LIMITS_H
-+#define LIMITS_H	1
-+
-+
-+/* Number of bits in a `char' */
-+#define CHAR_BIT	8
-+
-+/* Minimum and maximum values a `signed char' can hold */
-+#define SCHAR_MIN	(-128)
-+#define SCHAR_MAX	127
-+
-+/* Maximum value an `unsigned char' can hold. (Minimum is 0.) */
-+#define UCHAR_MAX	255
-+
-+/* Minimum and maximum values a `char' can hold */
-+#define CHAR_MIN	SCHAR_MIN
-+#define CHAR_MAX	SCHAR_MAX
-+
-+/* Minimum and maximum values a `signed short int' can hold */
-+#define SHRT_MIN	(-32768)
-+#define SHRT_MAX	32767
-+
-+/* Maximum value an `unsigned short' can hold. (Minimum is 0.) */
-+#define USHRT_MAX	65535
-+
-+
-+/* Minimum and maximum values a `signed int' can hold */
-+#define INT_MIN		(-INT_MAX - 1)
-+#define INT_MAX		2147483647
-+
-+/* Maximum value an `unsigned int' can hold. (Minimum is 0.) */
-+#define UINT_MAX	4294967295U
-+
-+
-+/* Minimum and maximum values a `signed int' can hold */
-+#define INT_MIN		(-INT_MAX - 1)
-+#define INT_MAX		2147483647
-+
-+/* Maximum value an `unsigned int' can hold. (Minimum is 0.) */
-+#define UINT_MAX	4294967295U
-+
-+/* Minimum and maximum values a `signed long' can hold */
-+#define LONG_MAX	2147483647L
-+#define LONG_MIN	(-LONG_MAX - 1L)
-+
-+/* Maximum value an `unsigned long' can hold. (Minimum is 0.) */
-+#define ULONG_MAX	4294967295UL
-+
-+/* Minimum and maximum values a `signed long long' can hold */
-+#define LLONG_MAX	9223372036854775807LL
-+#define LLONG_MIN	(-LONG_MAX - 1LL)
-+
-+
-+/* Maximum value an `unsigned long long' can hold. (Minimum is 0.) */
-+#define ULLONG_MAX	18446744073709551615ULL
-+
-+
-+#endif /* LIMITS_H */
-Index: kexec-tools-2.0.1/purgatory/arch/arm/include/stdint.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ kexec-tools-2.0.1/purgatory/arch/arm/include/stdint.h	2006-02-06 18:28:37.031096672 +0100
-@@ -0,0 +1,31 @@
-+#ifndef STDINT_H
-+#define STDINT_H
-+
-+/*  +typedef unsigned long      size_t;  */
-+
-+typedef unsigned char      uint8_t;
-+typedef unsigned short     uint16_t;
-+typedef unsigned int       uint32_t;
-+typedef unsigned long long uint64_t;
-+
-+typedef signed char        int8_t;
-+typedef signed short       int16_t;
-+typedef signed int         int32_t;
-+typedef signed long long   int64_t;
-+
-+/* Types for `void *' pointers.  */
-+#if __WORDSIZE == 64
-+# ifndef __intptr_t_defined
-+typedef long int		intptr_t;
-+#  define __intptr_t_defined
-+# endif
-+typedef unsigned long int	uintptr_t;
-+#else
-+# ifndef __intptr_t_defined
-+typedef int			intptr_t;
-+#  define __intptr_t_defined
-+# endif
-+typedef unsigned int		uintptr_t;
-+#endif
-+
-+#endif /* STDINT_H */
diff --git a/recipes/kexec-tools/kexec-tools-klibc-static-2.0.1/kexec-tools-2-klibc.patch b/recipes/kexec-tools/kexec-tools-klibc-static-2.0.1/kexec-tools-2-klibc.patch
deleted file mode 100644
index 2008829b60..0000000000
--- a/recipes/kexec-tools/kexec-tools-klibc-static-2.0.1/kexec-tools-2-klibc.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-Index: kexec-tools-2.0.1/kexec/kexec-elf-rel.c
-===================================================================
---- kexec-tools-2.0.1.orig/kexec/kexec-elf-rel.c	2009-09-24 14:15:34.025828340 +0100
-+++ kexec-tools-2.0.1/kexec/kexec-elf-rel.c	2009-09-24 14:15:47.030825302 +0100
-@@ -4,7 +4,7 @@
- #include <stdio.h>
- #include <errno.h>
- #include <stdlib.h>
--#include "elf.h"
-+#include "../include/elf.h"
- #include <boot/elf_boot.h>
- #include "kexec.h"
- #include "kexec-elf.h"
-
-Index: kexec-tools-2.0.1/kexec/ifdown.c
-===================================================================
---- kexec-tools-2.0.1.orig/kexec/ifdown.c	2009-09-24 14:15:34.025828340 +0100
-+++ kexec-tools-2.0.1/kexec/ifdown.c	2009-09-24 14:15:47.014827381 +0100
-@@ -14,7 +14,7 @@
- #include <sys/ioctl.h>
- #include <sys/socket.h>
- #include <sys/time.h>
--#include <sys/errno.h>
-+#include <errno.h>
-
- #include <net/if.h>
- #include <netinet/in.h>
-
-Index: kexec-tools-2.0.1/kexec/kexec-syscall.h
-===================================================================
---- kexec-tools-2.0.1.orig/kexec/kexec-syscall.h	2009-09-24 14:15:46.950825917 +0100
-+++ kexec-tools-2.0.1/kexec/kexec-syscall.h	2009-09-24 14:15:47.030825302 +0100
-@@ -2,7 +2,7 @@
- #define KEXEC_SYSCALL_H
-
- #define __LIBRARY__
--#include <syscall.h>
-+/*#include <syscall.h>*/
- #include <sys/syscall.h>
- #include <unistd.h>
-
-@@ -21,7 +21,7 @@
- #define LINUX_REBOOT_CMD_KEXEC_OLD	0x81726354
- #define LINUX_REBOOT_CMD_KEXEC_OLD2	0x18263645
- #define LINUX_REBOOT_CMD_KEXEC		0x45584543
--
-+/*
- #ifdef __i386__
- #define __NR_kexec_load		283
- #endif
-@@ -60,19 +60,20 @@
- #ifndef __NR_kexec_load
- #error Unknown processor architecture.  Needs a kexec_load syscall number.
- #endif
--
-+*/
- struct kexec_segment;
--
-+/*
- static inline long kexec_load(void *entry, unsigned long nr_segments,
-			struct kexec_segment *segments, unsigned long flags)
- {
-	return (long) syscall(__NR_kexec_load, entry, nr_segments, segments, flags);
- }
--
-+*/
- static inline long kexec_reboot(void)
- {
--	return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0);
-+	//return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0);
-+	return __reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0);
- }
-
-
- #define KEXEC_ON_CRASH<><------>0x00000001
-
-Index: kexec-tools-2.0.1/kexec/crashdump.c
-===================================================================
---- kexec-tools-2.0.1.orig/kexec/crashdump.c	2008-10-31 03:00:38.000000000 +0100
-+++ kexec-tools-2.0.1/kexec/crashdump.c	2009-09-26 11:16:27.000000000 +0200
-@@ -26,7 +26,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
--#include <elf.h>
-+#include "../../../include/elf.h"
- #include "kexec.h"
- #include "crashdump.h"
- #include "kexec-syscall.h"
-
-Index: kexec-tools-2.0.1/kexec/crashdump-xen.c
-===================================================================
---- kexec-tools-2.0.1.orig/kexec/crashdump-xen.c	2008-07-15 02:46:43.000000000 +0200
-+++ kexec-tools-2.0.1/kexec/crashdump-xen.c	2009-09-26 11:16:41.000000000 +0200
-@@ -3,7 +3,7 @@
- #include <stdarg.h>
- #include <string.h>
- #include <stdlib.h>
--#include <elf.h>
-+#include "../../../include/elf.h"
- #include <errno.h>
- #include <limits.h>
- #include <sys/types.h>
-
-Index: kexec-tools-2.0.1/kexec/crashdump-elf.c
-===================================================================
---- kexec-tools-2.0.1.orig/kexec/crashdump-elf.c	2008-10-31 03:00:38.000000000 +0100
-+++ kexec-tools-2.0.1/kexec/crashdump-elf.c	2009-09-26 11:17:57.000000000 +0200
-@@ -47,7 +47,8 @@
-	if (xen_present())
-		nr_cpus = xen_get_nr_phys_cpus();
-	else
--		nr_cpus = sysconf(_SC_NPROCESSORS_CONF);
-+		/*nr_cpus = sysconf(_SC_NPROCESSORS_CONF);*/
-+		nr_cpus = 1;
-
-	if (nr_cpus < 0) {
-		return -1;
-
-Index: kexec-tools-2.0.1/kexec/arch/arm/kexec-elf-rel-arm.c
-===================================================================
---- kexec-tools-2.0.1.orig/kexec/arch/arm/kexec-elf-rel-arm.c	2009-04-24 14:15:46.934825202 +0100
-+++ kexec-tools-2.0.1/kexec/arch/arm/kexec-elf-rel-arm.c	2009-09-24 14:15:47.014827381 +0100
-@@ -1,5 +1,5 @@
- #include <stdio.h>
--#include <elf.h>
-+#include "../../../include/elf.h"
- #include "../../kexec.h"
- #include "../../kexec-elf.h"
-
-Index: kexec-tools-2.0.1/purgatory/string.c
-===================================================================
---- kexec-tools-2.0.1.orig/purgatory/string.c	2008-05-16 13:28:19.000000000 +0200
-+++ kexec-tools-2.0.1/purgatory/string.c	2009-09-16 17:49:04.000000000 +0200
-@@ -1,5 +1,5 @@
- #include <stddef.h>
--#include <string.h>
-+/* #include <string.h> */
-
- size_t strnlen(const char *s, size_t max)
- {
-
-Index: kexec-tools-2.0.1/kexec/kexec.c
-===================================================================
---- kexec-tools-2.0.1.orig/kexec/kexec.c	2008-02-24 14:15:46.950825917 +0100
-+++ kexec-tools-2.0.1/kexec/kexec.c	2009-10-06 00:37:01.000000000 +0200
-@@ -38,9 +38,9 @@
-
- #include "config.h"
-
--#ifdef HAVE_LIBZ
--#include <zlib.h>
--#endif
-+#include "zlib.h"
-+
-+
- #include <sha256.h>
- #include "kexec.h"
- #include "kexec-syscall.h"
-@@ -554,7 +554,7 @@
-	return buf;
- }
-
--#if HAVE_LIBZ
-+#if 1
- char *slurp_decompress_file(const char *filename, off_t *r_size)
- {
-	gzFile fp;
-
-Index: kexec-tools-2.0.1/kexec/arch/arm/kexec-zImage-arm.c
-===================================================================
---- kexec-tools-2.0.1.orig/kexec/arch/arm/kexec-zImage-arm.c	2009-04-24 14:15:46.982825391 +0100
-+++ kexec-tools-2.0.1/kexec/arch/arm/kexec-zImage-arm.c	2009-09-26 01:58:20.838624318 +0200
-@@ -2,6 +2,10 @@
-  * - 08/21/2007 ATAG support added by Uli Luckas <u.luckas@road.de>
-  *
-  */
-+
-+/* work around for linux header files */
-+#define __deprecated
-+
- #define _GNU_SOURCE
- #define _XOPEN_SOURCE
- #include <stdio.h>
-@@ -110,13 +114,13 @@
-	}
-
-	fread(buf, sizeof(buf[1]), BOOT_PARAMS_SIZE, fp);
--	if (ferror(fp)) {
-+/*	if (ferror(fp)) {
-		fprintf(stderr, "Cannot read %s: %s\n",
-			fn, strerror(errno));
-		fclose(fp);
-		return NULL;
-	}
--
-+*/
-	fclose(fp);
-	return (struct tag *) buf;
- }
-
-Index: kexec-tools-2.0.1/kexec/kexec-elf-boot.c
-===================================================================
---- kexec-tools-2.0.1.orig/kexec/kexec-elf-boot.c	2009-05-16 13:28:19.000000000 +0200
-+++ kexec-tools-2.0.1/kexec/kexec-elf-boot.c	2009-09-16 11:13:28.000000000 +0200
-@@ -22,7 +22,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <errno.h>
--#include <elf.h>
-+#include "../include/elf.h"
- #include <boot/elf_boot.h>
- #include <ip_checksum.h>
- #include <x86/x86-linux.h>
-
-Index: kexec-tools-2.0.1/kdump/kdump.c
-===================================================================
---- kexec-tools-2.0.1.orig/kdump/kdump.c	2009-05-16 13:28:19.000000000 +0200
-+++ kexec-tools-2.0.1/kdump/kdump.c	2009-09-16 11:13:08.000000000 +0200
-@@ -8,7 +8,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <endian.h>
--#include <elf.h>
-+#include "../include/elf.h"
-
- #if !defined(__BYTE_ORDER) || !defined(__LITTLE_ENDIAN) || !defined(__BIG_ENDIAN)
- #error Endian defines missing
-
-Index: kexec-tools-2.0.1/kexec/kexec.h
-===================================================================
---- kexec-tools-2.0.1.orig/kexec/kexec.h	2008-05-16 13:28:19.000000000 +0200
-+++ kexec-tools-2.0.1/kexec/kexec.h	2009-09-16 17:32:15.000000000 +0200
-@@ -203,7 +203,7 @@
- extern char *slurp_file(const char *filename, off_t *r_size);
- extern char *slurp_file_len(const char *filename, off_t size);
- extern char *slurp_decompress_file(const char *filename, off_t *r_size);
--extern unsigned long virt_to_phys(unsigned long addr);
-+/* extern unsigned long virt_to_phys(unsigned long addr); */
- extern void add_segment(struct kexec_info *info,
-	const void *buf, size_t bufsz, unsigned long base, size_t memsz);
- extern void add_segment_phys_virt(struct kexec_info *info,
-
-Index: kexec-tools-2.0.1/Makefile.in
-===================================================================
---- kexec-tools-2.0.1.orig/Makefile.in	2009-09-29 23:49:47.000000000 +0200
-+++ kexec-tools-2.0.1/Makefile.in	2009-09-29 23:49:09.000000000 +0200
-@@ -46,7 +46,7 @@
- # where necessary.
- CPPFLAGS	= @CPPFLAGS@ -I$(srcdir)/include -I$(srcdir)/util_lib/include \
-			-Iinclude/
--CFLAGS		= @CFLAGS@ -fno-strict-aliasing -Wall -Wstrict-prototypes
-+CFLAGS		= @CFLAGS@ -static -fno-strict-aliasing -Wall -Wstrict-prototypes
- PURGATORY_EXTRA_CFLAGS = @PURGATORY_EXTRA_CFLAGS@
- ASFLAGS		= @ASFLAGS@
- LDFLAGS		= @LDFLAGS@
-
-Index: kexec-tools-2.0.1/util_lib/include/sha256.h
-===================================================================
---- kexec-tools-2.0.1.orig/util_lib/include/sha256.h	2008-07-15 02:46:43.000000000 +0200
-+++ kexec-tools-2.0.1/util_lib/include/sha256.h		2009-10-02 18:28:45.000000000 +0200
-@@ -1,7 +1,8 @@
- #ifndef SHA256_H
- #define SHA256_H
-
--#include <sys/types.h>
-+//#include <sys/types.h>
-+#include <stddef.h>
- #include <stdint.h>
-
- typedef struct
-
-Index: kexec-tools-2.0.1/purgatory/Makefile
-===================================================================
---- kexec-tools-2.0.1.orig/purgatory/Makefile	2008-10-09 00:32:14.000000000 +0200
-+++ kexec-tools-2.0.1.orig/purgatory/Makefile	2009-10-03 00:28:45.000000000 +0200
-@@ -47,7 +47,7 @@
- $(PURGATORY): CC=$(TARGET_CC)
- $(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \
-		      $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
--		      -Os -fno-builtin -ffreestanding
-+		      -Os -fno-builtin -ffreestanding -nostdinc
-
- $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
-			-I$(srcdir)/purgatory/include \
-@@ -60,7 +60,8 @@
-
- $(PURGATORY): $(PURGATORY_OBJS)
-	$(MKDIR) -p $(@D)
--	$(CC) $(LDFLAGS) -o $@ $^
-+#	$(CC) $(LDFLAGS) -o $@ $^
-+	$(LD) $(LDFLAGS) -o $@ $^
-
- #	$(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB)
-