From 23a9de3af244629ac8c4acfd4cc0c926faacdee9 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 12 Jul 2017 12:43:24 +0200 Subject: linux-toradex: add squashfs configuration in all mx6 defconfigs snapd requires squashfs kernel module but this has not been added to all defconfigs. Follow commit f0d525d36e915076416a443eb15a69efdcac1e73 or the images which add the snapd packagegroup will not build Signed-off-by: Max Krummenacher Acked-by: Stefan Agner --- recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig | 9 ++++++++- .../linux/linux-toradex-3.14.52/colibri-imx6/defconfig | 9 ++++++++- recipes-kernel/linux/linux-toradex-4.1-2.0.x/defconfig | 9 ++++++++- .../linux/linux-toradex-rt-4.1-2.0.x/apalis-imx6/defconfig | 9 ++++++++- .../linux/linux-toradex-rt-4.1-2.0.x/colibri-imx6/defconfig | 9 ++++++++- recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/defconfig | 9 ++++++++- 6 files changed, 48 insertions(+), 6 deletions(-) diff --git a/recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig b/recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig index b16d464..18f19f4 100644 --- a/recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-3.14.52/apalis-imx6/defconfig @@ -260,6 +260,14 @@ CONFIG_USB_SERIAL_PL2303=y CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_MXS_PHY=y CONFIG_USB_GADGET=y +CONFIG_SQUASHFS=m +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_LZO=y +CONFIG_SQUASHFS_XZ=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_MASS_STORAGE=m @@ -314,7 +322,6 @@ CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y -CONFIG_SQUASHFS=y CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y diff --git a/recipes-kernel/linux/linux-toradex-3.14.52/colibri-imx6/defconfig b/recipes-kernel/linux/linux-toradex-3.14.52/colibri-imx6/defconfig index 836220c..7b486b7 100644 --- a/recipes-kernel/linux/linux-toradex-3.14.52/colibri-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-3.14.52/colibri-imx6/defconfig @@ -250,6 +250,14 @@ CONFIG_USB_SERIAL_PL2303=y CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_MXS_PHY=y CONFIG_USB_GADGET=y +CONFIG_SQUASHFS=m +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_LZO=y +CONFIG_SQUASHFS_XZ=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_MASS_STORAGE=m @@ -306,7 +314,6 @@ CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y -CONFIG_SQUASHFS=y CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y diff --git a/recipes-kernel/linux/linux-toradex-4.1-2.0.x/defconfig b/recipes-kernel/linux/linux-toradex-4.1-2.0.x/defconfig index 5a17cb9..cbf3d85 100644 --- a/recipes-kernel/linux/linux-toradex-4.1-2.0.x/defconfig +++ b/recipes-kernel/linux/linux-toradex-4.1-2.0.x/defconfig @@ -360,6 +360,14 @@ CONFIG_USB_CONFIGFS_EEM=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_LB_SS=y CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_SQUASHFS=m +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_LZO=y +CONFIG_SQUASHFS_XZ=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_G_NCM=m @@ -425,7 +433,6 @@ CONFIG_NTFS_RW=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_UBIFS_FS=y -CONFIG_SQUASHFS=y CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y diff --git a/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/apalis-imx6/defconfig b/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/apalis-imx6/defconfig index bccff8c..bb849f3 100644 --- a/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/apalis-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/apalis-imx6/defconfig @@ -265,6 +265,14 @@ CONFIG_USB_CONFIGFS_EEM=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_LB_SS=y CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_SQUASHFS=m +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_LZO=y +CONFIG_SQUASHFS_XZ=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_G_NCM=m @@ -316,7 +324,6 @@ CONFIG_NTFS_FS=y CONFIG_NTFS_RW=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y -CONFIG_SQUASHFS=y CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y diff --git a/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/colibri-imx6/defconfig b/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/colibri-imx6/defconfig index 7412924..c631f5d 100644 --- a/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/colibri-imx6/defconfig +++ b/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/colibri-imx6/defconfig @@ -256,6 +256,14 @@ CONFIG_USB_CONFIGFS_EEM=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_LB_SS=y CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_SQUASHFS=m +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_LZO=y +CONFIG_SQUASHFS_XZ=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_G_NCM=m @@ -309,7 +317,6 @@ CONFIG_NTFS_FS=y CONFIG_NTFS_RW=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y -CONFIG_SQUASHFS=y CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y diff --git a/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/defconfig b/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/defconfig index 85d8933..2a644eb 100644 --- a/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/defconfig +++ b/recipes-kernel/linux/linux-toradex-rt-4.1-2.0.x/defconfig @@ -355,6 +355,14 @@ CONFIG_USB_CONFIGFS_EEM=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_LB_SS=y CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_SQUASHFS=m +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_LZO=y +CONFIG_SQUASHFS_XZ=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_G_NCM=m @@ -420,7 +428,6 @@ CONFIG_NTFS_RW=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_UBIFS_FS=y -CONFIG_SQUASHFS=y CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y -- cgit v1.2.3