From f0007307473d46c6a5b33051262b88f23a090d9c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 29 Jan 2020 16:32:31 -0800
Subject: wireguard: Upgrade to 20191219 snapshot

Fixes build with kernel >= 5.4

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../wireguard/wireguard-module_0.0.20190913.bb     | 31 ----------------------
 .../wireguard/wireguard-module_0.0.20191219.bb     | 31 ++++++++++++++++++++++
 .../wireguard/wireguard-tools_0.0.20190913.bb      | 27 -------------------
 .../wireguard/wireguard-tools_0.0.20191219.bb      | 27 +++++++++++++++++++
 .../recipes-kernel/wireguard/wireguard.inc         |  4 +--
 5 files changed, 60 insertions(+), 60 deletions(-)
 delete mode 100644 meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190913.bb
 create mode 100644 meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20191219.bb
 delete mode 100644 meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190913.bb
 create mode 100644 meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20191219.bb

(limited to 'meta-networking/recipes-kernel/wireguard')

diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190913.bb b/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190913.bb
deleted file mode 100644
index badc97a973..0000000000
--- a/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190913.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-require wireguard.inc
-
-inherit module kernel-module-split
-
-DEPENDS = "virtual/kernel libmnl"
-
-# This module requires Linux 3.10 higher and several networking related
-# configuration options. For exact kernel requirements visit:
-# https://www.wireguard.io/install/#kernel-requirements
-
-EXTRA_OEMAKE_append = " \
-    KERNELDIR=${STAGING_KERNEL_DIR} \
-    "
-
-MAKE_TARGETS = "module"
-
-RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit"
-MODULE_NAME = "wireguard"
-
-# Kernel module packages MUST begin with 'kernel-module-', otherwise
-# multilib image generation can fail.
-#
-# The following line is only necessary if the recipe name does not begin
-# with kernel-module-.
-PKG_${PN} = "kernel-module-${MODULE_NAME}"
-
-module_do_install() {
-    install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}
-    install -m 0644 ${MODULE_NAME}.ko \
-    ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko
-}
diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20191219.bb b/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20191219.bb
new file mode 100644
index 0000000000..badc97a973
--- /dev/null
+++ b/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20191219.bb
@@ -0,0 +1,31 @@
+require wireguard.inc
+
+inherit module kernel-module-split
+
+DEPENDS = "virtual/kernel libmnl"
+
+# This module requires Linux 3.10 higher and several networking related
+# configuration options. For exact kernel requirements visit:
+# https://www.wireguard.io/install/#kernel-requirements
+
+EXTRA_OEMAKE_append = " \
+    KERNELDIR=${STAGING_KERNEL_DIR} \
+    "
+
+MAKE_TARGETS = "module"
+
+RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit"
+MODULE_NAME = "wireguard"
+
+# Kernel module packages MUST begin with 'kernel-module-', otherwise
+# multilib image generation can fail.
+#
+# The following line is only necessary if the recipe name does not begin
+# with kernel-module-.
+PKG_${PN} = "kernel-module-${MODULE_NAME}"
+
+module_do_install() {
+    install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}
+    install -m 0644 ${MODULE_NAME}.ko \
+    ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko
+}
diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190913.bb b/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190913.bb
deleted file mode 100644
index c4ddbcb0e9..0000000000
--- a/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190913.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require wireguard.inc
-
-inherit bash-completion systemd pkgconfig
-
-DEPENDS = "wireguard-module libmnl"
-
-do_compile_prepend () {
-    cd ${S}/tools
-}
-
-do_install () {
-    cd ${S}/tools
-    oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \
-        SYSTEMDUNITDIR="${systemd_unitdir}" \
-        WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \
-        WITH_BASHCOMPLETION=yes \
-        WITH_WGQUICK=yes \
-        install
-}
-
-FILES_${PN} = " \
-    ${sysconfdir} \
-    ${systemd_unitdir} \
-    ${bindir} \
-"
-
-RDEPENDS_${PN} = "wireguard-module bash"
diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20191219.bb b/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20191219.bb
new file mode 100644
index 0000000000..c4ddbcb0e9
--- /dev/null
+++ b/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20191219.bb
@@ -0,0 +1,27 @@
+require wireguard.inc
+
+inherit bash-completion systemd pkgconfig
+
+DEPENDS = "wireguard-module libmnl"
+
+do_compile_prepend () {
+    cd ${S}/tools
+}
+
+do_install () {
+    cd ${S}/tools
+    oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \
+        SYSTEMDUNITDIR="${systemd_unitdir}" \
+        WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \
+        WITH_BASHCOMPLETION=yes \
+        WITH_WGQUICK=yes \
+        install
+}
+
+FILES_${PN} = " \
+    ${sysconfdir} \
+    ${systemd_unitdir} \
+    ${bindir} \
+"
+
+RDEPENDS_${PN} = "wireguard-module bash"
diff --git a/meta-networking/recipes-kernel/wireguard/wireguard.inc b/meta-networking/recipes-kernel/wireguard/wireguard.inc
index b0b48d0dd0..1ebe7cdfba 100644
--- a/meta-networking/recipes-kernel/wireguard/wireguard.inc
+++ b/meta-networking/recipes-kernel/wireguard/wireguard.inc
@@ -11,7 +11,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz"
-SRC_URI[md5sum] = "ec2345dfc8ffc61ccd7529d5d19b2602"
-SRC_URI[sha256sum] = "997327185d2d1b597dc118f737c0c165e2a2c21453387ea02659f1159d148518"
+SRC_URI[md5sum] = "5175ca88850993dc88a4c9d924ee79d4"
+SRC_URI[sha256sum] = "5aba6f0c38e97faa0b155623ba594bb0e4bd5e29deacd8d5ed8bda8d8283b0e7"
 
 S = "${WORKDIR}/WireGuard-${PV}/src/"
-- 
cgit 1.2.3-korg