[Aboriginal] Fail to patch uClibc
Ken Burk
knburk at gmail.com
Sun Feb 27 15:42:58 PST 2011
Rob,
I know your busy with your day job so please no rush on this but the latest
as of today fails to patch uClibc when building the cross compiler.My host
os is Knoppix 6.4.3 dvd(usb boot) which built fd341b09cc27.tar.bz2 without
problems as well as your lfs-bootstrap for i686 and armv5l (thanks for the
lfs it is awesome).I am posting the output below from when it started to
error.
Ken
Applying
/media/sda2/root/tech2k/aboriginal-29e1df07e99a/sources/patches/uClibc-backport-humor-udev.patch
patching file libc/sysdeps/linux/common/bits/socket.h
Hunk 1 FAILED 53/53.
SOCK_SEQPACKET = 5, /* Sequenced, reliable, connection-based,
datagrams of fixed maximum length. */
#define SOCK_SEQPACKET SOCK_SEQPACKET
- SOCK_PACKET = 10 /* Linux specific way of getting packets
+ SOCK_PACKET = 10, /* Linux specific way of getting packets
at the dev level. For writing rarp and
other similar things on the user level. */
#define SOCK_PACKET SOCK_PACKET
+
+ /* Flags to be ORed into the type parameter of socket and socketpair and
+ used for the flags parameter of paccept. */
+
+ SOCK_CLOEXEC = 02000000, /* Atomically set close-on-exec flag for the
+ new descriptor(s). */
+#define SOCK_CLOEXEC SOCK_CLOEXEC
+ SOCK_NONBLOCK = 04000 /* Atomically mark descriptor(s) as
+ non-blocking. */
+#define SOCK_NONBLOCK SOCK_NONBLOCK
};
/* Protocol families. */
patching file include/endian.h
Possibly reversed hunk 1 at 97
Hunk 1 FAILED 55/55.
# define __LONG_LONG_PAIR(HI, LO) HI, LO
#endif
+
+#ifdef __USE_BSD
+/* Conversion interfaces. */
+# include <byteswap.h>
+
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+# define htobe16(x) __bswap_16 (x)
+# define htole16(x) (x)
+# define be16toh(x) __bswap_16 (x)
+# define le16toh(x) (x)
+
+# define htobe32(x) __bswap_32 (x)
+# define htole32(x) (x)
+# define be32toh(x) __bswap_32 (x)
+# define le32toh(x) (x)
+
+# define htobe64(x) __bswap_64 (x)
+# define htole64(x) (x)
+# define be64toh(x) __bswap_64 (x)
+# define le64toh(x) (x)
+# else
+# define htobe16(x) (x)
+# define htole16(x) __bswap_16 (x)
+# define be16toh(x) (x)
+# define le16toh(x) __bswap_16 (x)
+
+# define htobe32(x) (x)
+# define htole32(x) __bswap_32 (x)
+# define be32toh(x) (x)
+# define le32toh(x) __bswap_32 (x)
+
+# define htobe64(x) (x)
+# define htole64(x) __bswap_64 (x)
+# define be64toh(x) (x)
+# define le64toh(x) __bswap_64 (x)
+# endif
+#endif
+
#endif /* endian.h */
patching file libc/sysdeps/linux/common/inotify.c
Possibly reversed hunk 1 at 29
Hunk 1 FAILED 15/15.
_syscall0(int, inotify_init)
#endif
+#ifdef __NR_inotify_init1
+_syscall1(int, inotify_init1, int, flags)
+#endif
+
#ifdef __NR_inotify_add_watch
_syscall3(int, inotify_add_watch, int, fd, const char *, path, uint32_t,
mask)
#endif
patching file libc/sysdeps/linux/common/sys/inotify.h
Possibly reversed hunk 1 at 106
Hunk 1 FAILED 22/22.
#include <stdint.h>
+/* Flags for the parameter of inotify_init1. */
+enum
+ {
+ IN_CLOEXEC = 02000000,
+#define IN_CLOEXEC IN_CLOEXEC
+ IN_NONBLOCK = 04000
+#define IN_NONBLOCK IN_NONBLOCK
+ };
+
+
/* Structure describing an inotify event. */
struct inotify_event
{
Applying
/media/sda2/root/tech2k/aboriginal-29e1df07e99a/sources/patches/uClibc-fix-arm-unwind-001.patch
patching file libc/sysdeps/linux/arm/Makefile.arch
Applying
/media/sda2/root/tech2k/aboriginal-29e1df07e99a/sources/patches/uClibc-fix-arm-unwind-002.patch
patching file libc/sysdeps/linux/arm/aeabi_unwind_cpp_pr1.c
Applying
/media/sda2/root/tech2k/aboriginal-29e1df07e99a/sources/patches/uClibc-fix-fcntl64.patch
patching file include/fcntl.h
Hunk 1 FAILED 73/73.
This function is a cancellation point and therefore not marked with
__THROW. */
-#ifndef __USE_FILE_OFFSET64
+#if !defined(__USE_FILE_OFFSET64) || defined(__LP64__)
extern int fcntl (int __fd, int __cmd, ...);
libc_hidden_proto(fcntl)
#else
Applying
/media/sda2/root/tech2k/aboriginal-29e1df07e99a/sources/patches/uClibc-fixintlassert.patch
patching file libc/misc/wchar/wchar.c
Hunk 1 FAILED 286/286.
s = empty_string;
n = 1;
} else if (*s == '\0') {
+ if (pwc) *pwc = 0;
/* According to the ISO C 89 standard this is the expected behaviour.
*/
return 0;
} else if (!n) {
Applying
/media/sda2/root/tech2k/aboriginal-29e1df07e99a/sources/patches/uClibc-fixlocalestruct.patch
patching file libc/sysdeps/linux/common/bits/uClibc_locale.h
Applying
/media/sda2/root/tech2k/aboriginal-29e1df07e99a/sources/patches/uClibc-fixm68k.patch
patching file Rules.mak
Applying
/media/sda2/root/tech2k/aboriginal-29e1df07e99a/sources/patches/uClibc-futimes.patch
patching file include/sys/time.h
Hunk 1 FAILED 143/143.
/* Same as `utimes', but does not follow symbolic links. */
extern int lutimes (__const char *__file, __const struct timeval __tvp[2])
__THROW __nonnull ((1));
+#endif
+#ifdef __USE_BSD
/* Same as `utimes', but takes an open file descriptor instead of a name.
*/
extern int futimes (int __fd, __const struct timeval __tvp[2]) __THROW;
#endif
creating libc/sysdeps/linux/common/futimes.c
Applying
/media/sda2/root/tech2k/aboriginal-29e1df07e99a/sources/patches/uClibc-mips64.patch
patching file ldso/ldso/mips/elfinterp.c
Hunk 1 FAILED 172/172.
for (i = 0; i < rel_size; i++, rpnt++) {
reloc_addr = (unsigned long *) (tpnt->loadaddr +
(unsigned long) rpnt->r_offset);
- reloc_type = ELF32_R_TYPE(rpnt->r_info);
- symtab_index = ELF32_R_SYM(rpnt->r_info);
+ reloc_type = ELF_R_TYPE(rpnt->r_info);
+ symtab_index = ELF_R_SYM(rpnt->r_info);
symbol_addr = 0;
debug_sym(symtab,strtab,symtab_index);
Applying
/media/sda2/root/tech2k/aboriginal-29e1df07e99a/sources/patches/uClibc-ruserpass.patch
patching file include/netdb.h
patching file libc/inet/rpc/rexec.c
patching file libc/inet/rpc/ruserpass.c
Applying
/media/sda2/root/tech2k/aboriginal-29e1df07e99a/sources/patches/uClibc-schedparam.patch
patching file libc/sysdeps/linux/common/bits/sched.h
Exiting due to errors (i586 simple-cross-compiler uClibc)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.landley.net/pipermail/aboriginal-landley.net/attachments/20110227/afe43e5b/attachment-0001.htm>
More information about the Aboriginal
mailing list