diff options
| -rw-r--r-- | packages/uclibc/uclibc-cvs/errno_values.h.patch | 21 | ||||
| -rw-r--r-- | packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch | 13 | ||||
| -rw-r--r-- | packages/uclibc/uclibc-initial_svn.bb | 8 | ||||
| -rw-r--r-- | packages/uclibc/uclibc_svn.bb | 10 |
4 files changed, 42 insertions, 10 deletions
diff --git a/packages/uclibc/uclibc-cvs/errno_values.h.patch b/packages/uclibc/uclibc-cvs/errno_values.h.patch new file mode 100644 index 0000000000..a1e39c181b --- /dev/null +++ b/packages/uclibc/uclibc-cvs/errno_values.h.patch @@ -0,0 +1,21 @@ +Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h +=================================================================== +--- uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h 2002-08-23 20:48:19.000000000 +0200 ++++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h 2007-07-01 22:11:53.000000000 +0200 +@@ -134,4 +134,16 @@ + #define ENOMEDIUM 123 /* No medium found */ + #define EMEDIUMTYPE 124 /* Wrong medium type */ + ++/* the following errornumbers are only in 2.6 */ ++ ++#define ECANCELED 125 /* Operation Canceled */ ++#define ENOKEY 126 /* Required key not available */ ++#define EKEYEXPIRED 127 /* Key has expired */ ++#define EKEYREVOKED 128 /* Key has been revoked */ ++#define EKEYREJECTED 129 /* Key was rejected by service */ ++ ++/* for robust mutexes */ ++#define EOWNERDEAD 130 /* Owner died */ ++#define ENOTRECOVERABLE 131 /* State not recoverable */ ++ + #endif /* _BITS_ERRNO_VALUES_H */ diff --git a/packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch b/packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch new file mode 100644 index 0000000000..504d37bcd2 --- /dev/null +++ b/packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch @@ -0,0 +1,13 @@ +Index: uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h +=================================================================== +--- uclibc-0.9.29.orig/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h ++++ uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h +@@ -38,4 +38,8 @@ + /* define if target supports IEEE signed zero floats */ + #define __UCLIBC_HAVE_SIGNED_ZERO__ + ++#ifdef __ARM_EABI__ ++# define __UCLIBC_TRUNCATE64_HAS_4_ARGS__ ++#endif ++ + #endif /* _BITS_UCLIBC_ARCH_FEATURES_H */ diff --git a/packages/uclibc/uclibc-initial_svn.bb b/packages/uclibc/uclibc-initial_svn.bb index eb57f85b24..f3496839ff 100644 --- a/packages/uclibc/uclibc-initial_svn.bb +++ b/packages/uclibc/uclibc-initial_svn.bb @@ -3,20 +3,20 @@ require uclibc_svn.bb FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" -DEPENDS = "linux-libc-headers" +DEPENDS = "linux-libc-headers ncurses-native" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" do_stage() { # Install initial headers into the cross dir - make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGING_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGING_PREFIX}/ \ + make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ pregen install_dev ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include # This conflicts with the c++ version of this header - rm -f ${UCLIBC_STAGING_PREFIX}/include/bits/atomicity.h + rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h } do_install() { diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index d19c986a7d..9f67a2a4d1 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -8,8 +8,8 @@ # UCLIBC_BASE ?= "0.9.29" PV = "${UCLIBC_BASE}+svnr${SRCREV}" -PR = "r5" - +PR = "r6" +DEFAULT_PREFERENCE = "2" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. @@ -28,10 +28,8 @@ KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}" SRC_URI += "svn://uclibc.org/trunk;module=uClibc \ file://uClibc.machine \ file://uClibc.distro \ - file://error_print_progname.patch;patch=1 \ - file://select.diff;patch=1 \ + file://uclibc-arm-ftruncate64.patch;patch=1 \ + file://errno_values.h.patch;patch=1 \ " S = "${WORKDIR}/uClibc" - - |