diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-01-02 10:21:16 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-01-02 11:19:36 +0000 |
| commit | f2ca3420aaf2656a2bcdf30cbd7bac0a33d19ec6 (patch) | |
| tree | 468a002761ec935045bb7e48ff1cb1f77b1eb1c8 /main/linux-lts | |
| parent | c1a44df21adc1008b4d6432e9c841bdabfcf8ba4 (diff) | |
| download | aports-f2ca3420aaf2656a2bcdf30cbd7bac0a33d19ec6.tar.bz2 aports-f2ca3420aaf2656a2bcdf30cbd7bac0a33d19ec6.tar.xz | |
main/linux-lts: enable NFT_FIB_IPV* for ppc64le/s390x
This is what we do for x86_64 since commit c1a44df21adc (main/linux-lts:
enable NFT_FIB_IPV4, NFT_FIB_IPV6)
Also enable NFT_DUP_IPV4 for ppc64le, which is what we do for x86_64.
ref #11058
Diffstat (limited to 'main/linux-lts')
| -rw-r--r-- | main/linux-lts/APKBUILD | 4 | ||||
| -rw-r--r-- | main/linux-lts/config-lts.ppc64le | 15 | ||||
| -rw-r--r-- | main/linux-lts/config-lts.s390x | 7 |
3 files changed, 16 insertions, 10 deletions
diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD index c9600806c5..22c54ddf8c 100644 --- a/main/linux-lts/APKBUILD +++ b/main/linux-lts/APKBUILD @@ -224,8 +224,8 @@ e44718f77a5817daf155d5ba1cab5a2ab1afce485e42164637254d320fadc28a8122f206e57d33e8 e4840371da27c28a67febbf6a91921098b0b55dfbf276bc744dc0fec93a7ba627f33e070f4a80156a07018002ff59ad00e67dfe2066511bccd33f1b34f718d42 config-lts.armv7 51d6512906def6c75147658c22513469089cfb1d65a095cff0d3630810920dbdf33d022ede131ba91536de4b71550acebe9666e4e94a0a9909f1c9a7223551e4 config-lts.x86 ace6e5f807ab94a54b3eaeff45d6745a89d42480efb3d169a1183f2b20398e91964d0400327264f1fdfa0a58a5210b197115126100c526b512e138a46cba8ddf config-lts.x86_64 -ea55a95e6cfd46a9dba9b1cffa8e1314df92b5f3168f742e615f6e48517aa91a8f5cf1bf341f03268946303495832c8d14901efc2d14963639351ea166a8bba8 config-lts.ppc64le -8203a703f4c1de28fbf4ee97b0b29379606472a43c31db72a3d88140d1e9980fab8cc212e30054b0e0cd4a551f7d842323fce203ec1c37485f77140f2f1eeb30 config-lts.s390x +e17b5a02abd13f68d3c903fcffa24cf3e4042c312249eb846fe82daa93ad193c3d13e9002be658028c0d64ea6d6ee1919f058fcfe6ca16607f2da0544ad34ccc config-lts.ppc64le +113abc4713314defe00d05ecd509db2d0cc53ca105ab4a9ab4d4fa16da8a39edb68d6c1c63b377f5bfa7610c686fe0017798fa70a5f9435afb215888c9be52bc config-lts.s390x 8f13fd5e2a30b98a4718f75221d6fe13c434cbcde432ad1aab0a8bf85937ee0038f5735ba741a670b94ec680fbce4728eeaf8935af4dd6b14722338446903288 config-virt.aarch64 d948391ff437a030ce30f795983748f9eb876b0405d3ef6728590a69adc2a77c9182d39477854be268458d583b8bc34c48fec8bd38502f57f3d02b49c3c9bb36 config-virt.x86 0926abbfeffb4bd532cdfd941cd771460fa0bb9f7a7612bac171a6448fccaa094c5ee9fcfe075076f3bd53b0c437d766e699bb96258cf2f80c40fe0c8d66dd94 config-virt.x86_64 diff --git a/main/linux-lts/config-lts.ppc64le b/main/linux-lts/config-lts.ppc64le index 5ff89a23d8..814cb96ff2 100644 --- a/main/linux-lts/config-lts.ppc64le +++ b/main/linux-lts/config-lts.ppc64le @@ -893,6 +893,8 @@ CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT_INET=m CONFIG_NFT_COMPAT=m CONFIG_NFT_HASH=m +CONFIG_NFT_FIB=m +# CONFIG_NFT_FIB_INET is not set # CONFIG_NFT_XFRM is not set CONFIG_NFT_SOCKET=m CONFIG_NFT_OSF=m @@ -901,6 +903,7 @@ CONFIG_NFT_TPROXY=m CONFIG_NF_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_FWD_NETDEV=m +# CONFIG_NFT_FIB_NETDEV is not set CONFIG_NF_FLOW_TABLE_INET=m CONFIG_NF_FLOW_TABLE=m CONFIG_NETFILTER_XTABLES=m @@ -1066,9 +1069,9 @@ CONFIG_NF_SOCKET_IPV4=m CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TABLES_IPV4=y CONFIG_NFT_REJECT_IPV4=m -# CONFIG_NFT_DUP_IPV4 is not set -# CONFIG_NFT_FIB_IPV4 is not set -# CONFIG_NF_TABLES_ARP is not set +CONFIG_NFT_DUP_IPV4=m +CONFIG_NFT_FIB_IPV4=m +CONFIG_NF_TABLES_ARP=y CONFIG_NF_FLOW_TABLE_IPV4=m CONFIG_NF_DUP_IPV4=m CONFIG_NF_LOG_ARP=m @@ -1107,8 +1110,8 @@ CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TPROXY_IPV6=m CONFIG_NF_TABLES_IPV6=y CONFIG_NFT_REJECT_IPV6=m -# CONFIG_NFT_DUP_IPV6 is not set -# CONFIG_NFT_FIB_IPV6 is not set +CONFIG_NFT_DUP_IPV6=m +CONFIG_NFT_FIB_IPV6=m CONFIG_NF_FLOW_TABLE_IPV6=m CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m @@ -3141,7 +3144,7 @@ CONFIG_HID_EZKEY=m # CONFIG_HID_GT683R is not set # CONFIG_HID_KEYTOUCH is not set # CONFIG_HID_KYE is not set -# CONFIG_HID_UCLOGIC is not set +CONFIG_HID_UCLOGIC=m # CONFIG_HID_WALTOP is not set # CONFIG_HID_VIEWSONIC is not set CONFIG_HID_GYRATION=m diff --git a/main/linux-lts/config-lts.s390x b/main/linux-lts/config-lts.s390x index 8066feb81e..c4b3cf1756 100644 --- a/main/linux-lts/config-lts.s390x +++ b/main/linux-lts/config-lts.s390x @@ -879,6 +879,8 @@ CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT_INET=m CONFIG_NFT_COMPAT=m CONFIG_NFT_HASH=m +CONFIG_NFT_FIB=m +# CONFIG_NFT_FIB_INET is not set # CONFIG_NFT_XFRM is not set CONFIG_NFT_SOCKET=m CONFIG_NFT_OSF=m @@ -887,6 +889,7 @@ CONFIG_NFT_TPROXY=m CONFIG_NF_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_FWD_NETDEV=m +# CONFIG_NFT_FIB_NETDEV is not set CONFIG_NF_FLOW_TABLE_INET=m CONFIG_NF_FLOW_TABLE=m CONFIG_NETFILTER_XTABLES=m @@ -1055,7 +1058,7 @@ CONFIG_NF_TPROXY_IPV4=m CONFIG_NF_TABLES_IPV4=y CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_DUP_IPV4=m -# CONFIG_NFT_FIB_IPV4 is not set +CONFIG_NFT_FIB_IPV4=m CONFIG_NF_TABLES_ARP=y CONFIG_NF_FLOW_TABLE_IPV4=m CONFIG_NF_DUP_IPV4=m @@ -1096,7 +1099,7 @@ CONFIG_NF_TPROXY_IPV6=m CONFIG_NF_TABLES_IPV6=y CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m -# CONFIG_NFT_FIB_IPV6 is not set +CONFIG_NFT_FIB_IPV6=m CONFIG_NF_FLOW_TABLE_IPV6=m CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m |