diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-kernel')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200712.bb (renamed from meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb) | 7 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb (renamed from meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200319.bb) | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200712.bb index 73199592c..3a83e48ee 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200712.bb @@ -1,6 +1,6 @@ require wireguard.inc -SRCREV = "43f57dac7b8305024f83addc533c9eede6509129" +SRCREV = "d553aa7c52ac78c1963886afb74ba861b0b7b0fc" SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat" @@ -33,3 +33,8 @@ module_do_install() { 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-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200319.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb index f698b9a9a..3403fd943 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200319.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb @@ -1,15 +1,15 @@ require wireguard.inc -SRCREV = "a8063adc8ae9b4fc9848500e93f94bee8ad2e585" +SRCREV = "c45d422a93d57f6fdec429640ff7f96b396beed4" SRC_URI = "git://git.zx2c4.com/wireguard-tools" inherit bash-completion systemd pkgconfig -DEPENDS += "wireguard-module libmnl" +DEPENDS += "libmnl" do_install () { oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \ - SYSTEMDUNITDIR="${systemd_unitdir}" \ + SYSTEMDUNITDIR="${systemd_system_unitdir}" \ WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \ WITH_BASHCOMPLETION=yes \ WITH_WGQUICK=yes \ @@ -18,8 +18,9 @@ do_install () { FILES_${PN} = " \ ${sysconfdir} \ - ${systemd_unitdir} \ + ${systemd_system_unitdir} \ ${bindir} \ " -RDEPENDS_${PN} = "wireguard-module bash" +RDEPENDS_${PN} = "bash" +RRECOMMENDS_${PN} = "kernel-module-wireguard" |