From fc1b5310b28f70900a8a432048e08ee06ae309d7 Mon Sep 17 00:00:00 2001 From: Scott Ellis Date: Fri, 17 May 2019 06:38:51 -0400 Subject: wireguard: Upgrade 20190123 -> 20190406 Fixes issues with kernels 5.1 and greater. Signed-off-by: Scott Ellis Signed-off-by: Khem Raj --- .../wireguard/wireguard-module_0.0.20190123.bb | 31 ---------------------- .../wireguard/wireguard-module_0.0.20190406.bb | 31 ++++++++++++++++++++++ .../wireguard/wireguard-tools_0.0.20190123.bb | 27 ------------------- .../wireguard/wireguard-tools_0.0.20190406.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.20190123.bb create mode 100644 meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190406.bb delete mode 100644 meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190123.bb create mode 100644 meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190406.bb diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190123.bb b/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190123.bb deleted file mode 100644 index badc97a973..0000000000 --- a/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190123.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.20190406.bb b/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190406.bb new file mode 100644 index 0000000000..badc97a973 --- /dev/null +++ b/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190406.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.20190123.bb b/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190123.bb deleted file mode 100644 index c4ddbcb0e9..0000000000 --- a/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190123.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.20190406.bb b/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190406.bb new file mode 100644 index 0000000000..c4ddbcb0e9 --- /dev/null +++ b/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190406.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 8314e79b93..5cf745e9a4 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] = "8a0a232f65d5d86dd408efd9ac30bcf9" -SRC_URI[sha256sum] = "edd13c7631af169e3838621b1a1bff3ef73cf7bc778eec2bd55f7c1089ffdf9b" +SRC_URI[md5sum] = "c11254fe48695e61c145a7e82756ecba" +SRC_URI[sha256sum] = "2f06f3adf70b95e74a7736a22dcf6e9ef623b311a15b7d55b5474e57c3d0415b" S = "${WORKDIR}/WireGuard-${PV}/src/" -- cgit 1.2.3-korg