pool/kmod
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trim two recently added lines from usr-lib-modules.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=224
This commit is contained in:
Jan Engelhardt 2023-07-16 18:04:31 +00:00 committed by Git OBS Bridge
parent 6dd634e97e
commit a88c2533b1
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr-lib-modules.patch
View File

@ -25,12 +25,12 @@ Signed-off-by: Michal Suchanek <msuchanek@suse.de>
testsuite/setup-rootfs.sh | 109 +++++++++++++++++++---------------- testsuite/setup-rootfs.sh | 109 +++++++++++++++++++----------------
testsuite/test-depmod.c | 16 ++--- testsuite/test-depmod.c | 16 ++---
testsuite/test-testsuite.c | 8 +- testsuite/test-testsuite.c | 8 +-
tools/depmod.c | 15 ++++ tools/depmod.c | 13 +++-
tools/kmod.c | 1 tools/kmod.c | 1
tools/modinfo.c | 4 - tools/modinfo.c | 4 -
tools/modprobe.c | 4 - tools/modprobe.c | 4 -
tools/static-nodes.c | 6 - tools/static-nodes.c | 6 -
18 files changed, 118 insertions(+), 84 deletions(-) 18 files changed, 116 insertions(+), 84 deletions(-)
Index: kmod-30/Makefile.am Index: kmod-30/Makefile.am
=================================================================== ===================================================================
@ -504,7 +504,7 @@ Index: kmod-30/tools/depmod.c
char *uncrelpath; /* same as relpath but ending in .ko */ char *uncrelpath; /* same as relpath but ending in .ko */
struct kmod_list *info_list; struct kmod_list *info_list;
struct kmod_list *dep_sym_list; struct kmod_list *dep_sym_list;
@@ -3024,12 +3024,23 @@ static int do_depmod(int argc, char *arg @@ -3024,12 +3024,21 @@ static int do_depmod(int argc, char *arg
} }
cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX, cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX,
@ -520,8 +520,6 @@ Index: kmod-30/tools/depmod.c
+ cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX, + cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX,
+ "%s/lib/modules/%s", + "%s/lib/modules/%s",
+ root ?: "", cfg.kversion); + root ?: "", cfg.kversion);
+ }
+ if (stat(cfg.outdirname, &sb) != 0) {
+ cfg.outdirnamelen = snprintf(cfg.outdirname, PATH_MAX, + cfg.outdirnamelen = snprintf(cfg.outdirname, PATH_MAX,
"%s/lib/modules/%s", "%s/lib/modules/%s",
out_root ?: (root ?: ""), cfg.kversion); out_root ?: (root ?: ""), cfg.kversion);