[PATCH Xenial SRU] UBUNTU: [Config] CONFIG_SQUASHFS=y
Tim Gardner
tim.gardner at canonical.com
Fri Jun 17 08:09:27 UTC 2016
BugLink: http://bugs.launchpad.net/bugs/1593134
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
debian.master/abi/4.4.0-25.44/amd64/generic.modules | 1 -
debian.master/abi/4.4.0-25.44/amd64/lowlatency.modules | 1 -
debian.master/abi/4.4.0-25.44/arm64/generic.modules | 1 -
debian.master/abi/4.4.0-25.44/armhf/generic-lpae.modules | 1 -
debian.master/abi/4.4.0-25.44/armhf/generic.modules | 1 -
debian.master/abi/4.4.0-25.44/i386/generic.modules | 1 -
debian.master/abi/4.4.0-25.44/i386/lowlatency.modules | 1 -
debian.master/abi/4.4.0-25.44/powerpc/powerpc-e500mc.modules | 1 -
debian.master/abi/4.4.0-25.44/powerpc/powerpc-smp.modules | 1 -
debian.master/abi/4.4.0-25.44/powerpc/powerpc64-emb.modules | 1 -
debian.master/abi/4.4.0-25.44/powerpc/powerpc64-smp.modules | 1 -
debian.master/abi/4.4.0-25.44/ppc64el/generic.modules | 1 -
debian.master/abi/4.4.0-25.44/s390x/generic.modules | 1 -
debian.master/config/annotations | 3 ++-
debian.master/config/config.common.ubuntu | 2 +-
debian.master/d-i/modules/squashfs-modules | 1 -
debian.master/d-i/package-list | 6 ------
17 files changed, 3 insertions(+), 22 deletions(-)
delete mode 100644 debian.master/d-i/modules/squashfs-modules
diff --git a/debian.master/abi/4.4.0-25.44/amd64/generic.modules b/debian.master/abi/4.4.0-25.44/amd64/generic.modules
index 139911a..d88bc81 100644
--- a/debian.master/abi/4.4.0-25.44/amd64/generic.modules
+++ b/debian.master/abi/4.4.0-25.44/amd64/generic.modules
@@ -3830,7 +3830,6 @@ spi-zynqmp-gqspi
spl
splat
spmi
-squashfs
sr9700
sr9800
ssb
diff --git a/debian.master/abi/4.4.0-25.44/amd64/lowlatency.modules b/debian.master/abi/4.4.0-25.44/amd64/lowlatency.modules
index 94876f2..972db47 100644
--- a/debian.master/abi/4.4.0-25.44/amd64/lowlatency.modules
+++ b/debian.master/abi/4.4.0-25.44/amd64/lowlatency.modules
@@ -3829,7 +3829,6 @@ spi-zynqmp-gqspi
spl
splat
spmi
-squashfs
sr9700
sr9800
ssb
diff --git a/debian.master/abi/4.4.0-25.44/arm64/generic.modules b/debian.master/abi/4.4.0-25.44/arm64/generic.modules
index 1ffabb1..fb0a021 100644
--- a/debian.master/abi/4.4.0-25.44/arm64/generic.modules
+++ b/debian.master/abi/4.4.0-25.44/arm64/generic.modules
@@ -3655,7 +3655,6 @@ splat
spmi
spmi-pmic-arb
sprd_serial
-squashfs
sr9700
sr9800
ssb
diff --git a/debian.master/abi/4.4.0-25.44/armhf/generic-lpae.modules b/debian.master/abi/4.4.0-25.44/armhf/generic-lpae.modules
index 0580e8a..a94a572 100644
--- a/debian.master/abi/4.4.0-25.44/armhf/generic-lpae.modules
+++ b/debian.master/abi/4.4.0-25.44/armhf/generic-lpae.modules
@@ -3818,7 +3818,6 @@ spi-xcomm
spi-zynqmp-gqspi
spmi
spmi-pmic-arb
-squashfs
sr9700
sr9800
ssb
diff --git a/debian.master/abi/4.4.0-25.44/armhf/generic.modules b/debian.master/abi/4.4.0-25.44/armhf/generic.modules
index 7630d11..083bff4 100644
--- a/debian.master/abi/4.4.0-25.44/armhf/generic.modules
+++ b/debian.master/abi/4.4.0-25.44/armhf/generic.modules
@@ -3902,7 +3902,6 @@ spi-xcomm
spi-zynqmp-gqspi
spmi
spmi-pmic-arb
-squashfs
sr9700
sr9800
ssb
diff --git a/debian.master/abi/4.4.0-25.44/i386/generic.modules b/debian.master/abi/4.4.0-25.44/i386/generic.modules
index d706d4d..f3585c7 100644
--- a/debian.master/abi/4.4.0-25.44/i386/generic.modules
+++ b/debian.master/abi/4.4.0-25.44/i386/generic.modules
@@ -3964,7 +3964,6 @@ spi-topcliff-pch
spi-xcomm
spi-zynqmp-gqspi
spmi
-squashfs
sr9700
sr9800
ssb
diff --git a/debian.master/abi/4.4.0-25.44/i386/lowlatency.modules b/debian.master/abi/4.4.0-25.44/i386/lowlatency.modules
index d6c4fe2..cfb3725 100644
--- a/debian.master/abi/4.4.0-25.44/i386/lowlatency.modules
+++ b/debian.master/abi/4.4.0-25.44/i386/lowlatency.modules
@@ -3963,7 +3963,6 @@ spi-topcliff-pch
spi-xcomm
spi-zynqmp-gqspi
spmi
-squashfs
sr9700
sr9800
ssb
diff --git a/debian.master/abi/4.4.0-25.44/powerpc/powerpc-e500mc.modules b/debian.master/abi/4.4.0-25.44/powerpc/powerpc-e500mc.modules
index caf6c6a..4bc52af 100644
--- a/debian.master/abi/4.4.0-25.44/powerpc/powerpc-e500mc.modules
+++ b/debian.master/abi/4.4.0-25.44/powerpc/powerpc-e500mc.modules
@@ -3615,7 +3615,6 @@ spi-tle62x0
spi-xcomm
spi-zynqmp-gqspi
spmi
-squashfs
sr9700
sr9800
ssb
diff --git a/debian.master/abi/4.4.0-25.44/powerpc/powerpc-smp.modules b/debian.master/abi/4.4.0-25.44/powerpc/powerpc-smp.modules
index 6b113bd..11e6825 100644
--- a/debian.master/abi/4.4.0-25.44/powerpc/powerpc-smp.modules
+++ b/debian.master/abi/4.4.0-25.44/powerpc/powerpc-smp.modules
@@ -3593,7 +3593,6 @@ spi-tle62x0
spi-xcomm
spi-zynqmp-gqspi
spmi
-squashfs
sr9700
sr9800
ssb
diff --git a/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-emb.modules b/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-emb.modules
index f274197..dda92f9 100644
--- a/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-emb.modules
+++ b/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-emb.modules
@@ -3600,7 +3600,6 @@ spi-tle62x0
spi-xcomm
spi-zynqmp-gqspi
spmi
-squashfs
sr9700
sr9800
ssb
diff --git a/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-smp.modules b/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-smp.modules
index 2e10784..bc5fb8d 100644
--- a/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-smp.modules
+++ b/debian.master/abi/4.4.0-25.44/powerpc/powerpc64-smp.modules
@@ -3627,7 +3627,6 @@ spl
splat
spmi
spufs
-squashfs
sr9700
sr9800
ssb
diff --git a/debian.master/abi/4.4.0-25.44/ppc64el/generic.modules b/debian.master/abi/4.4.0-25.44/ppc64el/generic.modules
index b9897ab..da50a80 100644
--- a/debian.master/abi/4.4.0-25.44/ppc64el/generic.modules
+++ b/debian.master/abi/4.4.0-25.44/ppc64el/generic.modules
@@ -3543,7 +3543,6 @@ spi-zynqmp-gqspi
spl
splat
spmi
-squashfs
sr9700
sr9800
ssb
diff --git a/debian.master/abi/4.4.0-25.44/s390x/generic.modules b/debian.master/abi/4.4.0-25.44/s390x/generic.modules
index ec0c5b4..fa7a51a 100644
--- a/debian.master/abi/4.4.0-25.44/s390x/generic.modules
+++ b/debian.master/abi/4.4.0-25.44/s390x/generic.modules
@@ -648,7 +648,6 @@ smsgiucv_app
softdog
spl
splat
-squashfs
st
ste10Xp
stm_console
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 5fc88eb..bf84251 100644
--- a/debian.master/config/annotations
+++ b/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'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 1394641..01572fb 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/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
diff --git a/debian.master/d-i/modules/squashfs-modules b/debian.master/d-i/modules/squashfs-modules
deleted file mode 100644
index b0c5ed0..0000000
--- a/debian.master/d-i/modules/squashfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-squashfs ?
diff --git a/debian.master/d-i/package-list b/debian.master/d-i/package-list
index 8e179fa..41b775f 100644
--- a/debian.master/d-i/package-list
+++ b/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
--
2.7.4
More information about the kernel-team
mailing list