From cdbdedd28df38a3916bf6a0c61cfbfbddd42ea26 Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Tue, 13 Dec 2022 19:31:42 +0100 Subject: [PATCH] Sync with Github Signed-off-by: Piotr Gorski --- .SRCINFO | 8 ++++---- PKGBUILD | 10 +++++----- config | 13 +++++-------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 40a0ffc..adb89b4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements pkgver = 6.1.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -28,11 +28,11 @@ pkgbase = linux-cachyos source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/misc/0001-Add-latency-priority-for-CFS-class.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/sched/0001-bore-cachy.patch sha256sums = 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb - sha256sums = 10205fdb7f16016658808d09e927b106f8286df17d511cf6374e2a6fcb265f26 + sha256sums = 28832ea41f4429260f4b1a355f89a2bda1332d3893b42b349897d4661ffc3d96 sha256sums = 32e77b3b71225c9f04df2d44c25f982773a8fff9927d26788366baab5e242e74 - sha256sums = dcb4652be945fd8de658b271e17a74e5d5c275b934bd852b766cb28c3f97d17d + sha256sums = 1638f816f56bb0989e71848b906c229aa0db2f08d482a5d52ad05761677d6dc5 sha256sums = 7b3c12a19efe84f023bd64f0c984c73b0ec7a73c78cba96b5f92c5263ed2a46f - sha256sums = e5c062656b1e3d65b5b10bf933aa6b0bd3f187b90336a067b1dd7d5ff635f002 + sha256sums = e74a2454da0b83435a95fa3c5d13b104e87c5003abcb1291fe055aa4d340e0ae pkgname = linux-cachyos pkgdesc = The Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules diff --git a/PKGBUILD b/PKGBUILD index e743bda..ca633b5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -101,7 +101,7 @@ _lru_config=${_lru_config-'standard'} _damon=${_damon-} ## Enable Linux Random Number Generator -_lrng_enable=${_lrng_enable-y} +_lrng_enable=${_lrng_enable-} # CPU compiler optimizations - Defaults to prompt at kernel config if left empty # AMD CPUs : "k8" "k8sse3" "k10" "barcelona" "bobcat" "jaguar" "bulldozer" "piledriver" "steamroller" "excavator" "zen" "zen2" "zen3" @@ -195,7 +195,7 @@ _stable=${_major} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=1 +pkgrel=2 _kernver=$pkgver-$pkgrel arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" @@ -991,8 +991,8 @@ for _p in "${pkgname[@]}"; do done sha256sums=('2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb' - '10205fdb7f16016658808d09e927b106f8286df17d511cf6374e2a6fcb265f26' + '28832ea41f4429260f4b1a355f89a2bda1332d3893b42b349897d4661ffc3d96' '32e77b3b71225c9f04df2d44c25f982773a8fff9927d26788366baab5e242e74' - 'dcb4652be945fd8de658b271e17a74e5d5c275b934bd852b766cb28c3f97d17d' + '1638f816f56bb0989e71848b906c229aa0db2f08d482a5d52ad05761677d6dc5' '7b3c12a19efe84f023bd64f0c984c73b0ec7a73c78cba96b5f92c5263ed2a46f' - 'e5c062656b1e3d65b5b10bf933aa6b0bd3f187b90336a067b1dd7d5ff635f002') + 'e74a2454da0b83435a95fa3c5d13b104e87c5003abcb1291fe055aa4d340e0ae') diff --git a/config b/config index 0361fae..b2f2cad 100644 --- a/config +++ b/config @@ -1104,19 +1104,17 @@ CONFIG_ZSWAP_DEFAULT_ON=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set -# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set +CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set -CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y -CONFIG_ZSWAP_COMPRESSOR_DEFAULT="zstd" +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set +CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lz4" # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD is not set -# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set +CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD=y # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set -CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBLOCK=y -CONFIG_ZSWAP_ZPOOL_DEFAULT="zblock" +CONFIG_ZSWAP_ZPOOL_DEFAULT="z3fold" CONFIG_ZBUD=y CONFIG_Z3FOLD=y CONFIG_ZSMALLOC=y -CONFIG_ZBLOCK=y # CONFIG_ZSMALLOC_STAT is not set # @@ -10520,7 +10518,6 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y # CONFIG_ZERO_CALL_USED_REGS is not set # end of Memory initialization -CONFIG_CC_HAS_RANDSTRUCT=y CONFIG_RANDSTRUCT_NONE=y # CONFIG_RANDSTRUCT_FULL is not set # CONFIG_RANDSTRUCT_PERFORMANCE is not set