From d688a01edf38bfee9e20fd4765d304c529dd3db3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 18 Sep 2020 13:36:00 -0500 Subject: meta-openembedded: subtree update:ae39f2e711..bccd3277e4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alejandro Enedino Hernandez Samaniego (2): emacs: Create a new recipe for emacs weechat: Upgrade to 2.9 Andreas Müller (3): Initial add source-code-pro-fonts 2.030_1.050 gedit: add source-code-pro-fonts to RRECOMMENDS geany: add source-code-pro-fonts to RRECOMMENDS Andrej Valek (1): squid: upgrade 4.12 -> 4.13 Armin Kuster (3): log4cplus: pkg moved to core kea: pkg moved to core dhcpcd: pkg moved to core Arthur She (1): xmlrpc-c: fix Makefile macro error Arturo Buzarra (1): byacc: add nativesdk support Bartosz Golaszewski (1): libgpiod: update v1.4.3 -> v1.4.4 Bjarne Michelsen (1): asio: extend recipe to add native support Diego Rondini (4): libeigen: update SRC_URI to download from gitlab gvfs: adjust fuse packageconfig to fuse3 libeigen: update SRC_URI to use gitlab git hplip: use libexecdir Fabio Berton (2): libqmi: Update 1.26.0 -> 1.26.4 modemmanager: Update 1.12.12 -> 1.14.2 Gianfranco Costamagna (3): dlt-daemon: superseed upstream pr #238 patch with pr #245 due to unexpected behaviour brotli: update to 1.0.9 brotli: set upstream-status for the patch backported from upstream Haiqing Bai (1): rsyslog: fix wrong option of PACKAGECONFIG[valgrind] Hongxu Jia (1): python3-texttable: add recipe Jack Mitchell (1): meta-networking: dhcpcd: backport ALIGN compile error fix Jens Rehsack (1): bearssl: fix missing install Jose Dapena Paz (1): xmlsec1: do not use system libraries for non nss Jugurtha BELKALEM (1): recipe/ettercap : new ettercap recipe Khem Raj (67): valijson: Move it to networking-layer under BBFILES_DYNAMIC linuxptp: Fix cross build kernel-selftest: Tests in 5.8 depend on libhugetlbfs.h wireguard-module: Exlude from world builds Revert "iwd: Module load dir should be relative to root_dir" vboxguestdrivers: Fix build with kernel 5.8 kernel-selftest: Disable vm tests for mips/arm vulkan-cts: Update to 1.2.3.2 nss: Avoid converting enum to void* nss: Disable Werror across all recipe types nss: Upgrade to 3.56 mini-iconv: Remove wvstreams: Update SRC_URI to a fetchable location wvdial: Update SRC_URI to an accessible location packagegroup-meta-oe: Overhaul so it can build meta-oe-image mime-support: Use update-alternatives canutils: Use update-alternatives libusbgx: Use update-alternatives ttf-liberation-sans-narrow: Do not install normal liberation fonts mutter: Add a comment to remove pipewire-0.2 dependency with 3.36 sblim-sfcb: Fix target postinst hexedit: Define update alternatives lmbench: Use update alternatives for stream uml-utilities: Use update alternatives for tunctl imagemagick: Create symlinks for magick-script sharutils: Use update alternatives for uudecode/uuencode layer.conf: fixes icon-theme signature changes layer.conf: Fix for signature change for allarch icon themes properties-cpp: Add recipe packagegroup-meta-filesystems: Update to add new recipes packagegroup-meta-webserver: Update to include new recipes monkey: Remove /var/run monkey: Correct the install path in init services packagegroup-meta-oe: Exclude from world builds networkmanager: Depend on dhcpcd packagegroup-meta-networking: Add new packages bearssl: fix GNU_HASH link error autossh: Depend on ssh instead of hardcoding openssh quagga,pimd: Use update-alternatives for pimd netkit-rpc: Use update alternatives for rpcinfo ssmtp: Use update alternatives for conflicts with esmtp netkit-rwho: Use update-alternatives for tftp netkit-ftp: Use update-alternatives for ftp netkit-rwho: Convert to ontarget postinst schroedinger: Update SRC_URI packagegroup-meta-multimedia: Add new recipes mycroft: rdep on procps imapfilter: Fix linker flags toybox: Add packageconfigs for iconv and getconf tmux: Add -p option to mkdir packagegroup-meta-networking: Remove dhcpcd and kea packagegroup-meta-oe: Remove log4cplus packagegroup-meta-multimedia: Remove projucer on musl packagegroup-meta-perl: Update to represent latest recipes po4a: Switch to github for SRC_URI as alioth one seems to be gone libdata-hexdump-perl: Use update alternatives for hexdump meta-perl-image: Add packagegroup-meta-perl-extended meta-perl-ptest-image: Depend on ptest DISTRO_FEATURE iwd: Upgrade to 1.9 packagegroup-meta-python: Add new packages meta-python-image,meta-python-ptest-image: Use python3 packagegroups android-tools: Support libselinux to build with musl which now has gettid packagegroup-meta-oe.bb: Add cukinia to test packagegroups packagegroup-meta-oe: Add source-code-pro-fonts mongodb: Pass OBJCOPY to scons so it does not use it from host mongodb: Fix libunwind build with -fno-common mongodb: Fix i386 builds for non-glibc systems Leon Anavi (134): python3-pywbem: Upgrade 0.17.4 -> 1.0.2 python3-pydicti: Add recipe python3-yamlloader: Add recipe python3-tabulate: Add recipe python3-asciitree: Add recipe python3-custom-inherit: Add recipe python3-nocasedict: Add recipe python3-nocaselist: Add recipe python3-click-repl: Add recipe python3-click-spinner: Add recipe python3-pywbemtools: Add recipe python3-diskcache: Upgrade 4.1.0 -> 5.0.1 python3-langtable: Upgrade 0.0.51 -> 0.0.52 python3-pint: Upgrade 0.14 -> 0.15 python3-networkx: Upgrade 2.4 -> 2.5 python3-attrs: Upgrade 19.3.0 -> 20.1.0 python3-pychromecast: Upgrade 7.2.0 -> 7.2.1 python3-dominate: Upgrade 2.5.1 -> 2.5.2 python3-pymisp: Upgrade 2.4.128 -> 2.4.130 python3-inflection: Upgrade 0.5.0 -> 0.5.1 python3-typing-extensions: Upgrade 3.7.4.2 -> 3.7.4.3 python3-pandas: Upgrade 1.1.0 -> 1.1.1 python3-msm: Upgrade 0.8.7 -> 0.8.8 lshw: Upgrade 2.18 -> 2.19 mercurial: Upgrade 5.4 -> 5.5 doxygen: Upgrade 1.8.17 -> 1.8.20 python3-bitarray: Upgrade 1.5.2 -> 1.5.3 python3-cryptography-vectors: Upgrade 2.9.2 -> 3.0 python3-openpyxl: Upgrade 3.0.4 -> 3.0.5 python3-cmd2: Upgrade 1.3.3 -> 1.3.4 python3-sentry-sdk: Upgrade 0.16.5 -> 0.17.0 python3-flask: Consolidate in a single file python3-flask: Upgrade 1.1.1 -> 1.1.2 python3-diskcache: Upgrade 5.0.1 -> 5.0.2 python3-cmd2: Upgrade 1.3.4 -> 1.3.5 python3-flask-wtf: Consolidate in a single file python3-flask-wtf: Upgrade 0.14.2 -> 0.14.3 python3-flask-socketio: Consolidate in a single file python3-flask-socketio: Upgrade 4.2.1 -> 4.3.1 python3-google-api-python-client: Upgrade 1.10.0 -> 1.10.1 python3-cryptography: Upgrade 3.0 -> 3.1 python3-twitter: Upgrade 3.8.0 -> 3.9.0 python3-ntplib: Upgrade 0.3.3 -> 0.3.4 python3-flask-babel: Upgrade 1.0.0 -> 2.0.0 python3-flask-migrate: Consolidate in a single file python3-flask-migrate: Upgrade 2.5.2 -> 2.5.3 python3-flask-restful: Consolidate in a single file python3-flask-restful: Upgrade 0.3.7 -> 0.3.8 python3-flask-sqlalchemy: Consolidate in a single file python3-flask-sqlalchemy: Upgrade 2.4.1 -> 2.4.4 php: Upgrade 7.4.4 -> 7.4.9 python3-ecdsa: Upgrade 0.15 -> 0.16.0 python3-luma-core: Upgrade 1.15.0 -> 1.16.0 python3-cryptography-vectors: Upgrade 3.0 -> 3.1 python3-google-api-python-client: Upgrade 1.10.1 -> 1.11.0 python3-flask-user: Consolidate in a single file python3-cmd2: Upgrade 1.3.5 -> 1.3.8 python3-sh: Upgrade 1.13.1 -> 1.14.0 python3-paramiko: Upgrade 2.7.1 - 2.7.2 python3-parse: Upgrade 1.16.0 -> 1.17.0 python3-prompt-toolkit: Upgrade 3.0.6 -> 3.0.7 python3-more-itertools: Upgrade 8.4.0 -> 8.5.0 python3-ipython: Upgrade 7.17.0 -> 7.18.1 python3-hpack: Consolidate in a single file python3-hpack: Upgrade 3.0.0 -> 4.0.0 python3-sentry-sdk: Upgrade 0.17.0 -> 0.17.1 python3-luma-core: Upgrade 1.16.0 -> 1.16.1 python3-traitlets: Upgrade 4.3.3 -> 5.0.0 python3-flask-nav: Consolidate in a single file python3-flask-mail: Consolidate in a single file python3-flask-pymongo: Consolidate in a single file python3-pillow: Upgrade 6.2.1 -> 7.2.0 znc: Upgrade 1.7.5 -> 1.8.1 mosquitto: Upgrade 1.6.11 -> 1.6.12 fping: Upgrade 4.4 -> 5.0 nano: Upgrade 5.1 -> 5.2 hwdata: Upgrade 0.336 -> 0.339 xscreensaver: Add HOMEPAGE python3-meh: Upgrade 0.48 -> 0.49 python3-stevedore: Upgrade 3.2.0 -> 3.2.1 python3-robotframework: Upgrade 3.2.1 -> 3.2.2 python3-sentry-sdk: Upgrade 0.17.1 -> 0.17.2 python3-pycurl: Upgrade 7.43.0.5 -> 7.43.0.6 python3-pyzmq: Upgrade 17.1.0 -> 19.0.2 python3-mccabe: Upgrade 0.2.1 -> 0.6.1 python3-nmap: Upgrade 1.4.7 -> 1.4.8 python3-absl: Upgrade 0.9.0 -> 0.10.0 python3-systemd: Consolidate in a single file python3-gevent: Consolidate in a single file python3-gevent: Upgrade 1.4.0 -> 20.6.2 python3-ruamel-yaml: Upgrade 0.16.10 -> 0.16.11 python3-cmd2: Upgrade 1.3.8 -> 1.3.9 python3-traitlets: 5.0.0 -> 5.0.3 python3-priority: Consolidate in a single file python3-hyperframe: Consolidate in a single file python3-mprpc: Consolidate in a single file python3-gsocketpool: Consolidate in a single file gyp: Consolidate in a single file gyp: Upgrade to latest version python3-fann2: Consolidate in a single file python3-isort: Upgrade 5.4.2 -> 5.5.0 python3-sentry-sdk: Upgrade 0.17.2 -> 0.17.3 python3-hyperframe: Upgrade 5.2.0 -> 6.0.0 python3-traitlets: Upgrade 5.0.3 -> 5.0.4 python3-texttable: Upgrade 1.6.2 -> 1.6.3 python3-iso8601: Upgrade 0.1.12 -> 0.1.13 python3-dbus-next: Upgrade 0.1.3 -> 0.1.4 python3-ujson: Upgrade 3.1.0 -> 3.2.0 python3-trafaret: Upgrade 2.0.2 -> 2.1.0 python3-tqdm: Upgrade 4.48.2 -> 4.49.0 python3-isort: Upgrade 5.5.0 -> 5.5.2 python3-coverage: Upgrade 5.2.1 -> 5.3 python3-diskcache: Upgrade 5.0.2 -> 5.0.3 python3-haversine: Upgrade 2.2.0 -> 2.3.0 python3-pymysql: Upgrade 0.10.0 -> 0.10.1 python3-alembic: Upgrade 1.4.2 -> 1.4.3 python3-nocasedict: Upgrade 0.5.0 -> 1.0.0 python3-pyroute2: Upgrade 0.5.13 -> 0.5.14 python3-pyusb: Upgrade 1.0.2 -> 1.1.0 python3-pandas: Upgrade 1.1.1 -> 1.1.2 python3-pint: Upgrade 0.15 -> 0.16 python3-parse: Upgrade 1.17.0 -> 1.18.0 python3-cffi: Upgrade 1.14.2 -> 1.14.3 python3-google-api-python-client: Upgrade 1.11.0 -> 1.12.1 python3-sentry-sdk: Upgrade 0.17.3 -> 0.17.5 python3-attrs: Upgrade 20.1.0 -> 20.2.0 python3-nocaselist: Upgrade 1.0.1 -> 1.0.2 python3-pymisp: Upgrade 2.4.130 -> 2.4.131 python3-stevedore: Upgrade 3.2.1 -> 3.2.2 python3-matplotlib: Upgrade 3.3.1 -> 3.3.2 python3-pychromecast: Upgrade 7.2.1 -> 7.3.0 python3-pyrsistent: Upgrade 0.16.0 -> 0.17.3 python3-ruamel-yaml: Upgrade 0.16.11 -> 0.16.12 python3-msk: Upgrade 0.3.15 -> 0.3.16 Madhavan Krishnan (1): libcamera: Bumped to latest revision and added pkgconfig to enable gstreamer Marc (1): openocd: Update to latest git version Marek Vasut (1): freerdp: Add missing libxkbcommon WL dependency Martin Jansa (5): fbida: require opengl in DISTRO_FEATURES nss: fix postinst in do_rootfs for target nss: remove signlibs.sh st: add x11 to REQUIRED_DISTRO_FEATURES to suck less st: fix indentation Michael Fitz-Payne (1): python3-greenstalk: add recipe for greenstalk python package. Michael Vetter (2): jasper: Use new repo URL README: Use quotation marks for subject prefix Mikko Rapeli (4): nss: fix postinst script for nativesdk build mdns: update to version 1096.40.7 mdns: set CVE_PRODUCT to "apple:mdnsresponder" mdns: add BSD-3-Clause to LICENSE Mingli Yu (2): mariadb: package executables named with mariadb opencv: improve reproducibility Ola X Nilsson (1): syslog-ng: Drop obsolete variable ONLINE_PACKAGE_MANAGEMENT Oleksandr Kravchuk (1): tesseract: update to 4.1.1 Ovidiu Panait (1): net-snmp: upgrade 5.8 -> 5.9 Richard Leitner (1): liburing: add v0.7 Robert Joslyn (3): postgresql: Update to 12.4 htop: Update to 3.0.1 consolation: Add recipe Sakib Sajal (1): apache2: upgrade v2.4.43 -> v2.4.46 Slater, Joseph (2): openjpeg: fix CVE-2020-15389 luajit: advance SRCREV to fix two CVE's Stanislav Angelovic (1): Bump sdbus-c++ version to v0.8.3 Trevor Gamblin (3): packagegroup-meta-python: fix PACKAGES and default ptest recipe name python3-django: upgrade 2.2.13 -> 2.2.16 python3-django: add recipe for 3.1.1 Vincent Prince (1): mongodb: bump to r4.4.1 version Wenlin Kang (2): lua: fix CVE-2020-15945 lua: fix CVE-2020-24371 Yann Dirson (5): New terminal emulator: st 0.8.4 libcec: workaround wrong choice of PYTHON_PKG_DIR when building on Debian libcec: build with Linux CEC API libcec: rename libcec-tools to libcec-examples libcec: split the python example into a separate package Zang Ruochen (38): lftp: upgrade 4.9.1 -> 4.9.2 wireshark: upgrade 3.2.5 -> 3.2.6 leptonica: upgrade 1.79.0 -> 1.80.0 links: upgrade 2.20.2 -> 2.21 nano: upgrade 5.0 -> 5.1 nlohmann-json: upgrade 3.9.0 -> 3.9.1 openldap: upgrade 2.4.50 -> 2.4.51 protobuf: upgrade 3.12.3 -> 3.13.0 sanlock: upgrade 3.8.1 -> 3.8.2 libnet-dns-perl: upgrade 1.25 -> 1.26 libidn: upgrade 1.35 -> 1.36 satyr: upgrade 0.30 -> 0.31 spitools: upgrade 0.8.4 -> 0.8.5 fio: upgrade 3.21 -> 3.22 iperf3: upgrade 3.7 -> 3.9 paho-mqtt-c: upgrade 1.3.4 -> 1.3.5 purple-skypeweb: upgrade 1.6 -> 1.7 libdbd-sqlite-perl: upgrade 1.64 -> 1.66 libencode-perl: upgrade 3.06 -> 3.07 dash: upgrade 0.5.11.1 -> 0.5.11.2 fuse3: upgrade 3.9.2 -> 3.9.3 gperftools: upgrade 2.7.90 -> 2.8 xfsprogs: upgrade 5.7.0 -> 5.8.0 cifs-utils: upgrade 6.10 -> 6.11 libdnet: upgrade 1.12 -> 1.14 asio: upgrade 1.16.1 -> 1.18.0 collectd: upgrade 5.11.0 -> 5.12.0 cryptsetup: upgrade 2.3.3 -> 2.3.4 gsoap: upgrade 2.0.105 -> 2.0.106 jasper: upgrade 2.0.19 -> 2.0.20 lcms: upgrade 2.9 -> 2.11 libhugetlbfs: upgrade 2.22 -> 2.23 ostree: upgrade 2020.5 -> 2020.6 poppler: upgrade 20.08.0 -> 20.09.0 redis: upgrade 6.0.6 -> 6.0.7 spdlog: upgrade 1.7.0 -> 1.8.0 zeromq: upgrade 4.3.2 -> 4.3.3 python3-test-generator: Enable ptest leckijakub (1): cukinia: new package Signed-off-by: Andrew Geissler Change-Id: I8382b605a3c059a037b8f4db53608f505da642ed --- .../meta-oe/recipes-connectivity/iwd/iwd_1.8.bb | 54 ---------------------- .../meta-oe/recipes-connectivity/iwd/iwd_1.9.bb | 54 ++++++++++++++++++++++ .../recipes-connectivity/libqmi/libqmi_1.26.0.bb | 22 --------- .../recipes-connectivity/libqmi/libqmi_1.26.4.bb | 21 +++++++++ .../linuxptp/Use-cross-cpp-in-incdefs.patch | 26 +++++++++++ .../linuxptp/no-incdefs-using-host-headers.patch | 29 ------------ .../recipes-connectivity/linuxptp/linuxptp_3.0.bb | 7 +-- .../modemmanager/modemmanager_1.12.12.bb | 54 ---------------------- .../modemmanager/modemmanager_1.14.2.bb | 53 +++++++++++++++++++++ .../files/0001-Fix-bug-of-free-with-musl.patch | 39 ---------------- .../paho-mqtt-c/paho-mqtt-c_1.3.4.bb | 35 -------------- .../paho-mqtt-c/paho-mqtt-c_1.3.5.bb | 34 ++++++++++++++ .../recipes-connectivity/wvdial/wvdial_1.61.bb | 2 +- .../recipes-connectivity/wvdial/wvstreams_4.6.1.bb | 2 +- ...txt-Avoid-host-specific-path-to-libsodium.patch | 19 +++++--- .../recipes-connectivity/zeromq/zeromq_4.3.2.bb | 29 ------------ .../recipes-connectivity/zeromq/zeromq_4.3.3.bb | 29 ++++++++++++ 17 files changed, 236 insertions(+), 273 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.12.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/files/0001-Fix-bug-of-free-with-musl.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb (limited to 'meta-openembedded/meta-oe/recipes-connectivity') diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.8.bb deleted file mode 100644 index b1e6fea2f..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.8.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Wireless daemon for Linux" -HOMEPAGE = "https://iwd.wiki.kernel.org/" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" - -DEPENDS = "ell" - -SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" -SRCREV = "a01754f56aacdc641c819f983c3c0ad374be77b2" -S = "${WORKDIR}/git" - -inherit autotools manpages pkgconfig python3native systemd - -PACKAGECONFIG ??= " \ - client \ - monitor \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ -" -PACKAGECONFIG[client] = "--enable-client,--disable-client,readline" -PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor" -PACKAGECONFIG[manpages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" -PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" -PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" -PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" - -EXTRA_OECONF = "--enable-external-ell" - -SYSTEMD_SERVICE_${PN} = " \ - iwd.service \ - ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ -" - -do_configure_prepend() { - install -d ${S}/build-aux -} - -do_install_append() { - # If client and monitor are disabled, bindir is empty, causing a QA error - rmdir --ignore-fail-on-non-empty ${D}/${bindir} -} - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${nonarch_base_libdir}/modules-load.d \ - ${systemd_unitdir}/network \ -" - -RDEPENDS_${PN} = "dbus" - -RRECOMMENDS_${PN} = "\ - kernel-module-pkcs7-message \ - kernel-module-pkcs8-key-parser \ - kernel-module-x509-key-parser \ -" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.9.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.9.bb new file mode 100644 index 000000000..25500e650 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.9.bb @@ -0,0 +1,54 @@ +SUMMARY = "Wireless daemon for Linux" +HOMEPAGE = "https://iwd.wiki.kernel.org/" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" + +DEPENDS = "ell" + +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" +SRCREV = "aa3dc1b95348dea177e9d8c2c3063b29e20fe2e9" +S = "${WORKDIR}/git" + +inherit autotools manpages pkgconfig python3native systemd + +PACKAGECONFIG ??= " \ + client \ + monitor \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" +PACKAGECONFIG[client] = "--enable-client,--disable-client,readline" +PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor" +PACKAGECONFIG[manpages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" +PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" +PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" + +EXTRA_OECONF = "--enable-external-ell" + +SYSTEMD_SERVICE_${PN} = " \ + iwd.service \ + ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ +" + +do_configure_prepend() { + install -d ${S}/build-aux +} + +do_install_append() { + # If client and monitor are disabled, bindir is empty, causing a QA error + rmdir --ignore-fail-on-non-empty ${D}/${bindir} +} + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${nonarch_libdir}/modules-load.d \ + ${systemd_unitdir}/network \ +" + +RDEPENDS_${PN} = "dbus" + +RRECOMMENDS_${PN} = "\ + kernel-module-pkcs7-message \ + kernel-module-pkcs8-key-parser \ + kernel-module-x509-key-parser \ +" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.0.bb deleted file mode 100644 index 3a1b70b80..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol" -DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \ - devices which speak the Qualcomm MSM Interface (QMI) protocol" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -DEPENDS = "glib-2.0 glib-2.0-native" - -inherit autotools pkgconfig bash-completion gobject-introspection - -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" - -SRC_URI[md5sum] = "8da95a97e893311878f8ce12dcf8fad0" -SRC_URI[sha256sum] = "7f0429e0ae58792e21512d09ca2412537840ea42696762795af1284a65fd6e40" - -PACKAGECONFIG ??= "udev mbim" -PACKAGECONFIG[udev] = ",--without-udev,libgudev" -PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.4.bb new file mode 100644 index 000000000..f778ffac4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.4.bb @@ -0,0 +1,21 @@ +SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol" +DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \ + devices which speak the Qualcomm MSM Interface (QMI) protocol" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +DEPENDS = "glib-2.0 glib-2.0-native" + +inherit autotools pkgconfig bash-completion gobject-introspection + +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" + +SRC_URI[sha256sum] = "c0adcb84ba452e3e13edeb3f94f7b003ea927b354bc187629e05efb333ce270b" + +PACKAGECONFIG ??= "udev mbim" +PACKAGECONFIG[udev] = ",--without-udev,libgudev" +PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch new file mode 100644 index 000000000..876088649 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch @@ -0,0 +1,26 @@ +From 8a4cad5e2f2cbb6a34bdc6e877fe499502b8c4c8 Mon Sep 17 00:00:00 2001 +From: Marcel Ziswiler +Date: Fri, 23 Dec 2016 18:12:29 +0100 +Subject: [PATCH] linuxptp: Use cross cpp in incdefs + +Use cross cpp incdefs.sh shell script since we are doing cross compiling +we need to ensure we use correct setttings from toolchain + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj +--- + + makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/incdefs.sh ++++ b/incdefs.sh +@@ -27,7 +27,7 @@ user_flags() + printf " -D_GNU_SOURCE" + + # Get list of directories searched for header files. +- dirs=$(echo "" | ${CROSS_COMPILE}cpp -Wp,-v 2>&1 >/dev/null | grep ^" /") ++ dirs=$(${CPP} -Wp,-v -xc /dev/null 2>&1 >/dev/null | grep ^" /") + + # Look for clock_adjtime(). + for d in $dirs; do diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch deleted file mode 100644 index 02dbb2346..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8a4cad5e2f2cbb6a34bdc6e877fe499502b8c4c8 Mon Sep 17 00:00:00 2001 -From: Marcel Ziswiler -Date: Fri, 23 Dec 2016 18:12:29 +0100 -Subject: [PATCH] linuxptp: no incdefs using host headers - -Avoid using host headers via incdefs.sh shell script. - -Signed-off-by: Marcel Ziswiler ---- - - makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/makefile b/makefile -index 8cdbd15..85174b8 100644 ---- a/makefile -+++ b/makefile -@@ -33,7 +33,7 @@ OBJECTS = $(OBJ) hwstamp_ctl.o phc2sys.o phc_ctl.o pmc.o pmc_common.o \ - SRC = $(OBJECTS:.o=.c) - DEPEND = $(OBJECTS:.o=.d) - srcdir := $(dir $(lastword $(MAKEFILE_LIST))) --incdefs := $(shell $(srcdir)/incdefs.sh) -+#incdefs := $(shell $(srcdir)/incdefs.sh) - version := $(shell $(srcdir)/version.sh $(srcdir)) - VPATH = $(srcdir) - --- -2.9.3 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.0.bb index 69dee1a2f..1472a671a 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.0.bb @@ -4,14 +4,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}.tgz \ file://build-Allow-CC-and-prefix-to-be-overriden.patch \ - file://no-incdefs-using-host-headers.patch \ + file://Use-cross-cpp-in-incdefs.patch \ " SRC_URI[md5sum] = "1318805702eb6d59f9f247e1dd5ce12a" SRC_URI[sha256sum] = "d74ceca722c75bfff53c633425f926dd48eb04f4a089451b855155c016d15785" -EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \ - EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'" +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}'" + +export KBUILD_OUTPUT="${RECIPE_SYSROOT}" do_install () { install -d ${D}/${bindir} diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.12.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.12.bb deleted file mode 100644 index b0ab46f3f..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.12.12.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" -DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" -LICENSE = "GPL-2.0 & LGPL-2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -inherit gnomebase gettext systemd vala gobject-introspection bash-completion - -DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" - -SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" -SRC_URI[sha256sum] = "a4fc4b33c0e8ae9372885f86fa033f3c1a89a76cd59a3458670eff1824222a3d" -S = "${WORKDIR}/ModemManager-${PV}" - -PACKAGECONFIG ??= "mbim qmi \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ -" - -PACKAGECONFIG[at] = "--with-at-command-via-dbus" -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," -PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" -# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. -PACKAGECONFIG[mbim] = "--with-mbim,--without-mbim,libmbim" -# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. -PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" - -EXTRA_OECONF = " \ - --with-udev-base-dir=${nonarch_base_libdir}/udev \ -" -EXTRA_OECONF_append_toolchain-clang = " --enable-more-warnings=no" - -FILES_${PN} += " \ - ${datadir}/icons \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${datadir}/ModemManager \ - ${libdir}/ModemManager \ - ${systemd_unitdir}/system \ -" - -FILES_${PN}-dev += " \ - ${libdir}/ModemManager/*.la \ -" - -FILES_${PN}-staticdev += " \ - ${libdir}/ModemManager/*.a \ -" - -FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" - -SYSTEMD_SERVICE_${PN} = "ModemManager.service" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.2.bb new file mode 100644 index 000000000..d5fe9bf00 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.14.2.bb @@ -0,0 +1,53 @@ +SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" +DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" +LICENSE = "GPL-2.0 & LGPL-2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +inherit gnomebase gettext systemd vala gobject-introspection bash-completion + +DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" + +SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" +SRC_URI[sha256sum] = "5fb5553aecd6eb9d6d8ecd130a24f3461e5f93c5f91a0e4ae0508b5228e8b0be" +S = "${WORKDIR}/ModemManager-${PV}" + +PACKAGECONFIG ??= "mbim qmi \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ +" + +PACKAGECONFIG[at] = "--with-at-command-via-dbus" +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," +PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" +# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. +PACKAGECONFIG[mbim] = "--with-mbim,--without-mbim,libmbim" +# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. +PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" + +EXTRA_OECONF = " \ + --with-udev-base-dir=${nonarch_base_libdir}/udev \ +" + +FILES_${PN} += " \ + ${datadir}/icons \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${datadir}/ModemManager \ + ${libdir}/ModemManager \ + ${systemd_unitdir}/system \ +" + +FILES_${PN}-dev += " \ + ${libdir}/ModemManager/*.la \ +" + +FILES_${PN}-staticdev += " \ + ${libdir}/ModemManager/*.a \ +" + +FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" + +SYSTEMD_SERVICE_${PN} = "ModemManager.service" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/files/0001-Fix-bug-of-free-with-musl.patch b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/files/0001-Fix-bug-of-free-with-musl.patch deleted file mode 100644 index 12f9e7abc..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/files/0001-Fix-bug-of-free-with-musl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 96233a8382b9520293a48b08dc3b204a21205800 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu -Date: Fri, 24 Apr 2020 00:53:19 +0900 -Subject: [PATCH] Fix bug of free() with musl - -This fixes build error with musl C library: -/ubinux-dev/ubinux001/contribution/build/tmp/work/armv7vet2hf-neon-poky-linux-musleabi/paho-mqtt-c/1.3.2-r0/git/src/Heap.h:55:24: -error: expected declaration specifiers or '...' before string constant - 55 | #define free(x) myfree(__FILE__, __LINE__, x) - | ^~~~~~~~ -/ubinux-dev/ubinux001/contribution/build/tmp/work/armv7vet2hf-neon-poky-linux-musleabi/paho-mqtt-c/1.3.2-r0/git/src/Heap.h:55:34: -error: expected declaration specifiers or '...' before numeric constant - 55 | #define free(x) myfree(__FILE__, __LINE__, x) - | ^~~~~~~~ - -Signed-off-by: Wang Mingyu ---- - src/MQTTReasonCodes.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/MQTTReasonCodes.c b/src/MQTTReasonCodes.c -index 416eab5..479dbac 100644 ---- a/src/MQTTReasonCodes.c -+++ b/src/MQTTReasonCodes.c -@@ -16,10 +16,10 @@ - - #include "MQTTReasonCodes.h" - --#include "Heap.h" - #include "StackTrace.h" - - #include -+#include "Heap.h" - - #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.4.bb deleted file mode 100644 index 2d4e39bf9..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.4.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Paho MQTT - C libraries for the MQTT and MQTT-SN protocols" -DESCRIPTION = "Client implementation of open and standard messaging protocols for Machine-to-Machine (M2M) and Internet of Things (IoT)." -HOMEPAGE = "http://www.eclipse.org/paho/" -SECTION = "console/network" -LICENSE = "EPL-2.0 | EDL-1.0" - -LIC_FILES_CHKSUM = " \ - file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ - file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ - file://notice.html;md5=943f861069889acecebf51dfa24478e2 \ - file://about.html;md5=e5662cbb5f8fd5c9faac526e4077898e \ -" - -SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http \ - file://0001-Fix-bug-of-free-with-musl.patch" - -SRCREV = "2d3d0941a9233889d4d5cc37f5182bbefea261ad" - -DEPENDS = "openssl" - -S = "${WORKDIR}/git" - -inherit cmake - -do_configure_prepend() { - sed -i s:\ lib/cmake:\ ${baselib}/cmake:g ${S}/src/CMakeLists.txt -} - -do_install_append() { - # paho-mqtt installes some thing that we don't want. - rm -rf ${D}${prefix}/samples - find ${D}${prefix} -maxdepth 1 -type f -delete -} - -EXTRA_OECMAKE = "-DPAHO_WITH_SSL=ON" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.5.bb new file mode 100644 index 000000000..673a24742 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.5.bb @@ -0,0 +1,34 @@ +SUMMARY = "Paho MQTT - C libraries for the MQTT and MQTT-SN protocols" +DESCRIPTION = "Client implementation of open and standard messaging protocols for Machine-to-Machine (M2M) and Internet of Things (IoT)." +HOMEPAGE = "http://www.eclipse.org/paho/" +SECTION = "console/network" +LICENSE = "EPL-2.0 | EDL-1.0" + +LIC_FILES_CHKSUM = " \ + file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ + file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ + file://notice.html;md5=943f861069889acecebf51dfa24478e2 \ + file://about.html;md5=e5662cbb5f8fd5c9faac526e4077898e \ +" + +SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http" + +SRCREV = "153dfd3a4a1d510697c5d55e169fa158db16e04a" + +DEPENDS = "openssl" + +S = "${WORKDIR}/git" + +inherit cmake + +do_configure_prepend() { + sed -i s:\ lib/cmake:\ ${baselib}/cmake:g ${S}/src/CMakeLists.txt +} + +do_install_append() { + # paho-mqtt installes some thing that we don't want. + rm -rf ${D}${prefix}/samples + find ${D}${prefix} -maxdepth 1 -type f -delete +} + +EXTRA_OECMAKE = "-DPAHO_WITH_SSL=ON" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb index b985d39ab..473ceabcf 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb @@ -9,7 +9,7 @@ inherit pkgconfig DEPENDS = "wvstreams" RDEPENDS_${PN} = "ppp" -SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.bz2 \ +SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${BPN}/${BP}.tar.bz2 \ file://typo_pon.wvdial.1.patch \ file://musl-support.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb index 20becaf57..57163ce65 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605" DEPENDS = "zlib openssl (>= 0.9.8) dbus readline" DEPENDS_append_libc-musl = " argp-standalone libexecinfo" -SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \ +SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${BPN}/${BP}.tar.gz \ file://04_signed_request.diff \ file://05_gcc.diff \ file://06_gcc-4.7.diff \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch index eb3dee4d3..3b0300c8a 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch @@ -1,6 +1,7 @@ +From 24ad50286a87833329213dc0b0e68c21aeeee95f Mon Sep 17 00:00:00 2001 From: Niko Mauno -Date: Wed Apr 22 09:00:00 2020 +0300 -Subject: CMakeLists.txt: Avoid host-specific path to libsodium +Date: Wed, 22 Apr 2020 09:00:00 +0300 +Subject: [PATCH] CMakeLists.txt: Avoid host-specific path to libsodium Avoid propagating full build host specific path to generated ZeroMQTargets.cmake when building with libsodium, which changes the @@ -17,10 +18,16 @@ Upstream-Status: Pending Signed-off-by: Niko Mauno +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e92141d..d0775c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1210,7 +1210,7 @@ - target_link_libraries(libzmq ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +@@ -1428,7 +1428,7 @@ if(BUILD_SHARED) + endif() if(SODIUM_FOUND) - target_link_libraries(libzmq ${SODIUM_LIBRARIES}) @@ -28,8 +35,8 @@ Signed-off-by: Niko Mauno # On Solaris, libsodium depends on libssp if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") target_link_libraries(libzmq ssp) -@@ -1240,7 +1240,7 @@ - target_link_libraries(libzmq-static ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +@@ -1473,7 +1473,7 @@ if(BUILD_STATIC) + endif() if(SODIUM_FOUND) - target_link_libraries(libzmq-static ${SODIUM_LIBRARIES}) diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb deleted file mode 100644 index 02a4c04fd..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like a concurrency framework" -HOMEPAGE = "http://www.zeromq.org" -LICENSE = "LGPLv3+" -LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1" - -PACKAGECONFIG ??= "libsodium" -PACKAGECONFIG[libsodium] = "-DWITH_LIBSODIUM=ON,-DWITH_LIBSODIUM=OFF, libsodium" - -SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \ - file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \ - file://run-ptest \ -" -SRC_URI[md5sum] = "2047e917c2cc93505e2579bcba67a573" -SRC_URI[sha256sum] = "ebd7b5c830d6428956b67a0454a7f8cbed1de74b3b01e5c33c5378e22740f763" - -UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases" - -inherit cmake ptest pkgconfig - -EXTRA_OECMAKE = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DBUILD_TESTS=ON', '-DBUILD_TESTS=OFF', d)} \ - -DCMAKE_SKIP_RPATH=ON \ -" - -do_install_ptest () { - install -d ${D}${PTEST_PATH}/tests - install -m 0755 ${B}/bin/test_* ${D}${PTEST_PATH}/tests -} - -FILES_${PN}-doc += "${datadir}/zmq/*.txt" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb new file mode 100644 index 000000000..a10500475 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like a concurrency framework" +HOMEPAGE = "http://www.zeromq.org" +LICENSE = "LGPLv3+" +LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1" + +PACKAGECONFIG ??= "libsodium" +PACKAGECONFIG[libsodium] = "-DWITH_LIBSODIUM=ON,-DWITH_LIBSODIUM=OFF, libsodium" + +SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \ + file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \ + file://run-ptest \ +" +SRC_URI[md5sum] = "78acc277d95e10812d71b2b3c3c3c9a9" +SRC_URI[sha256sum] = "9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2" + +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases" + +inherit cmake ptest pkgconfig + +EXTRA_OECMAKE = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DBUILD_TESTS=ON', '-DBUILD_TESTS=OFF', d)} \ + -DCMAKE_SKIP_RPATH=ON \ +" + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/test_* ${D}${PTEST_PATH}/tests +} + +FILES_${PN}-doc += "${datadir}/zmq/*.txt" -- cgit v1.2.3