From a88c2533b1f1f1f82dbb283699d8bb11212d36e2cac5751b0f1a0716d9b5407a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 16 Jul 2023 18:04:31 +0000 Subject: [PATCH] trim two recently added lines from usr-lib-modules.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=224 --- usr-lib-modules.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/usr-lib-modules.patch b/usr-lib-modules.patch index 0a89987..bf4a954 100644 --- a/usr-lib-modules.patch +++ b/usr-lib-modules.patch @@ -25,12 +25,12 @@ Signed-off-by: Michal Suchanek testsuite/setup-rootfs.sh | 109 +++++++++++++++++++---------------- testsuite/test-depmod.c | 16 ++--- testsuite/test-testsuite.c | 8 +- - tools/depmod.c | 15 ++++ + tools/depmod.c | 13 +++- tools/kmod.c | 1 tools/modinfo.c | 4 - tools/modprobe.c | 4 - tools/static-nodes.c | 6 - - 18 files changed, 118 insertions(+), 84 deletions(-) + 18 files changed, 116 insertions(+), 84 deletions(-) Index: kmod-30/Makefile.am =================================================================== @@ -504,7 +504,7 @@ Index: kmod-30/tools/depmod.c char *uncrelpath; /* same as relpath but ending in .ko */ struct kmod_list *info_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, @@ -520,8 +520,6 @@ Index: kmod-30/tools/depmod.c + cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX, + "%s/lib/modules/%s", + root ?: "", cfg.kversion); -+ } -+ if (stat(cfg.outdirname, &sb) != 0) { + cfg.outdirnamelen = snprintf(cfg.outdirname, PATH_MAX, "%s/lib/modules/%s", out_root ?: (root ?: ""), cfg.kversion);