From 7eebc4f1bc99234a1b79ac63dd62773640942fc4 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Wed, 26 Jan 2022 16:26:55 -0800 Subject: [PATCH] Revert "FROMLIST: kbuild: install the modules.order for external modules" This reverts commit 77cbbcd16fab0db6c1251fed13fd1f12a08e3325. This patch hasn't landed upstream yet, but needs a fix. So reverting it first to help keep the fixes together in case we need to forward port this feature. Bug: 216462633 Change-Id: Ia96084bd24d0ee27b7addc2acbd5277e46cb86f1 Signed-off-by: Will McVicker --- scripts/Makefile.modinst | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst index 2e2e31696fd6..ff9b09e4cfca 100644 --- a/scripts/Makefile.modinst +++ b/scripts/Makefile.modinst @@ -24,10 +24,6 @@ suffix-$(CONFIG_MODULE_COMPRESS_XZ) := .xz suffix-$(CONFIG_MODULE_COMPRESS_ZSTD) := .zst modules := $(patsubst $(extmod_prefix)%, $(dst)/%$(suffix-y), $(modules)) -ifneq ($(KBUILD_EXTMOD),) -extmod_suffix := $(subst /,_,$(subst .,_,$(subst -,_,$(KBUILD_EXTMOD)))) -modules += $(dst)/modules.order.$(extmod_suffix) -endif __modinst: $(modules) @: @@ -86,12 +82,6 @@ $(dst)/%.ko: $(extmod_prefix)%.ko FORCE $(call cmd,strip) $(call cmd,sign) -ifneq ($(KBUILD_EXTMOD),) -$(dst)/modules.order.$(extmod_suffix): $(MODORDER) FORCE - $(call cmd,install) - @sed -i "s:^$(KBUILD_EXTMOD):$(INSTALL_MOD_DIR):g" $@ -endif - else $(dst)/%.ko: FORCE