diff --git a/.SRCINFO b/.SRCINFO index a929471..e864424 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = linux-clear pkgdesc = Clear Linux - pkgver = 5.9.16 + pkgver = 5.10.5 pkgrel = 1 url = https://github.com/clearlinux-pkgs/linux arch = x86_64 @@ -12,24 +12,22 @@ pkgbase = linux-clear makedepends = libelf makedepends = xmlto 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.16.xz - source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.9.15-1008 + source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.sign + source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.10.5.xz + source = clearlinux::git+https://github.com/clearlinux-pkgs/linux.git#tag=5.10.5-1012 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 = dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43 sha256sums = SKIP - sha256sums = 46c520da2db82d8f9a15c2117d3a50e0faaaf98f05bd4ea1f3105e2724f207d6 + sha256sums = 20a9a6742728677d0959197bc00cb9963ecffc6164d0e082364c11b9c9961349 sha256sums = SKIP sha256sums = 278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90 sha256sums = 2c98de0814366b041aeee4cbf82b82620c7834bc33752d50f089e8bd7ea5cf5e sha256sums = 261574aeee09864929d44a5f9896ad2645fe4539d9ee8a86575bd19a07eed865 - sha256sums = 19dee9da3b2827493324c669cdead506e90fe4e967ec76937dc46f43ce81f5f7 pkgname = linux-clear pkgdesc = The Clear Linux kernel and modules diff --git a/PKGBUILD b/PKGBUILD index c7a8a8f..b537e50 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -67,10 +67,10 @@ _use_current= ### IMPORTANT: Do no edit below this line unless you know what you're doing -_major=5.9 -_minor=16 +_major=5.10 +_minor=5 _srcname=linux-${_major} -_clr=${_major}.15-1008 +_clr=${_major}.5-1012 pkgbase=linux-clear pkgver=${_major}.${_minor} pkgrel=1 @@ -89,7 +89,6 @@ 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 @@ -352,14 +351,13 @@ for _p in "${pkgname[@]}"; do }" done -sha256sums=('3239a4ee1250bf2048be988cc8cb46c487b2c8a0de5b1b032d38394d5c6b1a06' +sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43' 'SKIP' - '46c520da2db82d8f9a15c2117d3a50e0faaaf98f05bd4ea1f3105e2724f207d6' + '20a9a6742728677d0959197bc00cb9963ecffc6164d0e082364c11b9c9961349' 'SKIP' '278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90' '2c98de0814366b041aeee4cbf82b82620c7834bc33752d50f089e8bd7ea5cf5e' - '261574aeee09864929d44a5f9896ad2645fe4539d9ee8a86575bd19a07eed865' - '19dee9da3b2827493324c669cdead506e90fe4e967ec76937dc46f43ce81f5f7') + '261574aeee09864929d44a5f9896ad2645fe4539d9ee8a86575bd19a07eed865') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds diff --git a/nvidia-5.9-uvm-fix.patch b/nvidia-5.9-uvm-fix.patch deleted file mode 100644 index 83f7d50..0000000 --- a/nvidia-5.9-uvm-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- 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); \ No newline at end of file