Skip to content

Commit d724b57

Browse files
committed
kbuild: do not deduplicate modules.order
The AWK code was added to deduplicate modules.order in case $(obj-m) contains the same module multiple times, but it is actually unneeded since commit b2c8855 ("kbuild: update modules.order only when contained modules are updated"). The list is already deduplicated before being processed by AWK because $^ is the deduplicated list of prerequisites. (Please note the real-prereqs macro uses $^) Yet, modules.order will contain duplication if two different Makefiles build the same module: foo/Makefile: obj-m += bar/baz.o foo/bar/Makefile: obj-m += baz.o However, the parallel builds cannot properly handle this case in the first place. So, it is better to let it fail (as already done by scripts/modules-check.sh). Signed-off-by: Masahiro Yamada <[email protected]>
1 parent b10fdee commit d724b57

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,14 +1430,11 @@ endif
14301430

14311431
# Build modules
14321432
#
1433-
# A module can be listed more than once in obj-m resulting in
1434-
# duplicate lines in modules.order files. Those are removed
1435-
# using awk while concatenating to the final file.
14361433

14371434
PHONY += modules
14381435
modules: $(if $(KBUILD_BUILTIN),vmlinux) modules_check modules_prepare
14391436

1440-
cmd_modules_order = $(AWK) '!x[$$0]++' $(real-prereqs) > $@
1437+
cmd_modules_order = cat $(real-prereqs) > $@
14411438

14421439
modules.order: $(subdir-modorder) FORCE
14431440
$(call if_changed,modules_order)

scripts/Makefile.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ $(obj)/built-in.a: $(real-obj-y) FORCE
374374

375375
cmd_modules_order = { $(foreach m, $(real-prereqs), \
376376
$(if $(filter %/modules.order, $m), cat $m, echo $(patsubst %.o,%.ko,$m));) :; } \
377-
| $(AWK) '!x[$$0]++' - > $@
377+
> $@
378378

379379
$(obj)/modules.order: $(obj-m) FORCE
380380
$(call if_changed,modules_order)

0 commit comments

Comments
 (0)