Bug#970871: "modinfo -F" always shows name for built-ins

* Bug#970871: "modinfo -F" always shows name for built-ins
@ 2021-01-08  1:44 Marco d'Itri
  2021-01-08  3:34 ` Lucas De Marchi
  0 siblings, 1 reply; 4+ messages in thread
From: Marco d'Itri @ 2021-01-08  1:44 UTC (permalink / raw)
  To: linux-modules

[-- Attachment #1: Type: text/plain, Size: 1409 bytes --]

The attached patch fixes this.

----- Forwarded message from Ben Hutchings <ben@decadent.org.uk> -----

From: Ben Hutchings <ben@decadent.org.uk>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: Bug#970871: "modinfo -F" always shows name for built-ins

Package: kmod
Version: 27+20200310-2
Severity: normal

Now that the kernel provides module information for potentially
modular code that's actually built-in, it's possible to query these
built-ins with "modinfo -F".  However, this doesn't work quite right:

$ modinfo -Flicense e1000e
GPL v2
$ modinfo -Flicense bitrev
name:           bitrev
GPL

Ben.

-- System Information:
Debian Release: bullseye/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'stable-updates'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.8.0-1-amd64 (SMP w/2 CPU threads)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages kmod depends on:
ii  libc6      2.31-3
ii  libkmod2   27+20200310-2
ii  liblzma5   5.2.4-1+b1
ii  libssl1.1  1.1.1g-1
ii  lsb-base   11.1.0

kmod recommends no packages.

kmod suggests no packages.

-- no debconf information

----- End forwarded message -----

-- 
ciao,
Marco

[-- Attachment #2: fix_modinfo_F --]
[-- Type: text/plain, Size: 481 bytes --]

--- a/tools/modinfo.c
+++ b/tools/modinfo.c
@@ -178,7 +178,11 @@ static int modinfo_do(struct kmod_module
 	is_builtin = (filename == NULL);
 
 	if (is_builtin) {
-		printf("%-16s%s%c", "name:", kmod_module_get_name(mod), separator);
+		if (field == NULL)
+			printf("%-16s%s%c", "name:",
+			       kmod_module_get_name(mod), separator);
+		else if (field != NULL && streq(field, "name"))
+			printf("%s%c", kmod_module_get_name(mod), separator);
 		filename = "(builtin)";
 	}
 

^ permalink raw reply	[flat|nested] 4+ messages in thread