nvidia: Adjust linux-cachyos-rc

Signed-off-by: Peter Jung <[email protected]>

linux-cachyos-hardened/.SRCINFO

@@ -27,7 +27,7 @@ pkgbase = linux-cachyos-hardened
 	b2sums = 6c1f22d80bd5226a08c5ef80e9ab2ba553d00b49b4795b8ccb227381a7275ec89534267354318fa9b938fe99c4d91f0bf6b1d55263ea57eccc3aea1a9ce1d611
 	b2sums = e197432e92b1f29dfb89e108e332137a3f5348302a102d92535ba23bc6bc1fab13aef55a8218ecc5d35db8f77e1c30d110b4d64874d18bb7a0b8ecd86fd278dd
 	b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab
-	b2sums = f369461e2eea4e8c43e690aa8c1cae695354ee5120533e88397d920a5d73326dc20120698c6278066fdfd43bb6a215b1f8e99b2e7a618a8df3e4f88951a72c94
+	b2sums = ca014c2570ef63f11e162a015293225e1e4103513cefe2f3c20e01444fe2d6b7cbc7c993b5d77db97c84142fb6cb6cc401df419b2d9de1610b5539832c013cd8
 	b2sums = b8007db21488fcd281dde293aba0dfc7afcf556e19d6f397ea7e017e4254b6c3c97e96be9680868d2c03c3500d7b4cdc6493b2896d819d9cf7debf5ebf2ea964
 	b2sums = dfc178e56b6c5dbea55e5cec3cf6a7087121b3fc552a66c53ca1da4f395154502e60e3d5e7541ed15bcf717847583b4c6ccc75d4f49b7afefd8b40ddc4e84210
 

linux-cachyos-hardened/PKGBUILD

@@ -702,6 +702,6 @@ done
 b2sums=('6c1f22d80bd5226a08c5ef80e9ab2ba553d00b49b4795b8ccb227381a7275ec89534267354318fa9b938fe99c4d91f0bf6b1d55263ea57eccc3aea1a9ce1d611'
         'e197432e92b1f29dfb89e108e332137a3f5348302a102d92535ba23bc6bc1fab13aef55a8218ecc5d35db8f77e1c30d110b4d64874d18bb7a0b8ecd86fd278dd'
         '390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab'
-        'f369461e2eea4e8c43e690aa8c1cae695354ee5120533e88397d920a5d73326dc20120698c6278066fdfd43bb6a215b1f8e99b2e7a618a8df3e4f88951a72c94'
+        'ca014c2570ef63f11e162a015293225e1e4103513cefe2f3c20e01444fe2d6b7cbc7c993b5d77db97c84142fb6cb6cc401df419b2d9de1610b5539832c013cd8'
         'b8007db21488fcd281dde293aba0dfc7afcf556e19d6f397ea7e017e4254b6c3c97e96be9680868d2c03c3500d7b4cdc6493b2896d819d9cf7debf5ebf2ea964'
         'dfc178e56b6c5dbea55e5cec3cf6a7087121b3fc552a66c53ca1da4f395154502e60e3d5e7541ed15bcf717847583b4c6ccc75d4f49b7afefd8b40ddc4e84210')

linux-cachyos-rc/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = linux-cachyos-rc
-	pkgdesc = Linux BORE + LTO + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate
-	pkgver = 6.14.rc3
+	pkgdesc = Linux BORE + LTO + AutoFDO + Propeller + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate
+	pkgver = 6.14.rc4
 	pkgrel = 1
 	url = https://github.com/CachyOS/linux-cachyos
 	arch = x86_64
@@ -21,21 +21,21 @@ pkgbase = linux-cachyos-rc
 	options = !strip
 	options = !debug
 	options = !lto
-	source = https://github.com/torvalds/linux/archive/refs/tags/v6.14-rc3.tar.gz
+	source = https://github.com/torvalds/linux/archive/refs/tags/v6.14-rc4.tar.gz
 	source = config
 	source = auto-cpu-optimization.sh
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.14/all/0001-cachyos-base-all.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.14/misc/dkms-clang.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.14/sched/0001-bore-cachy.patch
-	b2sums = 3def393ef6a674fb9b8fa73c26e20f7b39c28c73dda19dfa7d87c3a7a1207e5bc848f2a1f6da01f36b6bb0a9a8bbb2d4467c4796c0b5228f564e0c0a1e8c1684
-	b2sums = a98afcb83a282750ee9d724201e20f0f6448fcac3ca7d7edbb9aa0957cc26588ab30bfe8240980287f753e0f0ed6b09dee63cfa237f4fc2d4a665a1d2b0bbc6e
+	b2sums = 67a0d3782f039d413fbfebdbd5d27e40664c4bce91b787d3d8f276501c4c0bef09dd77c59c7acb73695d278fa1d21312b44b10c2edc1780c8370d569ffa8fc23
+	b2sums = f71cada3c609e3dad22798ab0f279b2f8f7af4bd7f067973c70946bb4f4f216fe253ff185035d2b4d2b3e3fac3c81f8e877f797154dd6418e76044828280828e
 	b2sums = 390c7b80608e9017f752b18660cc18ad1ec69f0aab41a2edfcfc26621dcccf5c7051c9d233d9bdf1df63d5f1589549ee0ba3a30e43148509d27dafa9102c19ab
