5.4.77-1 (clr 5.4.75-75) update wireguard & patch fix from nixos

3 files changed, 28 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9d55be0b1bf2..139b3e5d7b4f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,6 +17,8 @@ pkgbase = linux-clear-lts2019
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.4.77.xz
 	source = clearlinux-lts2019::git+https://github.com/clearlinux-pkgs/linux-lts2019.git#tag=5.4.75-75
 	source = enable_additional_cpu_optimizations-20200615.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20200615.tar.gz
+	source = https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-1.0.20200908.tar.xz
+	source = linux-5.4.76-fix.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	sha256sums = bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
@@ -24,6 +26,8 @@ pkgbase = linux-clear-lts2019
 	sha256sums = 0b63a75f07f235a895438f8483ed38509e2b60f43ec2b91dc19e01828a33a930
 	sha256sums = SKIP
 	sha256sums = 278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90
+	sha256sums = ad33b2d2267a37e0f65c97e65e7d4d926d5aef7d530c251b63fbf919048eead9
+	sha256sums = 40512118e30e26486b94026caac3d4a35dd55cbd244472ec1adb91878f4c12b3
 
 pkgname = linux-clear-lts2019
 	pkgdesc = The Clear Linux lts2019 kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 20211e3991f4..cacc91995fbe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -73,6 +73,7 @@ url="https://github.com/clearlinux-pkgs/linux-lts2019"
 license=('GPL2')
 makedepends=('bc' 'cpio' 'git' 'kmod' 'libelf' 'xmlto')
 options=('!strip')
+_wrg_snap='1.0.20200908'
 _gcc_more_v='20200615'
 source=(
   "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_major}.tar.xz"
@@ -80,6 +81,8 @@ source=(
   "https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
   "clearlinux-lts2019::git+https://github.com/clearlinux-pkgs/linux-lts2019.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"
+  'linux-5.4.76-fix.patch'
 )
 
 export KBUILD_BUILD_HOST=archlinux
@@ -87,6 +90,7 @@ export KBUILD_BUILD_USER=$pkgbase
 export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
 prepare() {
+    patch -Np0 -i "$srcdir/linux-5.4.76-fix.patch"
     cd ${_srcname}
 
     ### Add upstream patches
@@ -101,11 +105,15 @@ prepare() {
 
     ### Add Clearlinux patches
         for i in $(grep '^Patch' ${srcdir}/clearlinux-lts2019/linux-lts2019.spec |\
-          grep -Ev '^Patch0123' | sed -n 's/.*: //p'); do
+          grep -Ev '^Patch0123|^Patch1001' | sed -n 's/.*: //p'); do
         echo "Applying patch ${i}..."
         patch -Np1 -i "$srcdir/clearlinux-lts2019/${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/clearlinux-lts2019/config ./.config
@@ -323,7 +331,9 @@ sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
             'SKIP'
             '0b63a75f07f235a895438f8483ed38509e2b60f43ec2b91dc19e01828a33a930'
             'SKIP'
-            '278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90')
+            '278fe9ffb29d92cc5220e7beac34a8e3a2006e714d16a21a0427069f9634af90'
+            'ad33b2d2267a37e0f65c97e65e7d4d926d5aef7d530c251b63fbf919048eead9'
+            '40512118e30e26486b94026caac3d4a35dd55cbd244472ec1adb91878f4c12b3')
 
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
diff --git a/linux-5.4.76-fix.patch b/linux-5.4.76-fix.patch
new file mode 100644
index 000000000000..78c3365bcb32
--- /dev/null
+++ b/linux-5.4.76-fix.patch
@@ -0,0 +1,12 @@
+diff -u -r wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h
+--- wireguard-linux-compat-1.0.20200908/src/compat/compat-asm.h	2020-09-08 16:22:40.000000000 +0000
++++ wireguard-linux-compat-1.0.20200908-lts/src/compat/compat-asm.h	2020-11-10 15:05:43.720093522 +0000
+@@ -40,7 +40,7 @@
+ #undef pull
+ #endif
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76)
+ #define SYM_FUNC_START ENTRY
+ #define SYM_FUNC_END ENDPROC
+ #endif