Skip to content

Archlinux Kernel based on different schedulers and some other performance improvements.

nvidia: Apply patches automatically by checking for its prefix

Eric Naimde067359f3ba
diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD
index 5d43c5c6..65b77b52 100644
--- a/linux-cachyos-bmq/PKGBUILD
+++ b/linux-cachyos-bmq/PKGBUILD
@@ -246,15 +246,17 @@ prepare() {
echo "${pkgbase#linux}" > localversion.20-pkgname
local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- # Skip nvidia patches
- [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue
- src="${src##*/}"
+ for patch in "${source[@]}"; do
+ patch="${patch%%::*}"
+ src="${patch##*/}"
src="${src%.zst}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
- patch -Np1 < "../$src"
+ if [[ "$patch" == "${_patchsource}"/misc/nvidia/* ]]; then
+ patch -Np1 < "../$src" -d "${srcdir}/${_nv_open_pkg}"
+ else
+ patch -Np1 < "../$src"
+ fi
done
echo "Setting config..."
@@ -450,10 +452,6 @@ prepare() {
echo "Save configuration for later reuse..."
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
-
- if [ "$_build_nvidia_open" = "yes" ]; then
- patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
- fi
}
_sign_modules() {
diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD
index 1d738630..5b45f31e 100644
--- a/linux-cachyos-bore/PKGBUILD
+++ b/linux-cachyos-bore/PKGBUILD
@@ -246,15 +246,17 @@ prepare() {
echo "${pkgbase#linux}" > localversion.20-pkgname
local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- # Skip nvidia patches
- [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue
- src="${src##*/}"
+ for patch in "${source[@]}"; do
+ patch="${patch%%::*}"
+ src="${patch##*/}"
src="${src%.zst}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
- patch -Np1 < "../$src"
+ if [[ "$patch" == "${_patchsource}"/misc/nvidia/* ]]; then
+ patch -Np1 < "../$src" -d "${srcdir}/${_nv_open_pkg}"
+ else
+ patch -Np1 < "../$src"
+ fi
done
echo "Setting config..."
@@ -450,10 +452,6 @@ prepare() {
echo "Save configuration for later reuse..."
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
-
- if [ "$_build_nvidia_open" = "yes" ]; then
- patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
- fi
}
_sign_modules() {
diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD
index b397dab8..b9b44d5d 100644
--- a/linux-cachyos-deckify/PKGBUILD
+++ b/linux-cachyos-deckify/PKGBUILD
@@ -247,15 +247,17 @@ prepare() {
echo "${pkgbase#linux}" > localversion.20-pkgname
local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- # Skip nvidia patches
- [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue
- src="${src##*/}"
+ for patch in "${source[@]}"; do
+ patch="${patch%%::*}"
+ src="${patch##*/}"
src="${src%.zst}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
- patch -Np1 < "../$src"
+ if [[ "$patch" == "${_patchsource}"/misc/nvidia/* ]]; then
+ patch -Np1 < "../$src" -d "${srcdir}/${_nv_open_pkg}"
+ else
+ patch -Np1 < "../$src"
+ fi
done
echo "Setting config..."
@@ -454,10 +456,6 @@ prepare() {
echo "Save configuration for later reuse..."
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
-
- if [ "$_build_nvidia_open" = "yes" ]; then
- patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
- fi
}
_sign_modules() {
diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD
index bc7c8d56..2f15cdce 100644
--- a/linux-cachyos-eevdf/PKGBUILD
+++ b/linux-cachyos-eevdf/PKGBUILD
@@ -246,15 +246,17 @@ prepare() {
echo "${pkgbase#linux}" > localversion.20-pkgname
local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- # Skip nvidia patches
- [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue
- src="${src##*/}"
+ for patch in "${source[@]}"; do
+ patch="${patch%%::*}"
+ src="${patch##*/}"
src="${src%.zst}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
- patch -Np1 < "../$src"
+ if [[ "$patch" == "${_patchsource}"/misc/nvidia/* ]]; then
+ patch -Np1 < "../$src" -d "${srcdir}/${_nv_open_pkg}"
+ else
+ patch -Np1 < "../$src"
+ fi
done
echo "Setting config..."
@@ -450,10 +452,6 @@ prepare() {
echo "Save configuration for later reuse..."
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
-
- if [ "$_build_nvidia_open" = "yes" ]; then
- patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
- fi
}
_sign_modules() {
diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD
index 2a33d196..ab39fb99 100644
--- a/linux-cachyos-hardened/PKGBUILD
+++ b/linux-cachyos-hardened/PKGBUILD
@@ -246,15 +246,17 @@ prepare() {
echo "${pkgbase#linux}" > localversion.20-pkgname
local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- # Skip nvidia patches
- [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue
- src="${src##*/}"
+ for patch in "${source[@]}"; do
+ patch="${patch%%::*}"
+ src="${patch##*/}"
src="${src%.zst}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
- patch -Np1 < "../$src"
+ if [[ "$patch" == "${_patchsource}"/misc/nvidia/* ]]; then
+ patch -Np1 < "../$src" -d "${srcdir}/${_nv_open_pkg}"
+ else
+ patch -Np1 < "../$src"
+ fi
done
echo "Setting config..."
@@ -450,10 +452,6 @@ prepare() {
echo "Save configuration for later reuse..."
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
-
- if [ "$_build_nvidia_open" = "yes" ]; then
- patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
- fi
}
_sign_modules() {
diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD
index e9f93866..e72ca144 100644
--- a/linux-cachyos-lts/PKGBUILD
+++ b/linux-cachyos-lts/PKGBUILD
@@ -246,15 +246,17 @@ prepare() {
echo "${pkgbase#linux}" > localversion.20-pkgname
local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- # Skip nvidia patches
- [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue
- src="${src##*/}"
+ for patch in "${source[@]}"; do
+ patch="${patch%%::*}"
+ src="${patch##*/}"
src="${src%.zst}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
- patch -Np1 < "../$src"
+ if [[ "$patch" == "${_patchsource}"/misc/nvidia/* ]]; then
+ patch -Np1 < "../$src" -d "${srcdir}/${_nv_open_pkg}"
+ else
+ patch -Np1 < "../$src"
+ fi
done
echo "Setting config..."
@@ -450,10 +452,6 @@ prepare() {
echo "Save configuration for later reuse..."
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
-
- if [ "$_build_nvidia_open" = "yes" ]; then
- patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
- fi
}
_sign_modules() {
diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD
index 6f05dfd3..48c692c3 100644
--- a/linux-cachyos-rc/PKGBUILD
+++ b/linux-cachyos-rc/PKGBUILD
@@ -293,15 +293,17 @@ prepare() {
echo "${pkgbase#linux}" > localversion.20-pkgname
local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- # Skip nvidia patches
- [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue
- src="${src##*/}"
+ for patch in "${source[@]}"; do
+ patch="${patch%%::*}"
+ src="${patch##*/}"
src="${src%.zst}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
- patch -Np1 < "../$src"
+ if [[ "$patch" == "${_patchsource}"/misc/nvidia/* ]]; then
+ patch -Np1 < "../$src" -d "${srcdir}/${_nv_open_pkg}"
+ else
+ patch -Np1 < "../$src"
+ fi
done
echo "Setting config..."
@@ -517,11 +519,6 @@ prepare() {
echo "Save configuration for later reuse..."
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
-
- if [ "$_build_nvidia_open" = "yes" ]; then
- patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
- patch -Np1 -i "${srcdir}/0004-HACK-kernel-open-Makefile-Remove-PAHOLE_VARIABLE.patch" -d "${srcdir}/${_nv_open_pkg}/"
- fi
}
_sign_modules() {
diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD
index 278dfda1..7b0fe383 100644
--- a/linux-cachyos-rt-bore/PKGBUILD
+++ b/linux-cachyos-rt-bore/PKGBUILD
@@ -246,15 +246,17 @@ prepare() {
echo "${pkgbase#linux}" > localversion.20-pkgname
local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- # Skip nvidia patches
- [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue
- src="${src##*/}"
+ for patch in "${source[@]}"; do
+ patch="${patch%%::*}"
+ src="${patch##*/}"
src="${src%.zst}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
- patch -Np1 < "../$src"
+ if [[ "$patch" == "${_patchsource}"/misc/nvidia/* ]]; then
+ patch -Np1 < "../$src" -d "${srcdir}/${_nv_open_pkg}"
+ else
+ patch -Np1 < "../$src"
+ fi
done
echo "Setting config..."
@@ -450,10 +452,6 @@ prepare() {
echo "Save configuration for later reuse..."
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
-
- if [ "$_build_nvidia_open" = "yes" ]; then
- patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
- fi
}
_sign_modules() {
diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD
index b8d8a3e7..a81dff4d 100644
--- a/linux-cachyos-server/PKGBUILD
+++ b/linux-cachyos-server/PKGBUILD
@@ -246,15 +246,17 @@ prepare() {
echo "${pkgbase#linux}" > localversion.20-pkgname
local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- # Skip nvidia patches
- [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue
- src="${src##*/}"
+ for patch in "${source[@]}"; do
+ patch="${patch%%::*}"
+ src="${patch##*/}"
src="${src%.zst}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
- patch -Np1 < "../$src"
+ if [[ "$patch" == "${_patchsource}"/misc/nvidia/* ]]; then
+ patch -Np1 < "../$src" -d "${srcdir}/${_nv_open_pkg}"
+ else
+ patch -Np1 < "../$src"
+ fi
done
echo "Setting config..."
@@ -450,10 +452,6 @@ prepare() {
echo "Save configuration for later reuse..."
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
-
- if [ "$_build_nvidia_open" = "yes" ]; then
- patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
- fi
}
_sign_modules() {
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index 49188b60..d305e62c 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -286,15 +286,17 @@ prepare() {
echo "${pkgbase#linux}" > localversion.20-pkgname
local src
- for src in "${source[@]}"; do
- src="${src%%::*}"
- # Skip nvidia patches
- [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue
- src="${src##*/}"
+ for patch in "${source[@]}"; do
+ patch="${patch%%::*}"
+ src="${patch##*/}"
src="${src%.zst}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
- patch -Np1 < "../$src"
+ if [[ "$patch" == "${_patchsource}"/misc/nvidia/* ]]; then
+ patch -Np1 < "../$src" -d "${srcdir}/${_nv_open_pkg}"
+ else
+ patch -Np1 < "../$src"
+ fi
done
echo "Setting config..."
@@ -511,10 +513,6 @@ prepare() {
echo "Save configuration for later reuse..."
local basedir="$(dirname "$(readlink "${srcdir}/config")")"
cat .config > "${basedir}/config-${pkgver}-${pkgrel}${pkgbase#linux}"
-
- if [ "$_build_nvidia_open" = "yes" ]; then
- patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_nv_open_pkg}/"
- fi
}
_sign_modules() {