-	b2sums = a046d8476b72ab4cbd8636952220bfa672e63e33755ca9e7d9745862ef61203b05f0cd73ef0d7d40a049c81d49a39b552fbc44dbb0faea698398975c87366f24
+	b2sums = 2022d29784605f8f3f883d6c6ad88e268402e7b5e705c35a34a1ee6b4be7ec21b1a313290e37df0cdefa225dcc174d51c983ff230f4f9677fc2d540d1b7d1741
 	b2sums = c7294a689f70b2a44b0c4e9f00c61dbd59dd7063ecbe18655c4e7f12e21ed7c5bb4f5169f5aa8623b1c59de7b2667facb024913ecb9f4c650dabce4e8a7e5452
 	b2sums = b8b3feb90888363c4eab359db05e120572d3ac25c18eb27fef5714d609c7cb895243d45585a150438fec0a2d595931b10966322cd956818dbd3a9b3ef412d1e8
 
 pkgname = linux-cachyos-rc
-	pkgdesc = The Linux BORE + LTO + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate kernel and modules
+	pkgdesc = The Linux BORE + LTO + AutoFDO + Propeller + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate kernel and modules
 	depends = coreutils
 	depends = kmod
 	depends = initramfs
@@ -46,11 +46,13 @@ pkgname = linux-cachyos-rc
 	provides = VIRTUALBOX-GUEST-MODULES
 	provides = WIREGUARD-MODULE
 	provides = KSMBD-MODULE
+	provides = UKSMD-BUILTIN
 	provides = NTSYNC-MODULE
 	provides = VHBA-MODULE
+	provides = ADIOS-MODULE
 
 pkgname = linux-cachyos-rc-headers
-	pkgdesc = Headers and scripts for building modules for the Linux BORE + LTO + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate kernel
+	pkgdesc = Headers and scripts for building modules for the Linux BORE + LTO + AutoFDO + Propeller + Cachy Sauce Kernel by CachyOS with other patches and improvements - Release Candidate kernel
 	depends = pahole
 	depends = linux-cachyos-rc
 	depends = clang

linux-cachyos-rc/PKGBUILD

@@ -237,15 +237,13 @@ fi
 # NVIDIA pre-build module support
 if [ "$_build_nvidia" = "yes" ]; then
     source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
-             "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
-             "${_patchsource}/misc/nvidia/0003-drm-Remove-driver-data-from-struct-drm_driver.patch")
+             "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch")
 fi
 
 if [ "$_build_nvidia_open" = "yes" ]; then
     source+=("nvidia-open-${_nv_ver}.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${_nv_ver}.tar.gz"
              "${_patchsource}/misc/nvidia/0001-Enable-atomic-kernel-modesetting-by-default.patch"
-             "${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch"
-             "${_patchsource}/misc/nvidia/0003-drm-Remove-driver-data-from-struct-drm_driver.patch")
+             "${_patchsource}/misc/nvidia/0002-Add-IBT-support.patch")
 fi
 
 # Use generated AutoFDO Profile
@@ -524,15 +522,13 @@ prepare() {
 
         # Use fbdev and modeset as default
         patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_pkg}/kernel"
-        patch -Np2 -i "${srcdir}/0003-drm-Remove-driver-data-from-struct-drm_driver.patch" -d "${srcdir}/${_nv_pkg}/kernel"
     fi
 
     if [ "$_build_nvidia_open" = "yes" ]; then
         # Use fbdev and modeset as default
         patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_nv_open_pkg}/kernel-open"
         # Fix for https://bugs.archlinux.org/task/74886
         patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}"
-        patch -Np1 -i "${srcdir}/0003-drm-Remove-driver-data-from-struct-drm_driver.patch" -d "${srcdir}/${_nv_open_pkg}"
     fi
 }