UBUNTU: [Config] CONFIG_SQUASHFS=y

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

debian.master/abi/4.4.0-28.47/amd64/generic.modules

@@ -3830,7 +3830,6 @@ spi-zynqmp-gqspi
 spl
 splat
 spmi
-squashfs
 sr9700
 sr9800
 ssb

debian.master/abi/4.4.0-28.47/amd64/lowlatency.modules

@@ -3829,7 +3829,6 @@ spi-zynqmp-gqspi
 spl
 splat
 spmi
-squashfs
 sr9700
 sr9800
 ssb

debian.master/abi/4.4.0-28.47/arm64/generic.modules

@@ -3655,7 +3655,6 @@ splat
 spmi
 spmi-pmic-arb
 sprd_serial
-squashfs
 sr9700
 sr9800
 ssb

debian.master/abi/4.4.0-28.47/armhf/generic-lpae.modules

@@ -3818,7 +3818,6 @@ spi-xcomm
 spi-zynqmp-gqspi
 spmi
 spmi-pmic-arb
-squashfs
 sr9700
 sr9800
 ssb

debian.master/abi/4.4.0-28.47/armhf/generic.modules

@@ -3902,7 +3902,6 @@ spi-xcomm
 spi-zynqmp-gqspi
 spmi
 spmi-pmic-arb
-squashfs
 sr9700
 sr9800
 ssb

debian.master/abi/4.4.0-28.47/i386/generic.modules

@@ -3964,7 +3964,6 @@ spi-topcliff-pch
 spi-xcomm
 spi-zynqmp-gqspi
 spmi
-squashfs
 sr9700
 sr9800
 ssb

debian.master/abi/4.4.0-28.47/i386/lowlatency.modules

@@ -3963,7 +3963,6 @@ spi-topcliff-pch
 spi-xcomm
 spi-zynqmp-gqspi
 spmi
-squashfs
 sr9700
 sr9800
 ssb

debian.master/abi/4.4.0-28.47/powerpc/powerpc-e500mc.modules

@@ -3615,7 +3615,6 @@ spi-tle62x0
 spi-xcomm
 spi-zynqmp-gqspi
 spmi
-squashfs
 sr9700
 sr9800
 ssb

debian.master/abi/4.4.0-28.47/powerpc/powerpc-smp.modules

@@ -3593,7 +3593,6 @@ spi-tle62x0
 spi-xcomm
 spi-zynqmp-gqspi
 spmi
-squashfs
 sr9700
 sr9800
 ssb

debian.master/abi/4.4.0-28.47/powerpc/powerpc64-emb.modules

@@ -3600,7 +3600,6 @@ spi-tle62x0
 spi-xcomm
 spi-zynqmp-gqspi
 spmi
-squashfs
 sr9700
 sr9800
 ssb

debian.master/abi/4.4.0-28.47/powerpc/powerpc64-smp.modules

@@ -3627,7 +3627,6 @@ spl
 splat
 spmi
 spufs
-squashfs
 sr9700
 sr9800
 ssb

debian.master/abi/4.4.0-28.47/ppc64el/generic.modules

@@ -3543,7 +3543,6 @@ spi-zynqmp-gqspi
 spl
 splat
 spmi
-squashfs
 sr9700
 sr9800
 ssb

debian.master/abi/4.4.0-28.47/s390x/generic.modules

@@ -648,7 +648,6 @@ smsgiucv_app
 softdog
 spl
 splat
-squashfs
 st
 ste10Xp
 stm_console

debian.master/config/annotations

@@ -7407,7 +7407,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'}>
@@ -7418,6 +7418,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'}>

debian.master/config/config.common.ubuntu

@@ -7605,7 +7605,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_SPMI_MSM_PMIC_ARB=m
 CONFIG_SPU_BASE=y
 CONFIG_SPU_FS=m
-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

debian.master/d-i/modules/squashfs-modules

-squashfs ?

debian.master/d-i/package-list

@@ -188,12 +188,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