aboutsummaryrefslogtreecommitdiffstats
path: root/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2017-07-07 08:15:50 +0000
committerTimo Teräs <timo.teras@iki.fi>2017-07-07 08:15:50 +0000
commit1f0857f0481303fb62e947bb108b7efa441aee7b (patch)
tree34f0aaf262da7301ec27f74d66efed00ac530c50 /main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
parente9b429f496a2b9b0891e6ecde82c35ab91ac9f0f (diff)
downloadaports-1f0857f0481303fb62e947bb108b7efa441aee7b.tar.gz
aports-1f0857f0481303fb62e947bb108b7efa441aee7b.tar.bz2
aports-1f0857f0481303fb62e947bb108b7efa441aee7b.tar.xz
main/busybox: fix depmod binary index patch
fixes #7487
Diffstat (limited to 'main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch')
-rw-r--r--main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch17
1 files changed, 9 insertions, 8 deletions
diff --git a/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch b/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
index ee4dfb1b75..8b89902deb 100644
--- a/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
+++ b/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
@@ -1,4 +1,4 @@
-From c7d6c398844aca9651b7f01edadd9a8284919c89 Mon Sep 17 00:00:00 2001
+From ab4df89615fc2c5726b4ce55546e4dc098211a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Sun, 25 Oct 2015 22:21:41 +0200
Subject: [PATCH 07/11] depmod: support generating kmod binary index files
@@ -15,18 +15,18 @@ the code size a little bit.
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
---
- modutils/Config.src | 10 ++
+ modutils/Config.src | 9 ++
modutils/depmod.c | 281 ++++++++++++++++++++++++++++++++++++++++++----------
modutils/modprobe.c | 15 ---
modutils/modutils.c | 31 ++++++
- modutils/modutils.h | 15 +++
+ modutils/modutils.h | 16 +++
5 files changed, 286 insertions(+), 66 deletions(-)
diff --git a/modutils/Config.src b/modutils/Config.src
-index 9b76c83d2..5ab51d68b 100644
+index 9b76c83d2..9e3b9b71e 100644
--- a/modutils/Config.src
+++ b/modutils/Config.src
-@@ -152,6 +152,16 @@ config FEATURE_MODUTILS_ALIAS
+@@ -152,6 +152,15 @@ config FEATURE_MODUTILS_ALIAS
Say Y if unsure.
@@ -34,7 +34,6 @@ index 9b76c83d2..5ab51d68b 100644
+ bool "Support for the kmod .bin file format"
+ default n
+ depends on DEPMOD && !MODPROBE_SMALL
-+ select PLATFORM_LINUX
+ help
+ Generate kmod compatible binary index files for .dep, .alias,
+ .symbols and .builtin files. Allows mixing use of busybox
@@ -478,7 +477,7 @@ index 6f7cd9721..257089af4 100644
{
char *tok;
diff --git a/modutils/modutils.h b/modutils/modutils.h
-index 4a702e97c..c07d961bd 100644
+index 4a702e97c..73e816028 100644
--- a/modutils/modutils.h
+++ b/modutils/modutils.h
@@ -18,6 +18,20 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
@@ -502,14 +501,16 @@ index 4a702e97c..c07d961bd 100644
typedef struct module_entry {
struct module_entry *next;
char *name, *modname;
-@@ -47,6 +61,7 @@ module_entry *moddb_get(module_db *db, const char *s) FAST_FUNC;
+@@ -47,7 +61,9 @@ module_entry *moddb_get(module_db *db, const char *s) FAST_FUNC;
module_entry *moddb_get_or_create(module_db *db, const char *s) FAST_FUNC;
void moddb_free(module_db *db) FAST_FUNC;
+char *gather_options_str(char *opts, const char *append) FAST_FUNC;
void replace(char *s, char what, char with) FAST_FUNC;
++char *replace_underscores(char *s) FAST_FUNC;
int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC;
char *filename2modname(const char *filename, char *modname) FAST_FUNC;
+ #if ENABLE_FEATURE_CMDLINE_MODULE_OPTIONS
--
2.13.2