5.9.7-1 (clr 5.9.4-995) enable AGP modules, add nvidia uvm patch

This commit is contained in:
Josip Ponjavic 2020-11-10 18:29:06 +01:00
parent 5b8891dbc7
commit 6958821459
3 changed files with 56 additions and 16 deletions

View file

@ -1,6 +1,6 @@
pkgbase = linux-clear
pkgdesc = Clear Linux
pkgver = 5.9.6
pkgver = 5.9.7
pkgrel = 1
url = https://github.com/clearlinux-pkgs/linux
arch = x86_64
@ -14,20 +14,22 @@ pkgbase = linux-clear
options = !strip
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.sign
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.9.6.xz
source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.9.3-994
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.9.7.xz
source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.9.4-995
source = enable_additional_cpu_optimizations-20200615.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20200615.tar.gz
source = pci-enable-overrides-for-missing-acs-capabilities.patch
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
source = nvidia-5.9-uvm-fix.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = 3239a4ee1250bf2048be988cc8cb46c487b2c8a0de5b1b032d38394d5c6b1a06
sha256sums = SKIP
sha256sums = 05c34bad1f3ed02494322637b2a246f7d666a118e5e77b85b4b0b24f063d2055
sha256sums = 2fd295318a3de15954cf4f4012b64de899538c4d5eba9192c98f9aba8f94bcab
sha256sums = SKIP
sha256sums = 278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90
sha256sums = 2c98de0814366b041aeee4cbf82b82620c7834bc33752d50f089e8bd7ea5cf5e
sha256sums = 261574aeee09864929d44a5f9896ad2645fe4539d9ee8a86575bd19a07eed865
sha256sums = 19dee9da3b2827493324c669cdead506e90fe4e967ec76937dc46f43ce81f5f7
pkgname = linux-clear
pkgdesc = The Clear Linux kernel and modules

View file

@ -68,9 +68,9 @@ _use_current=
### IMPORTANT: Do no edit below this line unless you know what you're doing
_major=5.9
_minor=6
_minor=7
_srcname=linux-${_major}
_clr=${_major}.3-994
_clr=${_major}.4-995
pkgbase=linux-clear
pkgver=${_major}.${_minor}
pkgrel=1
@ -89,6 +89,7 @@ source=(
"enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz"
'pci-enable-overrides-for-missing-acs-capabilities.patch'
'0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch'
'nvidia-5.9-uvm-fix.patch'
)
export KBUILD_BUILD_HOST=archlinux
@ -114,13 +115,14 @@ prepare() {
patch -Np1 -i "$srcdir/clearlinux/${i}"
done
### Add acs patch
echo "Applying pci-enable-overrides-for-missing-acs-capabilities.patch ..."
patch -Np1 -i "$srcdir/pci-enable-overrides-for-missing-acs-capabilities.patch"
### disable USER_NS for non-root users by default
echo "Applying 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch ..."
patch -Np1 -i "$srcdir/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch"
local src
for src in "${source[@]}"; do
src="${src%%::*}"
src="${src##*/}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 < "../$src"
done
### Setting config
echo "Setting config..."
@ -155,7 +157,8 @@ prepare() {
--enable SND_OSSEMUL \
--module-after SND_OSSEMUL SND_MIXER_OSS \
--module-after SND_MIXER_OSS SND_PCM_OSS \
--enable-after SND_PCM_OSS SND_PCM_OSS_PLUGINS
--enable-after SND_PCM_OSS SND_PCM_OSS_PLUGINS \
--module AGP --module-after AGP AGP_INTEL --module-after AGP_INTEL AGP_VIA
# Kernel hacking -> Compile-time checks and compiler options -> Make section mismatch errors non-fatal
scripts/config --enable SECTION_MISMATCH_WARN_ONLY
@ -352,11 +355,12 @@ done
sha256sums=('3239a4ee1250bf2048be988cc8cb46c487b2c8a0de5b1b032d38394d5c6b1a06'
'SKIP'
'05c34bad1f3ed02494322637b2a246f7d666a118e5e77b85b4b0b24f063d2055'
'2fd295318a3de15954cf4f4012b64de899538c4d5eba9192c98f9aba8f94bcab'
'SKIP'
'278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90'
'2c98de0814366b041aeee4cbf82b82620c7834bc33752d50f089e8bd7ea5cf5e'
'261574aeee09864929d44a5f9896ad2645fe4539d9ee8a86575bd19a07eed865')
'261574aeee09864929d44a5f9896ad2645fe4539d9ee8a86575bd19a07eed865'
'19dee9da3b2827493324c669cdead506e90fe4e967ec76937dc46f43ce81f5f7')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds

34
nvidia-5.9-uvm-fix.patch Normal file
View file

@ -0,0 +1,34 @@
--- linux-5.9/kernel/module.c.old 2020-10-14 06:51:57.598066293 +0200
+++ linux-5.9/kernel/module.c 2020-10-14 07:58:16.504570606 +0200
@@ -1431,6 +1431,7 @@
return 0;
}
+#if 0
static bool inherit_taint(struct module *mod, struct module *owner)
{
if (!owner || !test_bit(TAINT_PROPRIETARY_MODULE, &owner->taints))
@@ -1449,6 +1450,7 @@
}
return true;
}
+#endif
/* Resolve a symbol for this module. I.e. if we find one, record usage. */
static const struct kernel_symbol *resolve_symbol(struct module *mod,
@@ -1474,6 +1476,7 @@
if (!sym)
goto unlock;
+#if 0
if (license == GPL_ONLY)
mod->using_gplonly_symbols = true;
@@ -1481,6 +1484,7 @@
sym = NULL;
goto getname;
}
+#endif
if (!check_version(info, name, mod, crc)) {
sym = ERR_PTR(-EINVAL);