aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Kemper <sebastian_ml@gmx.net>2022-08-17 22:13:56 +0200
committerChristian Lamparter <chunkeey@gmail.com>2023-05-21 14:25:52 +0200
commit38c150612cc9be488527e342db92d5c74093213f (patch)
tree53c945cf6c09a9ca04d418fd04bd3d6ef48861b2
parent8182c7edcbe397fe87737d876c8529f42bc7bdd1 (diff)
downloadupstream-38c150612cc9be488527e342db92d5c74093213f.tar.gz
upstream-38c150612cc9be488527e342db92d5c74093213f.tar.bz2
upstream-38c150612cc9be488527e342db92d5c74093213f.zip
build: revert 54070a1 (all kernels are >= 5.10)
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_ml@gmx.net>
-rw-r--r--include/kernel-defaults.mk9
1 files changed, 2 insertions, 7 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 4029dad738..6a341c3225 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_XZ),$(STAGING_DIR_HOST)/bin/xz -T$(if $(filter 1,$(NPROC)),2,0) -9 -fz --check=crc32 $(KERNEL_BUILD_DIR)/initrd.cpio)
$(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