kernel: use older kernel for explicitly setting dependencies

It is generally more desirable to use older kernel versions for
dependencies, as this will require less changes when newer kernels
are added (they will by default select the newer packages).

Since we currently only have two kernels (4.14 and 4.19) in master,
this patch applies this logic by converting all LINUX_4_19 symbols
to their inverted LINUX_4_14 equivalents.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2020-01-24 23:40:22 +01:00
parent 3519bf4976
commit 9e0aab44b6
10 changed files with 13 additions and 13 deletions

View File

@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/i2c-gpio-custom define KernelPackage/i2c-gpio-custom
SUBMENU:=I2C support SUBMENU:=I2C support
TITLE:=Custom GPIO-based I2C device TITLE:=Custom GPIO-based I2C device
DEPENDS:=@GPIO_SUPPORT +kmod-i2c-core +kmod-i2c-gpio @!LINUX_4_19 DEPENDS:=@GPIO_SUPPORT +kmod-i2c-core +kmod-i2c-gpio @LINUX_4_14
FILES:=$(PKG_BUILD_DIR)/i2c-gpio-custom.ko FILES:=$(PKG_BUILD_DIR)/i2c-gpio-custom.ko
KCONFIG:= KCONFIG:=
endef endef

View File

@ -131,7 +131,7 @@ $(eval $(call KernelPackage,iio-dht11))
define KernelPackage/iio-bme680 define KernelPackage/iio-bme680
SUBMENU:=$(IIO_MENU) SUBMENU:=$(IIO_MENU)
TITLE:=BME680 gas/humidity/pressure/temperature sensor TITLE:=BME680 gas/humidity/pressure/temperature sensor
DEPENDS:=@LINUX_4_19 +kmod-iio-core +kmod-regmap-core DEPENDS:=@!LINUX_4_14 +kmod-iio-core +kmod-regmap-core
KCONFIG:=CONFIG_BME680 KCONFIG:=CONFIG_BME680
FILES:=$(LINUX_DIR)/drivers/iio/chemical/bme680_core.ko FILES:=$(LINUX_DIR)/drivers/iio/chemical/bme680_core.ko
endef endef

View File

@ -541,7 +541,7 @@ $(eval $(call KernelPackage,8139cp))
define KernelPackage/r8169 define KernelPackage/r8169
SUBMENU:=$(NETWORK_DEVICES_MENU) SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support
DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware +LINUX_4_19:kmod-phy-realtek DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware +!LINUX_4_14:kmod-phy-realtek
KCONFIG:=CONFIG_R8169 \ KCONFIG:=CONFIG_R8169 \
CONFIG_R8169_NAPI=y \ CONFIG_R8169_NAPI=y \
CONFIG_R8169_VLAN=n CONFIG_R8169_VLAN=n

View File

@ -540,7 +540,7 @@ define KernelPackage/nf-nathelper-extra
KCONFIG:=$(KCONFIG_NF_NATHELPER_EXTRA) KCONFIG:=$(KCONFIG_NF_NATHELPER_EXTRA)
FILES:=$(foreach mod,$(NF_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) FILES:=$(foreach mod,$(NF_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NATHELPER_EXTRA-m))) AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NATHELPER_EXTRA-m)))
DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch +kmod-ipt-raw +LINUX_4_19:kmod-asn1-decoder DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch +kmod-ipt-raw +!LINUX_4_14:kmod-asn1-decoder
endef endef
define KernelPackage/nf-nathelper-extra/description define KernelPackage/nf-nathelper-extra/description

View File

@ -1143,7 +1143,7 @@ $(eval $(call KernelPackage,rxrpc))
define KernelPackage/mpls define KernelPackage/mpls
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=MPLS support TITLE:=MPLS support
DEPENDS:=+LINUX_4_19:kmod-iptunnel DEPENDS:=+!LINUX_4_14:kmod-iptunnel
KCONFIG:= \ KCONFIG:= \
CONFIG_MPLS=y \ CONFIG_MPLS=y \
CONFIG_LWTUNNEL=y \ CONFIG_LWTUNNEL=y \

View File

