Skip to content

Commit 5faec68

Browse files
pimyn-girgisa-nogikh
pimyn-girgis
authored and
a-nogikh
committed
dashboard: enable ext4 in base config
Ext4 is necessary for normal boot, enable it unconditionally in base.
1 parent 252fbba commit 5faec68

18 files changed

+123
-20
lines changed

‎dashboard/config/linux/bits/base.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,3 +234,8 @@ config:
234234

235235
# Disable Rust by default
236236
- RUST: n
237+
238+
# Ext4 is necessary for normal boot.
239+
- EXT4_FS
240+
- EXT4_FS_POSIX_ACL
241+
- EXT4_FS_SECURITY

‎dashboard/config/linux/bits/filesystems.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,6 @@ config:
171171
- EXT3_FS_POSIX_ACL: [-v6.18]
172172
- EXT3_FS_SECURITY: [-v6.18]
173173

174-
- EXT4_FS: [v6.18]
175-
- EXT4_FS_POSIX_ACL: [v6.18]
176-
- EXT4_FS_SECURITY: [v6.18]
177-
178174
- REISERFS_FS: [-v6.12]
179175
- REISERFS_FS_XATTR: [-v6.12]
180176
- REISERFS_FS_POSIX_ACL: [-v6.12]

‎dashboard/config/linux/stable-5.15-arm64-kasan-base.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7574,7 +7574,7 @@ CONFIG_EXT3_FS=y
75747574
# CONFIG_EXT3_FS_SECURITY is not set
75757575
CONFIG_EXT4_FS=y
75767576
CONFIG_EXT4_FS_POSIX_ACL=y
7577-
# CONFIG_EXT4_FS_SECURITY is not set
7577+
CONFIG_EXT4_FS_SECURITY=y
75787578
# CONFIG_EXT4_DEBUG is not set
75797579
CONFIG_JBD2=y
75807580
# CONFIG_JBD2_DEBUG is not set

‎dashboard/config/linux/stable-6.1-arm64-kasan-base.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8142,7 +8142,7 @@ CONFIG_EXT3_FS=y
81428142
# CONFIG_EXT3_FS_SECURITY is not set
81438143
CONFIG_EXT4_FS=y
81448144
CONFIG_EXT4_FS_POSIX_ACL=y
8145-
# CONFIG_EXT4_FS_SECURITY is not set
8145+
CONFIG_EXT4_FS_SECURITY=y
81468146
# CONFIG_EXT4_DEBUG is not set
81478147
CONFIG_JBD2=y
81488148
# CONFIG_JBD2_DEBUG is not set

‎dashboard/config/linux/stable-6.6-arm64-kasan-base.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8527,7 +8527,7 @@ CONFIG_EXT3_FS=y
85278527
# CONFIG_EXT3_FS_SECURITY is not set
85288528
CONFIG_EXT4_FS=y
85298529
CONFIG_EXT4_FS_POSIX_ACL=y
8530-
# CONFIG_EXT4_FS_SECURITY is not set
8530+
CONFIG_EXT4_FS_SECURITY=y
85318531
# CONFIG_EXT4_DEBUG is not set
85328532
CONFIG_JBD2=y
85338533
# CONFIG_JBD2_DEBUG is not set

‎dashboard/config/linux/upstream-arm-full-base.config‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3597,14 +3597,21 @@ CONFIG_BUFFER_HEAD=y
35973597
CONFIG_LEGACY_DIRECT_IO=y
35983598
CONFIG_EXT2_FS=y
35993599
# CONFIG_EXT2_FS_XATTR is not set
3600-
# CONFIG_EXT4_FS is not set
3600+
CONFIG_EXT4_FS=y
3601+
CONFIG_EXT4_FS_POSIX_ACL=y
3602+
CONFIG_EXT4_FS_SECURITY=y
3603+
# CONFIG_EXT4_DEBUG is not set
3604+
CONFIG_JBD2=y
3605+
# CONFIG_JBD2_DEBUG is not set
3606+
CONFIG_FS_MBCACHE=y
36013607
# CONFIG_JFS_FS is not set
36023608
# CONFIG_XFS_FS is not set
36033609
# CONFIG_GFS2_FS is not set
36043610
# CONFIG_OCFS2_FS is not set
36053611
# CONFIG_BTRFS_FS is not set
36063612
# CONFIG_NILFS2_FS is not set
36073613
# CONFIG_F2FS_FS is not set
3614+
CONFIG_FS_POSIX_ACL=y
36083615
CONFIG_EXPORTFS=y
36093616
# CONFIG_EXPORTFS_BLOCK_OPS is not set
36103617
CONFIG_FILE_LOCKING=y

