From 8a5989c32446a94171b72dca28f550a3d17c676b Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Mon, 1 May 2023 11:31:31 +0200 Subject: [PATCH] Bump to 6.3.1 Signed-off-by: Piotr Gorski --- .SRCINFO | 18 +++++++------- PKGBUILD | 55 +++++++++++++++++++------------------------ config | 72 +++++++++++++++++++++++++++----------------------------- 3 files changed, 68 insertions(+), 77 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 46ff970fcd47..dbca96e5969d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-bmq pkgdesc = Linux BMQ scheduler Kernel by CachyOS with other patches and improvements - pkgver = 6.3.0 - pkgrel = 5 + pkgver = 6.3.1 + pkgrel = 1 url = https://github.com/CachyOS/linux-cachyos arch = x86_64 arch = x86_64_v3 @@ -21,18 +21,18 @@ pkgbase = linux-cachyos-bmq makedepends = make makedepends = patch options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.1.tar.xz source = config source = auto-cpu-optimization.sh source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.3/all/0001-cachyos-base-all.patch source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.3/sched/0001-prjc-cachy.patch source = linux-cachyos-prjc.install - sha256sums = ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e - sha256sums = 54d0470901596286036c20b1537754ba71885cad51452bcb9bf42b92b2175cbe - sha256sums = 41c34759ed248175e905c57a25e2b0ed09b11d054fe1a8783d37459f34984106 - sha256sums = a81babd189054ed217e58688612ad274ffc06f9912094b29be7f1442aa067d42 - sha256sums = 75946e91f032c4e9186d56092a90abc90c14f16ef938d5201d425d8a31298aa1 - sha256sums = a11c0100cc2f52a28f75bc788b3d7703f7224bb083465daa2d33403c1ff86697 + b2sums = 91c7ac2fb2bdeed323b6f0812582bd82c78f62ce3754063716a8769b30c41e35ae06b042ef27fb3c59a63ca17ec764313d7971ba2ddf84f8cf9fe5885ffe0644 + b2sums = 59b0697d3dce7b3bc75f9a096ada379a71cfd472775d9ebbb54c658a5aae756a631ec4b238b4b3dd9e503bda07b31ce5716643b8c57b21f45959f5f57eac7c1b + b2sums = 11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0 + b2sums = c935d5008fe006e6fe0e6c2e04a3bdb71602472274cfd47bae8b877f95b3df5fb5a8c9aedbcef2b5761f22487f662e043ec74de4e63cf40e3e3bb4b9b37a2a72 + b2sums = 8beaf8f1dee836ff2cdaf6874697f216099e5a427a7c2e3764bb084cb546ebf48f81b6bf83f3c7e7f1a9378264434ad2ed0c667b0bd3226e2c72ffa07d31d0fb + b2sums = 21f2753be26455812dde25232265a5660feed49751be36e1dcc1e6a9993de673380c2b210d58d4041096442f11080c7206846f140082e927284f6d001eea0d23 pkgname = linux-cachyos-bmq pkgdesc = The Linux BMQ scheduler Kernel by CachyOS with other patches and improvements kernel and modules diff --git a/PKGBUILD b/PKGBUILD index a26fc8f327cc..9c02414f6755 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -130,9 +130,6 @@ _use_auto_optimization=${_use_auto_optimization-y} # disable debug to lower the size of the kernel _disable_debug=${_disable_debug-} -## Enable zram/zswap ZSTD compression -_zstd_compression=${_zstd_compression-} - ### Selecting the ZSTD kernel and modules compression level # ATTENTION - one of two predefined values should be selected! # 'ultra' - highest compression ratio @@ -196,17 +193,17 @@ else pkgbase=linux-$pkgsuffix fi _major=6.3 -_minor=0 +_minor=1 #_minorc=$((_minor+1)) #_rcver=rc8 pkgver=${_major}.${_minor} -#_stable=${_major}.${_minor} -_stable=${_major} +_stable=${_major}.${_minor} +#_stable=${_major} #_stablerc=${_major}-${_rcver} _srcname=linux-${_stable} #_srcname=linux-${_major} pkgdesc='Linux BMQ scheduler Kernel by CachyOS with other patches and improvements' -pkgrel=5 +pkgrel=1 _kernver=$pkgver-$pkgrel arch=('x86_64' 'x86_64_v3') url="https://github.com/CachyOS/linux-cachyos" @@ -280,12 +277,21 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP _die() { error "$@" ; exit; } +_make() { + test -s version + make KERNELRELEASE="$( localversion.10-pkgrel echo "${pkgbase#linux}" > localversion.20-pkgname + make ${BUILD_FLAGS[*]} defconfig + make ${BUILD_FLAGS[*]} -s kernelrelease > version + make ${BUILD_FLAGS[*]} mrproper local src for src in "${source[@]}"; do @@ -585,17 +591,6 @@ prepare() { -d LRNG_RUNTIME_FORCE_SEEDING_DISABLE fi - ### Enable zram/zswap ZSTD compression - if [ -n "$_zstd_compression" ]; then - echo "Enabling zram/swap ZSTD compression..." - scripts/config -d ZRAM_DEF_COMP_LZORLE \ - -e ZRAM_DEF_COMP_ZSTD \ - --set-str ZRAM_DEF_COMP zstd \ - -d ZSWAP_COMPRESSOR_DEFAULT_LZ4 \ - -e ZSWAP_COMPRESSOR_DEFAULT_ZSTD \ - --set-str ZSWAP_COMPRESSOR_DEFAULT zstd - fi - ### Selecting the ZSTD modules and kernel compression level [ -z "$_zstd_level_value" ] && _die "The value is empty. Choose the correct one again." @@ -658,12 +653,11 @@ prepare() { ### Rewrite configuration echo "Rewrite configuration..." - make ${BUILD_FLAGS[*]} prepare - yes "" | make ${BUILD_FLAGS[*]} config >/dev/null + _make ${BUILD_FLAGS[*]} prepare + yes "" | _make ${BUILD_FLAGS[*]} config >/dev/null diff -u ../config .config || : ### Prepared version - make ${BUILD_FLAGS[*]} -s kernelrelease > version echo "Prepared $pkgbase version $(