@ -169,7 +169,7 @@ define KernelPackage/eeprom-at24
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=EEPROM AT24 support TITLE:=EEPROM AT24 support
KCONFIG:=CONFIG_EEPROM_AT24 KCONFIG:=CONFIG_EEPROM_AT24
DEPENDS:=+kmod-i2c-core +kmod-nvmem +LINUX_4_19:kmod-regmap-i2c DEPENDS:=+kmod-i2c-core +kmod-nvmem +!LINUX_4_14:kmod-regmap-i2c
FILES:=$(LINUX_DIR)/drivers/misc/eeprom/at24.ko FILES:=$(LINUX_DIR)/drivers/misc/eeprom/at24.ko
AUTOLOAD:=$(call AutoProbe,at24) AUTOLOAD:=$(call AutoProbe,at24)
endef endef
@ -938,7 +938,7 @@ $(eval $(call KernelPackage,ptp))
define KernelPackage/ptp-gianfar define KernelPackage/ptp-gianfar
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=Freescale Gianfar PTP support TITLE:=Freescale Gianfar PTP support
DEPENDS:=@TARGET_mpc85xx +kmod-ptp @!LINUX_4_19 DEPENDS:=@TARGET_mpc85xx +kmod-ptp @LINUX_4_14
KCONFIG:=CONFIG_PTP_1588_CLOCK_GIANFAR KCONFIG:=CONFIG_PTP_1588_CLOCK_GIANFAR
FILES:=$(LINUX_DIR)/drivers/net/ethernet/freescale/gianfar_ptp.ko FILES:=$(LINUX_DIR)/drivers/net/ethernet/freescale/gianfar_ptp.ko
AUTOLOAD:=$(call AutoProbe,gianfar_ptp) AUTOLOAD:=$(call AutoProbe,gianfar_ptp)
@ -954,7 +954,7 @@ $(eval $(call KernelPackage,ptp-gianfar))
define KernelPackage/ptp-qoriq define KernelPackage/ptp-qoriq
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=Freescale QorIQ PTP support TITLE:=Freescale QorIQ PTP support
DEPENDS:=@TARGET_mpc85xx +kmod-ptp @LINUX_4_19 DEPENDS:=@TARGET_mpc85xx +kmod-ptp @!LINUX_4_14
KCONFIG:=CONFIG_PTP_1588_CLOCK_QORIQ KCONFIG:=CONFIG_PTP_1588_CLOCK_QORIQ
FILES:=$(LINUX_DIR)/drivers/ptp/ptp_qoriq.o FILES:=$(LINUX_DIR)/drivers/ptp/ptp_qoriq.o
AUTOLOAD:=$(call AutoProbe,ptp_qoriq) AUTOLOAD:=$(call AutoProbe,ptp_qoriq)
@ -987,7 +987,7 @@ define KernelPackage/random-tpm
TITLE:=Hardware Random Number Generator TPM support TITLE:=Hardware Random Number Generator TPM support
KCONFIG:=CONFIG_HW_RANDOM_TPM KCONFIG:=CONFIG_HW_RANDOM_TPM
FILES:=$(LINUX_DIR)/drivers/char/hw_random/tpm-rng.ko FILES:=$(LINUX_DIR)/drivers/char/hw_random/tpm-rng.ko
DEPENDS:= +kmod-random-core +kmod-tpm @!LINUX_4_19 DEPENDS:= +kmod-random-core +kmod-tpm @LINUX_4_14
AUTOLOAD:=$(call AutoProbe,tpm-rng) AUTOLOAD:=$(call AutoProbe,tpm-rng)
endef endef

View File

@ -496,7 +496,7 @@ $(eval $(call KernelPackage,usb-dwc3-of-simple))
define KernelPackage/usb-dwc3-qcom define KernelPackage/usb-dwc3-qcom
TITLE:=DWC3 Qualcomm USB driver TITLE:=DWC3 Qualcomm USB driver
DEPENDS:=@LINUX_4_19 @(TARGET_ipq40xx||TARGET_ipq806x) +kmod-usb-dwc3 DEPENDS:=@!LINUX_4_14 @(TARGET_ipq40xx||TARGET_ipq806x) +kmod-usb-dwc3
KCONFIG:= CONFIG_USB_DWC3_QCOM KCONFIG:= CONFIG_USB_DWC3_QCOM
FILES:= $(LINUX_DIR)/drivers/usb/dwc3/dwc3-qcom.ko FILES:= $(LINUX_DIR)/drivers/usb/dwc3/dwc3-qcom.ko
AUTOLOAD:=$(call AutoLoad,53,dwc3-qcom,1) AUTOLOAD:=$(call AutoLoad,53,dwc3-qcom,1)

View File

@ -511,7 +511,7 @@ $(eval $(call KernelPackage,video-uvc))
define KernelPackage/video-gspca-core define KernelPackage/video-gspca-core
MENU:=1 MENU:=1
TITLE:=GSPCA webcam core support framework TITLE:=GSPCA webcam core support framework
DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-input-core +LINUX_4_19:kmod-video-videobuf2 DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-input-core +!LINUX_4_14:kmod-video-videobuf2
KCONFIG:=CONFIG_USB_GSPCA KCONFIG:=CONFIG_USB_GSPCA
FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_main.ko FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_main.ko
AUTOLOAD:=$(call AutoProbe,gspca_main) AUTOLOAD:=$(call AutoProbe,gspca_main)

View File

@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/spi-gpio-custom define KernelPackage/spi-gpio-custom
SUBMENU:=SPI Support SUBMENU:=SPI Support
TITLE:=Custom GPIO-based SPI device TITLE:=Custom GPIO-based SPI device
DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang +kmod-spi-gpio +kmod-spi-dev @!LINUX_4_19 DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang +kmod-spi-gpio +kmod-spi-dev @LINUX_4_14
FILES:=$(PKG_BUILD_DIR)/spi-gpio-custom.ko FILES:=$(PKG_BUILD_DIR)/spi-gpio-custom.ko
KCONFIG:= KCONFIG:=
endef endef

View File

@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/w1-gpio-custom define KernelPackage/w1-gpio-custom
SUBMENU:=W1 support SUBMENU:=W1 support
TITLE:=Custom GPIO-based 1-wire device TITLE:=Custom GPIO-based 1-wire device
DEPENDS:=kmod-w1 +kmod-w1-master-gpio @!LINUX_4_19 DEPENDS:=kmod-w1 +kmod-w1-master-gpio @LINUX_4_14
FILES:=$(PKG_BUILD_DIR)/w1-gpio-custom.ko FILES:=$(PKG_BUILD_DIR)/w1-gpio-custom.ko
KCONFIG:= KCONFIG:=
endef endef