Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2023-03-25 08:19:42 +0100
committerErich Eckner <git@eckner.net>2023-03-25 08:19:42 +0100
commitcb87f164527316dbc61f572d57c6a7c15db18b9d (patch)
treeed70f5f0f080fd74e6bb686e824304a45ae0e4e8
parent50c2a2da825859bf16bfdf792171e898bb5215a2 (diff)
core/linux-lts: fix no-ultra patch
-rw-r--r--core/linux-lts/PKGBUILD2
-rw-r--r--core/linux-lts/no-ultra-zstd.patch12
2 files changed, 9 insertions, 5 deletions
diff --git a/core/linux-lts/PKGBUILD b/core/linux-lts/PKGBUILD
index f50e9aa0..8afca124 100644
--- a/core/linux-lts/PKGBUILD
+++ b/core/linux-lts/PKGBUILD
@@ -37,7 +37,7 @@ _get_gcc_version_from_config() {
# avoid using zstd compression in ultra mode (exhausts virtual memory)
source+=('no-ultra-zstd.patch')
-sha256sums+=('3997ce6033fdf950a9960f1db720b38c47b1a2e06ab75fc6712c154f596e7c47')
+sha256sums+=('a044d2ed2ac13f0435e94e567f6fd5d8380b694f74e344857ca64ef0c9424a07')
# upstream prepare() does already do the *.patch patching
# temporarily disabled documentation due to sphinx_rtd_theme (FS32#163)
diff --git a/core/linux-lts/no-ultra-zstd.patch b/core/linux-lts/no-ultra-zstd.patch
index e3b133d5..7be75bbc 100644
--- a/core/linux-lts/no-ultra-zstd.patch
+++ b/core/linux-lts/no-ultra-zstd.patch
@@ -1,12 +1,16 @@
diff -rauN a/scripts/Makefile.lib b/scripts/Makefile.lib
--- a/scripts/Makefile.lib 2020-11-11 06:45:51.375133819 +0100
+++ b/scripts/Makefile.lib 2020-11-11 06:46:12.058448322 +0100
-@@ -445,7 +445,7 @@
- cmd_zstd = { cat $(real-prereqs) | $(ZSTD) -19; $(size_append); } > $@
+@@ -530,10 +530,10 @@
+ cmd_zstd = cat $(real-prereqs) | $(ZSTD) -19 > $@
quiet_cmd_zstd22 = ZSTD22 $@
-- cmd_zstd22 = { cat $(real-prereqs) | $(ZSTD) -22 --ultra; $(size_append); } > $@
-+ cmd_zstd22 = { cat $(real-prereqs) | $(ZSTD) -19; $(size_append); } > $@
+- cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -22 --ultra > $@
++ cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -19 --ultra > $@
+
+ quiet_cmd_zstd22_with_size = ZSTD22 $@
+- cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -22 --ultra; $(size_append); } > $@
++ cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -19 --ultra; $(size_append); } > $@
# ASM offsets
# ---------------------------------------------------------------------------