kmod: 27 -> 29
This commit is contained in:
parent
1d4b99c8e6
commit
42e20c4e79
@ -9,11 +9,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "kmod";
|
||||
version = "27";
|
||||
version = "29";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/kernel/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "035wzfzjx4nwidk747p8n085mgkvy531ppn16krrajx2dkqzply1";
|
||||
sha256 = "0am54mi5rk72g5q7k6l6f36gw3r9vwgjmyna43ywcjhqmakyx00b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config libxslt ];
|
||||
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
|
||||
"--with-modulesdirs=${modulesDirs}"
|
||||
] ++ lib.optional withStatic "--enable-static";
|
||||
|
||||
patches = [ ./module-dir.patch ./no-name-field.patch ]
|
||||
patches = [ ./module-dir.patch ]
|
||||
++ lib.optional stdenv.isDarwin ./darwin.patch
|
||||
++ lib.optional withStatic ./enable-static.patch;
|
||||
|
||||
|
@ -1,24 +0,0 @@
|
||||
|
||||
---
|
||||
tools/modinfo.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/modinfo.c b/tools/modinfo.c
|
||||
index 0231bb0..7b2259e 100644
|
||||
--- a/tools/modinfo.c
|
||||
+++ b/tools/modinfo.c
|
||||
@@ -178,7 +178,10 @@ static int modinfo_do(struct kmod_module *mod)
|
||||
is_builtin = (filename == NULL);
|
||||
|
||||
if (is_builtin) {
|
||||
- printf("%-16s%s%c", "name:", kmod_module_get_name(mod), separator);
|
||||
+ if (field == NULL || field != NULL && streq(field, "name")){
|
||||
+ printf("%-16s%s%c", "name:",
|
||||
+ kmod_module_get_name(mod), separator);
|
||||
+ }
|
||||
filename = "(builtin)";
|
||||
}
|
||||
|
||||
--
|
||||
2.28.0
|
||||
|
Loading…
Reference in New Issue
Block a user