From 165a5b1176c5d5c635a546005a065c8f99c2dc22 Mon Sep 17 00:00:00 2001 From: Wizzard Date: Mon, 5 Feb 2024 21:21:38 -0500 Subject: [PATCH] Updated for version 6.7.4-zen1 & added GPL patch for nvidia drivers --- .../linux6.7-zen/patches/gpl_patch.patch | 19 +++++++++++++++++++ linux-clang/linux6.7-zen/template | 6 +++--- .../linux6.7-zen/patches/gpl_patch.patch | 19 +++++++++++++++++++ linux-gcc/linux6.7-zen/template | 6 +++--- 4 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 linux-clang/linux6.7-zen/patches/gpl_patch.patch create mode 100644 linux-gcc/linux6.7-zen/patches/gpl_patch.patch diff --git a/linux-clang/linux6.7-zen/patches/gpl_patch.patch b/linux-clang/linux6.7-zen/patches/gpl_patch.patch new file mode 100644 index 0000000..4b0efa7 --- /dev/null +++ b/linux-clang/linux6.7-zen/patches/gpl_patch.patch @@ -0,0 +1,19 @@ +diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h +index 4102108..72474d8 100644 +--- a/kernel/rcu/tree_plugin.h ++++ b/kernel/rcu/tree_plugin.h +@@ -406,7 +406,7 @@ void __rcu_read_lock(void) + WRITE_ONCE(current->rcu_read_unlock_special.b.need_qs, true); + barrier(); /* critical section after entry code. */ + } +-EXPORT_SYMBOL_GPL(__rcu_read_lock); ++EXPORT_SYMBOL(__rcu_read_lock); + + /* + * Preemptible RCU implementation for rcu_read_unlock(). +@@ -431,7 +431,7 @@ void __rcu_read_unlock(void) + WARN_ON_ONCE(rrln < 0 || rrln > RCU_NEST_PMAX); + } + } +-EXPORT_SYMBOL_GPL(__rcu_read_unlock); ++EXPORT_SYMBOL(__rcu_read_unlock); diff --git a/linux-clang/linux6.7-zen/template b/linux-clang/linux6.7-zen/template index 2d2cb32..4dbaa62 100644 --- a/linux-clang/linux6.7-zen/template +++ b/linux-clang/linux6.7-zen/template @@ -1,6 +1,6 @@ pkgname=linux6.7-zen -version=6.7.2 -revision=2 +version=6.7.4 +revision=1 zen=1 wrksrc="linux-${version}-zen${zen}" short_desc="Linux kernel and modules with Zen patches (${version%.*} series) compiled with Clang" @@ -8,7 +8,7 @@ maintainer="Wizzard " license="GPL-2.0-only" homepage="http://www.zen-kernel.org/" distfiles="https://github.com/zen-kernel/zen-kernel/archive/refs/tags/v${version}-zen${zen}.tar.gz" -checksum="69add7e7f243e9ef6ef7c24066fee51eb5e06e66e6d4bdbfa22e43fdbf2155e8" +checksum="c4e702ad7cb5341f8a6563dcfc24e17d8952dfcdc79d4f467eca398ee0be9d47" python_version=3 patch_args="-Np1" diff --git a/linux-gcc/linux6.7-zen/patches/gpl_patch.patch b/linux-gcc/linux6.7-zen/patches/gpl_patch.patch new file mode 100644 index 0000000..4b0efa7 --- /dev/null +++ b/linux-gcc/linux6.7-zen/patches/gpl_patch.patch @@ -0,0 +1,19 @@ +diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h +index 4102108..72474d8 100644 +--- a/kernel/rcu/tree_plugin.h ++++ b/kernel/rcu/tree_plugin.h +@@ -406,7 +406,7 @@ void __rcu_read_lock(void) + WRITE_ONCE(current->rcu_read_unlock_special.b.need_qs, true); + barrier(); /* critical section after entry code. */ + } +-EXPORT_SYMBOL_GPL(__rcu_read_lock); ++EXPORT_SYMBOL(__rcu_read_lock); + + /* + * Preemptible RCU implementation for rcu_read_unlock(). +@@ -431,7 +431,7 @@ void __rcu_read_unlock(void) + WARN_ON_ONCE(rrln < 0 || rrln > RCU_NEST_PMAX); + } + } +-EXPORT_SYMBOL_GPL(__rcu_read_unlock); ++EXPORT_SYMBOL(__rcu_read_unlock); diff --git a/linux-gcc/linux6.7-zen/template b/linux-gcc/linux6.7-zen/template index eb0d266..8c52f6c 100644 --- a/linux-gcc/linux6.7-zen/template +++ b/linux-gcc/linux6.7-zen/template @@ -1,6 +1,6 @@ pkgname=linux6.7-zen -version=6.7.2 -revision=2 +version=6.7.4 +revision=1 zen=1 python_version=3 short_desc="Linux kernel and modules with Zen patches (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Wizzard " license="GPL-2.0-only" homepage="https://github.com/zen-kernel/zen-kernel" distfiles="https://github.com/zen-kernel/zen-kernel/archive/refs/tags/v${version}-zen${zen}.tar.gz" -checksum="69add7e7f243e9ef6ef7c24066fee51eb5e06e66e6d4bdbfa22e43fdbf2155e8" +checksum="c4e702ad7cb5341f8a6563dcfc24e17d8952dfcdc79d4f467eca398ee0be9d47" archs="x86_64* i686* ppc* aarch64*" patch_args="-Np1"