From 93659818985180ed270564f012fedeb164491223 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Wed, 27 Apr 2022 16:26:04 +0200 Subject: [PATCH] 5.17.5-1 --- .SRCINFO | 52 +++++++++++++++++------------------- PKGBUILD | 81 +++++++++++++++++++++++++++++++++----------------------- 2 files changed, 72 insertions(+), 61 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 085fe81..053fba9 100755 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos pkgdesc = Linux CFS scheduler Kernel by CachyOS with other patches and improvements - pkgver = 5.17.4 - pkgrel = 3 + pkgver = 5.17.5 + pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -24,7 +24,7 @@ pkgbase = linux-cachyos makedepends = make makedepends = patch options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.17.4.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.17.5.tar.xz source = config source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0001-arch.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0002-anbox.patch @@ -35,34 +35,30 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0007-fixes-miscellaneous.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0008-fs-patches.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0009-hwmon.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0010-MG-LRU.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0010-lru-le9.patch source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0011-spf-lru.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0012-v4l2loopback.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0013-xanmod.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0014-lrng.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0015-le9.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0016-ck-hrtimer.patch - source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0017-futex-winesync.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0012-xanmod.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0013-lrng.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0014-ck-hrtimer.patch + source = https://raw.githubusercontent.com/ptr1337/kernel-patches/master/5.17/0015-futex-winesync.patch source = auto-cpu-optimization.sh - sha256sums = 6e3cd56ee83a9cb5ac3fde1442c40367ab67368946c4c93bbeb1c65664a0d3c5 + sha256sums = 9bbcd185b94436f9c8fe977fa0e862f60d34003562327fcebb27c9fa342fe987 sha256sums = 29c5dd2ae6b452b75b25816a8f6610fa2ff54f21b22a0ccef5c2e98a7077eb36 - sha256sums = e7a81fb26bb61875c07ba83075522d3d1c1ed463581c7067404a91bc724340b8 - sha256sums = dea401c0efff7f7979b91b1a32524646d0bab38191d70daf18924f944a4f1fd5 - sha256sums = 9962cab7ce58729912c70f2dce345d088c0c61f640e0bd9ee2975d571b08a0d2 - sha256sums = 2abc3cd48db8e37cdaf3dd8e4bfd350a314ad91185b57faf78292c41620d1d7d - sha256sums = 6f291e71de3df52728933d2e04da6a59eb08c3bdb3012ebeae40f05183744b93 - sha256sums = 18cfe65a2da89006f8aeb701a846a2e6ed2cac2e84b86cd7f6f9a25e988c4057 - sha256sums = 832781712c6c6a9523e1a9436f2131cc9f0b9d7131d44477c7e81739fc28e529 - sha256sums = 6d40f7697931628c7e55dff52248170f27230d4f6ab97a15d0432c4b5d3876d5 - sha256sums = be3e41373ab7a6f112b5ebd96f4c2b0550333192b54b587be43727bf82003a2a - sha256sums = 9c701eda6fda419ceab4b9e7b21b9d6e2a1eb0844b65404fc04bc609778b7419 - sha256sums = b03d9ea1b2a7e5687e6e954dd3f039c341fa4d69fb047ca688ffe5b953e977be - sha256sums = 6cb2a9282ebb4fd53058d22f8159e10d1d8c321b7d17d0f2d761bdab7f88eaf8 - sha256sums = b64ccbec1080320fec7bfc3b55a6a2ebc33159d216039170ba58008ba7ec37b7 - sha256sums = 354616dccd88c5227c276ddbf184c083c77d9cea9ac143993101d9e67b7f0cfc - sha256sums = 93eca845542db214f113c72df69c456f53ea0e77e1db865124384939ecd76e2d - sha256sums = 3a2f95a37b4614f05ac5a7c5d81a99555ba01b0b192667896006db8490cb89fa - sha256sums = 3135986d57900333a3a8a685fd7ab816f76948f926b3a8e00613e4fe21a35622 + sha256sums = ba45fa1a0de3d0c813358e381f5fe1105afd730fbcd8c9ba451b115448f7aa5b + sha256sums = b0cfdc9867119d36cf2deaaa8efffca165fcf1a48c7fd5a28a2b2ec7c5026421 + sha256sums = 0d4b9c288727e6e4c44ba53990538cf118d5a432e612e9060534ab077427848a + sha256sums = 8ec8d66e06a1b5ca6a5ddf59a793b8af01d0e5ce4c5168e30b0b95aceb89dafb + sha256sums = e71f3a80e83ff2a31cdc7533f1dcd4f4832f233346668fc5c86f60ec6d20a47e + sha256sums = fcef8eb5b5d7f7dbc32fdc20d3b6764ec352b33079d96f9fd583d0f7094a1542 + sha256sums = d089a0a3063b5fbccf7175e89ebc648c19a3d9eb74cb457d4685ca5cab092628 + sha256sums = d94002f53ee9cdad412fc6f2c487cea97143a7b880335b2847d4acc2b6f4b823 + sha256sums = 290f75b6ce492c32c17f3c1a0fea7b2aa7228ceb91acb274922ea0fa9c768af0 + sha256sums = 4375a07806c57819cadb5c91ba15169baacdda5a44425da4ac1e2d517c483a88 + sha256sums = 40500b27dc527563de24f029641bb108b829987dcbf7e441c299b3a1efc275ff + sha256sums = ed3053a8bd1d4b855ef6ed3b0dd456cef15e38061dbb834624d62486c875b1c8 + sha256sums = 71b5ea3baa39520b5687a1b5265b722f2240590eb9d11336e7b145db7f1e9c62 + sha256sums = f1fab7056f9f62b8c967bbd7d678adfc9ab20802c78d9aa9355cf6869ac699fc + sha256sums = 71e4b1f30c50a947bbf11167e00aaadcd97d3d5d4b06dce94b4f72cd3e776117 sha256sums = 65ec9ac5b8b28d5b61df1c72498059be2e7cb1f9b965bac0e4ffed3c05520b2b pkgname = linux-cachyos diff --git a/PKGBUILD b/PKGBUILD index a7115a4..2ba4340 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -26,6 +26,9 @@ _makenconfig= # See, https://bugs.archlinux.org/task/31187 _NUMAdisable=y +## Enable Anbox +_anbox= + # Compile ONLY used modules to VASTLYreduce the number of modules built # and the build time. # @@ -95,6 +98,9 @@ _nf_cone=y # "thin: uses multiple threads, faster and uses less memory, may have a lower runtime performance than Full." _use_llvm_lto= +## Change the thin lto cachedir for fixing building several dkms modules including zfs +_thin_lto_cachedir= + # Enable it for using the LLVM CFI PATCH for a better security _use_cfi= @@ -104,7 +110,7 @@ else pkgbase=linux-cachyos fi _major=5.17 -_minor=4 +_minor=5 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} @@ -115,7 +121,7 @@ _srcname=linux-${_stable} #_srcname=linux-${_major} arch=(x86_64 x86_64_v3) pkgdesc='Linux CFS scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=3 +pkgrel=1 arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" license=('GPL2') @@ -124,6 +130,8 @@ makedepends=('bc' 'texlive-latexextra' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz if [ -n "$_use_llvm_lto" ]; then depends+=(clang llvm lld python) BUILD_FLAGS=( + CC=clang + LD=ld.lld LLVM=1 LLVM_IAS=1 ) @@ -161,16 +169,21 @@ source+=( "${_patchsource}/0007-fixes-miscellaneous.patch" "${_patchsource}/0008-fs-patches.patch" "${_patchsource}/0009-hwmon.patch" - "${_patchsource}/0010-MG-LRU.patch" + "${_patchsource}/0010-lru-le9.patch" "${_patchsource}/0011-spf-lru.patch" - "${_patchsource}/0012-v4l2loopback.patch" - "${_patchsource}/0013-xanmod.patch" - "${_patchsource}/0014-lrng.patch" - "${_patchsource}/0015-le9.patch" - "${_patchsource}/0016-ck-hrtimer.patch" - "${_patchsource}/0017-futex-winesync.patch" + "${_patchsource}/0012-xanmod.patch" + "${_patchsource}/0013-lrng.patch" + "${_patchsource}/0014-ck-hrtimer.patch" + "${_patchsource}/0015-futex-winesync.patch" +# "${_patchsource}/0017-FG-KASLR.patch" +# "${_patchsource}/0018-zstd-dev.patch" # Don't use them without custom mkinitcpio "auto-cpu-optimization.sh" ) +if [ -n "$_thin_lto_cachedir" ] && [ "$_use_llvm_lto" = "thin" ]; then +source+=( + "${_patchsource}/0016-thinlto-cache-dir.patch" +) +fi export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase @@ -249,6 +262,7 @@ prepare() { exit fi + ## Enable it for using the LLVM CFI PATCH for a better security if [ -n "$_use_cfi" ] && [ -n "$_use_llvm_lto" ]; then echo "Enabling CFI" scripts/config --enable CONFIG_ARCH_SUPPORTS_CFI_CLANG @@ -492,12 +506,15 @@ prepare() { scripts/config --set-str CONFIG_ZSWAP_COMPRESSOR_DEFAULT zstd fi - echo "Enable Anbox..." - scripts/config --enable CONFIG_ASHMEM - scripts/config --enable CONFIG_ANDROID - scripts/config --enable CONFIG_ANDROID_BINDER_IPC - scripts/config --enable CONFIG_ANDROID_BINDERFS - scripts/config --enable CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder" + ## Enable Anbox Support + if [ -n "$_anbox" ]; then + echo "Enable Anbox..." + scripts/config --enable CONFIG_ASHMEM + scripts/config --enable CONFIG_ANDROID + scripts/config --enable CONFIG_ANDROID_BINDER_IPC + scripts/config --enable CONFIG_ANDROID_BINDERFS + scripts/config --enable CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder" + fi echo "disable debugging features to reduce the size..." scripts/config --disable CONFIG_DEBUG_INFO @@ -686,23 +703,21 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('6e3cd56ee83a9cb5ac3fde1442c40367ab67368946c4c93bbeb1c65664a0d3c5' +sha256sums=('9bbcd185b94436f9c8fe977fa0e862f60d34003562327fcebb27c9fa342fe987' '29c5dd2ae6b452b75b25816a8f6610fa2ff54f21b22a0ccef5c2e98a7077eb36' - 'e7a81fb26bb61875c07ba83075522d3d1c1ed463581c7067404a91bc724340b8' - 'dea401c0efff7f7979b91b1a32524646d0bab38191d70daf18924f944a4f1fd5' - '9962cab7ce58729912c70f2dce345d088c0c61f640e0bd9ee2975d571b08a0d2' - '2abc3cd48db8e37cdaf3dd8e4bfd350a314ad91185b57faf78292c41620d1d7d' - '6f291e71de3df52728933d2e04da6a59eb08c3bdb3012ebeae40f05183744b93' - '18cfe65a2da89006f8aeb701a846a2e6ed2cac2e84b86cd7f6f9a25e988c4057' - '832781712c6c6a9523e1a9436f2131cc9f0b9d7131d44477c7e81739fc28e529' - '6d40f7697931628c7e55dff52248170f27230d4f6ab97a15d0432c4b5d3876d5' - 'be3e41373ab7a6f112b5ebd96f4c2b0550333192b54b587be43727bf82003a2a' - '9c701eda6fda419ceab4b9e7b21b9d6e2a1eb0844b65404fc04bc609778b7419' - 'b03d9ea1b2a7e5687e6e954dd3f039c341fa4d69fb047ca688ffe5b953e977be' - '6cb2a9282ebb4fd53058d22f8159e10d1d8c321b7d17d0f2d761bdab7f88eaf8' - 'b64ccbec1080320fec7bfc3b55a6a2ebc33159d216039170ba58008ba7ec37b7' - '354616dccd88c5227c276ddbf184c083c77d9cea9ac143993101d9e67b7f0cfc' - '93eca845542db214f113c72df69c456f53ea0e77e1db865124384939ecd76e2d' - '3a2f95a37b4614f05ac5a7c5d81a99555ba01b0b192667896006db8490cb89fa' - '3135986d57900333a3a8a685fd7ab816f76948f926b3a8e00613e4fe21a35622' + 'ba45fa1a0de3d0c813358e381f5fe1105afd730fbcd8c9ba451b115448f7aa5b' + 'b0cfdc9867119d36cf2deaaa8efffca165fcf1a48c7fd5a28a2b2ec7c5026421' + '0d4b9c288727e6e4c44ba53990538cf118d5a432e612e9060534ab077427848a' + '8ec8d66e06a1b5ca6a5ddf59a793b8af01d0e5ce4c5168e30b0b95aceb89dafb' + 'e71f3a80e83ff2a31cdc7533f1dcd4f4832f233346668fc5c86f60ec6d20a47e' + 'fcef8eb5b5d7f7dbc32fdc20d3b6764ec352b33079d96f9fd583d0f7094a1542' + 'd089a0a3063b5fbccf7175e89ebc648c19a3d9eb74cb457d4685ca5cab092628' + 'd94002f53ee9cdad412fc6f2c487cea97143a7b880335b2847d4acc2b6f4b823' + '290f75b6ce492c32c17f3c1a0fea7b2aa7228ceb91acb274922ea0fa9c768af0' + '4375a07806c57819cadb5c91ba15169baacdda5a44425da4ac1e2d517c483a88' + '40500b27dc527563de24f029641bb108b829987dcbf7e441c299b3a1efc275ff' + 'ed3053a8bd1d4b855ef6ed3b0dd456cef15e38061dbb834624d62486c875b1c8' + '71b5ea3baa39520b5687a1b5265b722f2240590eb9d11336e7b145db7f1e9c62' + 'f1fab7056f9f62b8c967bbd7d678adfc9ab20802c78d9aa9355cf6869ac699fc' + '71e4b1f30c50a947bbf11167e00aaadcd97d3d5d4b06dce94b4f72cd3e776117' '65ec9ac5b8b28d5b61df1c72498059be2e7cb1f9b965bac0e4ffed3c05520b2b')