diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-connectivity | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-connectivity')
27 files changed, 463 insertions, 141 deletions
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/defconfig b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/defconfig index 278964017..a62bec403 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/defconfig +++ b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/defconfig @@ -139,6 +139,9 @@ CONFIG_DRIVER_RADIUS_ACL=y # IEEE 802.11n (High Throughput) support CONFIG_IEEE80211N=y +# IEEE 802.11ac (Very High Throughput) support +CONFIG_IEEE80211AC=y + # Remove debugging code that is printing out debug messages to stdout. # This can be used to reduce the size of the hostapd considerably if debugging # code is not needed. diff --git a/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.0.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.1.2.bb index 10b04bb52..e2867e84b 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.1.2.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55fdc1113306167d6ea2561404ce02f8" DEPENDS = "glib-2.0 ncurses openssl" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" -SRC_URI[md5sum] = "46d4ac2a7ab472e5dc800e5d7bd9a879" -SRC_URI[sha256sum] = "b85c07dbafe178213eccdc69f5f8f0ac024dea01c67244668f91ec1c06b986ca" +SRC_URI[md5sum] = "271d2fd875cddd34526234d8a766d82c" +SRC_URI[sha256sum] = "5ccc2b89a394e91bea0aa83a951c3b1d471c76da87b4169ec435530a31bf9732" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.14.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.14.bb new file mode 100644 index 000000000..1dfbed9fd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_0.14.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Wireless daemon for Linux" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" + +inherit autotools pkgconfig systemd + +DEPENDS = "ell readline dbus" + +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" +SRCREV = "f87159964cf8fd9f85b0699d50e4a051d4f7c948" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +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" + +do_configure_prepend () { + mkdir -p ${S}/build-aux +} + +do_install_append() { + mkdir --parents ${D}${docdir}/${BPN} + install -m644 ${S}/doc/*.txt ${D}${docdir}/${BPN} +} + +FILES_${PN} += "${datadir}/dbus-1" + +SYSTEMD_SERVICE_${PN} = "iwd.service ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.16.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.bb index 11748cbd0..e27a4ae07 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.16.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.17.bb @@ -14,7 +14,7 @@ DESCRIPTION = "Kerberos is a system for authenticating users and services on a n HOMEPAGE = "http://web.mit.edu/Kerberos/" SECTION = "console/network" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=7f95bc3d8d0351aa481d56d5e9de20c3" +LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=aff541e7261f1926ac6a2a9a7bbab839" DEPENDS = "bison-native ncurses util-linux e2fsprogs e2fsprogs-native openssl" inherit autotools-brokensep binconfig perlnative systemd update-rc.d @@ -31,19 +31,21 @@ SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ file://krb5-kdc.service \ file://krb5-admin-server.service \ " -SRC_URI[md5sum] = "848e9b80d6aaaa798e3f3df24b83c407" -SRC_URI[sha256sum] = "214ffe394e3ad0c730564074ec44f1da119159d94281bbec541dc29168d21117" +SRC_URI[md5sum] = "3b729d89eb441150e146780c4138481b" +SRC_URI[sha256sum] = "5a6e2284a53de5702d3dc2be3b9339c963f9b5397d3fbbc53beb249380a781f5" CVE_PRODUCT = "kerberos" +CVE_VERSION = "5-${PV}" S = "${WORKDIR}/${BP}/src" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "pkinit" PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" PACKAGECONFIG[openssl] = "--with-crypto-impl=openssl,,openssl" PACKAGECONFIG[keyutils] = "--enable-keyutils,--disable-keyutils,keyutils" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" +PACKAGECONFIG[pkinit] = "--enable-pkinit, --disable-pkinit" EXTRA_OECONF += " --without-tcl --with-system-et --disable-rpath" CACHED_CONFIGUREVARS += "krb5_cv_attr_constructor_destructor=yes ac_cv_func_regcomp=yes \ @@ -103,6 +105,7 @@ PACKAGES =+ "${PN}-admin-server \ ${PN}-kpropd \ ${PN}-otp \ ${PN}-pkinit \ + ${PN}-spake \ ${PN}-user \ libgssapi-krb5 \ libgssrpc \ @@ -149,6 +152,7 @@ FILES_${PN}-kdc-ldap = "${libdir}/krb5/libkdb_ldap${SOLIBS} \ FILES_${PN}-kpropd = "${sbindir}/kpropd" FILES_${PN}-otp = "${libdir}/krb5/plugins/preauth/otp.so" FILES_${PN}-pkinit = "${libdir}/krb5/plugins/preauth/pkinit.so" +FILES_${PN}-spake = "${libdir}/krb5/plugins/preauth/spake.so" FILES_${PN}-user = "${bindir}/k*" FILES_libgssapi-krb5 = "${libdir}/libgssapi_krb5${SOLIBS}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.24.bb b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.25.bb index a5838d368..9456e51f1 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.24.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.25.bb @@ -5,9 +5,8 @@ LICENSE = "BSD-2-Clause | GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6ad416afd040c90698edcdf1cbee347" SRC_URI = "http://dist.schmorp.de/libev/Attic/${BP}.tar.gz" - -SRC_URI[md5sum] = "94459a5a22db041dec6f98424d6efe54" -SRC_URI[sha256sum] = "973593d3479abdf657674a55afe5f78624b0e440614e2b8cb3a07f16d4d7f821" +SRC_URI[md5sum] = "911daf566534f745726015736a04f04a" +SRC_URI[sha256sum] = "78757e1c27778d2f3795251d9fe09715d51ce0422416da4abb34af3929c02589" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch index 92e657c00..d88578418 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch @@ -45,7 +45,7 @@ Index: libmbim-1.14.0/m4/compiler-warnings.m4 -Wdeclaration-after-statement -Wstrict-prototypes \ @@ -17,22 +37,23 @@ if test "$GCC" = "yes" -a "$set_more_war -Wmissing-include-dirs -Waggregate-return \ - -Wformat-security; do + -Wformat-security -Wtype-limits; do SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" + CFLAGS="$CFLAGS $option $WERROR" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.16.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.18.0.bb index 5260c0f14..9f59ad6b4 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.16.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.18.0.bb @@ -14,5 +14,5 @@ inherit autotools pkgconfig bash-completion SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ file://clang.patch \ " -SRC_URI[md5sum] = "76ea4d8381989919b1d9b91c818fed80" -SRC_URI[sha256sum] = "c8ca50beeddd4b43309df5b698917268303bf176cea58fe4fe53d5bf0e93fac2" +SRC_URI[md5sum] = "840cd133bc0f715a7ee4797dd9ac5562" +SRC_URI[sha256sum] = "6cf40128d83d087946a7d8577e735526202e034d52f90047735329609097b282" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch deleted file mode 100644 index d230d6803..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8269f4d86927fbe19e78776a12736680fe9169b6 Mon Sep 17 00:00:00 2001 -From: Adrian Bunk <bunk@stusta.de> -Date: Mon, 1 Oct 2018 16:53:31 +0300 -Subject: [PATCH] qmi-network: Don't create invalid --wds-start-network when - APN is not set - -In 1.20.2 the warning for this was turned into an error. - -(cherry picked from commit 289d8ad6419895e2e1fba3d78a54a0db65da521d) ---- -Upstream-Status: Backport - - utils/qmi-network.in | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/utils/qmi-network.in b/utils/qmi-network.in -index bf7bed9..a9e5299 100755 ---- a/utils/qmi-network.in -+++ b/utils/qmi-network.in -@@ -334,11 +334,13 @@ start_network () - - setup_data_format - -- START_NETWORK_ARGS="apn='$APN'" -- if [ -n "$APN_USER" ]; then -- START_NETWORK_ARGS="${START_NETWORK_ARGS},username='$APN_USER'" -- if [ -n "$APN_PASS" ]; then -- START_NETWORK_ARGS="${START_NETWORK_ARGS},password='$APN_PASS'" -+ if [ -n "$APN" ]; then -+ START_NETWORK_ARGS="apn='$APN'" -+ if [ -n "$APN_USER" ]; then -+ START_NETWORK_ARGS="${START_NETWORK_ARGS},username='$APN_USER'" -+ if [ -n "$APN_PASS" ]; then -+ START_NETWORK_ARGS="${START_NETWORK_ARGS},password='$APN_PASS'" -+ fi - fi - fi - --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.22.2.bb index f0bc81cc9..da13286b4 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.22.2.bb @@ -12,12 +12,12 @@ DEPENDS = "glib-2.0 glib-2.0-native" inherit autotools pkgconfig bash-completion SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ - file://0001-qmi-network-Don-t-create-invalid-wds-start-network-w.patch \ file://0001-Detect-clang.patch \ " -SRC_URI[md5sum] = "584214476ab75c394160cb85fbccaa1d" -SRC_URI[sha256sum] = "c73459ca8bfe1213f8047858d4946fc1f58e164d4f488a7a6904edee25e2ca44" +SRC_URI[md5sum] = "3fd831c1b0de4a4432be628432a960ff" +SRC_URI[sha256sum] = "f1f1e514a89b1dcba05cf7274895e7301a2da4c947b7c2f17acb84fc74038227" 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/libuv/libuv_1.20.3.bb b/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.27.0.bb index a11ff9d2c..c8239443c 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.20.3.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.27.0.bb @@ -4,10 +4,9 @@ BUGTRACKER = "https://github.com/libuv/libuv/issues" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" -S = "${WORKDIR}/git" -SRCREV = "8cfd67e59195251dff793ee47c185c9d6a8f3818" -BRANCH = "v1.x" -SRC_URI = "git://github.com/libuv/libuv.git;protocol=https;branch=${BRANCH};" +SRC_URI = "https://github.com/libuv/libuv/archive/v${PV}.tar.gz" +SRC_URI[md5sum] = "cc2cf259442fbe85404e75691e8244e1" +SRC_URI[sha256sum] = "4afcdc84cd315b77c8e532e7b3fde43d536af0e2e835eafbd0e75518ed26dbed" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.1.0.bb index f38414862..50620d99e 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_3.1.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4ce87f3facb6f911c142c8bef9bfb380" DEPENDS = "zlib" S = "${WORKDIR}/git" -SRCREV = "eaa935a80adb38b5cc4d09ce06ec987b87dcddfa" +SRCREV = "89eedcaa94e1c8a97ea3af10642fd224bcea068f" SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;" inherit cmake pkgconfig @@ -21,6 +21,10 @@ PACKAGECONFIG[server] = "-DLWS_WITHOUT_SERVER=OFF,-DLWS_WITHOUT_SERVER=ON," PACKAGECONFIG[ssl] = "-DLWS_WITH_SSL=ON,-DLWS_WITH_SSL=OFF,openssl" PACKAGECONFIG[testapps] = "-DLWS_WITHOUT_TESTAPPS=OFF,-DLWS_WITHOUT_TESTAPPS=ON," +EXTRA_OECMAKE += " \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ +" + PACKAGES =+ "${PN}-testapps" FILES_${PN}-testapps += "${datadir}/libwebsockets-test-server/*" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch deleted file mode 100644 index 96163f654..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b36cafdbcbe2193f5b669e703c608e19e23f80a3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 15 Jul 2017 11:16:42 -0700 -Subject: [PATCH 3/4] include missing time.h for time_t - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - util.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util.h b/util.h -index e912f19..3c634c1 100644 ---- a/util.h -+++ b/util.h -@@ -22,7 +22,7 @@ - - #include "ddt.h" - #include "ether.h" -- -+#include <time.h> - /** - * Table of human readable strings, one for each port state. - */ --- -2.13.3 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch deleted file mode 100644 index e69927514..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3cd28aa771934d9165ff0d7e19932cde65de3e52 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 15 Jul 2017 11:16:57 -0700 -Subject: [PATCH 4/4] Adjust include header sequence to avoid duplicate - definitions on musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - raw.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/raw.c b/raw.c -index f51c829..494ea7f 100644 ---- a/raw.c -+++ b/raw.c -@@ -18,8 +18,6 @@ - */ - #include <errno.h> - #include <fcntl.h> --#include <linux/filter.h> --#include <linux/if_ether.h> - #include <net/ethernet.h> - #include <net/if.h> - #include <netinet/in.h> -@@ -32,6 +30,8 @@ - #include <sys/types.h> - #include <unistd.h> - -+#include <linux/filter.h> -+#include <linux/if_ether.h> - #include <linux/errqueue.h> - #include <linux/net_tstamp.h> - #include <linux/sockios.h> --- -2.13.3 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb index c7b8b2933..eb262d36b 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb @@ -5,12 +5,10 @@ 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://0003-include-missing-time.h-for-time_t.patch \ - file://0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch \ " -SRC_URI[md5sum] = "5688cdfe57932273e1dbf35b3b97b9a0" -SRC_URI[sha256sum] = "fa8e00f6ec73cefa7bb313dce7f60dfe5eb9e2bde3353594e9ac18edc93e5165" +SRC_URI[md5sum] = "d8bb7374943bb747db7786ac26f17f11" +SRC_URI[sha256sum] = "0a24d9401e87d4af023d201e234d91127d82c350daad93432106284aa9459c7d" EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \ EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_POSIX_SPAWN -DHAVE_ONESTEP_SYNC ${CFLAGS}'" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-pass-null-string-to-s-printf-formatted-string.patch b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-pass-null-string-to-s-printf-formatted-string.patch new file mode 100644 index 000000000..5fbafbb5d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager/0001-Do-not-pass-null-string-to-s-printf-formatted-string.patch @@ -0,0 +1,31 @@ +From b8862e6af1c6d022b8c182098e7deddb874ece19 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 18 Dec 2018 23:10:44 -0800 +Subject: [PATCH] Do not pass null string to %s printf formatted string + +Here the string is already decided to be NULL and passing +a null pointer to %s will not work + +Fixes +error: '%s' directive argument is null + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mobile-broadband/ModemManager/merge_requests/67] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + plugins/mtk/mm-broadband-modem-mtk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/mtk/mm-broadband-modem-mtk.c b/plugins/mtk/mm-broadband-modem-mtk.c +index 475a63ac..541de4a5 100644 +--- a/plugins/mtk/mm-broadband-modem-mtk.c ++++ b/plugins/mtk/mm-broadband-modem-mtk.c +@@ -191,7 +191,7 @@ get_supported_modes_ready (MMBaseModem *self, + + response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); + if (!response) { +- mm_dbg ("Fail to get response %s", response); ++ mm_dbg ("Fail to get response"); + g_task_return_error (task, error); + g_object_unref (task); + return; diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb index 01c621441..f9b302a3d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.8.2.bb @@ -9,10 +9,11 @@ LIC_FILES_CHKSUM = " \ inherit gnomebase gettext systemd vala gobject-introspection bash-completion -DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native" +DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native libxslt-native" SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ file://0001-Do-not-set-Wno-unused-but-set-variable.patch \ + file://0001-Do-not-pass-null-string-to-s-printf-formatted-string.patch \ " SRC_URI[md5sum] = "a49c9f73e46c7b89e5efedda250d22c0" @@ -20,14 +21,14 @@ SRC_URI[sha256sum] = "96f2a5f0ed15532b4c4c185b756fdc0326e7c2027cea26a1264f91e098 S = "${WORKDIR}/ModemManager-${PV}" -PACKAGECONFIG ??= "mbim qmi polkit \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +PACKAGECONFIG ??= "mbim qmi \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ " 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,--with-mbim=no,libmbim" +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" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch new file mode 100644 index 000000000..100ede17b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch @@ -0,0 +1,24 @@ +From efa9e49714b30d7d9128946a2504c93e10d109b5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 29 Jan 2019 12:20:03 -0800 +Subject: [PATCH] Fix building with libc++ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/network/network.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/network/network.cc b/src/network/network.cc +index 26da603..e480853 100644 +--- a/src/network/network.cc ++++ b/src/network/network.cc +@@ -335,7 +335,7 @@ bool Connection::try_bind( const char *addr, int port_low, int port_high ) + } + } + +- if ( bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) { ++ if ( ::bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) { + set_MTU( local_addr.sa.sa_family ); + return true; + } else if ( i == search_high ) { /* last port to search */ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb index 9fc8435ee..9c439354d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb @@ -14,9 +14,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter" -SRC_URI = "http://mosh.mit.edu/mosh-${PV}.tar.gz" -SRC_URI[md5sum] = "d961276995936953bf2d5a794068b076" -SRC_URI[sha256sum] = "320e12f461e55d71566597976bd9440ba6c5265fa68fbf614c6f1c8401f93376" +SRC_URI = "http://mosh.mit.edu/mosh-${PV}.tar.gz \ + file://0001-Fix-building-with-libc.patch \ + " +SRC_URI[md5sum] = "5122f4d2b973ab7c38dcdac8c35cb61e" +SRC_URI[sha256sum] = "da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb b/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb index f2a16dcf7..913e31111 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb @@ -31,7 +31,3 @@ RDEPENDS_bluez5 = " \ pulseaudio-module-loopback', \ '', d)} \ " - -# Install bluez4 tools or bluez5 tools depending on what is specified in the distro. -# Otherwise install nothing. -RDEPENDS_${PN} = "${RDEPENDS_${BLUEZ}}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.7.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.9.0.bb index e9846fdea..5096d6cd3 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.9.0.bb @@ -4,15 +4,16 @@ LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=6b7424f9db80cfb11fdd5c980b583f53" LICENSE = "MIT" SRC_URI = "git://github.com/alanxz/rabbitmq-c.git" -SRCREV = "4dde30ce8d984edda540349f57eb7995a87ba9de" +# v0.9.0-master +SRCREV = "7e693a23f7fb7120f85995d3c922814495be30db" S = "${WORKDIR}/git" DEPENDS = "popt openssl" -EXTRA_OECONF = "--disable-examples --enable-tools --disable-docs" +EXTRA_OECMAKE = "-DBUILD_EXAMPLES=OFF -DBUILD_TOOLS=ON -DBUILD_TOOLS_DOCS=OFF -DBUILD_API_DOCS=OFF" -inherit autotools pkgconfig +inherit cmake pkgconfig PACKAGE_BEFORE_PN += "${PN}-tools" FILES_${PN}-tools = "${bindir}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/0001-Use-toolchain-from-environment-variables.patch b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/0001-Use-toolchain-from-environment-variables.patch new file mode 100644 index 000000000..9ee4a51f9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/0001-Use-toolchain-from-environment-variables.patch @@ -0,0 +1,92 @@ +From 6b822b36739222d0c864249992b5d28e3ff4d948 Mon Sep 17 00:00:00 2001 +From: Adrian Friedli <adrian.friedli@husqvarnagroup.com> +Date: Mon, 3 Sep 2018 17:58:27 +0200 +Subject: [PATCH] Use toolchain from environment variables + +Upstream-Status: Submitted [https://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT/pull/42] +Signed-off-by: Adrian Friedli <adrian.friedli@husqvarnagroup.com> +Signed-off-by: Ankit Navik <ankit.tarot@gmail.com> +--- + Makefile.inc | 7 ++++--- + WTGService/Makefile | 2 +- + console_src/Makefile | 2 +- + lib/Makefile | 6 +++--- + 4 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/Makefile.inc b/Makefile.inc +index b0edf5a..0094bdf 100644 +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -13,14 +13,15 @@ + # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE + # USE OR PERFORMANCE OF THIS SOFTWARE. + # +-CC = gcc ++CC ?= gcc ++AR ?= ar + LIB=lib + DUT=dut + CA=ca + UCC=ucc + CON=console_src + WTG=WTGService +-MAKE=make ++MAKE?=make + + # This is for WMM-PS + #for Ext TG +@@ -46,7 +47,7 @@ CFLAGS = -g -O2 -D_REENTRANT -Wall -I../inc + + DUTLIBS = ../lib/libwfa_dut.a -lpthread + CALIBS = ../lib/libwfa_ca.a -lpthread +-RANLIB = ranlib ++RANLIB ?= ranlib + + LIBWFA_NAME_DUT = libwfa_dut.a + LIBWFA_NAME_CA = libwfa_ca.a +diff --git a/WTGService/Makefile b/WTGService/Makefile +index 5312eb6..4855771 100644 +--- a/WTGService/Makefile ++++ b/WTGService/Makefile +@@ -13,7 +13,7 @@ + # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE + # USE OR PERFORMANCE OF THIS SOFTWARE. + # +-CC=gcc ++CC?=gcc + CFLAGS= -Wall + LIB=-lpthread + +diff --git a/console_src/Makefile b/console_src/Makefile +index 8282283..d1098eb 100644 +--- a/console_src/Makefile ++++ b/console_src/Makefile +@@ -14,7 +14,7 @@ + # USE OR PERFORMANCE OF THIS SOFTWARE. + # + +-CC = gcc ++CC ?= gcc + CFLAGS = -g -DWFA_DEBUG -pthread + + TARGETS = wfa_con +diff --git a/lib/Makefile b/lib/Makefile +index ffcef94..299b8d6 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -17,9 +17,9 @@ + include ../Makefile.inc + + all: ${LIB_OBJS} +- ar crv ${LIBWFA_NAME} $? +- ar crv ${LIBWFA_NAME_DUT} ${LIB_OBJS_DUT} +- ar crv ${LIBWFA_NAME_CA} ${LIB_OBJS_CA} ++ $(AR) crv ${LIBWFA_NAME} $? ++ $(AR) crv ${LIBWFA_NAME_DUT} ${LIB_OBJS_DUT} ++ $(AR) crv ${LIBWFA_NAME_CA} ${LIB_OBJS_CA} + ${RANLIB} ${LIBWFA_NAME} ${LIBWFA_NAME_DUT} ${LIBWFA_NAME_CA} + + wfa_tg.o: wfa_tg.c ../inc/wfa_agt.h ../inc/wfa_types.h ../inc/wfa_rsp.h ../inc/wfa_tlv.h ../inc/wfa_tg.h +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch new file mode 100644 index 000000000..20fb6473f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch @@ -0,0 +1,45 @@ +From 451b162c903a1ef070a75dc18171620f3beef7b3 Mon Sep 17 00:00:00 2001 +From: Ankit Navik <ankit.tarot@gmail.com> +Date: Tue, 25 Dec 2018 00:36:59 +0530 +Subject: [PATCH 2/3] Add missing include, removes unnedded stuff and add non + glibc rpc + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Reto Schneider <code@reto-schneider.ch> +Signed-off-by: Ankit Navik <ankit.tarot@gmail.com> +--- + Makefile | 2 +- + inc/wfa_tg.h | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 2c41a17..5c4ad8c 100644 +--- a/Makefile ++++ b/Makefile +@@ -15,7 +15,7 @@ + # + include Makefile.inc + +-DIRS= ${LIB} ${DUT} ${CA} ${TC} ${WTG} ${CON} ++DIRS= ${LIB} ${DUT} ${CA} ${TC} + + all: + for i in ${DIRS}; do \ +diff --git a/inc/wfa_tg.h b/inc/wfa_tg.h +index 799bf9f..a1804dd 100644 +--- a/inc/wfa_tg.h ++++ b/inc/wfa_tg.h +@@ -24,6 +24,9 @@ + #ifndef _WFA_TG_H + #define _WFA_TG_H + ++#ifndef _WINDOWS ++#include <pthread.h> ++#endif + #include <sys/time.h> + + /* maximum number of streams to support */ +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch new file mode 100644 index 000000000..a51302a0c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch @@ -0,0 +1,58 @@ +From fc7b7106dd0d8d123f20cbd8d408637fbc315e17 Mon Sep 17 00:00:00 2001 +From: Ankit Navik <ankit.tarot@gmail.com> +Date: Tue, 25 Dec 2018 01:12:32 +0530 +Subject: [PATCH 3/3] fix path to /usr/sbin for script and make script for + generic shell + +Signed-off-by: Ankit Navik <ankit.tarot@gmail.com> +--- + lib/wfa_cs.c | 4 ++-- + scripts/dev_send_frame | 2 +- + scripts/sta_reset_parm | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/lib/wfa_cs.c b/lib/wfa_cs.c +index 6b1f5a2..2a18533 100644 +--- a/lib/wfa_cs.c ++++ b/lib/wfa_cs.c +@@ -319,7 +319,7 @@ int wfaStaGetIpConfig(int len, BYTE *caCmdBuf, int *respLen, BYTE *respBuf) + /* + * check a script file (the current implementation specific) + */ +- ret = access("/usr/local/sbin/getipconfig.sh", F_OK); ++ ret = access("/usr/sbin/getipconfig.sh", F_OK); + if(ret == -1) + { + ipconfigResp->status = STATUS_ERROR; +@@ -2115,7 +2115,7 @@ int wfaStaPresetParams(int len, BYTE *caCmdBuf, int *respLen, BYTE *respBuf) + st = remove("/tmp/processid.txt"); + } + +- sprintf(cmdStr, "/usr/local/sbin/findprocess.sh %s /tmp/processid.txt\n", "wpa_supplicant"); ++ sprintf(cmdStr, "/usr/sbin/findprocess.sh %s /tmp/processid.txt\n", "wpa_supplicant"); + st = system(cmdStr); + + tmpfd = fopen("/tmp/processid.txt", "r+"); +diff --git a/scripts/dev_send_frame b/scripts/dev_send_frame +index 9e6afd3..3c37d61 100644 +--- a/scripts/dev_send_frame ++++ b/scripts/dev_send_frame +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env sh + + # + # Copyright (c) 2016 Wi-Fi Alliance +diff --git a/scripts/sta_reset_parm b/scripts/sta_reset_parm +index 2aff1f1..2c1c31e 100644 +--- a/scripts/sta_reset_parm ++++ b/scripts/sta_reset_parm +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env sh + + # + # Copyright (c) 2016 Wi-Fi Alliance +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/0004-run-ranlib-per-library-and-use-AR.patch b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/0004-run-ranlib-per-library-and-use-AR.patch new file mode 100644 index 000000000..40af48970 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/0004-run-ranlib-per-library-and-use-AR.patch @@ -0,0 +1,38 @@ +From cca2f9901fb4fdcdd49066fe434eae512964143f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 9 Feb 2019 07:59:47 -0800 +Subject: [PATCH 4/4] run ranlib per library and use AR + +Use AR variable to invoke archiver instead of hardcoding, helps cross +compile + +compiler ranlib e.g. llvm-ranlib fails to operate on multiple archives +on single invocation + +fixes errors like +arm-yoe-linux-musleabi-llvm-ranlib: error: Exactly one archive should be specified. + +Upstream-Status: Submitted [https://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT/pull/47] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/Makefile b/lib/Makefile +index 299b8d6..5fca322 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -20,7 +20,9 @@ all: ${LIB_OBJS} + $(AR) crv ${LIBWFA_NAME} $? + $(AR) crv ${LIBWFA_NAME_DUT} ${LIB_OBJS_DUT} + $(AR) crv ${LIBWFA_NAME_CA} ${LIB_OBJS_CA} +- ${RANLIB} ${LIBWFA_NAME} ${LIBWFA_NAME_DUT} ${LIBWFA_NAME_CA} ++ ${RANLIB} ${LIBWFA_NAME} ++ ${RANLIB} ${LIBWFA_NAME_DUT} ++ ${RANLIB} ${LIBWFA_NAME_CA} + + wfa_tg.o: wfa_tg.c ../inc/wfa_agt.h ../inc/wfa_types.h ../inc/wfa_rsp.h ../inc/wfa_tlv.h ../inc/wfa_tg.h + +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb new file mode 100644 index 000000000..99cfb3205 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb @@ -0,0 +1,38 @@ +SUMMARY = "Wi-Fi Test Suite Linux Control Agent" +DESCRIPTION = "Wi-Fi Test Suite is a software platform originally developed \ +by Wi-Fi Alliance, the global non-profit industry association that brings you \ +Wi-Fi, to support certification program development and device certification." +HOMEPAGE = "https://www.wi-fi.org/certification/wi-fi-test-suite" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0542427ed5c315ca34aa09ae7a85ed32" +SECTION = "test" + +S = "${WORKDIR}/git" +SRCREV = "f7a8d7ef7d1a831c1bb47de21fa083536ea2f3a9" +SRC_URI = "git://github.com/Wi-FiTestSuite/Wi-FiTestSuite-Linux-DUT.git \ + file://0001-Use-toolchain-from-environment-variables.patch \ + file://0002-Add-missing-include-removes-unnedded-stuff-and-add-n.patch \ + file://0003-fix-path-to-usr-sbin-for-script-and-make-script-for-.patch \ + file://0004-run-ranlib-per-library-and-use-AR.patch \ +" + +# to avoid host path QA error +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +# Fix GNU HASH error +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install () { + install -d ${D}${libdir} + install -m 0644 ${S}/lib/libwfa.a ${D}${libdir} + install -m 0644 ${S}/lib/libwfa_ca.a ${D}${libdir} + install -m 0644 ${S}/lib/libwfa_dut.a ${D}${libdir} + install -d ${D}${sbindir} + install -m 0755 ${S}/dut/wfa_dut ${D}${sbindir} + install -m 0755 ${S}/ca/wfa_ca ${D}${sbindir} + install -m 0755 ${S}/scripts/*.sh ${D}${sbindir} + install -m 0755 ${S}/scripts/arp_neigh_loop ${D}${sbindir} + install -m 0755 ${S}/scripts/dev_send_frame ${D}${sbindir} + install -m 0755 ${S}/scripts/sta_reset_parm ${D}${sbindir} +} + +RDEPENDS_${PN} = "wpa-supplicant" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb new file mode 100644 index 000000000..f2db0041c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "C bindings for ZeroMQ" +HOMEPAGE = "http://www.zeromq.org" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" +DEPENDS = "zeromq" + +SRC_URI = "https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz \ + file://0001-Problem-out-of-date-with-zproject.patch \ +" + +SRC_URI[md5sum] = "6d3a6fdd25c2bb29897c53670dce97bf" +SRC_URI[sha256sum] = "f00ff419881dc2a05d0686c8467cd89b4882677fc56f31c0e2cc81c134cbb0c0" + +inherit cmake + +PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg" + +FILES_${PN} = "${bindir}/*" +FILES_lib${BPN} = "${libdir}/*.so.*" +FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir}" +FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" + +RDEPENDS_lib${BPN}-dev = "zeromq-dev" + +PACKAGECONFIG ??= "lz4 uuid" +PACKAGECONFIG[lz4] = ",-DCMAKE_DISABLE_FIND_PACKAGE_lz4=TRUE,lz4" +PACKAGECONFIG[uuid] = ",-DCMAKE_DISABLE_FIND_PACKAGE_uuid=TRUE,util-linux" + +BBCLASSEXTEND = "nativesdk" + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-Problem-out-of-date-with-zproject.patch b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-Problem-out-of-date-with-zproject.patch new file mode 100644 index 000000000..5f5702c8c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-Problem-out-of-date-with-zproject.patch @@ -0,0 +1,31 @@ +From d155ffd33630f80b23c31b3a6e01da221dd9bd13 Mon Sep 17 00:00:00 2001 +From: Luca Boccassi <luca.boccassi@gmail.com> +Date: Fri, 30 Mar 2018 16:36:22 +0100 +Subject: [PATCH] Problem: out of date with zproject + +Upstream-Status: backport +Signed-off-by: Adrian Bunk <bunk@stusta.de> + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3b81722..4f203461 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,7 +38,7 @@ if (NOT CMAKE_BUILD_TYPE) + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + message(STATUS "git workspace root [${git_result}]: ${git_root}") +- if ( "${git_result}" == "0" ) ++ if ( "${git_result}" STREQUAL "0" ) + set (CMAKE_BUILD_TYPE Debug) + else () + set (CMAKE_BUILD_TYPE Release) +@@ -608,7 +608,7 @@ add_custom_command( + TARGET distclean + ) + +-include(ClangFormat) ++include(ClangFormat OPTIONAL) + + ######################################################################## + # summary + |