Skip to content

Commit 8cb2cd2

Browse files
committed
dashboard/app/linux: fix configuration errors
1 parent 52750da commit 8cb2cd2

File tree

5 files changed

+39
-13
lines changed

5 files changed

+39
-13
lines changed

dashboard/config/linux/bits/crypto.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ config:
66
- CRYPTO_USER_API_ENABLE_OBSOLETE: [v5.10]
77
- CRYPTO_PCRYPT
88
- CRYPTO_ECRDSA
9-
- CRYPTO_CURVE25519: [v5.6]
9+
# Removed in "crypto: curve25519 - Remove unused kpp support"
10+
- CRYPTO_CURVE25519: [v5.6, -v6.17]
1011
- CRYPTO_CHACHA20POLY1305
1112
- CRYPTO_AEGIS128
1213
- CRYPTO_CFB: [-v5.8]
@@ -21,7 +22,8 @@ config:
2122
# Removed in "crypto: vmac - remove unused VMAC algorithm".
2223
- CRYPTO_VMAC: [-v6.14]
2324
- CRYPTO_BLAKE2S: [v5.6, -v5.15]
24-
- CRYPTO_BLAKE2S_X86: [v6.1, x86_64, -kmsan]
25+
# Moved by "lib/crypto: blake2s: Consolidate into single C translation unit"
26+
- CRYPTO_BLAKE2S_X86: [v6.1, x86_64, -kmsan, -v6.17]
2527
- CRYPTO_BLAKE2S_ARM: [v6.1, arm]
2628
- CRYPTO_MICHAEL_MIC
2729
- CRYPTO_RMD160
@@ -92,11 +94,14 @@ config:
9294
- CRYPTO_CRC32_PCLMUL: [x86_64, -kmsan, -v6.14]
9395
# Removed in "x86/crc-t10dif: expose CRC-T10DIF function through lib".
9496
- CRYPTO_CRCT10DIF_PCLMUL: [x86_64, -kmsan, -v6.14]
95-
- CRYPTO_SHA1_SSSE3: [x86_64, -kmsan]
97+
# Moved by "lib/crypto: x86/sha1: Migrate optimized code into library"
98+
- CRYPTO_SHA1_SSSE3: [x86_64, -kmsan, -v6.17]
9699
# Replaced in v6.16 "crypto: x86/sha256 - implement library instead of shash".
97100
- CRYPTO_SHA256_SSSE3: [x86_64, -kmsan, -v6.16]
98-
- CRYPTO_SHA256_X86_64: [x86_64, -kmsan, v6.16]
99-
- CRYPTO_SHA512_SSSE3: [x86_64, -kmsan]
101+
# Moved in "lib/crypto: sha256: Consolidate into single module"
102+
- CRYPTO_SHA256_X86_64: [x86_64, -kmsan, v6.16, -v6.17]
103+
# Moved in v6.17 "lib/crypto: x86/sha512: Migrate optimized SHA-512 code to library".
104+
- CRYPTO_SHA512_SSSE3: [x86_64, -kmsan, -v6.17]
100105
- CRYPTO_DEV_PADLOCK: [x86_64]
101106
- CRYPTO_DEV_PADLOCK_AES: [x86_64]
102107
- CRYPTO_DEV_PADLOCK_SHA: [x86_64]
@@ -125,9 +130,12 @@ config:
125130
- CRYPTO_CRC32_ARM_CE: [arm, -v6.14]
126131
- CRYPTO_NHPOLY1305_NEON: [arm, arm64]
127132
- CRYPTO_CURVE25519_NEON: [arm]
128-
- CRYPTO_SHA256_ARM64: [arm64]
129-
- CRYPTO_SHA512_ARM64: [arm64]
130-
- CRYPTO_SHA1_ARM64_CE: [arm64]
133+
# Moved by "lib/crypto: sha256: Consolidate into single module"
134+
- CRYPTO_SHA256_ARM64: [arm64, -v6.17]
135+
# Moved by "lib/crypto: arm64/sha512: Migrate optimized SHA-512 code to library"
136+
- CRYPTO_SHA512_ARM64: [arm64, -v6.17]
137+
# Moved by "lib/crypto: arm64/sha1: Migrate optimized code into library"
138+
- CRYPTO_SHA1_ARM64_CE: [arm64, -v6.17]
131139
# Removed in "crypto: arm64/sha256 - implement library instead of shash".
132140
- CRYPTO_SHA2_ARM64_CE: [arm64, -v6.16]
133141
- CRYPTO_SHA512_ARM64_CE: [arm64, -v6.16]
@@ -144,5 +152,6 @@ config:
144152
- CRYPTO_AES_ARM64_CE_CCM: [arm64]
145153
- CRYPTO_AES_ARM64_CE_BLK: [arm64]
146154
- CRYPTO_AES_ARM64_NEON_BLK: [arm64]
147-
- CRYPTO_POLY1305_NEON: [arm64]
155+
# Moved by ""
156+
- CRYPTO_POLY1305_NEON: [arm64, -v6.17]
148157
- CRYPTO_AES_ARM64_BS: [arm64]

