diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-01-24 05:14:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-01-24 05:14:13 +0100 |
| commit | f5a32ccc8db573d377e491105bdb95f36c0ad977 (patch) | |
| tree | 0985dee1ddd709b6846b6628dc0aca020845b37a /package/busybox/patches | |
| parent | 9d558ab93a7d672f4fcf9c5c1bdd123005355b5d (diff) | |
busybox: update to 1.26.2
Diffstat (limited to 'package/busybox/patches')
| -rw-r--r-- | package/busybox/patches/009-modutils.patch | 76 | ||||
| -rw-r--r-- | package/busybox/patches/010-ifup-hotfix.patch | 12 |
2 files changed, 0 insertions, 88 deletions
diff --git a/package/busybox/patches/009-modutils.patch b/package/busybox/patches/009-modutils.patch deleted file mode 100644 index 49ccb8ff4..000000000 --- a/package/busybox/patches/009-modutils.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 7cf41b6e281c42fb7f2117927a8ff7f476103e76 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <wbx@openadk.org> -Date: Sun, 25 Dec 2016 16:53:32 +0100 -Subject: [PATCH] modutils: remove special handling of uClibc - -Commit 3a45b87ac36f (modutils: support finit_module syscall) introduced -macro finit_module. But it is not defined for uClibc. - -The compilation for busybox fails for MIPS with: -With uClibc, we get following build errors: - - modutils/lib.a(modutils.o): In function `bb_init_module': - modutils.c:(.text.bb_init_module+0x94): undefined reference to `finit_module' - modutils.c:(.text.bb_init_module+0xa0): undefined reference to `finit_module' - -We can just use syscall() without any need for the -uClibc wrappers. - -Newer versions of uClibc-ng (>1.0.20) will remove the -module syscall wrappers. - -Found via Buildroot autobuilders: -http://autobuild.buildroot.net/results/556/55655daef23788fb3967f801ec8b79e9bed7122b/build-end.log - -Reported-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com> -Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> ---- - modutils/modprobe-small.c | 4 ++-- - modutils/modutils.c | 15 +++++---------- - 2 files changed, 7 insertions(+), 12 deletions(-) - -diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c -index 652ff4d..0fc9ea4 100644 ---- a/modutils/modprobe-small.c -+++ b/modutils/modprobe-small.c -@@ -39,8 +39,8 @@ - #include <fnmatch.h> - #include <sys/syscall.h> - --extern int init_module(void *module, unsigned long len, const char *options); --extern int delete_module(const char *module, unsigned flags); -+#define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts) -+#define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags) - #ifdef __NR_finit_module - # define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags) - #endif -diff --git a/modutils/modutils.c b/modutils/modutils.c -index d36caaf..d56bfc8 100644 ---- a/modutils/modutils.c -+++ b/modutils/modutils.c -@@ -7,17 +7,12 @@ - */ - #include "modutils.h" - --#ifdef __UCLIBC__ --extern int init_module(void *module, unsigned long len, const char *options); --extern int delete_module(const char *module, unsigned int flags); --#else --# include <sys/syscall.h> --# define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts) --# if defined(__NR_finit_module) --# define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags) --# endif --# define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags) -+#include <sys/syscall.h> -+#define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts) -+#if defined(__NR_finit_module) -+# define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags) - #endif -+#define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags) - - static module_entry *helper_get_module(module_db *db, const char *module, int create) - { --- -2.1.4 - diff --git a/package/busybox/patches/010-ifup-hotfix.patch b/package/busybox/patches/010-ifup-hotfix.patch deleted file mode 100644 index 3060b986c..000000000 --- a/package/busybox/patches/010-ifup-hotfix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur busybox-1.26.0.orig/networking/Config.src busybox-1.26.0/networking/Config.src ---- busybox-1.26.0.orig/networking/Config.src 2016-12-12 08:46:14.000000000 +0100 -+++ busybox-1.26.0/networking/Config.src 2016-12-25 09:39:42.715064866 +0100 -@@ -53,7 +53,7 @@ - config IFUPDOWN_UDHCPC_CMD_OPTIONS - string "ifup udhcpc command line options" - default "-R -n" -- depends on IFUPDOWN && UDHCPC -+ depends on IFUP && UDHCPC - help - Command line options to pass to udhcpc from ifup. - Intended to alter options not available in /etc/network/interfaces. |
