From afc1675833a7bf5df094f59f7250369520646d04 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 16 Mar 2017 10:23:29 +0100 Subject: [PATCH] kernel: do not build modules.order It is not needed for anything on the system and skipping this saves some build time, especially in cases where there is nothing to do. Signed-off-by: Felix Fietkau --- .../patches-4.4/208-disable-modorder.patch | 34 +++++++++++++++++++ .../patches-4.9/207-disable-modorder.patch | 34 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 target/linux/generic/patches-4.4/208-disable-modorder.patch create mode 100644 target/linux/generic/patches-4.9/207-disable-modorder.patch diff --git a/target/linux/generic/patches-4.4/208-disable-modorder.patch b/target/linux/generic/patches-4.4/208-disable-modorder.patch new file mode 100644 index 000000000000..6b97946c23db --- /dev/null +++ b/target/linux/generic/patches-4.4/208-disable-modorder.patch @@ -0,0 +1,34 @@ +Disable modules.order to improve build performance. +This file is not needed for anything in LEDE + +Signed-off-by: Felix Fietkau +--- +--- a/Makefile ++++ b/Makefile +@@ -1115,7 +1115,6 @@ all: modules + + PHONY += modules + modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin +- $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order + @$(kecho) ' Building modules, stage 2.'; + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild +@@ -1145,7 +1144,6 @@ _modinst_: + rm -f $(MODLIB)/build ; \ + ln -s $(CURDIR) $(MODLIB)/build ; \ + fi +- @cp -f $(objtree)/modules.order $(MODLIB)/ + @cp -f $(objtree)/modules.builtin $(MODLIB)/ + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst + +--- a/scripts/Makefile.build ++++ b/scripts/Makefile.build +@@ -92,7 +92,7 @@ modorder-target := $(obj)/modules.order + # We keep a list of all modules in $(MODVERDIR) + + __build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \ +- $(if $(KBUILD_MODULES),$(obj-m) $(modorder-target)) \ ++ $(if $(KBUILD_MODULES),$(obj-m)) \ + $(subdir-ym) $(always) + @: + diff --git a/target/linux/generic/patches-4.9/207-disable-modorder.patch b/target/linux/generic/patches-4.9/207-disable-modorder.patch new file mode 100644 index 000000000000..ca97b77f7ed1 --- /dev/null +++ b/target/linux/generic/patches-4.9/207-disable-modorder.patch @@ -0,0 +1,34 @@ +Disable modules.order to improve build performance. +This file is not needed for anything in LEDE + +Signed-off-by: Felix Fietkau +--- +--- a/Makefile ++++ b/Makefile +@@ -1193,7 +1193,6 @@ all: modules + + PHONY += modules + modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin +- $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order + @$(kecho) ' Building modules, stage 2.'; + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild +@@ -1223,7 +1222,6 @@ _modinst_: + rm -f $(MODLIB)/build ; \ + ln -s $(CURDIR) $(MODLIB)/build ; \ + fi +- @cp -f $(objtree)/modules.order $(MODLIB)/ + @cp -f $(objtree)/modules.builtin $(MODLIB)/ + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst + +--- a/scripts/Makefile.build ++++ b/scripts/Makefile.build +@@ -93,7 +93,7 @@ modorder-target := $(obj)/modules.order + # We keep a list of all modules in $(MODVERDIR) + + __build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \ +- $(if $(KBUILD_MODULES),$(obj-m) $(modorder-target)) \ ++ $(if $(KBUILD_MODULES),$(obj-m)) \ + $(subdir-ym) $(always) + @: + -- 2.30.2