aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-vanilla/config-vanilla.x86
diff options
context:
space:
mode:
authorJack Schmidt <github@mowsey.org>2017-11-04 16:26:58 -0400
committerNatanael Copa <ncopa@alpinelinux.org>2017-11-20 15:30:24 +0000
commit547dbc028acfb8c1f52f4928f5e6e7aa3176828e (patch)
tree56ccb26a34dd13c28c5323dc82911dcfae53cf98 /main/linux-vanilla/config-vanilla.x86
parent20f4684c1e3789331b8389c3f1c69342f22de490 (diff)
downloadaports-547dbc028acfb8c1f52f4928f5e6e7aa3176828e.tar.gz
aports-547dbc028acfb8c1f52f4928f5e6e7aa3176828e.tar.bz2
aports-547dbc028acfb8c1f52f4928f5e6e7aa3176828e.tar.xz
main/linux-* and main/squashfs-tools: normalize squashfs compression options
This commit brings kernel and userspace into agreement about squashfs compression algorithms: zlib, xz, lzo, and lz4 (except on S/390 and PPC64LE). Some kernels has LZO, some had LZ4, some had both. Userspace had LZO, but not LZ4. XZ and LZO were added to squashfs-tools in commit 151deb4c2fe91078c30c588de3fe9e411849a52f Most compression options were added to kernels through default configs: * LZO had been enabled in RPI, RPI2, S/390, PPC64le, and squashfs-tools. * LZ4 had been enabled in x86, x86_64, aarch64, armhf, rpi, rpi2. Default linux kernel config does not currently include LZ4 for S/390 or PPC64le, so I did not change their config. XZ and ZLIB are in everything.
Diffstat (limited to 'main/linux-vanilla/config-vanilla.x86')
-rw-r--r--main/linux-vanilla/config-vanilla.x862
1 files changed, 1 insertions, 1 deletions
diff --git a/main/linux-vanilla/config-vanilla.x86 b/main/linux-vanilla/config-vanilla.x86
index 26cbd85765..268987e0cb 100644
--- a/main/linux-vanilla/config-vanilla.x86
+++ b/main/linux-vanilla/config-vanilla.x86
@@ -6270,7 +6270,7 @@ CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
CONFIG_SQUASHFS_XATTR=y
CONFIG_SQUASHFS_ZLIB=y
CONFIG_SQUASHFS_LZ4=y
-# CONFIG_SQUASHFS_LZO is not set
+CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
# CONFIG_SQUASHFS_EMBEDDED is not set