diff options
| author | Jack Schmidt <github@mowsey.org> | 2017-11-04 16:26:58 -0400 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-11-20 15:30:24 +0000 |
| commit | 547dbc028acfb8c1f52f4928f5e6e7aa3176828e (patch) | |
| tree | 56ccb26a34dd13c28c5323dc82911dcfae53cf98 /main/linux-vanilla | |
| parent | 20f4684c1e3789331b8389c3f1c69342f22de490 (diff) | |
| download | 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')
| -rw-r--r-- | main/linux-vanilla/APKBUILD | 8 | ||||
| -rw-r--r-- | main/linux-vanilla/config-vanilla.aarch64 | 2 | ||||
| -rw-r--r-- | main/linux-vanilla/config-vanilla.armhf | 2 | ||||
| -rw-r--r-- | main/linux-vanilla/config-vanilla.x86 | 2 | ||||
| -rw-r--r-- | main/linux-vanilla/config-vanilla.x86_64 | 2 |
5 files changed, 8 insertions, 8 deletions
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 |