From 43c48d09ecaa1c0950906d60a4968060f57594c9 Mon Sep 17 00:00:00 2001 From: Mieczyslaw Nalewaj Date: Wed, 26 Nov 2025 18:18:46 +0100 Subject: [PATCH] packages: remove dependencies for kernel 6.6 and 6.12 Once kernel 6.6 support ends, its dependencies will become redundant. Remove them and keep only those for kernel 6.12. Signed-off-by: Mieczyslaw Nalewaj Link: https://github.com/openwrt/openwrt/pull/20943 Signed-off-by: Christian Marangi --- package/kernel/linux/modules/block.mk | 15 -------- package/kernel/linux/modules/bluetooth.mk | 2 +- package/kernel/linux/modules/fs.mk | 41 +++------------------- package/kernel/linux/modules/gpio.mk | 2 +- package/kernel/linux/modules/hwmon.mk | 23 +++--------- package/kernel/linux/modules/iio.mk | 4 +-- package/kernel/linux/modules/leds.mk | 16 --------- package/kernel/linux/modules/netdevices.mk | 41 ++++++---------------- package/kernel/linux/modules/netsupport.mk | 18 +--------- package/kernel/linux/modules/other.mk | 39 ++++++++++---------- package/kernel/linux/modules/sound.mk | 4 +-- package/kernel/linux/modules/usb.mk | 2 +- package/kernel/linux/modules/video.mk | 22 +++++------- 13 files changed, 53 insertions(+), 176 deletions(-) diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk index ab2496a2fe..e053cf5d00 100644 --- a/package/kernel/linux/modules/block.mk +++ b/package/kernel/linux/modules/block.mk @@ -418,21 +418,6 @@ endef $(eval $(call KernelPackage,md-raid456)) -define KernelPackage/md-multipath -$(call KernelPackage/md/Depends,@LINUX_6_6) - TITLE:=MD Multipath Module - KCONFIG:=CONFIG_MD_MULTIPATH - FILES:=$(LINUX_DIR)/drivers/md/multipath.ko - AUTOLOAD:=$(call AutoLoad,29,multipath) -endef - -define KernelPackage/md-multipath/description - Multipath driver module (multipath.ko) -endef - -$(eval $(call KernelPackage,md-multipath)) - - define KernelPackage/libsas SUBMENU:=$(BLOCK_MENU) DEPENDS:=@TARGET_x86 diff --git a/package/kernel/linux/modules/bluetooth.mk b/package/kernel/linux/modules/bluetooth.mk index 3e6b38a88c..f86763271f 100644 --- a/package/kernel/linux/modules/bluetooth.mk +++ b/package/kernel/linux/modules/bluetooth.mk @@ -84,7 +84,7 @@ define KernelPackage/btmtk SUBMENU:=$(BLUETOOTH_MENU) TITLE:=MTK Bluetooth support HIDDEN:=1 - DEPENDS:=+kmod-bluetooth +!LINUX_6_6&&USB_SUPPORT:kmod-usb-core + DEPENDS:=+kmod-bluetooth +USB_SUPPORT:kmod-usb-core KCONFIG:=CONFIG_BT_MTK FILES:=$(LINUX_DIR)/drivers/bluetooth/btmtk.ko endef diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 32114024e7..85c9a5e9cb 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -31,7 +31,7 @@ define KernelPackage/fs-afs SUBMENU:=$(FS_MENU) TITLE:=Andrew FileSystem client DEFAULT:=n - DEPENDS:=+kmod-rxrpc +kmod-dnsresolver +LINUX_6_6:kmod-fs-fscache +!LINUX_6_6:kmod-fs-netfs + DEPENDS:=+kmod-rxrpc +kmod-dnsresolver +kmod-fs-netfs KCONFIG:=\ CONFIG_AFS_FS=m \ CONFIG_AFS_DEBUG=n \ @@ -86,7 +86,7 @@ $(eval $(call KernelPackage,fs-btrfs)) define KernelPackage/fs-cachefiles SUBMENU:=$(FS_MENU) TITLE:=Filesystem caching on files - DEPENDS:=LINUX_6_6:kmod-fs-fscache !LINUX_6_6:kmod-fs-netfs + DEPENDS:=kmod-fs-netfs KCONFIG:=\ CONFIG_CACHEFILES \ CONFIG_CACHEFILES_DEBUG=n \ @@ -275,21 +275,6 @@ endef $(eval $(call KernelPackage,fs-f2fs)) -define KernelPackage/fs-fscache - SUBMENU:=$(FS_MENU) - TITLE:=General filesystem local cache manager - DEPENDS:=@LINUX_6_6 +kmod-fs-netfs - KCONFIG:=\ - CONFIG_FSCACHE \ - CONFIG_FSCACHE_STATS=y \ - CONFIG_FSCACHE_DEBUG=n - FILES:= $(LINUX_DIR)/fs/fscache/fscache.ko - AUTOLOAD:=$(call AutoLoad,29,fscache) -endef - -$(eval $(call KernelPackage,fs-fscache)) - - define KernelPackage/fs-hfs SUBMENU:=$(FS_MENU) TITLE:=HFS filesystem support @@ -431,8 +416,8 @@ define KernelPackage/fs-netfs TITLE:=Network Filesystems support KCONFIG:= \ CONFIG_NETFS_SUPPORT \ - CONFIG_FSCACHE=y@ge6.12 \ - CONFIG_FSCACHE_STATS=y@ge6.12 + CONFIG_FSCACHE=y \ + CONFIG_FSCACHE_STATS=y FILES:=$(LINUX_DIR)/fs/netfs/netfs.ko AUTOLOAD:=$(call AutoLoad,28,netfs) endef @@ -589,24 +574,6 @@ endef $(eval $(call KernelPackage,fs-nfsd)) -define KernelPackage/fs-ntfs - SUBMENU:=$(FS_MENU) - TITLE:=NTFS filesystem read-only (old driver) support - DEPENDS:=@LINUX_6_6 - KCONFIG:=CONFIG_NTFS_FS - FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.ko - AUTOLOAD:=$(call AutoLoad,30,ntfs) - $(call AddDepends/nls) -endef - -define KernelPackage/fs-ntfs/description - Kernel module for limited NTFS filesystem support. Support for writing - is extremely limited and disabled as a result. -endef - -$(eval $(call KernelPackage,fs-ntfs)) - - define KernelPackage/fs-ntfs3 SUBMENU:=$(FS_MENU) TITLE:=NTFS filesystem read & write (new driver) support diff --git a/package/kernel/linux/modules/gpio.mk b/package/kernel/linux/modules/gpio.mk index acc922472b..11a92192f6 100644 --- a/package/kernel/linux/modules/gpio.mk +++ b/package/kernel/linux/modules/gpio.mk @@ -141,7 +141,7 @@ $(eval $(call KernelPackage,gpio-pcf857x)) define KernelPackage/gpio-pwm SUBMENU:=$(GPIO_MENU) - DEPENDS:=@GPIO_SUPPORT @PWM_SUPPORT @!LINUX_6_6 + DEPENDS:=@GPIO_SUPPORT @PWM_SUPPORT TITLE:=PWM GPIO support KCONFIG:=CONFIG_PWM_GPIO FILES:=$(LINUX_DIR)/drivers/pwm/pwm-gpio.ko diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk index 21c522edcd..37e35f90c8 100644 --- a/package/kernel/linux/modules/hwmon.mk +++ b/package/kernel/linux/modules/hwmon.mk @@ -9,7 +9,7 @@ HWMON_MENU:=Hardware Monitoring Support define KernelPackage/hwmon-core SUBMENU:=$(HWMON_MENU) - DEPENDS:=+!LINUX_6_6:kmod-i2c-core + DEPENDS:=+kmod-i2c-core TITLE:=Hardware monitoring support KCONFIG:= \ CONFIG_HWMON \ @@ -362,7 +362,7 @@ define KernelPackage/hwmon-lm92 KCONFIG:=CONFIG_SENSORS_LM92 FILES:=$(LINUX_DIR)/drivers/hwmon/lm92.ko AUTOLOAD:=$(call AutoProbe,lm92) - $(call AddDepends/hwmon,+kmod-i2c-core +!LINUX_6_6:kmod-regmap-core) + $(call AddDepends/hwmon,+kmod-i2c-core +kmod-regmap-core) endef define KernelPackage/hwmon-lm92/description @@ -402,27 +402,12 @@ endef $(eval $(call KernelPackage,hwmon-ltc4151)) -define KernelPackage/hwmon-max6642 - TITLE:=MAX6642 monitoring support - KCONFIG:=CONFIG_SENSORS_MAX6642 - FILES:=$(LINUX_DIR)/drivers/hwmon/max6642.ko - AUTOLOAD:=$(call AutoLoad,60,max6642 max6642) - $(call AddDepends/hwmon,@LINUX_6_6 +kmod-i2c-core) -endef - -define KernelPackage/hwmon-max6642/description - Kernel module for Maxim MAX6642 temperature monitor -endef - -$(eval $(call KernelPackage,hwmon-max6642)) - - define KernelPackage/hwmon-max6697 TITLE:=MAX6697 monitoring support KCONFIG:=CONFIG_SENSORS_MAX6697 FILES:=$(LINUX_DIR)/drivers/hwmon/max6697.ko AUTOLOAD:=$(call AutoProbe,max6697) - $(call AddDepends/hwmon,+kmod-i2c-core +!LINUX_6_6:kmod-regmap-i2c) + $(call AddDepends/hwmon,+kmod-i2c-core +kmod-regmap-i2c) endef define KernelPackage/hwmon-max6697/description @@ -548,7 +533,7 @@ define KernelPackage/hwmon-sch5627 $(LINUX_DIR)/drivers/hwmon/sch5627.ko \ $(LINUX_DIR)/drivers/hwmon/sch56xx-common.ko AUTOLOAD:=$(call AutoProbe,sch5627) - $(call AddDepends/hwmon,+kmod-i2c-core +!LINUX_6_6:kmod-regmap-core) + $(call AddDepends/hwmon,+kmod-i2c-core +kmod-regmap-core) endef define KernelPackage/hwmon-sch5627/description diff --git a/package/kernel/linux/modules/iio.mk b/package/kernel/linux/modules/iio.mk index a55dd54805..d7430675cf 100644 --- a/package/kernel/linux/modules/iio.mk +++ b/package/kernel/linux/modules/iio.mk @@ -9,7 +9,7 @@ IIO_MENU:=Industrial I/O Modules define KernelPackage/iio-core SUBMENU:=$(IIO_MENU) TITLE:=Industrial IO core - DEPENDS:=+!LINUX_6_6:kmod-dma-buf + DEPENDS:=+kmod-dma-buf KCONFIG:= \ CONFIG_IIO \ CONFIG_IIO_BUFFER=y \ @@ -287,7 +287,7 @@ $(eval $(call KernelPackage,iio-bme680-spi)) define KernelPackage/iio-bmp280 TITLE:=BMP180/BMP280/BME280 pressure/temperatur sensor - DEPENDS:=+kmod-regmap-core +!LINUX_6_6:kmod-industrialio-triggered-buffer + DEPENDS:=+kmod-regmap-core +kmod-industrialio-triggered-buffer KCONFIG:=CONFIG_BMP280 FILES:=$(LINUX_DIR)/drivers/iio/pressure/bmp280.ko $(call AddDepends/iio) diff --git a/package/kernel/linux/modules/leds.mk b/package/kernel/linux/modules/leds.mk index 1de74c98c8..f7a32936eb 100644 --- a/package/kernel/linux/modules/leds.mk +++ b/package/kernel/linux/modules/leds.mk @@ -55,22 +55,6 @@ endef $(eval $(call KernelPackage,ledtrig-activity)) -define KernelPackage/ledtrig-audio - SUBMENU:=$(LEDS_MENU) - TITLE:=LED Audio Mute Trigger - DEPENDS:=@LINUX_6_6 - KCONFIG:=CONFIG_LEDS_TRIGGER_AUDIO - FILES:=$(LED_TRIGGER_DIR)/ledtrig-audio.ko - AUTOLOAD:=$(call AutoLoad,50,ledtrig-audio) -endef - -define KernelPackage/ledtrig-audio/description - Kernel module that allows LEDs to be controlled by audio drivers - to follow audio mute and mic-mute changes. -endef - -$(eval $(call KernelPackage,ledtrig-audio)) - define KernelPackage/ledtrig-gpio SUBMENU:=$(LEDS_MENU) TITLE:=LED GPIO Trigger diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 77fe0c153b..b92c060c1d 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -123,7 +123,7 @@ $(eval $(call KernelPackage,atl1e)) define KernelPackage/libie SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Intel Ethernet library - DEPENDS:=@!LINUX_6_6 +kmod-libeth + DEPENDS:=+kmod-libeth KCONFIG:=CONFIG_LIBIE HIDDEN:=1 FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/libie/libie.ko @@ -139,7 +139,6 @@ $(eval $(call KernelPackage,libie)) define KernelPackage/libeth SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Common Intel Ethernet library - DEPENDS:=@!LINUX_6_6 KCONFIG:=CONFIG_LIBETH HIDDEN:=1 FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/libeth/libeth.ko @@ -610,7 +609,7 @@ $(eval $(call KernelPackage,phy-airoha-en8811h)) define KernelPackage/phy-aquantia SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Aquantia Ethernet PHYs - DEPENDS:=+kmod-libphy +kmod-hwmon-core +LINUX_6_6:kmod-lib-crc-ccitt +!LINUX_6_6:kmod-lib-crc-itu-t + DEPENDS:=+kmod-libphy +kmod-hwmon-core +kmod-lib-crc-itu-t KCONFIG:=CONFIG_AQUANTIA_PHY FILES:=$(LINUX_DIR)/drivers/net/phy/aquantia/aquantia.ko AUTOLOAD:=$(call AutoLoad,18,aquantia,1) @@ -813,7 +812,7 @@ $(eval $(call KernelPackage,dsa-rtl8365mb)) define KernelPackage/dsa-ks8995 SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Micrel/Kendin KS8995 Ethernet DSA Switch - DEPENDS:=@!LINUX_6_6 +kmod-dsa +kmod-dsa-notag + DEPENDS:=+kmod-dsa +kmod-dsa-notag FILES:= $(LINUX_DIR)/drivers/net/dsa/ks8995.ko KCONFIG:= CONFIG_NET_DSA_KS8995 \ CONFIG_SPI=y \ @@ -831,7 +830,7 @@ $(eval $(call KernelPackage,dsa-ks8995)) define KernelPackage/dsa-vsc73xx SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Vitesse VSC73XX DSA switch family support - DEPENDS:=@!LINUX_6_6 +kmod-dsa +kmod-phy-vitesse +kmod-fixed-phy + DEPENDS:=+kmod-dsa +kmod-phy-vitesse +kmod-fixed-phy KCONFIG:= \ CONFIG_NET_DSA_VITESSE_VSC73XX \ CONFIG_NET_DSA_TAG_VSC73XX_8021Q @@ -850,7 +849,7 @@ $(eval $(call KernelPackage,dsa-vsc73xx)) define KernelPackage/dsa-vsc73xx-spi SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Vitesse VSC73XX SPI support - DEPENDS:=@!LINUX_6_6 +kmod-dsa-vsc73xx + DEPENDS:=+kmod-dsa-vsc73xx KCONFIG:= CONFIG_NET_DSA_VITESSE_VSC73XX_SPI FILES:= $(LINUX_DIR)/drivers/net/dsa/vitesse-vsc73xx-spi.ko AUTOLOAD:=$(call AutoProbe,vitesse-vsc73xx-spi) @@ -866,7 +865,7 @@ $(eval $(call KernelPackage,dsa-vsc73xx-spi)) define KernelPackage/dsa-vsc73xx-platform SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Vitesse VSC73XX platform support - DEPENDS:=@!LINUX_6_6 +kmod-dsa-vsc73xx + DEPENDS:=+kmod-dsa-vsc73xx KCONFIG:= CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM FILES:= $(LINUX_DIR)/drivers/net/dsa/vitesse-vsc73xx-platform.ko AUTOLOAD:=$(call AutoProbe,vitesse-vsc73xx-platform) @@ -1364,7 +1363,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 +!LINUX_6_6:kmod-libie + DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-libie KCONFIG:=CONFIG_I40E \ CONFIG_I40E_DCB=y FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/i40e/i40e.ko @@ -1381,7 +1380,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 +!LINUX_6_6:kmod-hwmon-core +!LINUX_6_6:kmod-libie + DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-hwmon-core +kmod-libie KCONFIG:=CONFIG_ICE \ CONFIG_ICE_HWMON=y \ CONFIG_ICE_HWTS=n \ @@ -1400,7 +1399,7 @@ $(eval $(call KernelPackage,ice)) define KernelPackage/iavf SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Intel(R) Ethernet Adaptive Virtual Function support - DEPENDS:=@PCI_SUPPORT +!LINUX_6_6:kmod-libie + DEPENDS:=@PCI_SUPPORT +kmod-libie KCONFIG:= \ CONFIG_I40EVF \ CONFIG_IAVF @@ -1723,24 +1722,6 @@ endef $(eval $(call KernelPackage,vmxnet3)) -define KernelPackage/spi-ks8995 - SUBMENU:=$(NETWORK_DEVICES_MENU) - TITLE:=Micrel/Kendin KS8995 Ethernet switch control - DEPENDS:=@LINUX_6_6 - FILES:=$(LINUX_DIR)/drivers/net/phy/spi_ks8995.ko - KCONFIG:=CONFIG_MICREL_KS8995MA \ - CONFIG_SPI=y \ - CONFIG_SPI_MASTER=y - AUTOLOAD:=$(call AutoLoad,50,spi_ks8995) -endef - -define KernelPackage/spi-ks8995/description - Kernel module for Micrel/Kendin KS8995 ethernet switch -endef - -$(eval $(call KernelPackage,spi-ks8995)) - - define KernelPackage/ethoc SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Opencore.org ethoc driver @@ -2083,7 +2064,7 @@ $(eval $(call KernelPackage,pcs-qcom-ipq9574)) define KernelPackage/pcs-xpcs SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Synopsis DesignWare PCS driver - DEPENDS:=@(TARGET_x86_64||TARGET_armsr) +kmod-phylink +!LINUX_6_6:kmod-mdio-devres + DEPENDS:=@(TARGET_x86_64||TARGET_armsr) +kmod-phylink +kmod-mdio-devres KCONFIG:=CONFIG_PCS_XPCS FILES:=$(LINUX_DIR)/drivers/net/pcs/pcs_xpcs.ko AUTOLOAD:=$(call AutoLoad,20,pcs_xpcs) @@ -2302,7 +2283,7 @@ $(eval $(call KernelPackage,atlantic)) define KernelPackage/lan743x SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Microchip LAN743x PCI Express Gigabit Ethernet NIC - DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-mdio-devres +kmod-fixed-phy +!LINUX_6_6:kmod-phylink + DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-mdio-devres +kmod-fixed-phy +kmod-phylink KCONFIG:=CONFIG_LAN743X FILES:=$(LINUX_DIR)/drivers/net/ethernet/microchip/lan743x.ko AUTOLOAD:=$(call AutoProbe,lan743x) diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index b0524718e2..7ae729f6ba 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -778,22 +778,6 @@ endef $(eval $(call KernelPackage,sched-act-sample)) -define KernelPackage/sched-act-ipt - SUBMENU:=$(NETWORK_SUPPORT_MENU) - TITLE:=IPtables targets - DEPENDS:=@LINUX_6_6 +kmod-ipt-core +kmod-sched-core - KCONFIG:=CONFIG_NET_ACT_IPT - FILES:=$(LINUX_DIR)/net/sched/act_ipt.ko - AUTOLOAD:=$(call AutoProbe, act_ipt) -endef - -define KernelPackage/sched-act-ipt/description - Allows to invoke iptables targets after successful classification. -endef - -$(eval $(call KernelPackage,sched-act-ipt)) - - define KernelPackage/sched-act-vlan SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Traffic VLAN manipulation @@ -1376,7 +1360,7 @@ $(eval $(call KernelPackage,mpls)) define KernelPackage/9pnet SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Plan 9 Resource Sharing Support (9P2000) - DEPENDS:=+!LINUX_6_6:kmod-fs-netfs + DEPENDS:=+kmod-fs-netfs KCONFIG:= \ CONFIG_NET_9P \ CONFIG_NET_9P_DEBUG=n \ diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 369d50252b..c1daf935f1 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -737,49 +737,46 @@ endef define KernelPackage/zram/config if PACKAGE_kmod-zram - if !LINUX_6_6 - config KERNEL_ZRAM_BACKEND_LZO - bool "lzo and lzo-rle compression support" + config KERNEL_ZRAM_BACKEND_LZO + bool "lzo and lzo-rle compression support" - config KERNEL_ZRAM_BACKEND_LZ4 - bool "lz4 compression support" + config KERNEL_ZRAM_BACKEND_LZ4 + bool "lz4 compression support" - config KERNEL_ZRAM_BACKEND_LZ4HC - bool "lz4hc compression support" + config KERNEL_ZRAM_BACKEND_LZ4HC + bool "lz4hc compression support" - config KERNEL_ZRAM_BACKEND_ZSTD - bool "zstd compression support" + config KERNEL_ZRAM_BACKEND_ZSTD + bool "zstd compression support" - config KERNEL_ZRAM_BACKEND_FORCE_LZO - def_bool !KERNEL_ZRAM_BACKEND_LZ4 && \ - !KERNEL_ZRAM_BACKEND_LZ4HC && \ - !KERNEL_ZRAM_BACKEND_ZSTD - select KERNEL_ZRAM_BACKEND_LZO - - endif + config KERNEL_ZRAM_BACKEND_FORCE_LZO + def_bool !KERNEL_ZRAM_BACKEND_LZ4 && \ + !KERNEL_ZRAM_BACKEND_LZ4HC && \ + !KERNEL_ZRAM_BACKEND_ZSTD + select KERNEL_ZRAM_BACKEND_LZO choice prompt "ZRAM Default compressor" default KERNEL_ZRAM_DEF_COMP_LZORLE config KERNEL_ZRAM_DEF_COMP_LZORLE bool "lzo-rle" - depends on KERNEL_ZRAM_BACKEND_LZO || LINUX_6_6 + depends on KERNEL_ZRAM_BACKEND_LZO config KERNEL_ZRAM_DEF_COMP_LZO bool "lzo" - depends on KERNEL_ZRAM_BACKEND_LZO || LINUX_6_6 + depends on KERNEL_ZRAM_BACKEND_LZO config KERNEL_ZRAM_DEF_COMP_LZ4 bool "lz4" - depends on KERNEL_ZRAM_BACKEND_LZ4 || LINUX_6_6 + depends on KERNEL_ZRAM_BACKEND_LZ4 config KERNEL_ZRAM_DEF_COMP_LZ4HC bool "lz4-hc" - depends on KERNEL_ZRAM_BACKEND_LZ4HC || LINUX_6_6 + depends on KERNEL_ZRAM_BACKEND_LZ4HC config KERNEL_ZRAM_DEF_COMP_ZSTD bool "zstd" - depends on KERNEL_ZRAM_BACKEND_ZSTD || LINUX_6_6 + depends on KERNEL_ZRAM_BACKEND_ZSTD endchoice endif diff --git a/package/kernel/linux/modules/sound.mk b/package/kernel/linux/modules/sound.mk index 5645d31878..4d77c7cd29 100644 --- a/package/kernel/linux/modules/sound.mk +++ b/package/kernel/linux/modules/sound.mk @@ -361,7 +361,6 @@ $(eval $(call KernelPackage,sound-dummy)) define KernelPackage/sound-hda-core SUBMENU:=$(SOUND_MENU) TITLE:=HD Audio Sound Core Support - DEPENDS:=+LINUX_6_6:kmod-ledtrig-audio KCONFIG:= \ CONFIG_SND_HDA_CORE \ CONFIG_SND_HDA_HWDEP=y \ @@ -386,7 +385,6 @@ $(eval $(call KernelPackage,sound-hda-core)) define KernelPackage/snd-hda-scodec-component SUBMENU:=$(SOUND_MENU) TITLE:= HD Audio Codec Component - DEPENDS:=@!LINUX_6_6 KCONFIG:= \ CONFIG_SND_HDA_SCODEC_COMPONENT FILES:= \ @@ -405,7 +403,7 @@ define KernelPackage/sound-hda-codec-realtek FILES:= \ $(LINUX_DIR)/sound/pci/hda/snd-hda-codec-realtek.ko AUTOLOAD:=$(call AutoProbe,snd-hda-codec-realtek) - $(call AddDepends/sound,kmod-sound-hda-core +!LINUX_6_6:kmod-snd-hda-scodec-component) + $(call AddDepends/sound,kmod-sound-hda-core +kmod-snd-hda-scodec-component) endef define KernelPackage/sound-hda-codec-realtek/description diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 5c67669139..d484c3a8f8 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -1489,7 +1489,7 @@ $(eval $(call KernelPackage,usb-net-rtl8150)) define KernelPackage/usb-net-rtl8152 TITLE:=Kernel module for USB-to-Ethernet Realtek convertors - DEPENDS:=+r8152-firmware +kmod-crypto-sha256 +kmod-mii +!LINUX_6_6:kmod-libphy + DEPENDS:=+r8152-firmware +kmod-crypto-sha256 +kmod-mii +kmod-libphy KCONFIG:=CONFIG_USB_RTL8152 FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/r8152.ko AUTOLOAD:=$(call AutoProbe,r8152) diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index a43701cddb..6e12475870 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -63,7 +63,7 @@ $(eval $(call KernelPackage,acpi-video)) define KernelPackage/backlight SUBMENU:=$(VIDEO_MENU) TITLE:=Backlight support - DEPENDS:=@DISPLAY_SUPPORT +!LINUX_6_6:kmod-fb + DEPENDS:=@DISPLAY_SUPPORT +kmod-fb HIDDEN:=1 KCONFIG:=CONFIG_BACKLIGHT_CLASS_DEVICE \ CONFIG_BACKLIGHT_LCD_SUPPORT=y \ @@ -102,7 +102,7 @@ $(eval $(call KernelPackage,backlight-pwm)) define KernelPackage/fb SUBMENU:=$(VIDEO_MENU) TITLE:=Framebuffer and framebuffer console support - DEPENDS:=@DISPLAY_SUPPORT +LINUX_6_6:kmod-fb-io-fops + DEPENDS:=@DISPLAY_SUPPORT KCONFIG:= \ CONFIG_FB \ CONFIG_FB_DEVICE=y \ @@ -137,9 +137,8 @@ define KernelPackage/fb/description endef define KernelPackage/fb/x86 - FILES+=$(LINUX_DIR)/arch/x86/video/fbdev.ko@lt6.12 \ - $(LINUX_DIR)/arch/x86/video/video-common.ko@ge6.12 - AUTOLOAD:=$(call AutoLoad,06,fbdev@lt6.12 video-common@ge6.12 fb font) + FILES+=$(LINUX_DIR)/arch/x86/video/video-common.ko + AUTOLOAD:=$(call AutoLoad,06,video-common fb font) endef $(eval $(call KernelPackage,fb)) @@ -209,8 +208,7 @@ define KernelPackage/fb-sys-fops TITLE:=Framebuffer software sys ops support DEPENDS:=+kmod-fb KCONFIG:= \ - CONFIG_FB_SYS_FOPS@lt6.12 \ - CONFIG_FB_SYSMEM_FOPS@ge6.12 + CONFIG_FB_SYSMEM_FOPS FILES:=$(LINUX_DIR)/drivers/video/fbdev/core/fb_sys_fops.ko AUTOLOAD:=$(call AutoLoad,07,fb_sys_fops) endef @@ -439,7 +437,7 @@ define KernelPackage/drm-ttm-helper SUBMENU:=$(VIDEO_MENU) TITLE:=Helpers for ttm-based gem objects HIDDEN:=1 - DEPENDS:=@DISPLAY_SUPPORT +kmod-drm-ttm +!LINUX_6_6:kmod-drm-kms-helper + DEPENDS:=@DISPLAY_SUPPORT +kmod-drm-ttm +kmod-drm-kms-helper KCONFIG:=CONFIG_DRM_TTM_HELPER FILES:=$(LINUX_DIR)/drivers/gpu/drm/drm_ttm_helper.ko AUTOLOAD:=$(call AutoProbe,drm_ttm_helper) @@ -726,7 +724,7 @@ define KernelPackage/drm-radeon DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-backlight +kmod-drm-kms-helper \ +kmod-drm-ttm +kmod-drm-ttm-helper +kmod-i2c-algo-bit +radeon-firmware \ +kmod-drm-display-helper +kmod-acpi-video +kmod-drm-suballoc-helper \ - +!LINUX_6_6:kmod-fb-io-fops + +kmod-fb-io-fops KCONFIG:=CONFIG_DRM_RADEON FILES:=$(LINUX_DIR)/drivers/gpu/drm/radeon/radeon.ko AUTOLOAD:=$(call AutoProbe,radeon) @@ -1473,10 +1471,8 @@ define KernelPackage/video-coda CONFIG_VIDEO_CODA \ CONFIG_VIDEO_IMX_VDOA FILES:= \ - $(LINUX_DIR)/drivers/media/$(V4L2_MEM2MEM_DIR)/chips-media/coda-vpu.ko@lt6.12 \ - $(LINUX_DIR)/drivers/media/$(V4L2_MEM2MEM_DIR)/chips-media/imx-vdoa.ko@lt6.12 \ - $(LINUX_DIR)/drivers/media/$(V4L2_MEM2MEM_DIR)/chips-media/coda/coda-vpu.ko@ge6.12 \ - $(LINUX_DIR)/drivers/media/$(V4L2_MEM2MEM_DIR)/chips-media/coda/imx-vdoa.ko@ge6.12 \ + $(LINUX_DIR)/drivers/media/$(V4L2_MEM2MEM_DIR)/chips-media/coda/coda-vpu.ko \ + $(LINUX_DIR)/drivers/media/$(V4L2_MEM2MEM_DIR)/chips-media/coda/imx-vdoa.ko \ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/v4l2-jpeg.ko AUTOLOAD:=$(call AutoProbe,coda-vpu imx-vdoa v4l2-jpeg) $(call AddDepends/video) -- 2.30.2