diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk index e053cf5d00..bfd8d1b241 100644 --- a/package/kernel/linux/modules/block.mk +++ b/package/kernel/linux/modules/block.mk @@ -380,7 +380,7 @@ $(eval $(call KernelPackage,md-raid10)) define KernelPackage/md-raid456 -$(call KernelPackage/md/Depends,+kmod-lib-raid6 +kmod-lib-xor +kmod-lib-crc32c) +$(call KernelPackage/md/Depends,+kmod-lib-raid6 +kmod-lib-xor +LINUX_6_12:kmod-lib-crc32c) TITLE:=RAID Level 456 Driver KCONFIG:= \ CONFIG_ASYNC_CORE \ diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 8b27413c4b..45d39de357 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -116,7 +116,7 @@ $(eval $(call KernelPackage,crypto-ccm)) define KernelPackage/crypto-chacha20poly1305 TITLE:=ChaCha20-Poly1305 AEAD support, RFC7539 (used by strongSwan IPsec VPN) - DEPENDS:=+kmod-crypto-aead +kmod-crypto-manager + DEPENDS:=+kmod-crypto-aead +kmod-crypto-manager +!LINUX_6_12:kmod-crypto-lib-poly1305 KCONFIG:=CONFIG_CRYPTO_CHACHA20POLY1305 FILES:=$(LINUX_DIR)/crypto/chacha20poly1305.ko AUTOLOAD:=$(call AutoLoad,09,chacha20poly1305) @@ -143,8 +143,9 @@ define KernelPackage/crypto-crc32 DEPENDS:=+kmod-crypto-hash KCONFIG:=CONFIG_CRYPTO_CRC32 HIDDEN:=1 - FILES:=$(LINUX_DIR)/crypto/crc32_generic.ko - AUTOLOAD:=$(call AutoLoad,04,crc32_generic,1) + FILES:=$(LINUX_DIR)/crypto/crc32_generic.ko@lt6.18 \ + $(LINUX_DIR)/crypto/crc32-cryptoapi.ko@ge6.18 + AUTOLOAD:=$(call AutoLoad,04,LINUX_6_12:crc32_generic !LINUX_6_12:crc32-cryptoapi,1) $(call AddDepends/crypto) endef @@ -155,8 +156,9 @@ define KernelPackage/crypto-crc32c TITLE:=CRC32c CRC module DEPENDS:=+kmod-crypto-hash KCONFIG:=CONFIG_CRYPTO_CRC32C - FILES:=$(LINUX_DIR)/crypto/crc32c_generic.ko - AUTOLOAD:=$(call AutoLoad,04,crc32c_generic,1) + FILES:=$(LINUX_DIR)/crypto/crc32c_generic.ko@lt6.18 \ + $(LINUX_DIR)/crypto/crc32c-cryptoapi.ko@ge6.18 + AUTOLOAD:=$(call AutoLoad,04,LINUX_6_12:crc32c_generic !LINUX_6_12:crc32c-cryptoapi,1) $(call AddDepends/crypto) endef @@ -572,6 +574,7 @@ define KernelPackage/crypto-lib-chacha20 $(call AddDepends/crypto) endef +ifeq ($(KERNEL_PATCHVER),6.12) ifndef CONFIG_TARGET_uml define KernelPackage/crypto-lib-chacha20/x86_64 KCONFIG+=CONFIG_CRYPTO_CHACHA20_X86_64 @@ -607,6 +610,7 @@ ifdef KernelPackage/crypto-lib-chacha20/$(ARCH) KernelPackage/crypto-lib-chacha20/$(CRYPTO_TARGET)=\ $(KernelPackage/crypto-lib-chacha20/$(ARCH)) endif +endif $(eval $(call KernelPackage,crypto-lib-chacha20)) @@ -628,10 +632,11 @@ define KernelPackage/crypto-lib-curve25519 HIDDEN:=1 FILES:= \ $(LINUX_DIR)/lib/crypto/libcurve25519.ko \ - $(LINUX_DIR)/lib/crypto/libcurve25519-generic.ko + $(LINUX_DIR)/lib/crypto/libcurve25519-generic.ko@lt6.18 $(call AddDepends/crypto,+kmod-crypto-kpp) endef +ifeq ($(KERNEL_PATCHVER),6.12) ifndef CONFIG_TARGET_uml define KernelPackage/crypto-lib-curve25519/x86_64 KCONFIG+=CONFIG_CRYPTO_CURVE25519_X86 @@ -653,6 +658,7 @@ ifdef KernelPackage/crypto-lib-curve25519/$(ARCH) KernelPackage/crypto-lib-curve25519/$(CRYPTO_TARGET)=\ $(KernelPackage/crypto-lib-curve25519/$(ARCH)) endif +endif $(eval $(call KernelPackage,crypto-lib-curve25519)) @@ -665,6 +671,7 @@ define KernelPackage/crypto-lib-poly1305 $(call AddDepends/crypto,+kmod-crypto-hash) endef +ifeq ($(KERNEL_PATCHVER),6.12) ifndef CONFIG_TARGET_uml define KernelPackage/crypto-lib-poly1305/x86_64 KCONFIG+=CONFIG_CRYPTO_POLY1305_X86_64 @@ -697,6 +704,7 @@ ifdef KernelPackage/crypto-lib-poly1305/$(ARCH) KernelPackage/crypto-lib-poly1305/$(CRYPTO_TARGET)=\ $(KernelPackage/crypto-lib-poly1305/$(ARCH)) endif +endif $(eval $(call KernelPackage,crypto-lib-poly1305)) @@ -734,8 +742,9 @@ define KernelPackage/crypto-md5 CONFIG_CRYPTO_MD5 \ CONFIG_CRYPTO_MD5_OCTEON \ CONFIG_CRYPTO_MD5_PPC - FILES:=$(LINUX_DIR)/crypto/md5.ko - AUTOLOAD:=$(call AutoLoad,09,md5) + FILES:=$(LINUX_DIR)/crypto/md5.ko \ + $(LINUX_DIR)/lib/crypto/libmd5.ko@ge6.18 + AUTOLOAD:=$(call AutoLoad,09,md5 !LINUX_6_12:libmd5) $(call AddDepends/crypto) endef @@ -966,17 +975,19 @@ define KernelPackage/crypto-sha1 DEPENDS:=+kmod-crypto-hash KCONFIG:= \ CONFIG_CRYPTO_SHA1 \ - CONFIG_CRYPTO_SHA1_ARM \ - CONFIG_CRYPTO_SHA1_ARM_NEON \ - CONFIG_CRYPTO_SHA1_ARM64_CE \ - CONFIG_CRYPTO_SHA1_OCTEON \ - CONFIG_CRYPTO_SHA1_PPC_SPE \ - CONFIG_CRYPTO_SHA1_SSSE3 - FILES:=$(LINUX_DIR)/crypto/sha1_generic.ko - AUTOLOAD:=$(call AutoLoad,09,sha1_generic) + CONFIG_CRYPTO_SHA1_ARM@lt6.18 \ + CONFIG_CRYPTO_SHA1_ARM_NEON@lt6.18 \ + CONFIG_CRYPTO_SHA1_ARM64_CE@lt6.18 \ + CONFIG_CRYPTO_SHA1_OCTEON@lt6.18 \ + CONFIG_CRYPTO_SHA1_PPC_SPE@lt6.18 \ + CONFIG_CRYPTO_SHA1_SSSE3@lt6.18 + FILES:=$(LINUX_DIR)/crypto/sha1_generic.ko@lt6.18 \ + $(LINUX_DIR)/crypto/sha1.ko@ge6.18 + AUTOLOAD:=$(call AutoLoad,09,LINUX_6_12:sha1_generic !LINUX_6_12:sha1) $(call AddDepends/crypto) endef +ifeq ($(KERNEL_PATCHVER),6.12) define KernelPackage/crypto-sha1/arm FILES+=$(LINUX_DIR)/arch/arm/crypto/sha1-arm.ko AUTOLOAD+=$(call AutoLoad,09,sha1-arm) @@ -1027,6 +1038,7 @@ ifdef KernelPackage/crypto-sha1/$(ARCH) KernelPackage/crypto-sha1/$(CRYPTO_TARGET)=\ $(KernelPackage/crypto-sha1/$(ARCH)) endif +endif $(eval $(call KernelPackage,crypto-sha1)) @@ -1048,18 +1060,20 @@ define KernelPackage/crypto-sha256 DEPENDS:=+kmod-crypto-hash KCONFIG:= \ CONFIG_CRYPTO_SHA256 \ - CONFIG_CRYPTO_SHA256_OCTEON \ - CONFIG_CRYPTO_SHA256_PPC_SPE \ - CONFIG_CRYPTO_SHA256_ARM64 \ - CONFIG_CRYPTO_SHA2_ARM64_CE \ - CONFIG_CRYPTO_SHA256_SSSE3 + CONFIG_CRYPTO_SHA256_OCTEON@lt6.18 \ + CONFIG_CRYPTO_SHA256_PPC_SPE@lt6.18 \ + CONFIG_CRYPTO_SHA256_ARM64@lt6.18 \ + CONFIG_CRYPTO_SHA2_ARM64_CE@lt6.18 \ + CONFIG_CRYPTO_SHA256_SSSE3@lt6.18 FILES:= \ - $(LINUX_DIR)/crypto/sha256_generic.ko \ + $(LINUX_DIR)/crypto/sha256_generic.ko@lt6.18 \ + $(LINUX_DIR)/crypto/sha256.ko@ge6.18 \ $(LINUX_DIR)/lib/crypto/libsha256.ko - AUTOLOAD:=$(call AutoLoad,09,sha256_generic) + AUTOLOAD:=$(call AutoLoad,09,LINUX_6_12:sha256_generic !LINUX_6_12:sha256) $(call AddDepends/crypto) endef +ifeq ($(KERNEL_PATCHVER),6.12) define KernelPackage/crypto-sha256/aarch64 FILES+=$(LINUX_DIR)/arch/arm64/crypto/sha256-arm64.ko AUTOLOAD+=$(call AutoLoad,09,sha256-arm64) @@ -1099,6 +1113,7 @@ ifdef KernelPackage/crypto-sha256/$(ARCH) KernelPackage/crypto-sha256/$(CRYPTO_TARGET)=\ $(KernelPackage/crypto-sha256/$(ARCH)) endif +endif $(eval $(call KernelPackage,crypto-sha256)) @@ -1108,15 +1123,18 @@ define KernelPackage/crypto-sha512 DEPENDS:=+kmod-crypto-hash KCONFIG:= \ CONFIG_CRYPTO_SHA512 \ - CONFIG_CRYPTO_SHA512_ARM \ - CONFIG_CRYPTO_SHA512_ARM64 \ - CONFIG_CRYPTO_SHA512_OCTEON \ - CONFIG_CRYPTO_SHA512_SSSE3 - FILES:=$(LINUX_DIR)/crypto/sha512_generic.ko - AUTOLOAD:=$(call AutoLoad,09,sha512_generic) + CONFIG_CRYPTO_SHA512_ARM@lt6.18 \ + CONFIG_CRYPTO_SHA512_ARM64@lt6.18 \ + CONFIG_CRYPTO_SHA512_OCTEON@lt6.18 \ + CONFIG_CRYPTO_SHA512_SSSE3@lt6.18 + FILES:=$(LINUX_DIR)/crypto/sha512_generic.ko@lt6.18 \ + $(LINUX_DIR)/crypto/sha512.ko@ge6.18 \ + $(LINUX_DIR)/lib/crypto/libsha512.ko@ge6.18 + AUTOLOAD:=$(call AutoLoad,09,LINUX_6_12:sha512_generic !LINUX_6_12:sha512) $(call AddDepends/crypto) endef +ifeq ($(KERNEL_PATCHVER),6.12) define KernelPackage/crypto-sha512/arm FILES+=$(LINUX_DIR)/arch/arm/crypto/sha512-arm.ko AUTOLOAD+=$(call AutoLoad,09,sha512-arm) @@ -1150,6 +1168,7 @@ ifdef KernelPackage/crypto-sha512/$(ARCH) KernelPackage/crypto-sha512/$(CRYPTO_TARGET)=\ $(KernelPackage/crypto-sha512/$(ARCH)) endif +endif $(eval $(call KernelPackage,crypto-sha512)) diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 5b95eb45e5..59e7b99634 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -67,7 +67,7 @@ $(eval $(call KernelPackage,fs-autofs4)) define KernelPackage/fs-btrfs SUBMENU:=$(FS_MENU) TITLE:=BTRFS filesystem support - DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd +kmod-crypto-blake2b +kmod-crypto-xxhash + DEPENDS:=+LINUX_6_12:kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd +kmod-crypto-blake2b +kmod-crypto-xxhash KCONFIG:=\ CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS_CHECK_INTEGRITY=n @@ -107,7 +107,7 @@ define KernelPackage/fs-smbfs-common KCONFIG:=\ CONFIG_SMBFS FILES:= \ - $(LINUX_DIR)/fs/smb/common/cifs_arc4.ko \ + $(LINUX_DIR)/fs/smb/common/cifs_arc4.ko@lt6.18 \ $(LINUX_DIR)/fs/smb/common/cifs_md4.ko endef @@ -666,7 +666,7 @@ define KernelPackage/fs-xfs SUBMENU:=$(FS_MENU) TITLE:=XFS filesystem support KCONFIG:=CONFIG_XFS_FS - DEPENDS:= +kmod-fs-exportfs +kmod-lib-crc32c + DEPENDS:= +kmod-fs-exportfs +LINUX_6_12:kmod-lib-crc32c FILES:=$(LINUX_DIR)/fs/xfs/xfs.ko AUTOLOAD:=$(call AutoLoad,30,xfs,1) endef diff --git a/package/kernel/linux/modules/iio.mk b/package/kernel/linux/modules/iio.mk index 6a77fb9c17..d2626d800c 100644 --- a/package/kernel/linux/modules/iio.mk +++ b/package/kernel/linux/modules/iio.mk @@ -243,7 +243,7 @@ $(eval $(call KernelPackage,iio-dht11)) define KernelPackage/iio-bme680 TITLE:=BME680 gas/humidity/pressure/temperature sensor - DEPENDS:=+kmod-regmap-core + DEPENDS:=+kmod-regmap-core +!LINUX_6_12:kmod-industrialio-triggered-buffer KCONFIG:=CONFIG_BME680 FILES:=$(LINUX_DIR)/drivers/iio/chemical/bme680_core.ko $(call AddDepends/iio) @@ -504,7 +504,8 @@ $(eval $(call KernelPackage,iio-lsm6dsx)) define KernelPackage/iio-lsm6dsx-i2c DEPENDS:=+kmod-iio-lsm6dsx +kmod-i2c-core +kmod-regmap-i2c TITLE:=ST LSM6DSx driver for IMU MEMS sensors (I2C) - KCONFIG:=CONFIG_IIO_ST_LSM6DSX + KCONFIG:=CONFIG_IIO_ST_LSM6DSX \ + CONFIG_IIO_ST_LSM6DSX_I2C FILES:=$(LINUX_DIR)/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.ko AUTOLOAD:=$(call AutoProbe,st_lsm6dsx-i2c) $(call AddDepends/iio) @@ -520,7 +521,8 @@ $(eval $(call KernelPackage,iio-lsm6dsx-i2c)) define KernelPackage/iio-lsm6dsx-spi DEPENDS:=+kmod-iio-lsm6dsx +kmod-regmap-spi TITLE:=ST LSM6DSx driver for IMU MEMS sensors (SPI) - KCONFIG:=CONFIG_IIO_ST_LSM6DSX + KCONFIG:=CONFIG_IIO_ST_LSM6DSX \ + CONFIG_IIO_ST_LSM6DSX_SPI FILES:=$(LINUX_DIR)/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.ko AUTOLOAD:=$(call AutoProbe,st_lsm6dsx-spi) $(call AddDepends/iio) diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk index af445c84a1..75530c5ef7 100644 --- a/package/kernel/linux/modules/lib.mk +++ b/package/kernel/linux/modules/lib.mk @@ -11,7 +11,8 @@ define KernelPackage/lib-crc-ccitt SUBMENU:=$(LIB_MENU) TITLE:=CRC-CCITT support KCONFIG:=CONFIG_CRC_CCITT - FILES:=$(LINUX_DIR)/lib/crc-ccitt.ko + FILES:=$(LINUX_DIR)/lib/crc-ccitt.ko@lt6.18 \ + $(LINUX_DIR)/lib/crc/crc-ccitt.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,crc-ccitt) endef @@ -26,7 +27,8 @@ define KernelPackage/lib-crc-itu-t SUBMENU:=$(LIB_MENU) TITLE:=CRC ITU-T V.41 support KCONFIG:=CONFIG_CRC_ITU_T - FILES:=$(LINUX_DIR)/lib/crc-itu-t.ko + FILES:=$(LINUX_DIR)/lib/crc-itu-t.ko@lt6.18 \ + $(LINUX_DIR)/lib/crc/crc-itu-t.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,crc-itu-t) endef @@ -41,7 +43,8 @@ define KernelPackage/lib-crc7 SUBMENU:=$(LIB_MENU) TITLE:=CRC7 support KCONFIG:=CONFIG_CRC7 - FILES:=$(LINUX_DIR)/lib/crc7.ko + FILES:=$(LINUX_DIR)/lib/crc7.ko@lt6.18 \ + $(LINUX_DIR)/lib/crc/crc7.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,crc7) endef @@ -56,7 +59,8 @@ define KernelPackage/lib-crc8 SUBMENU:=$(LIB_MENU) TITLE:=CRC8 support KCONFIG:=CONFIG_CRC8 - FILES:=$(LINUX_DIR)/lib/crc8.ko + FILES:=$(LINUX_DIR)/lib/crc8.ko@lt6.18 \ + $(LINUX_DIR)/lib/crc/crc8.ko@ge6.18 AUTOLOAD:=$(call AutoProbe,crc8) endef @@ -71,7 +75,8 @@ define KernelPackage/lib-crc16 SUBMENU:=$(LIB_MENU) TITLE:=CRC16 support KCONFIG:=CONFIG_CRC16 - FILES:=$(LINUX_DIR)/lib/crc16.ko + FILES:=$(LINUX_DIR)/lib/crc16.ko@lt6.18 \ + $(LINUX_DIR)/lib/crc/crc16.ko@ge6.18 AUTOLOAD:=$(call AutoLoad,20,crc16,1) endef @@ -86,7 +91,7 @@ define KernelPackage/lib-crc32c SUBMENU:=$(LIB_MENU) TITLE:=CRC32 support KCONFIG:=CONFIG_LIBCRC32C - DEPENDS:=+kmod-crypto-crc32c + DEPENDS:=@LINUX_6_12 +kmod-crypto-crc32c FILES:=$(LINUX_DIR)/lib/libcrc32c.ko AUTOLOAD:=$(call AutoProbe,libcrc32c) endef diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index cae14f3614..1d1d6ae5d6 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -120,6 +120,38 @@ endef $(eval $(call KernelPackage,atl1e)) +define KernelPackage/libie-adminq + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=Intel Ethernet common library - adminq helpers + DEPENDS:=@!LINUX_6_12 +kmod-libie + KCONFIG:=CONFIG_LIBIE_ADMINQ + HIDDEN:=1 + FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/libie/libie_adminq.ko +endef + +define KernelPackage/libie-adminq/description + Intel Ethernet common library - adminq helpers +endef + +$(eval $(call KernelPackage,libie-adminq)) + + +define KernelPackage/libie-fwlog + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=Intel Ethernet library fw log + DEPENDS:=@!LINUX_6_12 +kmod-libie + KCONFIG:=CONFIG_LIBIE_FWLOG + HIDDEN:=1 + FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/libie/libie_fwlog.ko +endef + +define KernelPackage/libie-fwlog/description + Intel Ethernet library FW Log +endef + +$(eval $(call KernelPackage,libie-fwlog)) + + define KernelPackage/libie SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Intel Ethernet library @@ -155,9 +187,11 @@ define KernelPackage/libphy SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=PHY library KCONFIG:=CONFIG_PHYLIB \ - CONFIG_PHYLIB_LEDS=y - FILES:=$(LINUX_DIR)/drivers/net/phy/libphy.ko - AUTOLOAD:=$(call AutoLoad,15,libphy,1) + CONFIG_PHYLIB_LEDS=y \ + CONFIG_MDIO_BUS + FILES:=$(LINUX_DIR)/drivers/net/phy/libphy.ko \ + $(LINUX_DIR)/drivers/net/phy/mdio-bus.ko@ge6.18 + AUTOLOAD:=$(call AutoLoad,15,libphy !LINUX_6_12:mdio-bus,1) endef define KernelPackage/libphy/description @@ -202,7 +236,9 @@ define KernelPackage/mdio-devres SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Supports MDIO device registration DEPENDS:=+kmod-libphy +(TARGET_armsr||TARGET_bcm27xx_bcm2708||TARGET_loongarch64||TARGET_malta||TARGET_tegra):kmod-of-mdio +ifeq ($(KERNEL_PATCHVER),6.12) KCONFIG:=CONFIG_MDIO_DEVRES +endif HIDDEN:=1 FILES:=$(LINUX_DIR)/drivers/net/phy/mdio_devres.ko AUTOLOAD:=$(call AutoProbe,mdio-devres) @@ -490,12 +526,27 @@ endef $(eval $(call KernelPackage,phy-marvell-10g)) +define KernelPackage/phy-package + SUBMENU:=$(NETWORK_DEVICES_MENU) + TITLE:=Generic PHY Framework + DEPENDS:=@!LINUX_6_12 +kmod-libphy + KCONFIG:=CONFIG_PHY_PACKAGE + HIDDEN:=1 + FILES:=$(LINUX_DIR)/drivers/net/phy/phy_package.ko + AUTOLOAD:=$(call AutoLoad,15,phy-package,1) +endef + +define KernelPackage/phy-package/description + Generic PHY Framework +endef + +$(eval $(call KernelPackage,phy-package)) define KernelPackage/phy-micrel SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Micrel PHYs KCONFIG:=CONFIG_MICREL_PHY - DEPENDS:=+kmod-libphy +kmod-ptp + DEPENDS:=+kmod-libphy +kmod-ptp +!LINUX_6_12:kmod-phy-package FILES:=$(LINUX_DIR)/drivers/net/phy/micrel.ko AUTOLOAD:=$(call AutoLoad,18,micrel,1) endef @@ -824,7 +875,7 @@ $(eval $(call KernelPackage,dsa-mxl862xx)) define KernelPackage/dsa-qca8k SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Qualcomm Atheros QCA8xxx switch family DSA support - DEPENDS:=+kmod-dsa +kmod-regmap-core + DEPENDS:=+kmod-dsa +kmod-regmap-core +!LINUX_6_12:kmod-mdio-devres KCONFIG:= \ CONFIG_NET_DSA_QCA8K \ CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT=y \ @@ -1419,7 +1470,7 @@ $(eval $(call KernelPackage,igbvf)) define KernelPackage/ixgbe SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Intel(R) 82598/82599 PCI-Express 10 Gigabit Ethernet support - DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-ptp +kmod-hwmon-core +kmod-libphy +kmod-mdio-devres + DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-ptp +kmod-hwmon-core +kmod-libphy +kmod-mdio-devres +!LINUX_6_12:kmod-libie-fwlog KCONFIG:=CONFIG_IXGBE \ CONFIG_IXGBE_HWMON=y \ CONFIG_IXGBE_DCA=n \ @@ -1456,7 +1507,7 @@ $(eval $(call KernelPackage,ixgbevf)) define KernelPackage/i40e SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Intel(R) Ethernet Controller XL710 Family support - DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-libie + DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-libie +!LINUX_6_12:kmod-libie-adminq KCONFIG:=CONFIG_I40E \ CONFIG_I40E_DCB=y FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/i40e/i40e.ko @@ -1473,7 +1524,7 @@ $(eval $(call KernelPackage,i40e)) define KernelPackage/ice SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Intel(R) Ethernet Controller E810 Series support - DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-hwmon-core +kmod-libie + DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-hwmon-core +kmod-libie +!LINUX_6_12:kmod-libie-adminq +!LINUX_6_12:kmod-libie-fwlog KCONFIG:=CONFIG_ICE \ CONFIG_ICE_HWMON=y \ CONFIG_ICE_HWTS=n \ @@ -1492,7 +1543,7 @@ $(eval $(call KernelPackage,ice)) define KernelPackage/iavf SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Intel(R) Ethernet Adaptive Virtual Function support - DEPENDS:=@PCI_SUPPORT +kmod-libie + DEPENDS:=@PCI_SUPPORT +kmod-libie +!LINUX_6_12:kmod-libie-adminq KCONFIG:= \ CONFIG_I40EVF \ CONFIG_IAVF @@ -1850,7 +1901,7 @@ $(eval $(call KernelPackage,bnx2)) define KernelPackage/bnx2x SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=QLogic 5771x/578xx 10/20-Gigabit ethernet adapter driver - DEPENDS:=@PCI_SUPPORT +bnx2x-firmware +kmod-lib-crc32c +kmod-mdio +kmod-ptp +kmod-lib-zlib-inflate + DEPENDS:=@PCI_SUPPORT +bnx2x-firmware +LINUX_6_12:kmod-lib-crc32c +kmod-mdio +kmod-ptp +kmod-lib-zlib-inflate FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/bnx2x/bnx2x.ko KCONFIG:= \ CONFIG_BNX2X \ @@ -1867,7 +1918,7 @@ $(eval $(call KernelPackage,bnx2x)) define KernelPackage/bnxt-en SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Broadcom NetXtreme-C/E network driver - DEPENDS:=@PCI_SUPPORT +kmod-hwmon-core +kmod-lib-crc32c +kmod-mdio +kmod-ptp + DEPENDS:=@PCI_SUPPORT +kmod-hwmon-core +LINUX_6_12:kmod-lib-crc32c +kmod-mdio +kmod-ptp FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/bnxt/bnxt_en.ko KCONFIG:= \ CONFIG_BNXT \ @@ -2219,7 +2270,7 @@ $(eval $(call KernelPackage,hinic)) define KernelPackage/sfc SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Solarflare SFC9000/SFC9100/EF100-family support - DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-lib-crc32c +kmod-ptp +kmod-hwmon-core + DEPENDS:=@PCI_SUPPORT +kmod-mdio +LINUX_6_12:kmod-lib-crc32c +kmod-ptp +kmod-hwmon-core KCONFIG:= \ CONFIG_SFC \ CONFIG_SFC_MTD=y \ @@ -2240,7 +2291,7 @@ $(eval $(call KernelPackage,sfc)) define KernelPackage/sfc-falcon SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Solarflare SFC4000 support - DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-lib-crc32c +kmod-i2c-algo-bit + DEPENDS:=@PCI_SUPPORT +kmod-mdio +LINUX_6_12:kmod-lib-crc32c +kmod-i2c-algo-bit KCONFIG:= \ CONFIG_SFC_FALCON \ CONFIG_SFC_FALCON_MTD=y @@ -2258,7 +2309,7 @@ $(eval $(call KernelPackage,sfc-falcon)) define KernelPackage/sfc-siena SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Solarflare SFN5000/6000 'Siena' based card support - DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-lib-crc32c +kmod-i2c-algo-bit +kmod-ptp +kmod-hwmon-core + DEPENDS:=@PCI_SUPPORT +kmod-mdio +LINUX_6_12:kmod-lib-crc32c +kmod-i2c-algo-bit +kmod-ptp +kmod-hwmon-core KCONFIG:= \ CONFIG_SFC_SIENA \ CONFIG_SFC_SIENA_MTD=y \ diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index fa49085710..ffacd80a73 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -51,10 +51,32 @@ endef $(eval $(call KernelPackage,nf-conncount)) + +define KernelPackage/iptables + SUBMENU:=$(NF_MENU) + TITLE:=Iptables legacy + KCONFIG:= \ + CONFIG_IP_NF_IPTABLES_LEGACY \ + CONFIG_NETFILTER_XTABLES \ + CONFIG_NETFILTER_XTABLES_LEGACY=y \ + CONFIG_IP6_NF_IPTABLES_LEGACY \ + CONFIG_BRIDGE_NF_EBTABLES_LEGACY + HIDDEN:=1 + DEPENDS:=@!LINUX_6_12 + FILES:= \ + $(LINUX_DIR)/net/ipv4/netfilter/ip_tables.ko \ + $(LINUX_DIR)/net/netfilter/x_tables.ko + AUTOLOAD:=$(call AutoProbe,$(notdir ip_tables x_tables)) +endef + +$(eval $(call KernelPackage,iptables)) + + define KernelPackage/nf-ipt SUBMENU:=$(NF_MENU) TITLE:=Iptables core KCONFIG:=$(KCONFIG_NF_IPT) + DEPENDS:=+!LINUX_6_12:kmod-iptables FILES:=$(foreach mod,$(NF_IPT-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_IPT-m))) endef @@ -428,7 +450,7 @@ IPVS_MODULES:= \ define KernelPackage/nf-ipvs SUBMENU:=Netfilter Extensions TITLE:=IP Virtual Server modules - DEPENDS:=@IPV6 +kmod-lib-crc32c +kmod-ipt-conntrack +kmod-nf-conntrack + DEPENDS:=@IPV6 +LINUX_6_12:kmod-lib-crc32c +kmod-ipt-conntrack +kmod-nf-conntrack KCONFIG:= \ CONFIG_IP_VS \ CONFIG_IP_VS_IPV6=y \ @@ -1123,7 +1145,7 @@ $(eval $(call KernelPackage,ipt-rpfilter)) define KernelPackage/nft-core SUBMENU:=$(NF_MENU) TITLE:=Netfilter nf_tables support - DEPENDS:=+kmod-nfnetlink +kmod-nf-reject +IPV6:kmod-nf-reject6 +kmod-nf-nat +kmod-nf-log +IPV6:kmod-nf-log6 +kmod-lib-crc32c + DEPENDS:=+kmod-nfnetlink +kmod-nf-reject +IPV6:kmod-nf-reject6 +kmod-nf-nat +kmod-nf-log +IPV6:kmod-nf-log6 +LINUX_6_12:kmod-lib-crc32c FILES:=$(foreach mod,$(NFT_CORE-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_CORE-m))) KCONFIG:= \ diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index e1795354de..c3720c791a 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -1016,7 +1016,7 @@ SCHED_FILES_EXTRA = $(foreach mod,$(SCHED_MODULES_EXTRA),$(LINUX_DIR)/net/sched/ define KernelPackage/sched SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Extra traffic schedulers - DEPENDS:=+kmod-sched-core +kmod-lib-crc32c +kmod-lib-textsearch + DEPENDS:=+kmod-sched-core +LINUX_6_12:kmod-lib-crc32c +kmod-lib-textsearch KCONFIG:= \ CONFIG_NET_SCH_CODEL \ CONFIG_NET_SCH_GRED \ @@ -1237,7 +1237,7 @@ define KernelPackage/sctp CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y FILES:= $(LINUX_DIR)/net/sctp/sctp.ko AUTOLOAD:= $(call AutoLoad,32,sctp) - DEPENDS:=+kmod-lib-crc32c +kmod-crypto-md5 +kmod-crypto-hmac \ + DEPENDS:=+LINUX_6_12:kmod-lib-crc32c +kmod-crypto-md5 +kmod-crypto-hmac \ +kmod-udptunnel4 +kmod-udptunnel6 endef diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 1b9a287253..992c776ca3 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -619,7 +619,7 @@ define KernelPackage/serial-8250-exar KCONFIG:= CONFIG_SERIAL_8250_EXAR FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250_exar.ko AUTOLOAD:=$(call AutoProbe,8250 8250_base 8250_exar) - DEPENDS:=@PCI_SUPPORT +kmod-serial-8250 + DEPENDS:=@PCI_SUPPORT +kmod-serial-8250 +!LINUX_6_12:kmod-eeprom-93cx6 endef define KernelPackage/serial-8250-exar/description diff --git a/package/kernel/linux/modules/rtc.mk b/package/kernel/linux/modules/rtc.mk index e386167286..dc7f0c78d4 100644 --- a/package/kernel/linux/modules/rtc.mk +++ b/package/kernel/linux/modules/rtc.mk @@ -138,7 +138,7 @@ define KernelPackage/rtc-pcf8563 SUBMENU:=$(RTC_MENU) TITLE:=Philips PCF8563/Epson RTC8564 RTC support DEFAULT:=m if ALL_KMODS && RTC_SUPPORT - DEPENDS:=+kmod-i2c-core + DEPENDS:=+kmod-i2c-core +!LINUX_6_12:kmod-regmap-i2c KCONFIG:=CONFIG_RTC_DRV_PCF8563 \ CONFIG_RTC_CLASS=y FILES:=$(LINUX_DIR)/drivers/rtc/rtc-pcf8563.ko diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index b9d3dba13a..b90a967014 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -1337,7 +1337,7 @@ $(eval $(call KernelPackage,usb-net-kaweth)) define KernelPackage/usb-net-lan78xx TITLE:=USB-To-Ethernet Microchip LAN78XX convertors - DEPENDS:=+kmod-fixed-phy +kmod-phy-microchip +PACKAGE_kmod-of-mdio:kmod-of-mdio + DEPENDS:=+kmod-fixed-phy +kmod-phy-microchip +PACKAGE_kmod-of-mdio:kmod-of-mdio +!LINUX_6_12:kmod-phylink +!LINUX_6_12:kmod-net-selftests KCONFIG:=CONFIG_USB_LAN78XX FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/lan78xx.ko AUTOLOAD:=$(call AutoProbe,lan78xx)