diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-05 15:11:45 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-05 15:11:45 +0200 |
| commit | 62afc58ffbc19a44808f7e749fb297572b3c9410 (patch) | |
| tree | e23e47f04c05f3fc9dc975ee5950c700d24329c7 /main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch | |
| parent | 87698baa9ec19d0554e5233954b6f266efe8b5cd (diff) | |
| download | aports-62afc58ffbc19a44808f7e749fb297572b3c9410.tar.bz2 aports-62afc58ffbc19a44808f7e749fb297572b3c9410.tar.xz | |
main/busybox: fix depmod regression
introduced with the rebase of depmod patch
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.patch | 19 |
1 files changed, 14 insertions, 5 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 03a503c070..9534101692 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 249ef5277e15bd9f6728275a4d21ffdcd7877dc4 Mon Sep 17 00:00:00 2001 +From 62748c093b0fcf79880b330eea82c84e64daae59 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/15] depmod: support generating kmod binary index files @@ -16,11 +16,11 @@ the code size a little bit. Signed-off-by: Timo Teräs <timo.teras@iki.fi> --- modutils/Config.src | 10 ++ - modutils/depmod.c | 277 ++++++++++++++++++++++++++++++++++++++++++---------- + modutils/depmod.c | 279 ++++++++++++++++++++++++++++++++++++++++++---------- modutils/modprobe.c | 15 --- modutils/modutils.c | 27 ++++- modutils/modutils.h | 15 +++ - 5 files changed, 278 insertions(+), 66 deletions(-) + 5 files changed, 280 insertions(+), 66 deletions(-) diff --git a/modutils/Config.src b/modutils/Config.src index 0b11832..09db515 100644 @@ -44,7 +44,7 @@ index 0b11832..09db515 100644 bool "Support for module.symbols file" default y diff --git a/modutils/depmod.c b/modutils/depmod.c -index e5f0e3d..c35a584 100644 +index e5f0e3d..b73c1e5 100644 --- a/modutils/depmod.c +++ b/modutils/depmod.c @@ -2,7 +2,7 @@ @@ -299,7 +299,16 @@ index e5f0e3d..c35a584 100644 int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int depmod_main(int argc UNUSED_PARAM, char **argv) { -@@ -198,53 +368,60 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) +@@ -166,6 +336,8 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) + unsigned i; + int tmp; + ++ INIT_G(); ++ + getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL); + argv += optind; + +@@ -198,53 +370,60 @@ int depmod_main(int argc UNUSED_PARAM, char **argv) } /* Generate dependency and alias files */ |