From 2297d4ee04b47bc574f8879732d9e213ab7bf685 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 17 Apr 2021 07:36:39 -0700 Subject: wireguard: update to v1.0.20210219 +1 The +1 fixes build issues for the 5.4 kernel. This update looks like bugfixes Signed-off-by: Armin Kuster v2] Wrong version listed Signed-off-by: Khem Raj (cherry picked from commit 4784c7c62f6549577228f6830aebb33baa1ee931) Signed-off-by: Armin Kuster --- .../wireguard/wireguard-module_1.0.20201112.bb | 33 --------------------- .../wireguard/wireguard-module_1.0.20210219.bb | 34 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 33 deletions(-) delete mode 100644 meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb create mode 100644 meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20210219.bb diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb b/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb deleted file mode 100644 index 64958a75b2..0000000000 --- a/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20201112.bb +++ /dev/null @@ -1,33 +0,0 @@ -require wireguard.inc - -SRCREV = "fe402261666821514377d06c2c68ed9bc19e7634" - -SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat" - -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" - -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 -} - -# WireGuard has been merged into Linux kernel >= 5.6 and therefore this compatibility module is no longer required. -# OE-core post dunfell has moved to use kernel 5.8 which now means we cant build this module in world builds -# for reference machines e.g. qemu -EXCLUDE_FROM_WORLD = "1" diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20210219.bb b/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20210219.bb new file mode 100644 index 0000000000..0525b4135a --- /dev/null +++ b/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20210219.bb @@ -0,0 +1,34 @@ +require wireguard.inc + +SRCREV = "122f06bfd8fc7b06a0899fa9adc4ce8e06900d98" + +SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat" + +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" + +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 +} + +# WireGuard has been merged into Linux kernel >= 5.6 and therefore this compatibility module is no longer required. +# OE-core post dunfell has moved to use kernel 5.8 which now means we cant build this module in world builds +# for reference machines e.g. qemu +EXCLUDE_FROM_WORLD = "1" + -- cgit 1.2.3-korg