Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit bccfd47

Browse files
André DraszikTreehugger Robot
André Draszik
authored and
Treehugger Robot
committed
ANDROID: kbuild: re-add .ko to external modules' modules.order
Since commit f65a486 ("kbuild: change module.order to list *.o instead of *.ko") modules.order files contain .o (instead of .ko) and there is code in place to replace them with .ko during installation. In Android we have some extra code which also installs modules.order for external kernel modules as of commit cf74cca ("kbuild: install the modules.order for external modules") (from https://r.android.com/1962081). We need to update this additional code as otherwise modules.order for the external modules remains incorrect (still stating .o) and various things break, e.g. modules.load, device booting, etc. Bug: 210713925 Bug: 266959026 Test: TH Fixes: 3b153f0 ("Merge 6feb57c ("Merge tag 'kbuild-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild") into android-mainline") Change-Id: Ib3a1b5b5c4184fdb04cfac1ae6b2a4f38ebe99cf Signed-off-by: André Draszik <draszik@google.com>
1 parent 13aefad commit bccfd47

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

scripts/Makefile.modinst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ $(dst)/%.ko: $(extmod_prefix)%.ko FORCE
8989
ifneq ($(KBUILD_EXTMOD),)
9090
$(dst)/modules.order.$(extmod_suffix): $(MODORDER) FORCE
9191
$(call cmd,install)
92-
@sed -i "s:^$(KBUILD_EXTMOD):$(INSTALL_MOD_DIR):g" $@
92+
@sed -e "s:^$(KBUILD_EXTMOD):$(INSTALL_MOD_DIR):g" \
93+
-e 's:^\(.*\)\.o$$:\1.ko:' \
94+
-i $@
9395
endif
9496

9597
else

0 commit comments

Comments
 (0)