forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'openwrt:main' into mx4300-dev
- Loading branch information
Showing
36 changed files
with
319 additions
and
308 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -120,9 +120,7 @@ $(eval $(call KernelPackage,can-c-can-platform)) | |
| define KernelPackage/can-flexcan | ||
| TITLE:=Support for Freescale FLEXCAN based chips | ||
| KCONFIG:=CONFIG_CAN_FLEXCAN | ||
| FILES:= \ | ||
| $(LINUX_DIR)/drivers/net/can/[email protected] \ | ||
| $(LINUX_DIR)/drivers/net/can/flexcan/[email protected] | ||
| FILES:=$(LINUX_DIR)/drivers/net/can/flexcan/flexcan.ko | ||
| AUTOLOAD:=$(call AutoProbe,flexcan) | ||
| $(call AddDepends/can,@TARGET_imx) | ||
| endef | ||
|
|
@@ -185,9 +183,7 @@ $(eval $(call KernelPackage,can-raw)) | |
| define KernelPackage/can-slcan | ||
| TITLE:=Serial / USB serial CAN Adaptors (slcan) | ||
| KCONFIG:=CONFIG_CAN_SLCAN | ||
| FILES:= \ | ||
| $(LINUX_DIR)/drivers/net/can/[email protected] \ | ||
| $(LINUX_DIR)/drivers/net/can/slcan/[email protected] | ||
| FILES:=$(LINUX_DIR)/drivers/net/can/slcan/slcan.ko | ||
| AUTOLOAD:=$(call AutoProbe,slcan) | ||
| $(call AddDepends/can) | ||
| endef | ||
|
|
@@ -235,12 +231,8 @@ $(eval $(call KernelPackage,can-usb-ems)) | |
|
|
||
| define KernelPackage/can-usb-esd | ||
| TITLE:=ESD USB/2 CAN/USB interface | ||
| KCONFIG:= \ | ||
| [email protected] \ | ||
| [email protected] | ||
| FILES:= \ | ||
| $(LINUX_DIR)/drivers/net/can/usb/[email protected] \ | ||
| $(LINUX_DIR)/drivers/net/can/usb/[email protected] | ||
| KCONFIG:=CONFIG_CAN_ESD_USB | ||
| FILES:=$(LINUX_DIR)/drivers/net/can/usb/esd_usb.ko | ||
| AUTOLOAD:=$(call AutoProbe,esd_usb2 esd_usb) | ||
| $(call AddDepends/can,+kmod-usb-core) | ||
| endef | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,11 +39,8 @@ define KernelPackage/crypto-aead | |
| TITLE:=CryptoAPI AEAD support | ||
| KCONFIG:= \ | ||
| CONFIG_CRYPTO_AEAD \ | ||
| CONFIG_CRYPTO_AEAD2 \ | ||
| [email protected] | ||
| FILES:= \ | ||
| $(LINUX_DIR)/crypto/aead.ko \ | ||
| $(LINUX_DIR)/crypto/[email protected] | ||
| CONFIG_CRYPTO_AEAD2 | ||
| FILES:=$(LINUX_DIR)/crypto/aead.ko | ||
| AUTOLOAD:=$(call AutoLoad,09,aead,1) | ||
| $(call AddDepends/crypto, +kmod-crypto-null) | ||
| endef | ||
|
|
@@ -243,7 +240,7 @@ $(eval $(call KernelPackage,crypto-ecdh)) | |
|
|
||
| define KernelPackage/crypto-echainiv | ||
| TITLE:=Encrypted Chain IV Generator | ||
| DEPENDS:=+kmod-crypto-aead +LINUX_6_6:kmod-crypto-geniv | ||
| DEPENDS:=+kmod-crypto-aead +kmod-crypto-geniv | ||
| KCONFIG:=CONFIG_CRYPTO_ECHAINIV | ||
| FILES:=$(LINUX_DIR)/crypto/echainiv.ko | ||
| AUTOLOAD:=$(call AutoLoad,09,echainiv) | ||
|
|
@@ -305,9 +302,7 @@ define KernelPackage/crypto-gf128 | |
| KCONFIG:= \ | ||
| CONFIG_CRYPTO_GF128MUL \ | ||
| CONFIG_CRYPTO_LIB_GF128MUL | ||
| FILES:= \ | ||
| $(LINUX_DIR)/crypto/[email protected] \ | ||
| $(LINUX_DIR)/lib/crypto/[email protected] | ||
| FILES:=$(LINUX_DIR)/lib/crypto/gf128mul.ko | ||
| AUTOLOAD:=$(call AutoLoad,09,gf128mul) | ||
| $(call AddDepends/crypto) | ||
| endef | ||
|
|
@@ -863,8 +858,7 @@ define KernelPackage/crypto-rsa | |
| KCONFIG:= CONFIG_CRYPTO_RSA | ||
| HIDDEN:=1 | ||
| FILES:= \ | ||
| $(LINUX_DIR)/lib/mpi/[email protected] \ | ||
| $(LINUX_DIR)/lib/crypto/mpi/[email protected] \ | ||
| $(LINUX_DIR)/lib/crypto/mpi/mpi.ko \ | ||
| $(LINUX_DIR)/crypto/akcipher.ko \ | ||
| $(LINUX_DIR)/crypto/rsa_generic.ko | ||
| AUTOLOAD:=$(call AutoLoad,10,rsa_generic) | ||
|
|
@@ -888,7 +882,7 @@ $(eval $(call KernelPackage,crypto-rmd160)) | |
|
|
||
| define KernelPackage/crypto-rng | ||
| TITLE:=CryptoAPI random number generation | ||
| DEPENDS:=+kmod-crypto-hash +kmod-crypto-hmac +kmod-crypto-sha512 +LINUX_6_6:kmod-crypto-sha3 | ||
| DEPENDS:=+kmod-crypto-hash +kmod-crypto-hmac +kmod-crypto-sha512 +kmod-crypto-sha3 | ||
| KCONFIG:= \ | ||
| CONFIG_CRYPTO_DRBG \ | ||
| CONFIG_CRYPTO_DRBG_HMAC=y \ | ||
|
|
@@ -910,7 +904,7 @@ $(eval $(call KernelPackage,crypto-rng)) | |
| define KernelPackage/crypto-geniv | ||
| TITLE:=CryptoAPI Shared IV generator | ||
| HIDDEN:=1 | ||
| DEPENDS:=+kmod-crypto-rng +kmod-crypto-aead @LINUX_6_6 | ||
| DEPENDS:=+kmod-crypto-rng +kmod-crypto-aead | ||
| KCONFIG:=CONFIG_CRYPTO_GENIV | ||
| FILES:=$(LINUX_DIR)/crypto/geniv.ko | ||
| AUTOLOAD:=$(call AutoLoad,09,geniv) | ||
|
|
@@ -922,7 +916,7 @@ $(eval $(call KernelPackage,crypto-geniv)) | |
|
|
||
| define KernelPackage/crypto-seqiv | ||
| TITLE:=CryptoAPI Sequence Number IV Generator | ||
| DEPENDS:=+kmod-crypto-aead +kmod-crypto-rng +LINUX_6_6:kmod-crypto-geniv | ||
| DEPENDS:=+kmod-crypto-aead +kmod-crypto-rng +kmod-crypto-geniv | ||
| KCONFIG:=CONFIG_CRYPTO_SEQIV | ||
| FILES:=$(LINUX_DIR)/crypto/seqiv.ko | ||
| AUTOLOAD:=$(call AutoLoad,09,seqiv) | ||
|
|
@@ -1137,7 +1131,7 @@ $(eval $(call KernelPackage,crypto-test)) | |
|
|
||
| define KernelPackage/crypto-user | ||
| TITLE:=CryptoAPI userspace interface | ||
| DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager +LINUX_6_6:kmod-crypto-rng | ||
| DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager +kmod-crypto-rng | ||
| KCONFIG:= \ | ||
| CONFIG_CRYPTO_USER \ | ||
| CONFIG_CRYPTO_USER_API \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -818,27 +818,6 @@ endef | |
|
|
||
| $(eval $(call KernelPackage,ipt-cluster)) | ||
|
|
||
| define KernelPackage/ipt-clusterip | ||
| TITLE:=Module for CLUSTERIP | ||
| KCONFIG:=$(KCONFIG_IPT_CLUSTERIP) | ||
| FILES:=$(foreach mod,$(IPT_CLUSTERIP-m),$(LINUX_DIR)/net/$(mod).ko) | ||
| AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_CLUSTERIP-m))) | ||
| $(call AddDepends/ipt,+kmod-nf-conntrack @LINUX_6_1) | ||
| endef | ||
|
|
||
| define KernelPackage/ipt-clusterip/description | ||
| Netfilter (IPv4-only) module for CLUSTERIP | ||
| The CLUSTERIP target allows you to build load-balancing clusters of | ||
| network servers without having a dedicated load-balancing | ||
| router/server/switch. | ||
|
|
||
| To use it also enable iptables-mod-clusterip | ||
|
|
||
| see `iptables -j CLUSTERIP --help` for more information. | ||
| endef | ||
|
|
||
| $(eval $(call KernelPackage,ipt-clusterip)) | ||
|
|
||
|
|
||
| define KernelPackage/ipt-extra | ||
| TITLE:=Extra modules | ||
|
|
@@ -1197,15 +1176,11 @@ define KernelPackage/nft-offload | |
| DEPENDS:=@IPV6 +kmod-nf-flow +kmod-nft-nat | ||
| KCONFIG:= \ | ||
| CONFIG_NF_FLOW_TABLE_INET \ | ||
| [email protected] \ | ||
| [email protected] \ | ||
| CONFIG_NFT_FLOW_OFFLOAD | ||
| FILES:= \ | ||
| $(LINUX_DIR)/net/netfilter/nf_flow_table_inet.ko \ | ||
| $(LINUX_DIR)/net/ipv4/netfilter/[email protected] \ | ||
| $(LINUX_DIR)/net/ipv6/netfilter/[email protected] \ | ||
| $(LINUX_DIR)/net/netfilter/nft_flow_offload.ko | ||
| AUTOLOAD:=$(call AutoProbe,nf_flow_table_inet [email protected] [email protected] nft_flow_offload) | ||
| AUTOLOAD:=$(call AutoProbe,nf_flow_table_inet nft_flow_offload) | ||
| endef | ||
|
|
||
| $(eval $(call KernelPackage,nft-offload)) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.