diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/kexec/files/kexec-klibc.patch | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/kexec/files/kexec-klibc.patch')
-rw-r--r-- | packages/kexec/files/kexec-klibc.patch | 151 |
1 files changed, 0 insertions, 151 deletions
diff --git a/packages/kexec/files/kexec-klibc.patch b/packages/kexec/files/kexec-klibc.patch deleted file mode 100644 index 090b6231f1..0000000000 --- a/packages/kexec/files/kexec-klibc.patch +++ /dev/null @@ -1,151 +0,0 @@ -Index: kexec-tools-1.101/kexec/arch/arm/kexec-elf-rel-arm.c -=================================================================== ---- kexec-tools-1.101.orig/kexec/arch/arm/kexec-elf-rel-arm.c 2008-02-24 14:15:46.934825202 +0100 -+++ kexec-tools-1.101/kexec/arch/arm/kexec-elf-rel-arm.c 2008-02-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-1.101/kexec/arch/arm/kexec-zImage-arm.c -=================================================================== ---- kexec-tools-1.101.orig/kexec/arch/arm/kexec-zImage-arm.c 2008-02-24 14:15:46.982825391 +0100 -+++ kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c 2008-07-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 - #include <stdio.h> - #include <string.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-1.101/kexec/ifdown.c -=================================================================== ---- kexec-tools-1.101.orig/kexec/ifdown.c 2008-02-24 14:15:34.025828340 +0100 -+++ kexec-tools-1.101/kexec/ifdown.c 2008-02-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-1.101/purgatory/Makefile -=================================================================== ---- kexec-tools-1.101.orig/purgatory/Makefile 2008-02-24 14:15:34.037827479 +0100 -+++ kexec-tools-1.101/purgatory/Makefile 2008-02-24 14:15:47.022825503 +0100 -@@ -13,7 +13,7 @@ - - PCFLAGS += $(call cc-option, -ffreestanding) - PCFLAGS += $(call cc-option, -fnobuiltin) --PCFLAGS += $(call cc-option, -fnostdinc) -+PCFLAGS += $(call cc-option, -nostdinc) - PCFLAGS += $(call cc-option, -fno-zero-initialized-in-bss) - - PURGATORY_C_SRCS:= -Index: kexec-tools-1.101/kexec/kexec-elf-rel.c -=================================================================== ---- kexec-tools-1.101.orig/kexec/kexec-elf-rel.c 2008-02-24 14:15:34.025828340 +0100 -+++ kexec-tools-1.101/kexec/kexec-elf-rel.c 2008-02-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-1.101/kexec/kexec-syscall.h -=================================================================== ---- kexec-tools-1.101.orig/kexec/kexec-syscall.h 2008-02-24 14:15:46.950825917 +0100 -+++ kexec-tools-1.101/kexec/kexec-syscall.h 2008-02-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 -@@ -43,18 +43,19 @@ - #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); - } - - -Index: kexec-tools-1.101/kexec/kexec.c -=================================================================== ---- kexec-tools-1.101.orig/kexec/kexec.c 2008-02-24 14:15:46.950825917 +0100 -+++ kexec-tools-1.101/kexec/kexec.c 2008-07-26 01:58:53.545624148 +0200 -@@ -29,9 +29,7 @@ - #include <unistd.h> - #include <fcntl.h> - #include <getopt.h> --#ifdef HAVE_ZLIB_H --#include <zlib.h> --#endif -+#include "zlib.h" - #include <sha256.h> - #include "kexec.h" - #include "kexec-syscall.h" -@@ -383,7 +381,7 @@ - return buf; - } - --#if HAVE_ZLIB_H -+#if 1 - char *slurp_decompress_file(const char *filename, off_t *r_size) - { - gzFile fp; |