From c1d34338068e7d99e34db98597b2d8b3b58e6c2a Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 9 Sep 2019 14:56:00 -0400 Subject: meta-openembedded: subtree update:6a5d6bc9ad..3061ead8cf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (2): gpsd: gpscat no longer uses python-curses in 3.19 dejagnu: Remove, moved to oe-core Alex Kiernan (1): zstd: Upgrade 1.4.2 -> 1.4.3 Alistair Francis (2): python3-twine: Initial commit of 1.13.0 python3-pytest-asyncio: Initial commit of 0.10.0 Andreas Müller (4): fluidsynth: upgrade 2.0.5 -> 2.0.6 imsettings: upgrade 1.7.3 -> 1.8.1 and rework recipe xfce4-settings: upgrade 4.14.0 -> 4.14.1 xfce4-screenshooter: upgrade 1.9.5 -> 1.9.6 Andrej Valek (1): nodejs: 10.16.2 -> 10.16.3 Changqing Li (7): yail: update UPSTREAM_CHECK_GITTAGREGEX iscsi-initiator-utils: 2.0.876 -> 2.0.877 postgresql: 11.4 -> 11.5 satyr: upgrade 0.27 -> 0.28 freeradius: upgrade 3.0.17 -> 3.0.19 drbd-utils: switch to add patch from change source in do_configure xfsdump: support usrmerge Gianfranco Costamagna (2): grpc: don't use unexisting gettid function on glibc 2.29, it has been implemented only in 2.30 grpc: Change gettid patch with the upstream merged version Hongxu Jia (1): lvm2: fix blkdeactivate failed with command not found Kai Kang (4): lmbench: update script lmbench-run mariadb: fix file conflictions when multilib enabled php: sync with apache2's change apache2: fix multilib file conflicts Khem Raj (11): iperf2: Fix build with latest libc++ iscsi-initiator-utils: Inherit pkgconfig and override PKG_CONFIG klibc: Fix build with 5.2+ kernel headers samba: Fix configure tests to work with clang ltrace: Fix build on mips python-jinja2: Make asyncio specific to python3 module alone python3-cmd2: Add to blacklist nodejs: Mark incompatible with risc-v drbd,netkit-rusers: Blacklist packages vboxguestdrivers,can-isotp,bpftool: Add to Blacklist strongswan: Fix do_patch fuzz Li Zhou (1): tipcutils: ptts: Set recv buffer size to max to receive as many packets as possible Martin Jansa (1): python3-pyatspi: restrict with GTK2DISTROFEATURES Oleksandr Kravchuk (1): nano: update to 4.4 Qi.Chen@windriver.com (2): python-hyperlink: rdepend on python-idna python-jinja2: rdepend on asyncio module Robert Yang (1): netcf: Fix do_configure failed when multilib Scott Ellis (1): wireguard: Upgrade 20190702 to 20190905 Yuan Chao (10): strongswan: upgrade 5.8.0 -> 5.8.1 php: upgrade 7.3.8 -> 7.3.9 libtalloc: upgrade 2.2.0 -> 2.3.0 numactl: upgrade 2.0.12 -> 2.0.13 uhubctl: upgrade 2.0.0 -> 2.1.0 python-pytest: upgrade 5.1.1 -> 5.1.2 python-stevedore: upgrade 1.30.1 -> 1.31.0 python-dbus: upgrade 1.2.8 -> 1.2.10 python-pbr: upgrade 5.4.2 -> 5.4.3 python-pyasn1: upgrade 0.4.6 -> 0.4.7 Zang Ruochen (3): python-paste: upgrade 3.1.1 -> 3.2.0 libnet-dns-perl: upgrade 1.20 -> 1.21 hwdata: upgrade 0.326 -> 0.327 Zheng Ruoqin (1): python-cmd2: Add python3 version aehs29@gmail.com (1): remmina: Add recipe for the remmina remote desktop client Change-Id: I11f4319f53655ab389fcb7a0ce4f22b71f9a8da2 Signed-off-by: Brad Bishop --- .../wireguard/wireguard-module_0.0.20190702.bb | 31 ---------------------- .../wireguard/wireguard-module_0.0.20190905.bb | 31 ++++++++++++++++++++++ .../wireguard/wireguard-tools_0.0.20190702.bb | 27 ------------------- .../wireguard/wireguard-tools_0.0.20190905.bb | 27 +++++++++++++++++++ .../recipes-kernel/wireguard/wireguard.inc | 4 +-- 5 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190702.bb create mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190905.bb delete mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190702.bb create mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190905.bb (limited to 'meta-openembedded/meta-networking/recipes-kernel') diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190702.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190702.bb deleted file mode 100644 index badc97a97..000000000 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190702.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-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190905.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190905.bb new file mode 100644 index 000000000..badc97a97 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190905.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-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190702.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190702.bb deleted file mode 100644 index c4ddbcb0e..000000000 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190702.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-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190905.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190905.bb new file mode 100644 index 000000000..c4ddbcb0e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190905.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-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc index 12dd9c859..48487405b 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc +++ b/meta-openembedded/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] = "7410a52bacc5eb85e1634a20c07d3bed" -SRC_URI[sha256sum] = "1a1311bc71abd47a72c47d918be3bacc486b3de90734661858af75cc990dbaac" +SRC_URI[md5sum] = "97a8f781cb683f3a23ffa2f0cdb008cc" +SRC_URI[sha256sum] = "78767ceeb5286beaa851145f072d920a340a9f1b771a2943b8efd638cee1a8f6" S = "${WORKDIR}/WireGuard-${PV}/src/" -- cgit v1.2.3