From: Hauke Mehrtens Date: Sat, 10 Oct 2020 10:02:02 +0000 (+0200) Subject: kernel: Remove 2FS_FS_XATTR and F2FS_STAT_FS symbols from target configs X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=18deed29be8c4ba25aa45a3981b7366a257f58aa;p=openwrt%2Fstaging%2Fnbd.git kernel: Remove 2FS_FS_XATTR and F2FS_STAT_FS symbols from target configs This config option was moved to the generic kernel configuration. Fixes: ab1bd576562b ("kernel: move F2FS_FS_XATTR and F2FS_STAT_FS symbols to generic") Signed-off-by: Hauke Mehrtens --- diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index cfce929c0c..0abd5285db 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -208,8 +208,6 @@ define KernelPackage/fs-f2fs DEPENDS:= +kmod-crypto-hash +kmod-crypto-crc32 +!LINUX_4_19:kmod-nls-base KCONFIG:= \ CONFIG_F2FS_FS \ - CONFIG_F2FS_STAT_FS=y \ - CONFIG_F2FS_FS_XATTR=y \ CONFIG_F2FS_FS_POSIX_ACL=n \ CONFIG_F2FS_FS_SECURITY=n \ CONFIG_F2FS_CHECK_FS=n diff --git a/target/linux/apm821xx/sata/config-default b/target/linux/apm821xx/sata/config-default index daa4646bff..15aed962d5 100644 --- a/target/linux/apm821xx/sata/config-default +++ b/target/linux/apm821xx/sata/config-default @@ -18,7 +18,6 @@ CONFIG_EXT4_FS=y # CONFIG_F2FS_CHECK_FS is not set CONFIG_F2FS_FS=y # CONFIG_F2FS_FS_SECURITY is not set -CONFIG_F2FS_STAT_FS=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_GPIOLIB=y diff --git a/target/linux/bcm27xx/bcm2708/config-5.4 b/target/linux/bcm27xx/bcm2708/config-5.4 index 3c4dc98eb0..c560ff04ad 100644 --- a/target/linux/bcm27xx/bcm2708/config-5.4 +++ b/target/linux/bcm27xx/bcm2708/config-5.4 @@ -159,7 +159,6 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_F2FS_FS=y -CONFIG_F2FS_STAT_FS=y CONFIG_FB=y CONFIG_FB_BCM2708=y CONFIG_FB_CFB_COPYAREA=y diff --git a/target/linux/bcm27xx/bcm2709/config-5.4 b/target/linux/bcm27xx/bcm2709/config-5.4 index f76f3aae71..017f3eb0ad 100644 --- a/target/linux/bcm27xx/bcm2709/config-5.4 +++ b/target/linux/bcm27xx/bcm2709/config-5.4 @@ -205,7 +205,6 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_F2FS_FS=y -CONFIG_F2FS_STAT_FS=y CONFIG_FB=y CONFIG_FB_BCM2708=y CONFIG_FB_CFB_COPYAREA=y diff --git a/target/linux/bcm27xx/bcm2710/config-5.4 b/target/linux/bcm27xx/bcm2710/config-5.4 index 68ef51ca6f..a011e2f213 100644 --- a/target/linux/bcm27xx/bcm2710/config-5.4 +++ b/target/linux/bcm27xx/bcm2710/config-5.4 @@ -248,7 +248,6 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_F2FS_FS=y -CONFIG_F2FS_STAT_FS=y CONFIG_FB=y CONFIG_FB_BCM2708=y CONFIG_FB_CFB_COPYAREA=y diff --git a/target/linux/bcm27xx/bcm2711/config-5.4 b/target/linux/bcm27xx/bcm2711/config-5.4 index 5561051e97..ee391ff5be 100644 --- a/target/linux/bcm27xx/bcm2711/config-5.4 +++ b/target/linux/bcm27xx/bcm2711/config-5.4 @@ -253,7 +253,6 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_F2FS_FS=y -CONFIG_F2FS_STAT_FS=y CONFIG_FB=y CONFIG_FB_BCM2708=y CONFIG_FB_CFB_COPYAREA=y diff --git a/target/linux/mediatek/mt7623/config-4.19 b/target/linux/mediatek/mt7623/config-4.19 index 56ae95cc31..edf285c45a 100644 --- a/target/linux/mediatek/mt7623/config-4.19 +++ b/target/linux/mediatek/mt7623/config-4.19 @@ -176,8 +176,6 @@ CONFIG_EXT4_FS=y # CONFIG_F2FS_CHECK_FS is not set CONFIG_F2FS_FS=y # CONFIG_F2FS_FS_SECURITY is not set -CONFIG_F2FS_FS_XATTR=y -CONFIG_F2FS_STAT_FS=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FREEZER=y diff --git a/target/linux/mediatek/mt7623/config-5.4 b/target/linux/mediatek/mt7623/config-5.4 index 28760e6003..a6b32ce33b 100644 --- a/target/linux/mediatek/mt7623/config-5.4 +++ b/target/linux/mediatek/mt7623/config-5.4 @@ -184,7 +184,6 @@ CONFIG_EINT_MTK=y CONFIG_ELF_CORE=y CONFIG_EXT4_FS=y CONFIG_F2FS_FS=y -CONFIG_F2FS_STAT_FS=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FREEZER=y diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386 index 94a972792a..5a066ac6a3 100644 --- a/target/linux/uml/config/i386 +++ b/target/linux/uml/config/i386 @@ -30,7 +30,6 @@ CONFIG_DNOTIFY=y # CONFIG_EARLY_PRINTK is not set CONFIG_EXT4_FS=y CONFIG_F2FS_FS=y -CONFIG_F2FS_STAT_FS=y CONFIG_FAILOVER=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64 index 988ef22faf..d3b3704f6c 100644 --- a/target/linux/uml/config/x86_64 +++ b/target/linux/uml/config/x86_64 @@ -32,7 +32,6 @@ CONFIG_DNOTIFY=y # CONFIG_EARLY_PRINTK is not set CONFIG_EXT4_FS=y CONFIG_F2FS_FS=y -CONFIG_F2FS_STAT_FS=y CONFIG_FAILOVER=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y