mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-03 14:34:27 -05:00 
			
		
		
		
	Refresh patches Fixes: CVE-2017-5754 aka Meltdown Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> [fix typo in commit msg, conflict after 4.14 bump] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
		
			
				
	
	
		
			35 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			35 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
Disable modules.order to improve build performance.
 | 
						|
This file is not needed for anything in LEDE
 | 
						|
 | 
						|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | 
						|
---
 | 
						|
--- a/Makefile
 | 
						|
+++ b/Makefile
 | 
						|
@@ -1121,7 +1121,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
 | 
						|
@@ -1151,7 +1150,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)
 | 
						|
 	@:
 | 
						|
 
 |