4.14.185-1 (clr 4.14.185-115)

3 files changed, 13 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e1433d8bb23..9e055f4afe7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-clear-lts2017
 	pkgdesc = Clear Linux lts2017
-	pkgver = 4.14.183
+	pkgver = 4.14.185
 	pkgrel = 1
 	url = https://github.com/clearlinux-pkgs/linux-lts2017
 	arch = x86_64
@@ -13,18 +13,16 @@ pkgbase = linux-clear-lts2017
 	options = !strip
 	source = https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
 	source = https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.sign
-	source = https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-4.14.183.xz
-	source = linux-clear-lts2017::git+https://github.com/clearlinux-pkgs/linux-lts2017.git#tag=4.14.180-109
-	source = enable_additional_cpu_optimizations-20200527.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20200527.tar.gz
-	source = https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20200520.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-4.14.185.xz
+	source = linux-clear-lts2017::git+https://github.com/clearlinux-pkgs/linux-lts2017.git#tag=4.14.185-115
+	source = enable_additional_cpu_optimizations-20200615.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20200615.tar.gz
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	sha256sums = f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7
 	sha256sums = SKIP
-	sha256sums = a9a37cec8b218129b4479d8ef78dac94ae2eb02f219037de78eacb3c33fbd8a3
+	sha256sums = 1f1595d8c2b505bc5884458fabb69c76d9a5d67c51836b075588fa0f44c8e6bc
 	sha256sums = SKIP
-	sha256sums = 8255e6b6e0bdcd66a73d917b56cf2cccdd1c3f4b3621891cfffc203404a5b6dc
-	sha256sums = 16e7ae4bef734b243428eea07f3b3c3d4721880c3ea8eb8f98628fd6ae5b77c3
+	sha256sums = 278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90
 
 pkgname = linux-clear-lts2017
 	pkgdesc = The Clear Linux lts2017 kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 548faff621e4..c20ae728d070 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -61,9 +61,9 @@ _localmodcfg=
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 _major=4.14
-_minor=183
+_minor=185
 _srcname=linux-${_major}
-_clr=${_major}.180-109
+_clr=${_major}.185-115
 pkgbase=linux-clear-lts2017
 pkgver=${_major}.${_minor}
 pkgrel=1
@@ -73,14 +73,12 @@ url="https://github.com/clearlinux-pkgs/linux-lts2017"
 license=('GPL2')
 makedepends=('bc' 'git' 'kmod' 'libelf' 'xmlto')
 options=('!strip')
-_wrg_snap='1.0.20200520'
-_gcc_more_v='20200527'
+_gcc_more_v='20200615'
 source=(
   "https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${_major}.tar".{xz,sign}
   "https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
   "${pkgbase}::git+https://github.com/clearlinux-pkgs/linux-lts2017.git#tag=${_clr}"
   "enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz"
-  "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${_wrg_snap}.tar.xz"
 )
 
 export KBUILD_BUILD_HOST=archlinux
@@ -101,15 +99,11 @@ prepare() {
         echo "${pkgbase#linux}" > localversion.20-pkgname
 
     ### Add Clearlinux patches
-        for i in $(grep '^Patch' ${srcdir}/${pkgbase}/linux-lts2017.spec | grep -Ev '^Patch0127|^Patch1001' | sed -n 's/.*: //p'); do
+        for i in $(grep '^Patch' ${srcdir}/${pkgbase}/linux-lts2017.spec | grep -Ev '^Patch0127' | sed -n 's/.*: //p'); do
         echo "Applying patch ${i}..."
         patch -Np1 -i "$srcdir/${pkgbase}/${i}"
         done
 
-    ### Link the WireGuard source directory into the kernel tree
-        echo "Adding the WireGuard source directory..."
-        "${srcdir}/wireguard-linux-compat-${_wrg_snap}/kernel-tree-scripts/jury-rig.sh" ./
-
     ### Setting config
         echo "Setting config..."
         cp -Tf $srcdir/${pkgbase}/config ./.config
@@ -330,10 +324,9 @@ done
 
 sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
             'SKIP'
-            'a9a37cec8b218129b4479d8ef78dac94ae2eb02f219037de78eacb3c33fbd8a3'
+            '1f1595d8c2b505bc5884458fabb69c76d9a5d67c51836b075588fa0f44c8e6bc'
             'SKIP'
-            '8255e6b6e0bdcd66a73d917b56cf2cccdd1c3f4b3621891cfffc203404a5b6dc'
-            '16e7ae4bef734b243428eea07f3b3c3d4721880c3ea8eb8f98628fd6ae5b77c3')
+            '278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90')
 
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
diff --git a/linux.install b/linux.install
index 3339ccf15e4a..34b7696dd557 100644
--- a/linux.install
+++ b/linux.install
@@ -3,5 +3,5 @@ post_install() {
   echo ":: Adjust kernel command line in your bootloader to Clear Linux kernel default:"
   echo "   quiet console=tty0 console=ttyS0,115200n8 cryptomgr.notests initcall_debug"
   echo "   intel_iommu=igfx_off kvm-intel.nested=1 no_timer_check noreplace-smp"
-  echo "   rcu_nocbs=0-64 rcupdate.rcu_expedited=1 rootfstype=ext4,btrfs,xfs,f2fs tsc=reliable rw"
+  echo "   rcupdate.rcu_expedited=1 rootfstype=ext4,btrfs,xfs,f2fs tsc=reliable rw"
 }