Sync with Github

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
This commit is contained in:
Piotr Gorski 2025-08-20 07:26:38 +02:00
parent 4d58ec606b
commit d7dd27dabb
No known key found for this signature in database
GPG key ID: 79AFA05ABDB26C5A
3 changed files with 43 additions and 23 deletions

View file

@ -1,7 +1,7 @@
pkgbase = linux-cachyos
pkgdesc = Linux BORE + LTO + AutoFDO + Propeller Cachy Sauce Kernel by CachyOS with other patches and improvements.
pkgver = 6.16.0
pkgrel = 2
pkgver = 6.16.1
pkgrel = 1
url = https://github.com/CachyOS/linux-cachyos
arch = x86_64
license = GPL-2.0-only
@ -21,14 +21,14 @@ pkgbase = linux-cachyos
options = !strip
options = !debug
options = !lto
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.16.tar.xz
source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.16.1.tar.xz
source = config
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.16/all/0001-cachyos-base-all.patch
source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.16/sched/0001-bore-cachy.patch
b2sums = 87bc4da7e89cc8265aebffea7ec6c09f711be24fee87cb1c03a264c03fd5a538d66aa806640835aa5103926e612cdfbc52d7c861d7f7065f1a8bb11d893b0921
b2sums = e323923f3029a69272f6d895cedf8375e06a89de1b1663b63220997edfb64b0c9922751240fc130b3f32e811b4b5a7f02c354b89413fa84c4cf0f5d11c0f253b
b2sums = 45e0e15040d2d2577e10a8ab5e03ac861ab7faaf5081da590f5378268f5d54391e457aa3a91d0e0cb318749871372fee7f7f95a6557d6db762f2999419c98312
b2sums = dfda2c44baec52d4fc904d02dd9afe54fad51d5048d96f0ddc5668eb71f82b06fabc74d9db23db884377d6a69476290bfeba061483b7709cfa56ded247587ff9
b2sums = 280386f483f3f181fd0e45789815621f6f6bed208b7c10b05a7e2c2eed102d53928ce3f0e28cdd58d1e3c69f9977f60f7b6e832c3a00c0f4524aa45f83ec9491
b2sums = 08e0162b75c1b78f523efb71afbc06f2d37e5b8e73731517c5eec2b3663e5cf48a1ad4577304e7bf2eee270e5a9ee381cab8209c3104c8598653dce9cbcbb056
b2sums = 9ded1dae30b2ecf1bf2e6d811e1ead4518b185d318d70e3aa8cdc355c49adf5203b413346dcbe999a27c9765e770951b209d740f9824d3343a2881127b9ef1b1
b2sums = b8d0a52afbe6545c1d300e1a8ee2c74dcf97316a691cd5902b3356dc5f9ed28255b2515218ae2282a0a0bbd092b1cbb4a7f9cf04f786bf7df7067b0c72f7e4d3
pkgname = linux-cachyos
pkgdesc = The Linux BORE + LTO + AutoFDO + Propeller Cachy Sauce Kernel by CachyOS with other patches and improvements. kernel and modules

View file

