UBUNTU: [Config] CONFIG_SQUASHFS=y

BugLink: http://bugs.launchpad.net/bugs/1593134
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Paolo Pisati <paolo.pisati@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>

diff --git a/debian.snapdragon/abi/4.4.0-1019.22/arm64/snapdragon.modules b/debian.snapdragon/abi/4.4.0-1019.22/arm64/snapdragon.modules
index 1e83a8227e0a3b4e11b64ebab525a78b9e4c8650..2e1d5d8907fdd3ead30b643a37ac042a53af98da 100644 (file)
--- a/debian.snapdragon/abi/4.4.0-1019.22/arm64/snapdragon.modules
+++ b/debian.snapdragon/abi/4.4.0-1019.22/arm64/snapdragon.modules
@@ -3481,7 +3481,6 @@ spi-tle62x0
 spi-xcomm
 spi-zynqmp-gqspi
 sprd_serial
-squashfs
 sr9700
 sr9800
 ssb

diff --git a/debian.snapdragon/config/annotations b/debian.snapdragon/config/annotations
index 1261b89b2d7cc3b62440fab3c72f07fc546e2114..159ed206b4c9259abee1c18e1a73aa40e96ae2f6 100644 (file)
--- a/debian.snapdragon/config/annotations
+++ b/debian.snapdragon/config/annotations
@@ -7401,7 +7401,7 @@ CONFIG_ROMFS_BACKED_BY_MTD                      policy<{'amd64': 'n', 'arm64': '
 CONFIG_ROMFS_BACKED_BY_BOTH                     policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n'}>
 
 # Menu: File systems >> Miscellaneous filesystems >> SquashFS 4.0 - Squashed file system support
-CONFIG_SQUASHFS                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_SQUASHFS                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_SQUASHFS_XATTR                           policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_SQUASHFS_ZLIB                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_SQUASHFS_LZ4                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
@@ -7412,6 +7412,7 @@ CONFIG_SQUASHFS_EMBEDDED                        policy<{'amd64': 'n', 'arm64': '
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE             policy<{'amd64': '3', 'arm64': '3', 'armhf': '3', 'i386': '3', 'powerpc': '3', 'ppc64el': '3', 's390x': '3'}>
 #
 CONFIG_SQUASHFS_4K_DEVBLK_SIZE                  note<non-default block size>
+CONFIG_SQUASHFS                                        mark<ENFORCED> note<LP#1593134>
 
 # Menu: File systems >> Miscellaneous filesystems >> SquashFS 4.0 - Squashed file system support >> Decompressor parallelisation options
 CONFIG_SQUASHFS_DECOMP_SINGLE                   policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>

diff --git a/debian.snapdragon/config/config.common.ubuntu b/debian.snapdragon/config/config.common.ubuntu
index ae4eaa5bccdaca74bb51551dac0f5df7445523c6..bbba57fd0b4de29e3d6acc65ee5327fc48449c3c 100644 (file)
--- a/debian.snapdragon/config/config.common.ubuntu
+++ b/debian.snapdragon/config/config.common.ubuntu
@@ -5762,7 +5762,7 @@ CONFIG_SPI_ZYNQMP_GQSPI=m
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_SPMI=y
 CONFIG_SPMI_MSM_PMIC_ARB=y
-CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y

diff --git a/debian.snapdragon/d-i/modules/squashfs-modules b/debian.snapdragon/d-i/modules/squashfs-modules
deleted file mode 100644 (file)
index b0c5ed0..0000000
--- a/debian.snapdragon/d-i/modules/squashfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-squashfs ?

diff --git a/debian.snapdragon/d-i/package-list b/debian.snapdragon/d-i/package-list
index 51a520f1da525c04e1d7869e18b857671cba517d..d60058a4b6b13523b960e64d0d5f36824f0107db 100644 (file)
--- a/debian.snapdragon/d-i/package-list
+++ b/debian.snapdragon/d-i/package-list
@@ -177,12 +177,6 @@ Priority: extra
 Description: Mouse support
  This package contains mouse drivers for the Linux kernel.
 
-Package: squashfs-modules
-Depends: kernel-image
-Priority: extra
-Description: squashfs modules
- This package contains squashfs modules.
-
 Package: vlan-modules
 Depends: kernel-image
 Priority: extra