From 362256a31e72691cf46e8b83c549d7a3ab2329fb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 15 May 2012 11:46:39 +0200 Subject: uClibc: bump 0.9.33.x stable version Signed-off-by: Peter Korsgaard --- toolchain/uClibc/Config.in | 2 +- .../uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch | 28 ----------- toolchain/uClibc/uClibc-0.9.33.1-dup3.patch | 54 ---------------------- ...33.1-mmap64-include-stdint.h-for-uint64_t.patch | 28 ----------- toolchain/uClibc/uClibc-0.9.33.1-version.patch | 23 --------- .../uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch | 28 +++++++++++ toolchain/uClibc/uClibc-0.9.33.2-dup3.patch | 54 ++++++++++++++++++++++ 7 files changed, 83 insertions(+), 134 deletions(-) delete mode 100644 toolchain/uClibc/uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch delete mode 100644 toolchain/uClibc/uClibc-0.9.33.1-dup3.patch delete mode 100644 toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch delete mode 100644 toolchain/uClibc/uClibc-0.9.33.1-version.patch create mode 100644 toolchain/uClibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch create mode 100644 toolchain/uClibc/uClibc-0.9.33.2-dup3.patch (limited to 'toolchain') diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index 160ead417..d8b8a2a0c 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -37,7 +37,7 @@ config BR2_UCLIBC_VERSION_STRING string default 0.9.31.1 if BR2_UCLIBC_VERSION_0_9_31 default 0.9.32.1 if BR2_UCLIBC_VERSION_0_9_32 - default 0.9.33.1 if BR2_UCLIBC_VERSION_0_9_33 + default 0.9.33.2 if BR2_UCLIBC_VERSION_0_9_33 default $BR2_USE_UCLIBC_SNAPSHOT if BR2_UCLIBC_VERSION_SNAPSHOT config BR2_UCLIBC_CONFIG diff --git a/toolchain/uClibc/uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch b/toolchain/uClibc/uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch deleted file mode 100644 index c699b6b11..000000000 --- a/toolchain/uClibc/uClibc-0.9.33.1-define-MSG_CMSG_CLOEXEC.patch +++ /dev/null @@ -1,28 +0,0 @@ -Add definition of MSG_WAITFORONE and MSG_CMSG_CLOEXEC - -From yocto: -http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/uclibc/uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch - -Upstream-Status: Pending - -Index: git/libc/sysdeps/linux/common/bits/socket.h -=================================================================== ---- git.orig/libc/sysdeps/linux/common/bits/socket.h 2012-01-26 23:23:21.537456132 -0800 -+++ git/libc/sysdeps/linux/common/bits/socket.h 2012-01-26 23:25:10.125461388 -0800 -@@ -235,8 +235,15 @@ - #define MSG_ERRQUEUE MSG_ERRQUEUE - MSG_NOSIGNAL = 0x4000, /* Do not generate SIGPIPE. */ - #define MSG_NOSIGNAL MSG_NOSIGNAL -- MSG_MORE = 0x8000 /* Sender will send more. */ -+ MSG_MORE = 0x8000, /* Sender will send more. */ - #define MSG_MORE MSG_MORE -+ MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to return.*/ -+#define MSG_WAITFORONE MSG_WAITFORONE -+ -+ MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file -+ descriptor received through -+ SCM_RIGHTS. */ -+#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC - }; - - diff --git a/toolchain/uClibc/uClibc-0.9.33.1-dup3.patch b/toolchain/uClibc/uClibc-0.9.33.1-dup3.patch deleted file mode 100644 index 66b419e2b..000000000 --- a/toolchain/uClibc/uClibc-0.9.33.1-dup3.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Jonas Bonn -Subject: [RFC PATCH 16/38] Add dup3 syscall -Date: Tue, 6 Sep 2011 10:30:40 +0200 - -Signed-off-by: Jonas Bonn ---- - include/unistd.h | 4 ++++ - libc/sysdeps/linux/common/dup3.c | 15 +++++++++++++++ - 2 files changed, 19 insertions(+), 0 deletions(-) - create mode 100644 libc/sysdeps/linux/common/dup3.c - -diff --git a/include/unistd.h b/include/unistd.h -index 9568790..7c2fa4a 100644 ---- a/include/unistd.h -+++ b/include/unistd.h -@@ -513,6 +513,10 @@ extern int dup (int __fd) __THROW __wur; - extern int dup2 (int __fd, int __fd2) __THROW; - libc_hidden_proto(dup2) - -+/* Duplicate FD to FD2, closing FD2 and making it open on the same file. */ -+extern int dup3 (int __fd, int __fd2, int __flags) __THROW; -+libc_hidden_proto(dup3) -+ - /* NULL-terminated array of "NAME=VALUE" environment variables. */ - extern char **__environ; - #ifdef __USE_GNU -diff --git a/libc/sysdeps/linux/common/dup3.c b/libc/sysdeps/linux/common/dup3.c -new file mode 100644 -index 0000000..5fdab2e ---- /dev/null -+++ b/libc/sysdeps/linux/common/dup3.c -@@ -0,0 +1,15 @@ -+/* vi: set sw=4 ts=4: */ -+/* -+ * dup3() for uClibc -+ * -+ * Copyright (C) 2000-2006 Erik Andersen -+ * -+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -+ */ -+ -+#include -+#include -+ -+ -+_syscall3(int, dup3, int, oldfd, int, newfd, int, flags) -+libc_hidden_def(dup3) --- -1.7.5.4 - -_______________________________________________ -uClibc mailing list -uClibc@uclibc.org -http://lists.busybox.net/mailman/listinfo/uclibc diff --git a/toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch b/toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch deleted file mode 100644 index 8b08a2cd8..000000000 --- a/toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 47009e1e1c6b721c38b5ffa2eeb9202fb8db298a Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Wed, 11 Apr 2012 16:01:29 -0400 -Subject: [PATCH 1/2] mmap64: include stdint.h for uint64_t - -Some targets include this implicitly, but pull it in explicitly for those -which don't to fix building for them. - -Signed-off-by: Mike Frysinger ---- - libc/sysdeps/linux/common/mmap64.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/libc/sysdeps/linux/common/mmap64.c b/libc/sysdeps/linux/common/mmap64.c -index 3c97c84..cebf961 100644 ---- a/libc/sysdeps/linux/common/mmap64.c -+++ b/libc/sysdeps/linux/common/mmap64.c -@@ -10,6 +10,7 @@ - #ifdef __UCLIBC_HAS_LFS__ - - #include -+#include - #include - #include - #include --- -1.7.3.4 - diff --git a/toolchain/uClibc/uClibc-0.9.33.1-version.patch b/toolchain/uClibc/uClibc-0.9.33.1-version.patch deleted file mode 100644 index 37f8565ff..000000000 --- a/toolchain/uClibc/uClibc-0.9.33.1-version.patch +++ /dev/null @@ -1,23 +0,0 @@ -[PATCH] fix version number - -Somehow the 0.9.33.1 tarball thinks it is 0.9.33.2-git, as pointed out -by Mike Frysinger. - -Signed-off-by: Peter Korsgaard ---- - Rules.mak | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: uClibc-0.9.33.1/Rules.mak -=================================================================== ---- uClibc-0.9.33.1.orig/Rules.mak -+++ uClibc-0.9.33.1/Rules.mak -@@ -105,7 +105,7 @@ - MAJOR_VERSION := 0 - MINOR_VERSION := 9 - SUBLEVEL := 33 --EXTRAVERSION :=.2-git -+EXTRAVERSION :=.1 - VERSION := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL) - ABI_VERSION := $(MAJOR_VERSION) - ifneq ($(EXTRAVERSION),) diff --git a/toolchain/uClibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch b/toolchain/uClibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch new file mode 100644 index 000000000..c699b6b11 --- /dev/null +++ b/toolchain/uClibc/uClibc-0.9.33.2-define-MSG_CMSG_CLOEXEC.patch @@ -0,0 +1,28 @@ +Add definition of MSG_WAITFORONE and MSG_CMSG_CLOEXEC + +From yocto: +http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/uclibc/uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch + +Upstream-Status: Pending + +Index: git/libc/sysdeps/linux/common/bits/socket.h +=================================================================== +--- git.orig/libc/sysdeps/linux/common/bits/socket.h 2012-01-26 23:23:21.537456132 -0800 ++++ git/libc/sysdeps/linux/common/bits/socket.h 2012-01-26 23:25:10.125461388 -0800 +@@ -235,8 +235,15 @@ + #define MSG_ERRQUEUE MSG_ERRQUEUE + MSG_NOSIGNAL = 0x4000, /* Do not generate SIGPIPE. */ + #define MSG_NOSIGNAL MSG_NOSIGNAL +- MSG_MORE = 0x8000 /* Sender will send more. */ ++ MSG_MORE = 0x8000, /* Sender will send more. */ + #define MSG_MORE MSG_MORE ++ MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to return.*/ ++#define MSG_WAITFORONE MSG_WAITFORONE ++ ++ MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file ++ descriptor received through ++ SCM_RIGHTS. */ ++#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC + }; + + diff --git a/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch b/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch new file mode 100644 index 000000000..66b419e2b --- /dev/null +++ b/toolchain/uClibc/uClibc-0.9.33.2-dup3.patch @@ -0,0 +1,54 @@ +From: Jonas Bonn +Subject: [RFC PATCH 16/38] Add dup3 syscall +Date: Tue, 6 Sep 2011 10:30:40 +0200 + +Signed-off-by: Jonas Bonn +--- + include/unistd.h | 4 ++++ + libc/sysdeps/linux/common/dup3.c | 15 +++++++++++++++ + 2 files changed, 19 insertions(+), 0 deletions(-) + create mode 100644 libc/sysdeps/linux/common/dup3.c + +diff --git a/include/unistd.h b/include/unistd.h +index 9568790..7c2fa4a 100644 +--- a/include/unistd.h ++++ b/include/unistd.h +@@ -513,6 +513,10 @@ extern int dup (int __fd) __THROW __wur; + extern int dup2 (int __fd, int __fd2) __THROW; + libc_hidden_proto(dup2) + ++/* Duplicate FD to FD2, closing FD2 and making it open on the same file. */ ++extern int dup3 (int __fd, int __fd2, int __flags) __THROW; ++libc_hidden_proto(dup3) ++ + /* NULL-terminated array of "NAME=VALUE" environment variables. */ + extern char **__environ; + #ifdef __USE_GNU +diff --git a/libc/sysdeps/linux/common/dup3.c b/libc/sysdeps/linux/common/dup3.c +new file mode 100644 +index 0000000..5fdab2e +--- /dev/null ++++ b/libc/sysdeps/linux/common/dup3.c +@@ -0,0 +1,15 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * dup3() for uClibc ++ * ++ * Copyright (C) 2000-2006 Erik Andersen ++ * ++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. ++ */ ++ ++#include ++#include ++ ++ ++_syscall3(int, dup3, int, oldfd, int, newfd, int, flags) ++libc_hidden_def(dup3) +-- +1.7.5.4 + +_______________________________________________ +uClibc mailing list +uClibc@uclibc.org +http://lists.busybox.net/mailman/listinfo/uclibc -- cgit v1.2.3