From 200bbea7a762af17517399c57507e4fab919e450 Mon Sep 17 00:00:00 2001 From: Vasiliy Stelmachenok Date: Fri, 27 Sep 2024 19:40:37 +0300 Subject: [PATCH 1/3] Make nvidia patches skip via URL instead of filenames Signed-off-by: Vasiliy Stelmachenok --- linux-cachyos-bmq/PKGBUILD | 7 ++----- linux-cachyos-bore/PKGBUILD | 7 ++----- linux-cachyos-deckify/PKGBUILD | 7 ++----- linux-cachyos-eevdf/PKGBUILD | 7 ++----- linux-cachyos-hardened/PKGBUILD | 7 ++----- linux-cachyos-lts/PKGBUILD | 7 ++----- linux-cachyos-rc/PKGBUILD | 7 ++----- linux-cachyos-rt-bore/PKGBUILD | 7 ++----- linux-cachyos-sched-ext/PKGBUILD | 7 ++----- linux-cachyos-server/PKGBUILD | 7 ++----- linux-cachyos/PKGBUILD | 7 ++----- 11 files changed, 22 insertions(+), 55 deletions(-) diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD index ca146d5e..a87fac84 100644 --- a/linux-cachyos-bmq/PKGBUILD +++ b/linux-cachyos-bmq/PKGBUILD @@ -269,13 +269,10 @@ prepare() { local src for src in "${source[@]}"; do src="${src%%::*}" + # Skip nvidia patches + [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue src="${src##*/}" src="${src%.zst}" - [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue - [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue - [[ $src = 0003-Add-IBT-Support.patch ]] && continue - [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue - [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD index 278374c8..96fbeaae 100644 --- a/linux-cachyos-bore/PKGBUILD +++ b/linux-cachyos-bore/PKGBUILD @@ -270,13 +270,10 @@ prepare() { local src for src in "${source[@]}"; do src="${src%%::*}" + # Skip nvidia patches + [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue src="${src##*/}" src="${src%.zst}" - [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue - [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue - [[ $src = 0003-Add-IBT-Support.patch ]] && continue - [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue - [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD index 14562d07..f79bc723 100644 --- a/linux-cachyos-deckify/PKGBUILD +++ b/linux-cachyos-deckify/PKGBUILD @@ -274,13 +274,10 @@ prepare() { local src for src in "${source[@]}"; do src="${src%%::*}" + # Skip nvidia patches + [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue src="${src##*/}" src="${src%.zst}" - [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue - [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue - [[ $src = 0003-Add-IBT-Support.patch ]] && continue - [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue - [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD index 2b0769f6..5695fa08 100644 --- a/linux-cachyos-eevdf/PKGBUILD +++ b/linux-cachyos-eevdf/PKGBUILD @@ -270,13 +270,10 @@ prepare() { local src for src in "${source[@]}"; do src="${src%%::*}" + # Skip nvidia patches + [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue src="${src##*/}" src="${src%.zst}" - [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue - [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue - [[ $src = 0003-Add-IBT-Support.patch ]] && continue - [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue - [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD index 38184492..46f79369 100644 --- a/linux-cachyos-hardened/PKGBUILD +++ b/linux-cachyos-hardened/PKGBUILD @@ -268,13 +268,10 @@ prepare() { local src for src in "${source[@]}"; do src="${src%%::*}" + # Skip nvidia patches + [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue src="${src##*/}" src="${src%.zst}" - [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue - [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue - [[ $src = 0003-Add-IBT-Support.patch ]] && continue - [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue - [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD index b83d562f..c50b0ce1 100644 --- a/linux-cachyos-lts/PKGBUILD +++ b/linux-cachyos-lts/PKGBUILD @@ -295,13 +295,10 @@ prepare() { local src for src in "${source[@]}"; do src="${src%%::*}" + # Skip nvidia patches + [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue src="${src##*/}" src="${src%.zst}" - [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue - [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue - [[ $src = 0003-Add-IBT-Support.patch ]] && continue - [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue - [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD index f917395c..6cedaa33 100644 --- a/linux-cachyos-rc/PKGBUILD +++ b/linux-cachyos-rc/PKGBUILD @@ -270,13 +270,10 @@ prepare() { local src for src in "${source[@]}"; do src="${src%%::*}" + # Skip nvidia patches + [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue src="${src##*/}" src="${src%.zst}" - [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue - [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue - [[ $src = 0003-Add-IBT-Support.patch ]] && continue - [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue - [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD index ec4959ac..0e607da3 100644 --- a/linux-cachyos-rt-bore/PKGBUILD +++ b/linux-cachyos-rt-bore/PKGBUILD @@ -270,13 +270,10 @@ prepare() { local src for src in "${source[@]}"; do src="${src%%::*}" + # Skip nvidia patches + [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue src="${src##*/}" src="${src%.zst}" - [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue - [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue - [[ $src = 0003-Add-IBT-Support.patch ]] && continue - [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue - [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD index b9c39b6d..cce4c40f 100644 --- a/linux-cachyos-sched-ext/PKGBUILD +++ b/linux-cachyos-sched-ext/PKGBUILD @@ -270,13 +270,10 @@ prepare() { local src for src in "${source[@]}"; do src="${src%%::*}" + # Skip nvidia patches + [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue src="${src##*/}" src="${src%.zst}" - [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue - [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue - [[ $src = 0003-Add-IBT-Support.patch ]] && continue - [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue - [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD index 3af4d4ab..0f854e6b 100644 --- a/linux-cachyos-server/PKGBUILD +++ b/linux-cachyos-server/PKGBUILD @@ -270,13 +270,10 @@ prepare() { local src for src in "${source[@]}"; do src="${src%%::*}" + # Skip nvidia patches + [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue src="${src##*/}" src="${src%.zst}" - [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue - [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue - [[ $src = 0003-Add-IBT-Support.patch ]] && continue - [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue - [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD index d739cc49..ed7ab45a 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -270,13 +270,10 @@ prepare() { local src for src in "${source[@]}"; do src="${src%%::*}" + # Skip nvidia patches + [[ "$src" == "${_patchsource}"/misc/nvidia/*.patch ]] && continue src="${src##*/}" src="${src%.zst}" - [[ $src = 0001-Make-modeset-and-fbdev-default-enabled.patch ]] && continue - [[ $src = 0002-Do-not-error-on-unkown-CPU-Type-and-add-Zen5-support.patch ]] && continue - [[ $src = 0003-Add-IBT-Support.patch ]] && continue - [[ $src = 0004-6.11-Add-fix-for-fbdev.patch ]] && continue - [[ $src = 0005-6.12-drm_outpull_pill-changed-check.patch ]] && continue [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" From 2786780c2accd940021a7c25287a7ee234b47db9 Mon Sep 17 00:00:00 2001 From: Vasiliy Stelmachenok Date: Fri, 27 Sep 2024 19:54:10 +0300 Subject: [PATCH 2/3] Move declaration of common Nvidia flags Signed-off-by: Vasiliy Stelmachenok --- linux-cachyos-bmq/PKGBUILD | 23 ++++++++--------------- linux-cachyos-bore/PKGBUILD | 23 ++++++++--------------- linux-cachyos-deckify/PKGBUILD | 23 ++++++++--------------- linux-cachyos-eevdf/PKGBUILD | 23 ++++++++--------------- linux-cachyos-hardened/PKGBUILD | 23 ++++++++--------------- linux-cachyos-lts/PKGBUILD | 23 ++++++++--------------- linux-cachyos-rc/PKGBUILD | 23 ++++++++--------------- linux-cachyos-rt-bore/PKGBUILD | 23 ++++++++--------------- linux-cachyos-sched-ext/PKGBUILD | 23 ++++++++--------------- linux-cachyos-server/PKGBUILD | 23 ++++++++--------------- linux-cachyos/PKGBUILD | 23 ++++++++--------------- 11 files changed, 88 insertions(+), 165 deletions(-) diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD index a87fac84..49e45ff9 100644 --- a/linux-cachyos-bmq/PKGBUILD +++ b/linux-cachyos-bmq/PKGBUILD @@ -539,15 +539,14 @@ build() { make "${BUILD_FLAGS[@]}" -j"$(nproc)" all make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1 + local MODULE_FLAGS=( + KERNEL_UNAME="${_kernuname}" + IGNORE_PREEMPT_RT_PRESENCE=1 + SYSSRC="${srcdir}/${_srcname}" + SYSOUT="${srcdir}/${_srcname}" + ) if [ -n "$_build_nvidia" ]; then - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) - + MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES') cd "${srcdir}/${_nv_pkg}/kernel" make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules @@ -555,13 +554,7 @@ build() { if [ -n "$_build_nvidia_open" ]; then cd "${srcdir}/${_nv_open_pkg}" - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - IGNORE_CC_MISMATCH=yes - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) + MODULE_FLAGS+=(IGNORE_CC_MISMATCH=yes) CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules fi diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD index 96fbeaae..c65a74a9 100644 --- a/linux-cachyos-bore/PKGBUILD +++ b/linux-cachyos-bore/PKGBUILD @@ -540,15 +540,14 @@ build() { make "${BUILD_FLAGS[@]}" -j"$(nproc)" all make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1 + local MODULE_FLAGS=( + KERNEL_UNAME="${_kernuname}" + IGNORE_PREEMPT_RT_PRESENCE=1 + SYSSRC="${srcdir}/${_srcname}" + SYSOUT="${srcdir}/${_srcname}" + ) if [ -n "$_build_nvidia" ]; then - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) - + MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES') cd "${srcdir}/${_nv_pkg}/kernel" make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules @@ -556,13 +555,7 @@ build() { if [ -n "$_build_nvidia_open" ]; then cd "${srcdir}/${_nv_open_pkg}" - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - IGNORE_CC_MISMATCH=yes - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) + MODULE_FLAGS+=(IGNORE_CC_MISMATCH=yes) CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules fi diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD index f79bc723..be044401 100644 --- a/linux-cachyos-deckify/PKGBUILD +++ b/linux-cachyos-deckify/PKGBUILD @@ -544,15 +544,14 @@ build() { make "${BUILD_FLAGS[@]}" -j"$(nproc)" all make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1 + local MODULE_FLAGS=( + KERNEL_UNAME="${_kernuname}" + IGNORE_PREEMPT_RT_PRESENCE=1 + SYSSRC="${srcdir}/${_srcname}" + SYSOUT="${srcdir}/${_srcname}" + ) if [ -n "$_build_nvidia" ]; then - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) - + MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES') cd "${srcdir}/${_nv_pkg}/kernel" make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules @@ -560,13 +559,7 @@ build() { if [ -n "$_build_nvidia_open" ]; then cd "${srcdir}/${_nv_open_pkg}" - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - IGNORE_CC_MISMATCH=yes - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) + MODULE_FLAGS+=(IGNORE_CC_MISMATCH=yes) CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules fi diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD index 5695fa08..308f0e2a 100644 --- a/linux-cachyos-eevdf/PKGBUILD +++ b/linux-cachyos-eevdf/PKGBUILD @@ -540,15 +540,14 @@ build() { make "${BUILD_FLAGS[@]}" -j"$(nproc)" all make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1 + local MODULE_FLAGS=( + KERNEL_UNAME="${_kernuname}" + IGNORE_PREEMPT_RT_PRESENCE=1 + SYSSRC="${srcdir}/${_srcname}" + SYSOUT="${srcdir}/${_srcname}" + ) if [ -n "$_build_nvidia" ]; then - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) - + MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES') cd "${srcdir}/${_nv_pkg}/kernel" make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules @@ -556,13 +555,7 @@ build() { if [ -n "$_build_nvidia_open" ]; then cd "${srcdir}/${_nv_open_pkg}" - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - IGNORE_CC_MISMATCH=yes - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) + MODULE_FLAGS+=(IGNORE_CC_MISMATCH=yes) CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules fi diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD index 46f79369..d0c51a31 100644 --- a/linux-cachyos-hardened/PKGBUILD +++ b/linux-cachyos-hardened/PKGBUILD @@ -538,15 +538,14 @@ build() { cd ${srcdir}/${_srcname} make ${BUILD_FLAGS[*]} -j$(nproc) all + local MODULE_FLAGS=( + KERNEL_UNAME="${_kernuname}" + IGNORE_PREEMPT_RT_PRESENCE=1 + SYSSRC="${srcdir}/${_srcname}" + SYSOUT="${srcdir}/${_srcname}" + ) if [ -n "$_build_nvidia" ]; then - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) - + MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES') cd "${srcdir}/${_nv_pkg}/kernel" make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules @@ -554,13 +553,7 @@ build() { if [ -n "$_build_nvidia_open" ]; then cd "${srcdir}/${_nv_open_pkg}" - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - IGNORE_CC_MISMATCH=yes - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) + MODULE_FLAGS+=(IGNORE_CC_MISMATCH=yes) CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules fi diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD index c50b0ce1..80a14b1f 100644 --- a/linux-cachyos-lts/PKGBUILD +++ b/linux-cachyos-lts/PKGBUILD @@ -622,15 +622,14 @@ build() { make "${BUILD_FLAGS[@]}" -j"$(nproc)" all make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1 + local MODULE_FLAGS=( + KERNEL_UNAME="${_kernuname}" + IGNORE_PREEMPT_RT_PRESENCE=1 + SYSSRC="${srcdir}/${_srcname}" + SYSOUT="${srcdir}/${_srcname}" + ) if [ -n "$_build_nvidia" ]; then - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) - + MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES') cd "${srcdir}/${_nv_pkg}/kernel" make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules @@ -638,13 +637,7 @@ build() { if [ -n "$_build_nvidia_open" ]; then cd "${srcdir}/${_nv_open_pkg}" - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - IGNORE_CC_MISMATCH=yes - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) + MODULE_FLAGS+=(IGNORE_CC_MISMATCH=yes) CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules fi diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD index 6cedaa33..6c8d4919 100644 --- a/linux-cachyos-rc/PKGBUILD +++ b/linux-cachyos-rc/PKGBUILD @@ -540,15 +540,14 @@ build() { make "${BUILD_FLAGS[@]}" -j"$(nproc)" all make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1 + local MODULE_FLAGS=( + KERNEL_UNAME="${_kernuname}" + IGNORE_PREEMPT_RT_PRESENCE=1 + SYSSRC="${srcdir}/${_srcname}" + SYSOUT="${srcdir}/${_srcname}" + ) if [ -n "$_build_nvidia" ]; then - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) - + MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES') cd "${srcdir}/${_nv_pkg}/kernel" make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules @@ -556,13 +555,7 @@ build() { if [ -n "$_build_nvidia_open" ]; then cd "${srcdir}/${_nv_open_pkg}" - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - IGNORE_CC_MISMATCH=yes - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) + MODULE_FLAGS+=(IGNORE_CC_MISMATCH=yes) CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules fi diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD index 0e607da3..b6886eac 100644 --- a/linux-cachyos-rt-bore/PKGBUILD +++ b/linux-cachyos-rt-bore/PKGBUILD @@ -540,15 +540,14 @@ build() { make "${BUILD_FLAGS[@]}" -j"$(nproc)" all make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1 + local MODULE_FLAGS=( + KERNEL_UNAME="${_kernuname}" + IGNORE_PREEMPT_RT_PRESENCE=1 + SYSSRC="${srcdir}/${_srcname}" + SYSOUT="${srcdir}/${_srcname}" + ) if [ -n "$_build_nvidia" ]; then - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) - + MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES') cd "${srcdir}/${_nv_pkg}/kernel" make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules @@ -556,13 +555,7 @@ build() { if [ -n "$_build_nvidia_open" ]; then cd "${srcdir}/${_nv_open_pkg}" - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - IGNORE_CC_MISMATCH=yes - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) + MODULE_FLAGS+=(IGNORE_CC_MISMATCH=yes) CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules fi diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD index cce4c40f..bd32af97 100644 --- a/linux-cachyos-sched-ext/PKGBUILD +++ b/linux-cachyos-sched-ext/PKGBUILD @@ -540,15 +540,14 @@ build() { make "${BUILD_FLAGS[@]}" -j"$(nproc)" all make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1 + local MODULE_FLAGS=( + KERNEL_UNAME="${_kernuname}" + IGNORE_PREEMPT_RT_PRESENCE=1 + SYSSRC="${srcdir}/${_srcname}" + SYSOUT="${srcdir}/${_srcname}" + ) if [ -n "$_build_nvidia" ]; then - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) - + MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES') cd "${srcdir}/${_nv_pkg}/kernel" make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules @@ -556,13 +555,7 @@ build() { if [ -n "$_build_nvidia_open" ]; then cd "${srcdir}/${_nv_open_pkg}" - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - IGNORE_CC_MISMATCH=yes - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) + MODULE_FLAGS+=(IGNORE_CC_MISMATCH=yes) CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules fi diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD index 0f854e6b..92740ce0 100644 --- a/linux-cachyos-server/PKGBUILD +++ b/linux-cachyos-server/PKGBUILD @@ -540,15 +540,14 @@ build() { make "${BUILD_FLAGS[@]}" -j"$(nproc)" all make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1 + local MODULE_FLAGS=( + KERNEL_UNAME="${_kernuname}" + IGNORE_PREEMPT_RT_PRESENCE=1 + SYSSRC="${srcdir}/${_srcname}" + SYSOUT="${srcdir}/${_srcname}" + ) if [ -n "$_build_nvidia" ]; then - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) - + MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES') cd "${srcdir}/${_nv_pkg}/kernel" make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules @@ -556,13 +555,7 @@ build() { if [ -n "$_build_nvidia_open" ]; then cd "${srcdir}/${_nv_open_pkg}" - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - IGNORE_CC_MISMATCH=yes - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) + MODULE_FLAGS+=(IGNORE_CC_MISMATCH=yes) CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules fi diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD index ed7ab45a..c61c5046 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -540,15 +540,14 @@ build() { make "${BUILD_FLAGS[@]}" -j"$(nproc)" all make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1 + local MODULE_FLAGS=( + KERNEL_UNAME="${_kernuname}" + IGNORE_PREEMPT_RT_PRESENCE=1 + SYSSRC="${srcdir}/${_srcname}" + SYSOUT="${srcdir}/${_srcname}" + ) if [ -n "$_build_nvidia" ]; then - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) - + MODULE_FLAGS+=(NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES') cd "${srcdir}/${_nv_pkg}/kernel" make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules @@ -556,13 +555,7 @@ build() { if [ -n "$_build_nvidia_open" ]; then cd "${srcdir}/${_nv_open_pkg}" - local MODULE_FLAGS=( - KERNEL_UNAME="${_kernuname}" - IGNORE_PREEMPT_RT_PRESENCE=1 - IGNORE_CC_MISMATCH=yes - SYSSRC="${srcdir}/${_srcname}" - SYSOUT="${srcdir}/${_srcname}" - ) + MODULE_FLAGS+=(IGNORE_CC_MISMATCH=yes) CFLAGS= CXXFLAGS= LDFLAGS= make "${BUILD_FLAGS[@]}" "${MODULE_FLAGS[@]}" -j"$(nproc)" modules fi From 63cc8b3130748a43f6da54fbba2e85ae6f6306b0 Mon Sep 17 00:00:00 2001 From: Vasiliy Stelmachenok Date: Fri, 27 Sep 2024 20:06:09 +0300 Subject: [PATCH 3/3] Update maintainers list Signed-off-by: Vasiliy Stelmachenok --- linux-cachyos-bmq/PKGBUILD | 4 +++- linux-cachyos-bore/PKGBUILD | 4 +++- linux-cachyos-deckify/PKGBUILD | 4 +++- linux-cachyos-eevdf/PKGBUILD | 4 +++- linux-cachyos-hardened/PKGBUILD | 4 +++- linux-cachyos-lts/PKGBUILD | 4 +++- linux-cachyos-rc/PKGBUILD | 4 +++- linux-cachyos-rt-bore/PKGBUILD | 4 +++- linux-cachyos-sched-ext/PKGBUILD | 4 +++- linux-cachyos-server/PKGBUILD | 4 +++- linux-cachyos/PKGBUILD | 4 +++- 11 files changed, 33 insertions(+), 11 deletions(-) diff --git a/linux-cachyos-bmq/PKGBUILD b/linux-cachyos-bmq/PKGBUILD index 49e45ff9..d78450c6 100644 --- a/linux-cachyos-bmq/PKGBUILD +++ b/linux-cachyos-bmq/PKGBUILD @@ -1,4 +1,6 @@ -# Maintainer: Peter Jung ptr1337 && Piotr Gorski +# Maintainer: Peter Jung ptr1337 +# Maintainer: Piotr Gorski +# Maintainer: Vasiliy Stelmachenok # Contributor: Jan Alexander Steffens (heftig) # Contributor: Tobias Powalowski # Contributor: Thomas Baechler diff --git a/linux-cachyos-bore/PKGBUILD b/linux-cachyos-bore/PKGBUILD index c65a74a9..ddb2ea62 100644 --- a/linux-cachyos-bore/PKGBUILD +++ b/linux-cachyos-bore/PKGBUILD @@ -1,4 +1,6 @@ -# Maintainer: Peter Jung ptr1337 && Piotr Gorski +# Maintainer: Peter Jung ptr1337 +# Maintainer: Piotr Gorski +# Maintainer: Vasiliy Stelmachenok # Contributor: Jan Alexander Steffens (heftig) # Contributor: Tobias Powalowski # Contributor: Thomas Baechler diff --git a/linux-cachyos-deckify/PKGBUILD b/linux-cachyos-deckify/PKGBUILD index be044401..862a2fb2 100644 --- a/linux-cachyos-deckify/PKGBUILD +++ b/linux-cachyos-deckify/PKGBUILD @@ -1,4 +1,6 @@ -# Maintainer: Peter Jung ptr1337 && Piotr Gorski +# Maintainer: Peter Jung ptr1337 +# Maintainer: Piotr Gorski +# Maintainer: Vasiliy Stelmachenok # Contributor: Jan Alexander Steffens (heftig) # Contributor: Tobias Powalowski # Contributor: Thomas Baechler diff --git a/linux-cachyos-eevdf/PKGBUILD b/linux-cachyos-eevdf/PKGBUILD index 308f0e2a..f0743c6b 100644 --- a/linux-cachyos-eevdf/PKGBUILD +++ b/linux-cachyos-eevdf/PKGBUILD @@ -1,4 +1,6 @@ -# Maintainer: Peter Jung ptr1337 && Piotr Gorski +# Maintainer: Peter Jung ptr1337 +# Maintainer: Piotr Gorski +# Maintainer: Vasiliy Stelmachenok # Contributor: Jan Alexander Steffens (heftig) # Contributor: Tobias Powalowski # Contributor: Thomas Baechler diff --git a/linux-cachyos-hardened/PKGBUILD b/linux-cachyos-hardened/PKGBUILD index d0c51a31..0d4dd6ae 100644 --- a/linux-cachyos-hardened/PKGBUILD +++ b/linux-cachyos-hardened/PKGBUILD @@ -1,4 +1,6 @@ -# Maintainer: Peter Jung ptr1337 && Piotr Gorski +# Maintainer: Peter Jung ptr1337 +# Maintainer: Piotr Gorski +# Maintainer: Vasiliy Stelmachenok # Contributor: Jan Alexander Steffens (heftig) # Contributor: Tobias Powalowski # Contributor: Thomas Baechler diff --git a/linux-cachyos-lts/PKGBUILD b/linux-cachyos-lts/PKGBUILD index 80a14b1f..aec2e27c 100644 --- a/linux-cachyos-lts/PKGBUILD +++ b/linux-cachyos-lts/PKGBUILD @@ -1,4 +1,6 @@ -# Maintainer: Peter Jung ptr1337 && Piotr Gorski +# Maintainer: Peter Jung ptr1337 +# Maintainer: Piotr Gorski +# Maintainer: Vasiliy Stelmachenok # Contributor: Jan Alexander Steffens (heftig) # Contributor: Tobias Powalowski # Contributor: Thomas Baechler diff --git a/linux-cachyos-rc/PKGBUILD b/linux-cachyos-rc/PKGBUILD index 6c8d4919..52d8a4a6 100644 --- a/linux-cachyos-rc/PKGBUILD +++ b/linux-cachyos-rc/PKGBUILD @@ -1,4 +1,6 @@ -# Maintainer: Peter Jung ptr1337 && Piotr Gorski +# Maintainer: Peter Jung ptr1337 +# Maintainer: Piotr Gorski +# Maintainer: Vasiliy Stelmachenok # Contributor: Jan Alexander Steffens (heftig) # Contributor: Tobias Powalowski # Contributor: Thomas Baechler diff --git a/linux-cachyos-rt-bore/PKGBUILD b/linux-cachyos-rt-bore/PKGBUILD index b6886eac..c14a35da 100644 --- a/linux-cachyos-rt-bore/PKGBUILD +++ b/linux-cachyos-rt-bore/PKGBUILD @@ -1,4 +1,6 @@ -# Maintainer: Peter Jung ptr1337 && Piotr Gorski +# Maintainer: Peter Jung ptr1337 +# Maintainer: Piotr Gorski +# Maintainer: Vasiliy Stelmachenok # Contributor: Jan Alexander Steffens (heftig) # Contributor: Tobias Powalowski # Contributor: Thomas Baechler diff --git a/linux-cachyos-sched-ext/PKGBUILD b/linux-cachyos-sched-ext/PKGBUILD index bd32af97..4574b9a3 100644 --- a/linux-cachyos-sched-ext/PKGBUILD +++ b/linux-cachyos-sched-ext/PKGBUILD @@ -1,4 +1,6 @@ -# Maintainer: Peter Jung ptr1337 && Piotr Gorski +# Maintainer: Peter Jung ptr1337 +# Maintainer: Piotr Gorski +# Maintainer: Vasiliy Stelmachenok # Contributor: Jan Alexander Steffens (heftig) # Contributor: Tobias Powalowski # Contributor: Thomas Baechler diff --git a/linux-cachyos-server/PKGBUILD b/linux-cachyos-server/PKGBUILD index 92740ce0..cbc9c60c 100644 --- a/linux-cachyos-server/PKGBUILD +++ b/linux-cachyos-server/PKGBUILD @@ -1,4 +1,6 @@ -# Maintainer: Peter Jung ptr1337 && Piotr Gorski +# Maintainer: Peter Jung ptr1337 +# Maintainer: Piotr Gorski +# Maintainer: Vasiliy Stelmachenok # Contributor: Jan Alexander Steffens (heftig) # Contributor: Tobias Powalowski # Contributor: Thomas Baechler diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD index c61c5046..b3637a9f 100644 --- a/linux-cachyos/PKGBUILD +++ b/linux-cachyos/PKGBUILD @@ -1,4 +1,6 @@ -# Maintainer: Peter Jung ptr1337 && Piotr Gorski +# Maintainer: Peter Jung ptr1337 +# Maintainer: Piotr Gorski +# Maintainer: Vasiliy Stelmachenok # Contributor: Jan Alexander Steffens (heftig) # Contributor: Tobias Powalowski # Contributor: Thomas Baechler