dashboard/config/linux/bits/filesystems.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ config:
7676
- BTRFS_FS
7777
- BTRFS_FS_POSIX_ACL
7878
- BTRFS_ASSERT
79-
- BTRFS_FS_REF_VERIFY
79+
# Moved by "btrfs: move ref-verify under CONFIG_BTRFS_DEBUG"
80+
- BTRFS_FS_REF_VERIFY: [-v6.17]
81+
- BTRFS_DEBUG: [v6.17]
8082

8183
- F2FS_FS
8284
- F2FS_FS_SECURITY

dashboard/config/linux/bits/net-extra.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,22 @@ config:
1212
- TIPC_DIAG
1313

1414
- IP_SCTP
15-
- SCTP_COOKIE_HMAC_SHA1
15+
# Switched since v6.17 by "sctp: Convert cookie authentication to use HMAC-SHA256".
16+
- SCTP_DEFAULT_COOKIE_HMAC_SHA256: [ v6.17 ]
17+
- SCTP_COOKIE_HMAC_SHA1: [-v6.17]
1618
- NF_CT_PROTO_SCTP
1719
- NETFILTER_XT_MATCH_SCTP
1820

1921
# These were deprecated in v6.16.
2022
- IP_DCCP: [-v6.16]
2123
- IP_DCCP_CCID3: [-v6.16]
22-
- NF_CT_PROTO_DCCP
24+
# Removed by "netfilter: conntrack: remove DCCP protocol support"
25+
- NF_CT_PROTO_DCCP: [-v6.17]
2326
- NETFILTER_XT_MATCH_DCCP
2427

2528
- BATMAN_ADV
26-
- BATMAN_ADV_NC
29+
# Removed by "batman-adv: remove network coding support"
30+
- BATMAN_ADV_NC: [-v6.17]
2731
- BATMAN_ADV_SYSFS: [-v5.11]
2832
- BATMAN_ADV_BATMAN_V
2933
- BATMAN_ADV_BLA
@@ -56,6 +60,8 @@ config:
5660
- NF_LOG_BRIDGE: [-v5.13]
5761
- NF_CONNTRACK_BRIDGE
5862
- BRIDGE_NF_EBTABLES
63+
# Required since "netfilter: Exclude LEGACY TABLES on PREEMPT_RT".
64+
- BRIDGE_NF_EBTABLES_LEGACY: [v6.17]
5965
- BRIDGE_EBT_BROUTE
6066
- BRIDGE_EBT_T_FILTER
6167
- BRIDGE_EBT_T_NAT

dashboard/config/linux/bits/net.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ config:
1919
- XFRM_USER_COMPAT: [v5.10, x86_64]
2020
- NET_KEY
2121
- NET_KEY_MIGRATE
22+
# SMC requires DIBS.
23+
- DIBS
2224
- SMC
2325
- SMC_DIAG
2426
- XDP_SOCKETS
@@ -100,6 +102,8 @@ config:
100102
- NETFILTER_ADVANCED
101103
- NETFILTER_XTABLES
102104
- NETFILTER_XTABLES_COMPAT: [v5.15, -arm]
105+
# Required since "netfilter: Exclude LEGACY TABLES on PREEMPT_RT"
106+
- NETFILTER_XTABLES_LEGACY: [v6.17]
103107
- NF_CONNTRACK
104108
- NF_LOG_NETDEV: [-v5.13]
105109
- NETWORK_SECMARK
@@ -222,6 +226,8 @@ config:
222226
- NF_FLOW_TABLE_IPV4: [-v5.17]
223227
- NF_LOG_ARP
224228
- IP_NF_IPTABLES
229+
# Requires since "netfilter: Exclude LEGACY TABLES on PREEMPT_RT".
230+
- IP_NF_IPTABLES_LEGACY: [v6.17]
225231
- IP_NF_MATCH_AH
226232
- IP_NF_MATCH_ECN
227233
- IP_NF_MATCH_RPFILTER
@@ -246,6 +252,8 @@ config:
246252
- NFT_FIB_IPV6
247253
- NF_FLOW_TABLE_IPV6: [-v5.17]
248254
- IP6_NF_IPTABLES
255+
# Requires since "netfilter: Exclude LEGACY TABLES on PREEMPT_RT".
256+
- IP6_NF_IPTABLES_LEGACY: [v6.17]
249257
- IP6_NF_MATCH_AH
250258
- IP6_NF_MATCH_EUI64
251259
- IP6_NF_MATCH_FRAG

dashboard/config/linux/bits/subsystems.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ config:
333333
- SND_PCI
334334
- SND_OSSEMUL
335335
- SND_MIXER_OSS
336+
- SND_PCM
336337
- SND_PCM_OSS
337338
- SND_PCM_OSS_PLUGINS
338339
- SND_HRTIMER

0 commit comments

Comments
 (0)