uClibc: add unshare() syscall support
PATCH 1/2 uClibc: add unshare() syscall support
Add unshare() syscall support for uClibc 0.9.31 and 0.9.32 series. This is required by newer versions of iproute2.
Signed-off-by Gustavo Zacarias <[email protected]>
--- toolchain/uClibc/uClibc-0.9.31.1-unshare.patch | 74 +++++++++++++++++++++ toolchain/uClibc/uClibc-0.9.32-unshare.patch | 82 ++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 0 deletions(-) create mode 100644 toolchain/uClibc/uClibc-0.9.31.1-unshare.patch create mode 100644 toolchain/uClibc/uClibc-0.9.32-unshare.patch
toolchain/uClibc/uClibc-0.9.31.1-unshare.patch new file +74 -0
@@ -0,0 +1,74 @@ +Backport of unshare() syscall. +From uClibc git 19dd090a0f68765db87990ef8eda9bf77bb29581 + +Signed-off-by: Gustavo Zacarias <[email protected]> + +--- +diff -Nura uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/bits/sched.h uClibc-0.9.31.1/libc/sysdeps/linux/common/bits/sched.h +--- uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/bits/sched.h 2011-06-08 15:58:40.000000000 -0300 ++++ uClibc-0.9.31.1/libc/sysdeps/linux/common/bits/sched.h 2011-12-05 08:10:02.491978849 -0300 +@@ -58,7 +58,13 @@ + force CLONE_PTRACE on this clone. */ + # define CLONE_CHILD_SETTID 0x01000000 /* Store TID in userlevel buffer in + the child. */ +-# define CLONE_STOPPED 0x02000000 /* Start in stopped state. */ ++# define CLONE_STOPPED 0x02000000 /* Start in stopped state. */ ++# define CLONE_NEWUTS 0x04000000 /* New utsname group. */ ++# define CLONE_NEWIPC 0x08000000 /* New ipcs. */ ++# define CLONE_NEWUSER 0x10000000 /* New user namespace. */ ++# define CLONE_NEWPID 0x20000000 /* New pid namespace. */ ++# define CLONE_NEWNET 0x40000000 /* New network namespace. */ ++# define CLONE_IO 0x80000000 /* Clone I/O context. */ + #endif + + /* The official definition. */ +@@ -74,11 +80,9 @@ + extern int clone (int (*__fn) (void *__arg), void *__child_stack, + int __flags, void *__arg, ...) __THROW; + +-#if 0 + /* Unshare the specified resources. */ + extern int unshare (int __flags) __THROW; + #endif +-#endif + + __END_DECLS + +diff -Nura uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/Makefile.in uClibc-0.9.31.1/libc/sysdeps/linux/common/Makefile.in +--- uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/Makefile.in 2011-06-08 15:58:40.000000000 -0300 ++++ uClibc-0.9.31.1/libc/sysdeps/linux/common/Makefile.in 2011-12-05 08:23:28.353757602 -0300 +@@ -31,7 +31,8 @@ + remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \ + sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \ + splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \ +- sync_file_range.c sysctl.c sysinfo.c timerfd.c uselib.c vhangup.c,$(CSRC)) ++ sync_file_range.c sysctl.c sysinfo.c timerfd.c unshare.c uselib.c \ ++ vhangup.c,$(CSRC)) + endif + + ifneq ($(UCLIBC_BSD_SPECIFIC),y) +diff -Nura uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/unshare.c uClibc-0.9.31.1/libc/sysdeps/linux/common/unshare.c +--- uClibc-0.9.31.1.orig/libc/sysdeps/linux/common/unshare.c 1969-12-31 21:00:00.000000000 -0300 ++++ uClibc-0.9.31.1/libc/sysdeps/linux/common/unshare.c 2011-12-05 08:22:45.954453512 -0300 +@@ -0,0 +1,21 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * unshare() for uClibc ++ * ++ * Copyright (C) 2011 Henning Heinold <[email protected]> ++ * ++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. ++ */ ++ ++#include <sys/syscall.h> ++#include <sched.h> ++ ++#if defined __NR_unshare && defined __UCLIBC_LINUX_SPECIFIC__ ++_syscall1(int, unshare, int, flags) ++#else ++int unshare(int flags) ++{ ++ __set_errno(ENOSYS); ++ return -1; ++} ++#endif
toolchain/uClibc/uClibc-0.9.32-unshare.patch new file +82 -0
82 lines not on this page · raw message
Signature · 1 line
1.7.3.4
PATCH 2/2 iproute2: bump to version 3.1.0
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/iproute2/iproute2-xt-v6.patch | 39 --------------------------------- package/iproute2/iproute2.mk | 4 +- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 package/iproute2/iproute2-xt-v6.patch
package/iproute2/iproute2-xt-v6.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From: Andreas Henriksson <[email protected]> -Forwarded: yes -Subject: [PATCH] iproute2: Fix building xt module against xtables version 6 - - -diff --git a/tc/m_xt.c b/tc/m_xt.c -index 651a59e..13bf19f 100644 ---- a/tc/m_xt.c -+++ b/tc/m_xt.c -@@ -160,9 +160,13 @@ static int parse_ipt(struct action_util *a,int *argc_p, - return -1; - } - tcipt_globals.opts = -- xtables_merge_options(tcipt_globals.opts, -- m->extra_opts, -- &m->option_offset); -+ xtables_merge_options( -+#if (XTABLES_VERSION_CODE >= 6) -+ tcipt_globals.orig_opts, -+#endif -+ tcipt_globals.opts, -+ m->extra_opts, -+ &m->option_offset); - } else { - fprintf(stderr," failed to find target %s\n\n", optarg); - return -1; -@@ -305,7 +309,11 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr *arg) - } - - tcipt_globals.opts = -- xtables_merge_options(tcipt_globals.opts, -+ xtables_merge_options( -+#if (XTABLES_VERSION_CODE >= 6) -+ tcipt_globals.orig_opts, -+#endif -+ tcipt_globals.opts, - m->extra_opts, - &m->option_offset); - } else {
package/iproute2/iproute2.mk +2 -2
@@ -4,8 +4,8 @@ # ############################################################# -IPROUTE2_VERSION = 2.6.39 -IPROUTE2_SITE = http://devresources.linuxfoundation.org/dev/iproute2/download +IPROUTE2_VERSION = 3.1.0 +IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc # If both iproute2 and busybox are selected, make certain we win
Signature · 1 line
1.7.3.4
PATCH 2/2 iproute2: bump to version 3.1.0
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 uClibc: add unshare() syscall support
In reply to Gustavo ZacariasQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:
Gustavo> Add unshare() syscall support for uClibc 0.9.31 and 0.9.32 series. Gustavo> This is required by newer versions of iproute2.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard