6.6: sched-ext: Drop nest zfs: Update commit to fix compilation with …

…clang Signed-off-by: Peter Jung <[email protected]>
CachyOS · Nov 29, 2023 · 77e7948 · 77e7948
1 parent bd5d12d
commit 77e7948
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 13 deletions.
diff --git a/linux-bore/PKGBUILD b/linux-bore/PKGBUILD
@@ -218,7 +218,7 @@ fi
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
-    source+=("git+https://github.com/cachyos/zfs.git#commit=2a953e0ac928563166ad7caa89e48b8d257724d4")
+    source+=("git+https://github.com/cachyos/zfs.git#commit=d38565b5ac3ecbf9dde7e8f7d71f4620a9cea9f9")
 fi
 
 # NVIDIA pre-build module support

diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
@@ -218,7 +218,7 @@ fi
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
-    source+=("git+https://github.com/cachyos/zfs.git#commit=2a953e0ac928563166ad7caa89e48b8d257724d4")
+    source+=("git+https://github.com/cachyos/zfs.git#commit=d38565b5ac3ecbf9dde7e8f7d71f4620a9cea9f9")
 fi
 
 # NVIDIA pre-build module support

diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
@@ -218,7 +218,7 @@ fi
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
-    source+=("git+https://github.com/cachyos/zfs.git#commit=2a953e0ac928563166ad7caa89e48b8d257724d4")
+    source+=("git+https://github.com/cachyos/zfs.git#commit=d38565b5ac3ecbf9dde7e8f7d71f4620a9cea9f9")
 fi
 
 # NVIDIA pre-build module support

diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
@@ -214,7 +214,7 @@ fi
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
-    source+=("git+https://github.com/cachyos/zfs.git#commit=2a953e0ac928563166ad7caa89e48b8d257724d4")
+    source+=("git+https://github.com/cachyos/zfs.git#commit=d38565b5ac3ecbf9dde7e8f7d71f4620a9cea9f9")
 fi
 
 # NVIDIA pre-build module support

diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD
@@ -218,7 +218,7 @@ fi
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
-    source+=("git+https://github.com/cachyos/zfs.git#commit=2a953e0ac928563166ad7caa89e48b8d257724d4")
+    source+=("git+https://github.com/cachyos/zfs.git#commit=d38565b5ac3ecbf9dde7e8f7d71f4620a9cea9f9")
 fi
 
 # NVIDIA pre-build module support

diff --git a/linux-cachyos-rt/PKGBUILD b/linux-cachyos-rt/PKGBUILD
@@ -218,7 +218,7 @@ fi
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
-    source+=("git+https://github.com/cachyos/zfs.git#commit=2a953e0ac928563166ad7caa89e48b8d257724d4")
+    source+=("git+https://github.com/cachyos/zfs.git#commit=d38565b5ac3ecbf9dde7e8f7d71f4620a9cea9f9")
 fi
 
 # NVIDIA pre-build module support

diff --git a/linux-cachyos-sched-ext/.SRCINFO b/linux-cachyos-sched-ext/.SRCINFO
@@ -32,13 +32,15 @@ pkgbase = linux-cachyos-sched-ext
 	source = config
 	source = auto-cpu-optimization.sh
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/all/0001-cachyos-base-all.patch
+	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/545.29.06/NVIDIA-Linux-x86_64-545.29.06.run
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-sched-ext.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-bore-cachy-ext.patch
 	b2sums = cd0d70316592fface23a6eddb9d0f8b0c67593f5466388043ebd68613be4eabc3e7c712ce758fa63dd11603101d9d91e22b3552b436bbd1c76f8e19208d7bf22
 	b2sums = 5ddb5dcdb79354268e69d01523f06d5071538ba53171adcef0dd455b286df7785611d64f13b3aae06ac298cc60d990ebfa7b11d75dec9ab4a256b431de549483
 	b2sums = 11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0
 	b2sums = e56bb1bbedd7db10d9b7dcc02bd1e121c6338533ddd16bd9c7aeae660d62004b6e0b02aee824325e974e94cdbaeefdad436eb284ebb3cdd825606631ae49134d
-	b2sums = a44953842898a864d4227b5a459a5719c654c43c760aa0d7e4d876e9658ca144e2dd645e90149a50192575ec5bb0e6ac80f48c8297fd1ed3de20974ae3e24fd1
+	b2sums = 4b6ef76942f34422a366eb226a75f0e2fa17c8eda58b239fcff7a217bce0e237677a762603553120b49bbf458be763461266f5454bf1b37d99905701cc1d1aa5
+	b2sums = 620e10d37ca689dba174bbf1041c399f32d7b2d436409586b80ba2f99fcf58af9041b0d01302d69d7277da9414f8ec9535ec3518668d20bac2df48aa30dfd014
 	b2sums = d0cccc8d114086bcce3fd8d8e08f3814b278fe080d308f63953766be503747252c231ed6038f0f16f5c90811f6ab37db6c5137ad93aca348d9639530fb3fa95f
 
 pkgname = linux-cachyos-sched-ext
@@ -60,6 +62,14 @@ pkgname = linux-cachyos-sched-ext-headers
 	depends = pahole
 	depends = linux-cachyos-sched-ext
 
+pkgname = linux-cachyos-sched-ext-nvidia
+	pkgdesc = nvidia module of 545.29.06 driver for the linux-cachyos-sched-ext kernel
+	license = custom
+	depends = linux-cachyos-sched-ext=6.6.3-1
+	depends = nvidia-utils=545.29.06
+	depends = libglvnd
+	provides = NVIDIA-MODULE
+
 pkgname = linux-cachyos-sched-ext-schedulers
 	pkgdesc = Schedulers for Linux SCHED-EXT with BORE scheduler Kernel by CachyOS with other patches and improvements kernel
 	depends = libbpf

diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD
@@ -156,7 +156,7 @@ _build_zfs=${_build_zfs-}
 
 # Builds the nvidia module and package it into a own base
 # This does replace the requirement of nvidia-dkms
-_build_nvidia=${_build_nvidia-}
+_build_nvidia=${_build_nvidia-y}
 
 # Enable bcachefs
 _bcachefs=${_bcachefs-}
@@ -218,7 +218,7 @@ fi
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
-    source+=("git+https://github.com/cachyos/zfs.git#commit=2a953e0ac928563166ad7caa89e48b8d257724d4")
+    source+=("git+https://github.com/cachyos/zfs.git#commit=d38565b5ac3ecbf9dde7e8f7d71f4620a9cea9f9")
 fi
 
 # NVIDIA pre-build module support
@@ -844,7 +844,6 @@ _package-schedulers() {
    install -Dm755 scx_central "$pkgdir"/usr/bin/scx_central
    install -Dm755 scx_flatcg "$pkgdir"/usr/bin/scx_flatcg
    install -Dm755 scx_layered "$pkgdir"/usr/bin/scx_layered
-   install -Dm755 scx_nest "$pkgdir"/usr/bin/scx_nest
    install -Dm755 scx_pair "$pkgdir"/usr/bin/scx_pair
    install -Dm755 scx_qmap "$pkgdir"/usr/bin/scx_qmap
    install -Dm755 scx_rusty "$pkgdir"/usr/bin/scx_rusty
@@ -867,5 +866,6 @@ b2sums=('cd0d70316592fface23a6eddb9d0f8b0c67593f5466388043ebd68613be4eabc3e7c712
         '5ddb5dcdb79354268e69d01523f06d5071538ba53171adcef0dd455b286df7785611d64f13b3aae06ac298cc60d990ebfa7b11d75dec9ab4a256b431de549483'
         '11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0'
         'e56bb1bbedd7db10d9b7dcc02bd1e121c6338533ddd16bd9c7aeae660d62004b6e0b02aee824325e974e94cdbaeefdad436eb284ebb3cdd825606631ae49134d'
-        'a44953842898a864d4227b5a459a5719c654c43c760aa0d7e4d876e9658ca144e2dd645e90149a50192575ec5bb0e6ac80f48c8297fd1ed3de20974ae3e24fd1'
+        '4b6ef76942f34422a366eb226a75f0e2fa17c8eda58b239fcff7a217bce0e237677a762603553120b49bbf458be763461266f5454bf1b37d99905701cc1d1aa5'
+        '620e10d37ca689dba174bbf1041c399f32d7b2d436409586b80ba2f99fcf58af9041b0d01302d69d7277da9414f8ec9535ec3518668d20bac2df48aa30dfd014'
         'd0cccc8d114086bcce3fd8d8e08f3814b278fe080d308f63953766be503747252c231ed6038f0f16f5c90811f6ab37db6c5137ad93aca348d9639530fb3fa95f')
diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
@@ -218,7 +218,7 @@ fi
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
-    source+=("git+https://github.com/cachyos/zfs.git#commit=2a953e0ac928563166ad7caa89e48b8d257724d4")
+    source+=("git+https://github.com/cachyos/zfs.git#commit=d38565b5ac3ecbf9dde7e8f7d71f4620a9cea9f9")
 fi
 
 # NVIDIA pre-build module support

diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
@@ -218,7 +218,7 @@ fi
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
-    source+=("git+https://github.com/cachyos/zfs.git#commit=2a953e0ac928563166ad7caa89e48b8d257724d4")
+    source+=("git+https://github.com/cachyos/zfs.git#commit=d38565b5ac3ecbf9dde7e8f7d71f4620a9cea9f9")
 fi
 
 # NVIDIA pre-build module support