aboutsummaryrefslogtreecommitdiffstats
path: root/main
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
parent20f4684c1e3789331b8389c3f1c69342f22de490 (diff)
downloadaports-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')
-rw-r--r--main/linux-hardened/APKBUILD10
-rw-r--r--main/linux-hardened/config-hardened.armhf2
-rw-r--r--main/linux-hardened/config-hardened.x862
-rw-r--r--main/linux-hardened/config-hardened.x86_642
-rw-r--r--main/linux-hardened/config-virthardened.x862
-rw-r--r--main/linux-hardened/config-virthardened.x86_642
-rw-r--r--main/linux-vanilla/APKBUILD8
-rw-r--r--main/linux-vanilla/config-vanilla.aarch642
-rw-r--r--main/linux-vanilla/config-vanilla.armhf2
-rw-r--r--main/linux-vanilla/config-vanilla.x862
-rw-r--r--main/linux-vanilla/config-vanilla.x86_642
-rw-r--r--main/squashfs-tools/APKBUILD4
12 files changed, 20 insertions, 20 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
diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index 38cce30534..2fabca191d 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -174,10 +174,10 @@ dev() {
sha512sums="bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a linux-4.9.tar.xz
5373728be2b507c3db5e042e1d768740df7965078868afdc46418b1adc4cae3d8f9f1aedb59975a0f2acf8754340499354fcf97c503397a5d9886ccc9689b782 0001-HID-apple-fix-Fn-key-Magic-Keyboard-on-bluetooth.patch
-a4c808addf397540fccc2ac502413e3eeee5724fe29f4aac70d7accdb2808309d558d57c4ac84e0b37b5aab82a21139b7b65e67f9fb1a14e55b125f57dafc1b5 config-vanilla.aarch64
-34d33c24f76ce827fdf8b9b30dbec0bc190847b1480bbef93ed4f2251252accbce5779b8c382e6714aec35ab16d808edbbb78e07523c912b2d33ad434390c882 config-vanilla.armhf
-50c3e0c02423d39c11bd9804cde4ebe2194c8d9b4b187ef80c295977dea74aacc202e672e1f9293617bcee23a218d9a42655bc16f5918514bf3402a7a6da64e9 config-vanilla.x86
-001f288fb408b2dde66b2880e3f6a415b455d3d73132cde67ea10e735371e9864a3049cba5f46d1ac5f9eb2221ffb200dde4ce4d680b331fbe24135244a4ecbc config-vanilla.x86_64
+d552c5ab3b128cb1b4185aaa3ed27cd92070c2ba5f414747730c1915da432d1f930f81543737b902771967b02da8b41374d8b39518e5443aeaadeaa28153ae36 config-vanilla.aarch64
+560999f347b4729502312155fc4bbe2456c978b8e51326ff14f5e853c4d1cad817dbb5f6e00ac624bd0c8235f24e366447d78ba63ab36936d778a3852e9c1514 config-vanilla.armhf
+6e1d79ebd2113e02881aec39eb4d243761d78be9c736b0ce5ddf1721e65d411a17c866c9f5f9a253e46017d6e7c0b93b7220233780e46e18e29de705f2e543f7 config-vanilla.x86
+30a1ec682dd8df025151a7e76e83917d7ead6d2e730e85b0e87941f82dcb45f69afe928472e595997f373460f6c958b802c54663dab7ee9241ecaaf7cd13c769 config-vanilla.x86_64
ee565e219530bcfaf5cade2622432cfb83743bdbbfc388781901461f19ca553b7fdee3c81ce6b34225ef78a209eb60088630284fcbb0430947aad77a5d8a0865 config-vanilla.ppc
0d9104590a9da6723c071003ef9379235c2b74a284006badb323c4c1e6eafa88ae02910eb59b4bbd0ea0979ec99351c6bc4460d4c0c90e8e2dea831eddcc70d6 config-vanilla.ppc64le
040ded4603acd7d72227b8ea648876118f647d5750331c68419f057def3da4e751a13e8d73ae6d2f040e8a2eedd128415d9cf75420c1e3d5314910d11c705d95 config-vanilla.s390x
diff --git a/main/linux-vanilla/config-vanilla.aarch64 b/main/linux-vanilla/config-vanilla.aarch64
index 965acc83b7..cef31f02d9 100644
--- a/main/linux-vanilla/config-vanilla.aarch64
+++ b/main/linux-vanilla/config-vanilla.aarch64
@@ -6383,7 +6383,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-vanilla/config-vanilla.armhf b/main/linux-vanilla/config-vanilla.armhf
index 8dc0e7fff9..bda3ae0334 100644
--- a/main/linux-vanilla/config-vanilla.armhf
+++ b/main/linux-vanilla/config-vanilla.armhf
@@ -5219,7 +5219,7 @@ CONFIG_SQUASHFS_DECOMP_MULTI=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-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
diff --git a/main/linux-vanilla/config-vanilla.x86_64 b/main/linux-vanilla/config-vanilla.x86_64
index d61987d8b3..41bc728895 100644
--- a/main/linux-vanilla/config-vanilla.x86_64
+++ b/main/linux-vanilla/config-vanilla.x86_64
@@ -6298,7 +6298,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/squashfs-tools/APKBUILD b/main/squashfs-tools/APKBUILD
index 05681d0d0a..2e4be8822e 100644
--- a/main/squashfs-tools/APKBUILD
+++ b/main/squashfs-tools/APKBUILD
@@ -7,7 +7,7 @@ url="http://squashfs.sourceforge.net"
arch="all"
license="GPL"
depends=
-makedepends="zlib-dev xz-dev lzo-dev attr-dev"
+makedepends="zlib-dev xz-dev lzo-dev lz4-dev attr-dev"
source="http://downloads.sourceforge.net/sourceforge/squashfs/squashfs$pkgver.tar.gz
fix-compat.patch
vla-overlow.patch
@@ -28,7 +28,7 @@ prepare() {
build() {
cd "$_builddir"
- make XZ_SUPPORT=1 LZO_SUPPORT=1
+ make XZ_SUPPORT=1 LZO_SUPPORT=1 LZ4_SUPPORT=1
}
package() {
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 17:12:09 +0000