@ -166,17 +166,17 @@ fi
pkgbase="linux-$_pkgsuffix"
_major=6.16
_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 BORE + LTO + AutoFDO + Propeller Cachy Sauce Kernel by CachyOS with other patches and improvements.'
pkgrel=2
pkgrel=1
_kernver="$pkgver-$pkgrel"
_kernuname="${pkgver}-${_pkgsuffix}"
arch=('x86_64')
@ -200,7 +200,7 @@ makedepends=(
)
_patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
_nv_ver=575.64.05
_nv_ver=580.76.05
_nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
_nv_open_pkg="NVIDIA-kernel-module-source-${_nv_ver}"
source=(
@ -529,6 +529,20 @@ prepare() {
fi
}
_sign_modules() {
msg2 "Signing modules in $1"
local sign_script="${srcdir}/${_srcname}/scripts/sign-file"
local sign_key="$(grep -Po 'CONFIG_MODULE_SIG_KEY="\K[^"]*' "${srcdir}/${_srcname}/.config")"
if [[ ! "$sign_key" =~ ^/ ]]; then
sign_key="${srcdir}/${_srcname}/${sign_key}"
fi
local sign_cert="${srcdir}/${_srcname}/certs/signing_key.x509"
local hash_algo="$(grep -Po 'CONFIG_MODULE_SIG_HASH="\K[^"]*' "${srcdir}/${_srcname}/.config")"
find "$1" -type f -name '*.ko' -print -exec \
"${sign_script}" "${hash_algo}" "${sign_key}" "${sign_cert}" '{}' \;
}
build() {
cd "$_srcname"
make "${BUILD_FLAGS[@]}" -j"$(nproc)" all
@ -544,7 +558,6 @@ build() {
MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES')
cd "${srcdir}/${_nv_pkg}/kernel"
make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules
fi
if [ "$_build_nvidia_open" = "yes" ]; then
@ -723,6 +736,8 @@ _package-zfs(){
cd "${srcdir}/zfs"
install -dm755 "${modulesdir}"
install -m644 module/*.ko "${modulesdir}"
_sign_modules "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -19 -T0 {} +
# sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${pkgver}-${pkgbase}'/" "$startdir/zfs.install"
}
@ -741,6 +756,8 @@ _package-nvidia(){
install -dm755 "${modulesdir}"
install -m644 kernel/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 LICENSE
_sign_modules "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -19 -T0 {} +
}
@ -759,6 +776,7 @@ _package-nvidia-open(){
install -m644 kernel-open/*.ko "${modulesdir}"
install -Dt "$pkgdir/usr/share/licenses/${pkgname}" -m644 COPYING
_sign_modules "${modulesdir}"
find "$pkgdir" -name '*.ko' -exec zstd --rm -19 -T0 {} +
}
@ -775,7 +793,7 @@ for _p in "${pkgname[@]}"; do
}"
done
b2sums=('87bc4da7e89cc8265aebffea7ec6c09f711be24fee87cb1c03a264c03fd5a538d66aa806640835aa5103926e612cdfbc52d7c861d7f7065f1a8bb11d893b0921'
'e323923f3029a69272f6d895cedf8375e06a89de1b1663b63220997edfb64b0c9922751240fc130b3f32e811b4b5a7f02c354b89413fa84c4cf0f5d11c0f253b'
'45e0e15040d2d2577e10a8ab5e03ac861ab7faaf5081da590f5378268f5d54391e457aa3a91d0e0cb318749871372fee7f7f95a6557d6db762f2999419c98312'
'dfda2c44baec52d4fc904d02dd9afe54fad51d5048d96f0ddc5668eb71f82b06fabc74d9db23db884377d6a69476290bfeba061483b7709cfa56ded247587ff9')
b2sums=('280386f483f3f181fd0e45789815621f6f6bed208b7c10b05a7e2c2eed102d53928ce3f0e28cdd58d1e3c69f9977f60f7b6e832c3a00c0f4524aa45f83ec9491'
'08e0162b75c1b78f523efb71afbc06f2d37e5b8e73731517c5eec2b3663e5cf48a1ad4577304e7bf2eee270e5a9ee381cab8209c3104c8598653dce9cbcbb056'
'9ded1dae30b2ecf1bf2e6d811e1ead4518b185d318d70e3aa8cdc355c49adf5203b413346dcbe999a27c9765e770951b209d740f9824d3343a2881127b9ef1b1'
'b8d0a52afbe6545c1d300e1a8ee2c74dcf97316a691cd5902b3356dc5f9ed28255b2515218ae2282a0a0bbd092b1cbb4a7f9cf04f786bf7df7067b0c72f7e4d3')

14
config
View file

@ -1,15 +1,15 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 6.16.0-rc6 Kernel Configuration
# Linux/x86 6.16.1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 15.1.1 20250425"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=150101
CONFIG_GCC_VERSION=150201
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
CONFIG_AS_VERSION=24400
CONFIG_AS_VERSION=24500
CONFIG_LD_IS_BFD=y
CONFIG_LD_VERSION=24400
CONFIG_LD_VERSION=24500
CONFIG_LLD_VERSION=0
CONFIG_RUSTC_VERSION=108800
CONFIG_RUST_IS_AVAILABLE=y
@ -1981,7 +1981,7 @@ CONFIG_NET_SCH_FQ_PIE=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
CONFIG_NET_SCH_ETS=m
# CONFIG_NET_SCH_BPF is not set
CONFIG_NET_SCH_BPF=y
CONFIG_NET_SCH_DEFAULT=y
# CONFIG_DEFAULT_FQ is not set
# CONFIG_DEFAULT_CODEL is not set
@ -8226,6 +8226,7 @@ CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLETB_BL=m
CONFIG_HID_APPLETB_KBD=m
CONFIG_HID_ASUS=m
CONFIG_HID_ASUS_ALLY=m
CONFIG_HID_AUREAL=m
CONFIG_HID_BELKIN=m
CONFIG_HID_BETOP_FF=m
@ -9391,6 +9392,7 @@ CONFIG_VHOST_SCSI=m
CONFIG_VHOST_VSOCK=m
CONFIG_VHOST_VDPA=m
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y
#
# Microsoft Hyper-V guest support
@ -10967,7 +10969,7 @@ CONFIG_BCACHEFS_LOCK_TIME_STATS=y
CONFIG_BCACHEFS_SIX_OPTIMISTIC_SPIN=y
# CONFIG_BCACHEFS_PATH_TRACEPOINTS is not set
# CONFIG_BCACHEFS_TRANS_KMALLOC_TRACE is not set
CONFIG_BCACHEFS_ASYNC_OBJECT_LISTS=y
# CONFIG_BCACHEFS_ASYNC_OBJECT_LISTS is not set
CONFIG_ZONEFS_FS=m
CONFIG_FS_DAX=y
CONFIG_FS_DAX_PMD=y