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.

6 files changed, 10 insertions, 10 deletions

diff --git a/main/linux-hardened/APKBUILD b/main/linux-hardened/APKBUILD
index ba0a8fdebd..5a08e0bf85 100644
--- a/main/linux-hardened/APKBUILD
+++ b/main/linux-hardened/APKBUILD
@@ -208,8 +208,8 @@ ac1ffa5a28e8801ca42e7cb5b6850cb8aeb71dac7669c0fbb5edb1d94c8448012922ee2f5f8f6f06
 5dd0800e75a2fb69262a8761c64f5151609ec665eeb2b5724036e00b0e6b191b177297c07dc2dc1edaa0be8ff4e00c90f6cb5cc3ed8a7702f2f5e6475e13f6b9  hardened-3.1-4.9.60-201704252333-alpine.patch
 5373728be2b507c3db5e042e1d768740df7965078868afdc46418b1adc4cae3d8f9f1aedb59975a0f2acf8754340499354fcf97c503397a5d9886ccc9689b782  0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch
 5a0a78e6de11eb8180d96830b9faa9ac560586f7beb663c8196a16ac6232b5008b9181b3c9b94e2b13a444acba4b6e80a3408d34606432f92eb4d169c3953d5d  zfs-fix.patch
-575aadb21b93cd3d366ecbeee0c8205404114a0bcb769146c5e97362adead5bf53a8ec1da0f13d7cf3a73edab5d217eb9854c6b71c2fcd1be3e2afe07a278dd3  config-hardened.x86
-8553e40bb26f188ec1ede43273099649d08da068047d268ed21cca4471e358006ae82418031a2c9b7df3454cf8cc898ac58fc4025e582d9fb61ad0a9a40f8653  config-hardened.x86_64
-44e51cb6d54725f1de2a1700a801868de8f5e8b23b8cd2c8f936b22d46bb06ab2a3cec7bdedd2fbfc9272986db71ae072c2b96689e05304806bc3bda88e12a79  config-hardened.armhf
-8c05c51738b979225bfe46614eeddce85776ef05cfd8946c7c2ab7445981c43cf89c941c51ad689f437dc3705777f050e137c32095ef5a7451bb396cecaeac6b  config-virthardened.x86
-6d27f18e8c47e1f0d55cd21264ee0c2b6680600f7ab90e766957bcec05cd972301384d65916cd3b79fee127b492cc171dc95e9ad53fc7b2b70f7b8f51065fbdf  config-virthardened.x86_64"
+72ebda2e8f54047ff1884bcde9f2a0b02bbe5d2b210eff484b165963c53f22413d3513c36e00bc6114e9ee34bb1e3f289cdf82215a3685f2301f0e4deef62829  config-hardened.x86
+8310cca535b7c80806ca30f2f43a46222ceb1f65a3570d06e8e3a64bd1917ec881faf6dc2c94910dcfd8ba0a61f82db36f5fe94f5b1b86e08bb36ff89e7986b9  config-hardened.x86_64
+67e56335e8773c605bf6ceb69a8556989f82ceca59d7f26767cb0c123304a6044614090242877320ab51f3ff1e2e96eb1f3fc11d2432884bf8d12bf3d16d2e00  config-hardened.armhf
+4fe0622b6cfbb46cca5c4fcacb147b000d4ddeb6e8e3420bae8863074dc6be17e7c23af349949a3cc4f94c13a491195d3446c3e208cec500dfc773720e4470b2  config-virthardened.x86
+209f121c17f3be367be750d5742c9998ac63dc5eb91951268a48723e0c2698f6b3db7f7801a63dfe41ef42a8fb36446dd70b2bb49034baa103b8ec24a7af36b6  config-virthardened.x86_64"
diff --git a/main/linux-hardened/config-hardened.armhf b/main/linux-hardened/config-hardened.armhf
index e582268684..4b61eb9a0c 100644
--- a/main/linux-hardened/config-hardened.armhf
+++ b/main/linux-hardened/config-hardened.armhf
@@ -6059,7 +6059,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
diff --git a/main/linux-hardened/config-hardened.x86 b/main/linux-hardened/config-hardened.x86
index 0bf5808f25..23c22b4861 100644
--- a/main/linux-hardened/config-hardened.x86
+++ b/main/linux-hardened/config-hardened.x86
@@ -6319,7 +6319,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
diff --git a/main/linux-hardened/config-hardened.x86_64 b/main/linux-hardened/config-hardened.x86_64
index cc5fcadd84..8f2ec16b99 100644
--- a/main/linux-hardened/config-hardened.x86_64
+++ b/main/linux-hardened/config-hardened.x86_64
@@ -6242,7 +6242,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
diff --git a/main/linux-hardened/config-virthardened.x86 b/main/linux-hardened/config-virthardened.x86
index b94c7a4d24..8f9bba489d 100644
--- a/main/linux-hardened/config-virthardened.x86
+++ b/main/linux-hardened/config-virthardened.x86
@@ -3264,7 +3264,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
diff --git a/main/linux-hardened/config-virthardened.x86_64 b/main/linux-hardened/config-virthardened.x86_64
index cc7c495993..a28c81526f 100644
--- a/main/linux-hardened/config-virthardened.x86_64
+++ b/main/linux-hardened/config-virthardened.x86_64
@@ -3340,7 +3340,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