On Wed, Apr 10, 2019 at 11:50:54AM -0400, Joe Lawrence wrote:
>
> [ ... snip ... ]
>
> diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
> index 6b7f354f189a..1e8bb7442689 100644
> --- a/scripts/Makefile.modpost
> +++ b/scripts/Makefile.modpost
> @@ -124,8 +124,22 @@ quiet_cmd_ld_ko_o = LD [M] $@
> -o $@ $(real-prereqs) ; \
> $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
>
> +SLIST = $(objtree)/Symbols.list
> +KLP_CONVERT = scripts/livepatch/klp-convert
> +quiet_cmd_klp_convert = KLP $@
> + cmd_klp_convert = mv $@ $(@:.ko=.klp.o);
> \
> + $(KLP_CONVERT) $(SLIST) $(@:.ko=.klp.o) $@
> +
> +define rule_ld_ko_o
> + $(call echo-cmd,ld_ko_o) $(cmd_ld_ko_o) ; \
> + $(call save-cmd,ld_ko_o) ; \
> + $(if $(CONFIG_LIVEPATCH), \
> + $(if $(wildcard $(MODVERDIR)/$(basetarget).livepatch), \
> + $(call echo-cmd,klp_convert) $(cmd_klp_convert) ))
> +endef
> +
> $(modules): %.ko :%.o %.mod.o FORCE
> - +$(call if_changed,ld_ko_o)
> + +$(call if_changed_rule,ld_ko_o)
>
> targets += $(modules)
I just noticed that rule_ld_ko_o produces verbose output when linking
modules:
% make
...
echo ' LD [M] drivers/ata/ata_generic.ko'; ld -r -m elf_x86_64 -z
max-page-size=0x200000 -T ./scripts/module-common.lds --build-id -o
drivers/ata/ata_generic.ko drivers/ata/ata_generic.o
drivers/ata/ata_generic.mod.o ; true ; printf '%s\n'
'cmd_drivers/ata/ata_generic.ko := ld -r -m elf_x86_64 -z
max-page-size=0x200000 -T ./scripts/module-common.lds --build-id -o
drivers/ata/ata_generic.ko drivers/ata/ata_generic.o
drivers/ata/ata_generic.mod.o ; true' > drivers/ata/.ata_generic.ko.cmd ;
LD [M] drivers/ata/ata_generic.ko
so I think we need to use the $(Q) macro to respect the KBUILD_VERBOSE
and V kbuild settings.
Masahiro, does something like this look correct?
Thanks,
-- Joe
-->8-- -->8-- -->8-- -->8-- -->8-- -->8-- -->8-- -->8-- -->8-- -->8--
>From 5c8a2c58c7be98c0a9156155f201b88cc61bf0bd Mon Sep 17 00:00:00 2001
From: Joe Lawrence <[email protected]>
Date: Thu, 11 Apr 2019 11:32:37 -0400
Subject: [PATCH] [squash] modpost: fix rule_ld_ko_o verbosity
Note: squash with ("modpost: Integrate klp-convert")
rule_ld_ko_o should include $(Q) to honor build verbosity setting.
Cargo-cult-stolen from 70923bd26c73 ("perf tools: Make flex/bison calls
honour V=1").
[joe: quiet down rule_ld_ko_o]
Signed-off-by: Joe Lawrence <[email protected]>
---
scripts/Makefile.modpost | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 9fe4c5760aca..f2aee6b8dcfd 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -135,11 +135,11 @@ KLP_CONVERT = scripts/livepatch/klp-convert
quiet_cmd_klp_convert = KLP $@
cmd_klp_convert = mv $@ $(@:.ko=.klp.o); \
$(KLP_CONVERT) $(SLIST) $(@:.ko=.klp.o) $@
define rule_ld_ko_o
- $(call echo-cmd,ld_ko_o) $(cmd_ld_ko_o) ; \
+ $(Q)$(call echo-cmd,ld_ko_o) $(cmd_ld_ko_o) ; \
$(call save-cmd,ld_ko_o) ; \
$(if $(CONFIG_LIVEPATCH), \
$(if $(wildcard $(MODVERDIR)/$(basetarget).livepatch), \
$(call echo-cmd,klp_convert) $(cmd_klp_convert) ))
endef
--
2.20.1