‎dashboard/config/linux/upstream-arm-kasan-base.config‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3595,14 +3595,21 @@ CONFIG_FS_IOMAP=y
35953595
CONFIG_BUFFER_HEAD=y
35963596
CONFIG_EXT2_FS=y
35973597
# CONFIG_EXT2_FS_XATTR is not set
3598-
# CONFIG_EXT4_FS is not set
3598+
CONFIG_EXT4_FS=y
3599+
CONFIG_EXT4_FS_POSIX_ACL=y
3600+
CONFIG_EXT4_FS_SECURITY=y
3601+
# CONFIG_EXT4_DEBUG is not set
3602+
CONFIG_JBD2=y
3603+
# CONFIG_JBD2_DEBUG is not set
3604+
CONFIG_FS_MBCACHE=y
35993605
# CONFIG_JFS_FS is not set
36003606
# CONFIG_XFS_FS is not set
36013607
# CONFIG_GFS2_FS is not set
36023608
# CONFIG_OCFS2_FS is not set
36033609
# CONFIG_BTRFS_FS is not set
36043610
# CONFIG_NILFS2_FS is not set
36053611
# CONFIG_F2FS_FS is not set
3612+
CONFIG_FS_POSIX_ACL=y
36063613
CONFIG_EXPORTFS=y
36073614
# CONFIG_EXPORTFS_BLOCK_OPS is not set
36083615
CONFIG_FILE_LOCKING=y
@@ -4040,6 +4047,7 @@ CONFIG_GENERIC_NET_UTILS=y
40404047
# CONFIG_PRIME_NUMBERS is not set
40414048
CONFIG_RATIONAL=y
40424049
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
4050+
CONFIG_CRC16=y
40434051
CONFIG_CRC32=y
40444052
CONFIG_CRC32_ARCH=y
40454053
CONFIG_CRC_OPTIMIZATIONS=y

‎dashboard/config/linux/upstream-arm-kasan.config‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7275,7 +7275,13 @@ CONFIG_FS_IOMAP=y
72757275
CONFIG_BUFFER_HEAD=y
72767276
CONFIG_EXT2_FS=y
72777277
# CONFIG_EXT2_FS_XATTR is not set
7278-
# CONFIG_EXT4_FS is not set
7278+
CONFIG_EXT4_FS=y
7279+
CONFIG_EXT4_FS_POSIX_ACL=y
7280+
CONFIG_EXT4_FS_SECURITY=y
7281+
# CONFIG_EXT4_DEBUG is not set
7282+
CONFIG_JBD2=y
7283+
# CONFIG_JBD2_DEBUG is not set
7284+
CONFIG_FS_MBCACHE=y
72797285
# CONFIG_JFS_FS is not set
72807286
# CONFIG_XFS_FS is not set
72817287
# CONFIG_GFS2_FS is not set
@@ -7289,6 +7295,7 @@ CONFIG_EXPORTFS=y
72897295
# CONFIG_EXPORTFS_BLOCK_OPS is not set
72907296
CONFIG_FILE_LOCKING=y
72917297
CONFIG_FS_ENCRYPTION=y
7298+
CONFIG_FS_ENCRYPTION_ALGS=y
72927299
# CONFIG_FS_ENCRYPTION_INLINE_CRYPT is not set
72937300
CONFIG_FS_VERITY=y
72947301
CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y

‎dashboard/config/linux/upstream-arm64-kasan-base.config‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5588,7 +5588,14 @@ CONFIG_FS_IOMAP=y
55885588
CONFIG_FS_STACK=y
55895589
CONFIG_BUFFER_HEAD=y
55905590
# CONFIG_EXT2_FS is not set
5591-
# CONFIG_EXT4_FS is not set
5591+
CONFIG_EXT4_FS=y
5592+
CONFIG_EXT4_USE_FOR_EXT2=y
5593+
CONFIG_EXT4_FS_POSIX_ACL=y
5594+
CONFIG_EXT4_FS_SECURITY=y
5595+
# CONFIG_EXT4_DEBUG is not set
5596+
CONFIG_JBD2=y
5597+
# CONFIG_JBD2_DEBUG is not set
5598+
CONFIG_FS_MBCACHE=y
55925599
# CONFIG_JFS_FS is not set
55935600
# CONFIG_XFS_FS is not set
55945601
# CONFIG_GFS2_FS is not set

‎dashboard/config/linux/upstream-arm64-kasan.config‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6897,7 +6897,14 @@ CONFIG_FS_IOMAP=y
68976897
CONFIG_FS_STACK=y
68986898
CONFIG_BUFFER_HEAD=y
68996899
# CONFIG_EXT2_FS is not set
6900-
# CONFIG_EXT4_FS is not set
6900+
CONFIG_EXT4_FS=y
6901+
CONFIG_EXT4_USE_FOR_EXT2=y
6902+
CONFIG_EXT4_FS_POSIX_ACL=y
6903+
CONFIG_EXT4_FS_SECURITY=y
6904+
# CONFIG_EXT4_DEBUG is not set
6905+
CONFIG_JBD2=y
6906+
# CONFIG_JBD2_DEBUG is not set
6907+
CONFIG_FS_MBCACHE=y
69016908
# CONFIG_JFS_FS is not set
69026909
# CONFIG_XFS_FS is not set
69036910
# CONFIG_GFS2_FS is not set
@@ -6913,6 +6920,7 @@ CONFIG_EXPORTFS=y
69136920
# CONFIG_EXPORTFS_BLOCK_OPS is not set
69146921
CONFIG_FILE_LOCKING=y
69156922
CONFIG_FS_ENCRYPTION=y
6923+
CONFIG_FS_ENCRYPTION_ALGS=y
69166924
# CONFIG_FS_ENCRYPTION_INLINE_CRYPT is not set
69176925
CONFIG_FS_VERITY=y
69186926
CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y

0 commit comments

Comments
 (0)