Commit 54070a1 was added to allow building proper SDKs with kernels <
5.10. Now that all targets use at least kernel 5.10 it can be reverted.

Signed-off-by: Sebastian Kemper <sebastian...@gmx.net>
---
 include/kernel-defaults.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 2e21392016..6687a58d1a 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -153,17 +153,12 @@ define Kernel/CopyImage
        }
 endef

-# Always add "modules" so a proper Module.symvers file is written that
-# also contains symbols from the kernel modules. Without these symbols
-# external packages that depend on exported symbols from kernel modules
-# will fail to build.
 define Kernel/CompileImage/Default
        rm -f $(TARGET_DIR)/init
-       +$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if 
$(KERNELNAME),$(KERNELNAME),all) modules
+       +$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if 
$(KERNELNAME),$(KERNELNAME),all)
        $(call Kernel/CopyImage)
 endef

-# Here as well, always add "modules", see comment above.
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
 define Kernel/CompileImage/Initramfs
        $(call Kernel/Configure/Initramfs)
@@ -185,7 +180,7 @@ endif
 # ?    $(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZ4),)
        $(if 
$(CONFIG_TARGET_INITRAMFS_COMPRESSION_ZSTD),$(STAGING_DIR_HOST)/bin/zstd -T0 -f 
-o $(KERNEL_BUILD_DIR)/initrd.cpio.zstd $(KERNEL_BUILD_DIR)/initrd.cpio)
 endif
-       +$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if 
$(KERNELNAME),$(KERNELNAME),all) modules
+       +$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if 
$(KERNELNAME),$(KERNELNAME),all)
        $(call Kernel/CopyImage,-initramfs)
 endef
 else
--
2.30.2


_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to