From 8d07dc10b4e981a10f3fa6c1a03b39e378df71f4 Mon Sep 17 00:00:00 2001 From: Joseph Qi Date: Thu, 30 Apr 2020 16:06:12 +0800 Subject: [PATCH] configs: enable squashfs support to #27362006 Especially, we eanble the following for daishu, which are consistent with centos8: CONFIG_SQUASHFS_FILE_DIRECT CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU Signed-off-by: Joseph Qi Acked-by: Caspar Zhang --- configs/config-4.19.y-aarch64 | 2 +- configs/config-4.19.y-aarch64-debug | 2 +- configs/config-4.19.y-x86_64 | 16 +++++++++++++++- configs/config-4.19.y-x86_64-debug | 16 +++++++++++++++- configs/kernel-4.19-x86_64-alios7-debug.config | 8 ++++---- configs/kernel-4.19-x86_64-alios7.config | 8 ++++---- 6 files changed, 40 insertions(+), 12 deletions(-) diff --git a/configs/config-4.19.y-aarch64 b/configs/config-4.19.y-aarch64 index b93936134722..9601bed55e06 100644 --- a/configs/config-4.19.y-aarch64 +++ b/configs/config-4.19.y-aarch64 @@ -4818,7 +4818,7 @@ CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_ZLIB=y -CONFIG_SQUASHFS_LZ4=y +# CONFIG_SQUASHFS_LZ4 is not set CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y # CONFIG_SQUASHFS_ZSTD is not set diff --git a/configs/config-4.19.y-aarch64-debug b/configs/config-4.19.y-aarch64-debug index 31885a4d2702..09bc4e2827db 100644 --- a/configs/config-4.19.y-aarch64-debug +++ b/configs/config-4.19.y-aarch64-debug @@ -4800,7 +4800,7 @@ CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_ZLIB=y -CONFIG_SQUASHFS_LZ4=y +# CONFIG_SQUASHFS_LZ4 is not set CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y # CONFIG_SQUASHFS_ZSTD is not set diff --git a/configs/config-4.19.y-x86_64 b/configs/config-4.19.y-x86_64 index 85d414f27989..2ac2a2f121c6 100644 --- a/configs/config-4.19.y-x86_64 +++ b/configs/config-4.19.y-x86_64 @@ -3585,7 +3585,21 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set # CONFIG_CRAMFS is not set -# CONFIG_SQUASHFS is not set +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set +# CONFIG_SQUASHFS_DECOMP_MULTI is not set +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +# CONFIG_SQUASHFS_LZ4 is not set +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_ZSTD is not set +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_OMFS_FS is not set diff --git a/configs/config-4.19.y-x86_64-debug b/configs/config-4.19.y-x86_64-debug index 7822e7284b06..483c93505a31 100644 --- a/configs/config-4.19.y-x86_64-debug +++ b/configs/config-4.19.y-x86_64-debug @@ -3588,7 +3588,21 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set # CONFIG_CRAMFS is not set -# CONFIG_SQUASHFS is not set +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set +# CONFIG_SQUASHFS_DECOMP_MULTI is not set +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +# CONFIG_SQUASHFS_LZ4 is not set +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_ZSTD is not set +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_OMFS_FS is not set diff --git a/configs/kernel-4.19-x86_64-alios7-debug.config b/configs/kernel-4.19-x86_64-alios7-debug.config index a18d60cebccb..f4ee41777748 100644 --- a/configs/kernel-4.19-x86_64-alios7-debug.config +++ b/configs/kernel-4.19-x86_64-alios7-debug.config @@ -5887,11 +5887,11 @@ CONFIG_CRAMFS=m # CONFIG_CRAMFS_BLOCKDEV is not set # CONFIG_CRAMFS_MTD is not set CONFIG_SQUASHFS=m -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_ZLIB=y # CONFIG_SQUASHFS_LZ4 is not set diff --git a/configs/kernel-4.19-x86_64-alios7.config b/configs/kernel-4.19-x86_64-alios7.config index f81235d8bb18..b64d69830578 100644 --- a/configs/kernel-4.19-x86_64-alios7.config +++ b/configs/kernel-4.19-x86_64-alios7.config @@ -5885,11 +5885,11 @@ CONFIG_CRAMFS=m # CONFIG_CRAMFS_BLOCKDEV is not set # CONFIG_CRAMFS_MTD is not set CONFIG_SQUASHFS=m -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_ZLIB=y # CONFIG_SQUASHFS_LZ4 is not set -- GitLab