diff options
| -rw-r--r-- | core/linux-lts/PKGBUILD | 7 | ||||
| -rw-r--r-- | core/linux-lts/config | 2 | ||||
| -rw-r--r-- | core/linux-lts/no-ultra-zstd.patch | 12 |
3 files changed, 19 insertions, 2 deletions
diff --git a/core/linux-lts/PKGBUILD b/core/linux-lts/PKGBUILD index c43e3041..ffe999a4 100644 --- a/core/linux-lts/PKGBUILD +++ b/core/linux-lts/PKGBUILD @@ -3,7 +3,7 @@ # fail if upstream's .config changes for ((i=0; i<${#sha256sums[@]}; i++)); do if [ "${sha256sums[${i}]}" = '14d52a4f598bdbf752546c4bab4dd096173db1f958df7dde97d17bb347b7073f' ]; then - sha256sums[${i}]='4135bd56391d641aef00e4b52111c944f6ab816b0bc99f90dd0cb421967d516c' + sha256sums[${i}]='e92944269abb4310bd44c98a1008c95e5894a223caa3a73336fca218b513b66d' fi done @@ -14,3 +14,8 @@ eval "$( \,arch/x86/Makefile,a install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile_32.cpu ' )" + +# avoid using zstd compression in ultra mode (exhausts virtual memory) +source+=('no-ultra-zstd.patch') +sha256sums+=('3997ce6033fdf950a9960f1db720b38c47b1a2e06ab75fc6712c154f596e7c47') +# upstream prepare() does already do the *.patch patching diff --git a/core/linux-lts/config b/core/linux-lts/config index 8ebcc8de..0a8ce209 100644 --- a/core/linux-lts/config +++ b/core/linux-lts/config @@ -241,7 +241,7 @@ CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_BPF_JIT_DEFAULT_ON=y CONFIG_USERMODE_DRIVER=y -CONFIG_BPF_PRELOAD=y +# CONFIG_BPF_PRELOAD is not set CONFIG_BPF_PRELOAD_UMD=m CONFIG_USERFAULTFD=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y diff --git a/core/linux-lts/no-ultra-zstd.patch b/core/linux-lts/no-ultra-zstd.patch new file mode 100644 index 00000000..e3b133d5 --- /dev/null +++ b/core/linux-lts/no-ultra-zstd.patch @@ -0,0 +1,12 @@ +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); } > $@ + + quiet_cmd_zstd22 = ZSTD22 $@ +- cmd_zstd22 = { cat $(real-prereqs) | $(ZSTD) -22 --ultra; $(size_append); } > $@ ++ cmd_zstd22 = { cat $(real-prereqs) | $(ZSTD) -19; $(size_append); } > $@ + + # ASM offsets + # --------------------------------------------------------------------------- |