diff options
author | Yuri Bushmelev <jay4mail@gmail.com> | 2010-12-01 01:14:06 +0300 |
---|---|---|
committer | Yuri Bushmelev <jay4mail@gmail.com> | 2010-12-01 01:30:33 +0300 |
commit | fa740ca249c7b26a468031989bbdd5cb7c5a2c8c (patch) | |
tree | 100d5ebc3a7d3b864fe6c09e7defae77f24f64ca /recipes/kexec-tools | |
parent | f355bb4254838fcc875b6dfefbdd1c565570ee07 (diff) | |
download | openembedded-fa740ca249c7b26a468031989bbdd5cb7c5a2c8c.tar.gz |
kexec-tools-klibc: switch to using klibc's staged includes
kexec-tools-klibc is switched to use klibc's includes instead of having
patch with own. This will fix building for mipsel as well.
NOTE: now kexec-tools-klibc is just using 'klibc/include[/bits32]' dirs
to look for includes. This should be made more configurable.
Diffstat (limited to 'recipes/kexec-tools')
-rw-r--r-- | recipes/kexec-tools/kexec-tools-klibc-2.0.2/headers.patch | 99 | ||||
-rw-r--r-- | recipes/kexec-tools/kexec-tools-klibc_2.0.2.bb | 7 |
2 files changed, 4 insertions, 102 deletions
diff --git a/recipes/kexec-tools/kexec-tools-klibc-2.0.2/headers.patch b/recipes/kexec-tools/kexec-tools-klibc-2.0.2/headers.patch deleted file mode 100644 index 985cc4de3a..0000000000 --- a/recipes/kexec-tools/kexec-tools-klibc-2.0.2/headers.patch +++ /dev/null @@ -1,99 +0,0 @@ -Index: kexec-tools-2.0.2/purgatory/arch/arm/include/limits.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ kexec-tools-2.0.2/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.2/purgatory/arch/arm/include/stdint.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ kexec-tools-2.0.2/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_2.0.2.bb b/recipes/kexec-tools/kexec-tools-klibc_2.0.2.bb index 7f3f55b492..e799309f1c 100644 --- a/recipes/kexec-tools/kexec-tools-klibc_2.0.2.bb +++ b/recipes/kexec-tools/kexec-tools-klibc_2.0.2.bb @@ -1,13 +1,12 @@ # the binaries are statically linked against klibc require kexec-tools_${PV}.inc -PR = "r2" +PR = "r3" inherit klibc FILESPATHPKG =. "kexec-tools-${PV}:" -SRC_URI += "file://headers.patch \ - file://elf.patch \ +SRC_URI += "file://elf.patch \ file://errno.patch \ file://string.patch \ file://syscall.patch \ @@ -20,5 +19,7 @@ EXTRA_OECONF = " --without-zlib" PACKAGES =+ "kexec-klibc kdump-klibc" +CFLAGS += "-I${STAGING_DIR_HOST}${base_libdir}/klibc/include -I${STAGING_DIR_HOST}${base_libdir}/klibc/include/bits32" + FILES_kexec-klibc = "${sbindir}/kexec" FILES_kdump-klibc = "${sbindir}/kdump" |