ANDROID: kbuild: re-add .ko to external modules' modules.order

Since commit f65a486821
("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 cf74cca8a1
("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: 3b153f0a4c ("Merge 6feb57c2fd ("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>

scripts/Makefile.modinst

@@ -89,7 +89,9 @@ $(dst)/%.ko: $(extmod_prefix)%.ko FORCE
 ifneq ($(KBUILD_EXTMOD),)
 $(dst)/modules.order.$(extmod_suffix): $(MODORDER) FORCE
 	$(call cmd,install)
-	@sed -i "s:^$(KBUILD_EXTMOD):$(INSTALL_MOD_DIR):g" $@
+	@sed -e "s:^$(KBUILD_EXTMOD):$(INSTALL_MOD_DIR):g" \
+	     -e 's:^\(.*\)\.o$$:\1.ko:' \
+	     -i $@
 endif
 
 else