kernel: make make patches/files apply/compile for kernel 5.2

[openwrt/staging/mkresin.git] / target / linux / generic / hack-5.2 / 207-disable-modorder.patch

diff --git a/target/linux/generic/hack-5.2/207-disable-modorder.patch b/target/linux/generic/hack-5.2/207-disable-modorder.patch
index 2d72129880d40d3832ee089f15f0586902d7b367..2a70c314fd19f110d5f4277b90fa10967030a6ce 100644 (file)
--- a/target/linux/generic/hack-5.2/207-disable-modorder.patch
+++ b/target/linux/generic/hack-5.2/207-disable-modorder.patch
@@ -15,22 +15,22 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -1263,7 +1263,6 @@ all: modules
+@@ -1284,7 +1284,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
- 
-@@ -1292,7 +1291,6 @@ _modinst_:
+       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/modules-check.sh
+@@ -1314,7 +1313,6 @@ _modinst_:
                rm -f $(MODLIB)/build ; \
                ln -s $(CURDIR) $(MODLIB)/build ; \
        fi
 -      @cp -f $(objtree)/modules.order $(MODLIB)/
        @cp -f $(objtree)/modules.builtin $(MODLIB)/
+       @cp -f $(objtree)/modules.builtin.modinfo $(MODLIB)/
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst
- 
 --- a/scripts/Makefile.build
 +++ b/scripts/Makefile.build
 @@ -70,7 +70,7 @@ endif