commit: a47c371bfe46821952d584e7c0102948682a4602 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Sun Apr 12 15:28:25 2020 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Sun Apr 12 15:28:25 2020 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=a47c371b
Bump ZSTD Patchset to V5 Closes: https://bugs.gentoo.org/716520 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> 0000_README | 16 ++++++++-------- ...> 5000_ZSTD-v5-1-8-prepare-zstd-for-preboot-env.patch | 0 ...5001_ZSTD-v5-2-8-prepare-xxhash-for-preboot-env.patch | 0 ...5002_ZSTD-v5-3-8-add-zstd-support-to-decompress.patch | 6 +++--- ...3_ZSTD-v5-4-8-add-support-for-zstd-compres-kern.patch | 10 +++++----- ...5-5-8-add-support-for-zstd-compressed-initramfs.patch | 8 +++++--- ...> 5005_ZSTD-v5-6-8-bump-ZO-z-extra-bytes-margin.patch | 4 ++-- ..._ZSTD-v5-7-8-support-for-ZSTD-compressed-kernel.patch | 12 ++++++------ ...ZSTD-v5-8-8-gitignore-add-ZSTD-compressed-files.patch | 4 ++-- 9 files changed, 31 insertions(+), 29 deletions(-) diff --git a/0000_README b/0000_README index 7af0186..458ce4b 100644 --- a/0000_README +++ b/0000_README @@ -79,35 +79,35 @@ Patch: 4567_distro-Gentoo-Kconfig.patch From: Tom Wijsman <tom...@gentoo.org> Desc: Add Gentoo Linux support config settings and defaults. -Patch: 5000_ZSTD-v4-1-8-prepare-zstd-for-preboot-env.patch +Patch: 5000_ZSTD-v5-1-8-prepare-zstd-for-preboot-env.patch From: https://lkml.org/lkml/2020/4/1/29 Desc: lib: prepare zstd for preboot environment -Patch: 5001_ZSTD-v4-2-8-prepare-xxhash-for-preboot-env.patch +Patch: 5001_ZSTD-v5-2-8-prepare-xxhash-for-preboot-env.patch From: https://lkml.org/lkml/2020/4/1/29 Desc: lib: prepare xxhash for preboot environment -Patch: 5002_ZSTD-v4-3-8-add-zstd-support-to-decompress.patch +Patch: 5002_ZSTD-v5-3-8-add-zstd-support-to-decompress.patch From: https://lkml.org/lkml/2020/4/1/29 Desc: lib: add zstd support to decompress -Patch: 5003_ZSTD-v4-4-8-add-support-for-zstd-compres-kern.patch +Patch: 5003_ZSTD-v5-4-8-add-support-for-zstd-compres-kern.patch From: https://lkml.org/lkml/2020/4/1/29 Desc: init: add support for zstd compressed kernel -Patch: 5004_ZSTD-v4-5-8-add-support-for-zstd-compressed-initramfs.patch +Patch: 5004_ZSTD-v5-5-8-add-support-for-zstd-compressed-initramfs.patch From: https://lkml.org/lkml/2020/4/1/29 Desc: usr: add support for zstd compressed initramfs -Patch: 5005_ZSTD-v4-6-8-bump-ZO-z-extra-bytes-margin.patch +Patch: 5005_ZSTD-v5-6-8-bump-ZO-z-extra-bytes-margin.patch From: https://lkml.org/lkml/2020/4/1/29 Desc: x86: bump ZO_z_extra_bytes margin for zstd -Patch: 5006_ZSTD-v4-7-8-support-for-ZSTD-compressed-kernel.patch +Patch: 5006_ZSTD-v5-7-8-support-for-ZSTD-compressed-kernel.patch From: https://lkml.org/lkml/2020/4/1/29 Desc: x86: Add support for ZSTD compressed kernel -Patch: 5007_ZSTD-v4-8-8-gitignore-add-ZSTD-compressed-files.patch +Patch: 5007_ZSTD-v5-8-8-gitignore-add-ZSTD-compressed-files.patch From: https://lkml.org/lkml/2020/4/1/29 Desc: .gitignore: add ZSTD-compressed files diff --git a/5000_ZSTD-v4-1-8-prepare-zstd-for-preboot-env.patch b/5000_ZSTD-v5-1-8-prepare-zstd-for-preboot-env.patch similarity index 100% rename from 5000_ZSTD-v4-1-8-prepare-zstd-for-preboot-env.patch rename to 5000_ZSTD-v5-1-8-prepare-zstd-for-preboot-env.patch diff --git a/5001_ZSTD-v4-2-8-prepare-xxhash-for-preboot-env.patch b/5001_ZSTD-v5-2-8-prepare-xxhash-for-preboot-env.patch similarity index 100% rename from 5001_ZSTD-v4-2-8-prepare-xxhash-for-preboot-env.patch rename to 5001_ZSTD-v5-2-8-prepare-xxhash-for-preboot-env.patch diff --git a/5002_ZSTD-v4-3-8-add-zstd-support-to-decompress.patch b/5002_ZSTD-v5-3-8-add-zstd-support-to-decompress.patch similarity index 98% rename from 5002_ZSTD-v4-3-8-add-zstd-support-to-decompress.patch rename to 5002_ZSTD-v5-3-8-add-zstd-support-to-decompress.patch index 4f11460..1c22fa3 100644 --- a/5002_ZSTD-v4-3-8-add-zstd-support-to-decompress.patch +++ b/5002_ZSTD-v5-3-8-add-zstd-support-to-decompress.patch @@ -16,7 +16,7 @@ index 000000000000..56d539ae880f + void (*error_fn)(char *x)); +#endif diff --git a/lib/Kconfig b/lib/Kconfig -index bc7e56370129..11de5fa09a52 100644 +index 5d53f9609c25..e883aecb9279 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -336,6 +336,10 @@ config DECOMPRESS_LZ4 @@ -31,10 +31,10 @@ index bc7e56370129..11de5fa09a52 100644 # Generic allocator support is selected if needed # diff --git a/lib/Makefile b/lib/Makefile -index 611872c06926..09ad45ba6883 100644 +index ab68a8674360..3ce4ac296611 100644 --- a/lib/Makefile +++ b/lib/Makefile -@@ -160,6 +160,7 @@ lib-$(CONFIG_DECOMPRESS_LZMA) += decompress_unlzma.o +@@ -166,6 +166,7 @@ lib-$(CONFIG_DECOMPRESS_LZMA) += decompress_unlzma.o lib-$(CONFIG_DECOMPRESS_XZ) += decompress_unxz.o lib-$(CONFIG_DECOMPRESS_LZO) += decompress_unlzo.o lib-$(CONFIG_DECOMPRESS_LZ4) += decompress_unlz4.o diff --git a/5003_ZSTD-v4-4-8-add-support-for-zstd-compres-kern.patch b/5003_ZSTD-v5-4-8-add-support-for-zstd-compres-kern.patch similarity index 91% rename from 5003_ZSTD-v4-4-8-add-support-for-zstd-compres-kern.patch rename to 5003_ZSTD-v5-4-8-add-support-for-zstd-compres-kern.patch index e6598e6..d9dc79e 100644 --- a/5003_ZSTD-v4-4-8-add-support-for-zstd-compres-kern.patch +++ b/5003_ZSTD-v5-4-8-add-support-for-zstd-compres-kern.patch @@ -1,8 +1,8 @@ diff --git a/init/Kconfig b/init/Kconfig -index 20a6ac33761c..9b646a25918e 100644 +index 492bb7000aa4..806874fdd663 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -173,13 +173,16 @@ config HAVE_KERNEL_LZO +@@ -176,13 +176,16 @@ config HAVE_KERNEL_LZO config HAVE_KERNEL_LZ4 bool @@ -20,7 +20,7 @@ index 20a6ac33761c..9b646a25918e 100644 help The linux kernel is a kind of self-extracting executable. Several compression algorithms are available, which differ -@@ -258,6 +261,16 @@ config KERNEL_LZ4 +@@ -261,6 +264,16 @@ config KERNEL_LZ4 is about 8% bigger than LZO. But the decompression speed is faster than LZO. @@ -38,10 +38,10 @@ index 20a6ac33761c..9b646a25918e 100644 bool "None" depends on HAVE_KERNEL_UNCOMPRESSED diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 752ff0a225a9..4b99893efa3d 100644 +index b12dd5ba4896..efe69b78d455 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -394,6 +394,21 @@ quiet_cmd_xzkern = XZKERN $@ +@@ -405,6 +405,21 @@ quiet_cmd_xzkern = XZKERN $@ quiet_cmd_xzmisc = XZMISC $@ cmd_xzmisc = cat $(real-prereqs) | xz --check=crc32 --lzma2=dict=1MiB > $@ diff --git a/5004_ZSTD-v4-5-8-add-support-for-zstd-compressed-initramfs.patch b/5004_ZSTD-v5-5-8-add-support-for-zstd-compressed-initramfs.patch similarity index 91% rename from 5004_ZSTD-v4-5-8-add-support-for-zstd-compressed-initramfs.patch rename to 5004_ZSTD-v5-5-8-add-support-for-zstd-compressed-initramfs.patch index 6054414..0096db1 100644 --- a/5004_ZSTD-v4-5-8-add-support-for-zstd-compressed-initramfs.patch +++ b/5004_ZSTD-v5-5-8-add-support-for-zstd-compressed-initramfs.patch @@ -1,5 +1,5 @@ diff --git a/usr/Kconfig b/usr/Kconfig -index bdf5bbd40727..43aca37d09b5 100644 +index 96afb03b65f9..2599bc21c1b2 100644 --- a/usr/Kconfig +++ b/usr/Kconfig @@ -100,6 +100,15 @@ config RD_LZ4 @@ -18,7 +18,7 @@ index bdf5bbd40727..43aca37d09b5 100644 choice prompt "Built-in initramfs compression mode" depends on INITRAMFS_SOURCE != "" -@@ -207,4 +216,15 @@ config INITRAMFS_COMPRESSION_LZ4 +@@ -196,6 +205,17 @@ config INITRAMFS_COMPRESSION_LZ4 If you choose this, keep in mind that most distros don't provide lz4 by default which could cause a build failure. @@ -33,7 +33,9 @@ index bdf5bbd40727..43aca37d09b5 100644 + If you choose this, keep in mind that you may need to install the zstd + tool to be able to compress the initram. + - endchoice + config INITRAMFS_COMPRESSION_NONE + bool "None" + help diff --git a/usr/Makefile b/usr/Makefile index c12e6b15ce72..b1a81a40eab1 100644 --- a/usr/Makefile diff --git a/5005_ZSTD-v4-6-8-bump-ZO-z-extra-bytes-margin.patch b/5005_ZSTD-v5-6-8-bump-ZO-z-extra-bytes-margin.patch similarity index 87% rename from 5005_ZSTD-v4-6-8-bump-ZO-z-extra-bytes-margin.patch rename to 5005_ZSTD-v5-6-8-bump-ZO-z-extra-bytes-margin.patch index b4fd239..4e86d56 100644 --- a/5005_ZSTD-v4-6-8-bump-ZO-z-extra-bytes-margin.patch +++ b/5005_ZSTD-v5-6-8-bump-ZO-z-extra-bytes-margin.patch @@ -1,8 +1,8 @@ diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S -index 97d9b6d6c1af..b820875c5c95 100644 +index 735ad7f21ab0..6dbd7e9f74c9 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S -@@ -536,8 +536,14 @@ pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr +@@ -539,8 +539,14 @@ pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr # the size-dependent part now grows so fast. # # extra_bytes = (uncompressed_size >> 8) + 65536 diff --git a/5006_ZSTD-v4-7-8-support-for-ZSTD-compressed-kernel.patch b/5006_ZSTD-v5-7-8-support-for-ZSTD-compressed-kernel.patch similarity index 93% rename from 5006_ZSTD-v4-7-8-support-for-ZSTD-compressed-kernel.patch rename to 5006_ZSTD-v5-7-8-support-for-ZSTD-compressed-kernel.patch index 5fc8a77..6147136 100644 --- a/5006_ZSTD-v4-7-8-support-for-ZSTD-compressed-kernel.patch +++ b/5006_ZSTD-v5-7-8-support-for-ZSTD-compressed-kernel.patch @@ -1,8 +1,8 @@ diff --git a/Documentation/x86/boot.rst b/Documentation/x86/boot.rst -index c9c201596c3e..cedcf4d49bf0 100644 +index fa7ddc0428c8..0404e99dc1d4 100644 --- a/Documentation/x86/boot.rst +++ b/Documentation/x86/boot.rst -@@ -786,9 +786,9 @@ Protocol: 2.08+ +@@ -782,9 +782,9 @@ Protocol: 2.08+ uncompressed data should be determined using the standard magic numbers. The currently supported compression formats are gzip (magic numbers 1F 8B or 1F 9E), bzip2 (magic number 42 5A), LZMA @@ -16,10 +16,10 @@ index c9c201596c3e..cedcf4d49bf0 100644 ============ ============== Field name: payload_length diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index beea77046f9b..12d88997a3a6 100644 +index 886fa8368256..912f783bc01a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -183,6 +183,7 @@ config X86 +@@ -185,6 +185,7 @@ config X86 select HAVE_KERNEL_LZMA select HAVE_KERNEL_LZO select HAVE_KERNEL_XZ @@ -28,10 +28,10 @@ index beea77046f9b..12d88997a3a6 100644 select HAVE_KPROBES_ON_FTRACE select HAVE_FUNCTION_ERROR_INJECTION diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile -index 26050ae0b27e..8233f598f15b 100644 +index 7619742f91c9..471e61400a2e 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile -@@ -24,7 +24,7 @@ OBJECT_FILES_NON_STANDARD := y +@@ -26,7 +26,7 @@ OBJECT_FILES_NON_STANDARD := y KCOV_INSTRUMENT := n targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \ diff --git a/5007_ZSTD-v4-8-8-gitignore-add-ZSTD-compressed-files.patch b/5007_ZSTD-v5-8-8-gitignore-add-ZSTD-compressed-files.patch similarity index 72% rename from 5007_ZSTD-v4-8-8-gitignore-add-ZSTD-compressed-files.patch rename to 5007_ZSTD-v5-8-8-gitignore-add-ZSTD-compressed-files.patch index 7506899..adf8578 100644 --- a/5007_ZSTD-v4-8-8-gitignore-add-ZSTD-compressed-files.patch +++ b/5007_ZSTD-v5-8-8-gitignore-add-ZSTD-compressed-files.patch @@ -1,8 +1,8 @@ diff --git a/.gitignore b/.gitignore -index 72ef86a5570d..edb0191c294f 100644 +index 2258e906f01c..23871de69072 100644 --- a/.gitignore +++ b/.gitignore -@@ -43,6 +43,7 @@ +@@ -44,6 +44,7 @@ *.tab.[ch] *.tar *.xz
