From d502ee26e78db2128a788a81611d55f8d67cbfcf Mon Sep 17 00:00:00 2001 From: Piotr Gorski Date: Wed, 20 Aug 2025 07:27:56 +0200 Subject: [PATCH] Sync with Github Signed-off-by: Piotr Gorski --- .SRCINFO | 12 ++++++------ PKGBUILD | 36 +++++++++++++++++++++++++++--------- config | 10 ++++------ 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1f30e9b35123..0159e557373d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = linux-cachyos-eevdf pkgdesc = Linux EEVDF scheduler + 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,12 +21,12 @@ pkgbase = linux-cachyos-eevdf 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 - b2sums = 87bc4da7e89cc8265aebffea7ec6c09f711be24fee87cb1c03a264c03fd5a538d66aa806640835aa5103926e612cdfbc52d7c861d7f7065f1a8bb11d893b0921 - b2sums = e323923f3029a69272f6d895cedf8375e06a89de1b1663b63220997edfb64b0c9922751240fc130b3f32e811b4b5a7f02c354b89413fa84c4cf0f5d11c0f253b - b2sums = 45e0e15040d2d2577e10a8ab5e03ac861ab7faaf5081da590f5378268f5d54391e457aa3a91d0e0cb318749871372fee7f7f95a6557d6db762f2999419c98312 + b2sums = 280386f483f3f181fd0e45789815621f6f6bed208b7c10b05a7e2c2eed102d53928ce3f0e28cdd58d1e3c69f9977f60f7b6e832c3a00c0f4524aa45f83ec9491 + b2sums = ffaff366e98fe4c93ba1fcfd3d19c11a3f88ae7df1045dfb2c9e6972fe046ffeb4b46a242aef69f72129439700aefff47ae6cc651003ea963f59a522e3896179 + b2sums = 9ded1dae30b2ecf1bf2e6d811e1ead4518b185d318d70e3aa8cdc355c49adf5203b413346dcbe999a27c9765e770951b209d740f9824d3343a2881127b9ef1b1 pkgname = linux-cachyos-eevdf pkgdesc = The Linux EEVDF scheduler + Cachy Sauce Kernel by CachyOS with other patches and improvements kernel and modules diff --git a/PKGBUILD b/PKGBUILD index 58023477e282..cd56de7d6da7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -140,17 +140,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 EEVDF scheduler + Cachy Sauce Kernel by CachyOS with other patches and improvements' -pkgrel=2 +pkgrel=1 _kernver="$pkgver-$pkgrel" _kernuname="${pkgver}-${_pkgsuffix}" arch=('x86_64') @@ -174,7 +174,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=( @@ -467,6 +467,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 @@ -482,7 +496,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 @@ -657,6 +670,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" } @@ -675,6 +690,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 {} + } @@ -693,6 +710,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 {} + } @@ -709,6 +727,6 @@ for _p in "${pkgname[@]}"; do }" done -b2sums=('87bc4da7e89cc8265aebffea7ec6c09f711be24fee87cb1c03a264c03fd5a538d66aa806640835aa5103926e612cdfbc52d7c861d7f7065f1a8bb11d893b0921' - 'e323923f3029a69272f6d895cedf8375e06a89de1b1663b63220997edfb64b0c9922751240fc130b3f32e811b4b5a7f02c354b89413fa84c4cf0f5d11c0f253b' - '45e0e15040d2d2577e10a8ab5e03ac861ab7faaf5081da590f5378268f5d54391e457aa3a91d0e0cb318749871372fee7f7f95a6557d6db762f2999419c98312') +b2sums=('280386f483f3f181fd0e45789815621f6f6bed208b7c10b05a7e2c2eed102d53928ce3f0e28cdd58d1e3c69f9977f60f7b6e832c3a00c0f4524aa45f83ec9491' + 'ffaff366e98fe4c93ba1fcfd3d19c11a3f88ae7df1045dfb2c9e6972fe046ffeb4b46a242aef69f72129439700aefff47ae6cc651003ea963f59a522e3896179' + '9ded1dae30b2ecf1bf2e6d811e1ead4518b185d318d70e3aa8cdc355c49adf5203b413346dcbe999a27c9765e770951b209d740f9824d3343a2881127b9ef1b1') diff --git a/config b/config index dc21dee9b392..577f332b169c 100644 --- a/config +++ b/config @@ -7,9 +7,9 @@ CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=150101 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 @@ -7118,9 +7118,7 @@ CONFIG_DRM_SCHED=m # Drivers for system framebuffers # CONFIG_DRM_SYSFB_HELPER=y -CONFIG_DRM_EFIDRM=m CONFIG_DRM_SIMPLEDRM=y -CONFIG_DRM_VESADRM=m # end of Drivers for system framebuffers # @@ -10967,7 +10965,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