From f751e06cec78a745910c5c2ee93540b0d670deb9 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 19 Nov 2024 16:48:34 +0100 Subject: [PATCH] kernel-6.1 support Signed-off-by: John Crispin --- config/Config-images.in | 1 + include/kernel-6.1 | 2 ++ include/kernel-defaults.mk | 2 ++ package/kernel/linux/modules/netfilter.mk | 4 ++-- 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 include/kernel-6.1 diff --git a/config/Config-images.in b/config/Config-images.in index 8413f218a6..fbc9f9fac3 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -21,6 +21,7 @@ menu "Target Images" default TARGET_INITRAMFS_COMPRESSION_GZIP if TARGET_ipq60xx default TARGET_INITRAMFS_COMPRESSION_GZIP if TARGET_ipq50xx default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ipq95xx + default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ipq53xx default TARGET_INITRAMFS_COMPRESSION_XZ if USES_SEPARATE_INITRAMFS default TARGET_INITRAMFS_COMPRESSION_NONE depends on TARGET_ROOTFS_INITRAMFS diff --git a/include/kernel-6.1 b/include/kernel-6.1 new file mode 100644 index 0000000000..3673357888 --- /dev/null +++ b/include/kernel-6.1 @@ -0,0 +1,2 @@ +LINUX_VERSION-6.1 = .31 +LINUX_KERNEL_HASH-6.1.31 = ca116439ce055924f367ed3ad6c41fd2d84bd961a6cc1795443d152aad36310b diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 6a341c3225..ae44e1a5e5 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -82,6 +82,7 @@ endif else echo "# CONFIG_INITRAMFS_FORCE is not set" >> $(LINUX_DIR)/.config endif + echo "# CONFIG_INITRAMFS_PRESERVE_MTIME is not set" >> $(LINUX_DIR)/.config echo "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_NONE),CONFIG_INITRAMFS_COMPRESSION_NONE=y,# CONFIG_INITRAMFS_COMPRESSION_NONE is not set)" >> $(LINUX_DIR)/.config echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_GZIP),CONFIG_INITRAMFS_COMPRESSION_GZIP=y\nCONFIG_RD_GZIP=y,# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set\n# CONFIG_RD_GZIP is not set)" >> $(LINUX_DIR)/.config echo -e "$(if $(CONFIG_TARGET_INITRAMFS_COMPRESSION_BZIP2),CONFIG_INITRAMFS_COMPRESSION_BZIP2=y\nCONFIG_RD_BZIP2=y,# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set\n# CONFIG_RD_BZIP2 is not set)" >> $(LINUX_DIR)/.config @@ -99,6 +100,7 @@ define Kernel/SetNoInitramfs grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config.set echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config.set echo '# CONFIG_INITRAMFS_FORCE is not set' >> $(LINUX_DIR)/.config.set + echo "# CONFIG_INITRAMFS_PRESERVE_MTIME is not set" >> $(LINUX_DIR)/.config.set endef define Kernel/Configure/Default diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index 0d2f8a9140..8c14ab211d 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -1190,8 +1190,8 @@ define KernelPackage/nft-offload CONFIG_NFT_FLOW_OFFLOAD FILES:= \ $(LINUX_DIR)/net/netfilter/nf_flow_table_inet.ko \ - $(LINUX_DIR)/net/ipv4/netfilter/nf_flow_table_ipv4.ko \ - $(LINUX_DIR)/net/ipv6/netfilter/nf_flow_table_ipv6.ko \ + $(LINUX_DIR)/net/ipv4/netfilter/nf_flow_table_ipv4.ko@lt6.1 \ + $(LINUX_DIR)/net/ipv6/netfilter/nf_flow_table_ipv6.ko@lt6.1 \ $(LINUX_DIR)/net/netfilter/nft_flow_offload.ko AUTOLOAD:=$(call AutoProbe,nf_flow_table_inet nf_flow_table_ipv4 nf_flow_table_ipv6 nft_flow_offload) endef -- 2.34.1