From a2681d9b6ff6eb6e4456d769b8d76e77b2c4d51d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 16 Oct 2020 10:17:07 -0500 Subject: meta-openembedded: subtree update:bccd3277e4..2258c9a767 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alejandro Enedino Hernandez Samaniego (1): gedit: Add gsettings-desktop-schemas to RDEPENDS Alexander Vickberg (1): wolfssl: upgrade 4.4.0 -> 4.5.0 Andreas Müller (11): gnome-settings-daemon: Remove wrong RDEPEND gnome-desktop3: upgrade 3.36.5 -> 3.36.6 grilo: upgrade 0.3.12 -> 0.3.13 gspell: upgrade 1.8.3 -> 1.8.4 libgdata: upgrade 0.17.12 -> 0.17.13 tracker: upgrade 2.3.4 -> 2.3.6 tracker-miners: upgrade 2.3.3 -> 2.3.5 gjs: upgrade 1.58.7 -> 1.58.8 xfce4-notifyd: upgrade 0.6.1 -> 0.6.2 live555: upgrade 20200721 -> 20200819 vlc: upgrade 3.0.11 -> 3.0.11.1 Andrey Zhizhikin (1): python3-pybind11: extend to native and nativesdk Armin Kuster (3): cmocka: add recipe musl-nscd: add package add musl-nscd to pkg grps Bartosz Golaszewski (2): libgpiod: drop support for 0.3.3 libgpiod: consolidate the recipe files Diego Rondini (1): README: fix incorrect links Geoff Parker (1): multipath-tools: replace perl with sed in libdmmp/Makefile for pseudo Gianfranco Costamagna (1): vboxguestdrivers: upgrade 6.1.12 -> 6.1.14 Drop kernel 5.8 compatibility patch, now part of upstream codebase Hongxu Jia (4): python3-argcomplete: add recipe 1.12.0 python3-dateutil/python3-pykwalify: add nativesdk support python3-pykwalify: fix missing comma python3-docopt: add version 0.6.2 Kai Kang (2): python3-iniconfig: add recipe python3-pytest: 5.4.3 -> 6.1.0 Khem Raj (3): st: Use update alternatives numactl: Link with libatomic on rv64/rv32 ubi-utils-klibc: Remove trailing slash from S Lee Chee Yang (4): ace : improve reproducibility libgphoto2: improve reproducibility tbb: improve reproducibility glog : improve reproducibility Leon Anavi (57): python3-langtable: Upgrade 0.0.52 -> 0.0.53 python3-sentry-sdk: Upgrade 0.17.5 -> 0.17.6 python3-cmd2: Upgrade 1.3.9 -> 1.3.10 python3-rfc3339-validator: Upgrade 0.1.1 -> 0.1.2 python3-h2: Upgrade 3.2.0 -> 4.0.0 python3-luma-core: Upgrade 1.16.1 -> 1.16.2 python3-isort: Upgrade 5.5.2 -> 5.5.3 python3-xlsxwriter: Upgrade 1.3.3 -> 1.3.4 python3-flask-uploads: Consolidate in a single file python3-paho-mqtt: Upgrade 1.5.0 -> 1.5.1 python3-sentry-sdk: Upgrade 0.17.6 -> 0.17.7 python3-importlib-metadata: Upgrade 1.7.0 -> 2.0.0 python3-pint: Upgrade 0.16 -> 0.16.1 python3-zipp: Upgrade 3.1.0 -> 3.2.0 python3-xlsxwriter: Upgrade 1.3.4 -> 1.3.5 python3-greenlet: Upgrade 0.4.16 -> 0.4.17 python3-xlsxwriter: Upgrade 1.3.5 -> 1.3.6 python3-yarl: Upgrade 1.5.1 -> 1.6.0 python3-sentry-sdk: Upgrade 0.17.7 -> 0.17.8 python3-google-api-python-client: Upgrade 1.12.1 -> 1.12.2 python3-cryptography: Upgrade 3.1 -> 3.1.1 python3-cryptography-vectors: Upgrade 3.1 -> 3.1.1 python3-gevent: Upgrade 20.6.2 -> 20.9.0 python3-pycrypto: Consolidate in a single file python3-pychromecast: Upgrade 7.3.0 -> 7.5.0 python3-beautifulsoup4: Upgrade 4.9.1 -> 4.9.2 python3-tqdm: Upgrade 4.49.0 -> 4.50.0 python3-argcomplete: Upgrade 1.12.0 -> 1.12.1 python3-luma-core: Upgrade 1.16.2 -> 1.17.1 python3-luma-oled: Upgrade 3.5.0 -> 3.6.0 python3-regex: Upgrade 2020.7.14 -> 2020.9.27 python3-djangorestframework: Upgrade 3.11.1 -> 3.12.1 python3-isort: Upgrade 5.5.3 -> 5.5.4 python3-cbor2: Upgrade 5.1.2 -> 5.2.0 python3-humanize: Upgrade 2.6.0 -> 3.0.0 python3-pystemd: Upgrade 0.7.0 -> 0.8.0 python3-sentry-sdk: Upgrade 0.17.8 -> 0.18.0 python3-nocasedict: Upgrade 1.0.0 -> 1.0.1 python3-google-api-python-client: Upgrade 1.12.2 -> 1.12.3 beautifulsoup4: Upgrade 4.9.2 -> 4.9.3 python3-humanize: Upgrade 3.0.0 -> 3.0.1 python3-zipp: Upgrade 3.2.0 -> 3.3.0 python3-cmd2: Upgrade 1.3.10 -> 1.3.11 python3-pywbemtools: Upgrade 0.7.1 -> 0.7.2 python3-prettytable: Upgrade 0.7.2 -> 1.0.0 python3-nocaselist: Upgrade 1.0.2 -> 1.0.3 python3-pandas: Upgrade 1.1.2 -> 1.1.3 python3-configparser: Upgrade 5.0.0 -> 5.0.1 python3-pywbemtools: Upgrade 0.7.2 -> 0.7.3 python3-colorlog: Upgrade 4.2.1 -> 4.4.0 python3-markdown: Upgrade 3.2.2 -> 3.3 python3-tqdm: Upgrade 4.50.0 -> 4.50.2 python3-pywbem: Upgrade 1.0.2 -> 1.1.0 python3-regex: Upgrade 2020.9.27 -> 2020.10.11 python3-multidict: Upgrade 4.7.6 -> 5.0.0 python3-prettytable: Upgrade 1.0.0 -> 1.0.1 python3-pyperclip: Upgrade 1.8.0 -> 1.8.1 Lim Siew Hoon (1): Alliance for Open Media: new library Martin Jansa (4): libhugetlbfs: revert one commit from 2.23 to work around build error on arm netkit-rsh: inherit update-alternatives ssmtp: adjust u-a utouch-*, ifenslave, iozone3, ttf-honkyfonts, python3-smbus: don't use trailing slash in S Michael Vetter (3): jasper: use correct homepage jasper: upgrade 2.0.20 -> 2.0.21 jasper: upgrade 2.0.21 -> 2.0.22 Mingli Yu (3): smartmontools: Remove obsolete setting regarding the Standard Output ippool: Remove obsolete setting in service file strongswan: Remove obsolete setting regarding the Standard Output Naveen Saini (1): tbb: upgrade 2020.2 -> 2020.3 Pascal Bach (1): rocksdb: 6.6.4 -> 6.11.4 Pierre-Jean Texier (1): cppzmq: upgrade 4.6.0 -> 4.7.0 Ricardo Salveti (1): pcsc-lite: upgrade 1.8.26 -> 1.9.0 Richard Purdie (1): minifi-cpp: Adapt to potential psuedo changes Robert Yang (1): crda: rdepends on wireless-regdb-static Romain Naour (1): libiec61850: add recipe for libiec61850 Ross Burton (1): mpv: don't remove lua for aarch64 twice Sakib Sajal (1): libssh2: enable ptest Sinan Kaya (1): collectd: make rrdtool and rrdcached optional Tim Orling (3): python3-markupsafe: bbappend for ptest python3-jinja2: bbappend for ptest packagegroup-meta-python: -jinja2 -markupsafe => ptest Todd Cunningham (1): firewalld: upgrade 0.8.3 -> 0.9.0 Vladimir Zapolskiy (1): cifs-utils: remove explicitly set PV variable Winfried Dobbe (1): firewalld: Add missing rdep on nftables-python Yi Zhao (2): minifi-cpp: do not download source during compile minifi-cpp: set the default repositories location to /var/lib Zang Ruochen (6): byacc: upgrade 20200330 -> 20200910 memtester: upgrade 4.3.0 -> 4.4.0 redis: upgrade 6.0.7 -> 6.0.8 znc: upgrade 1.8.1 -> 1.8.2 arno-iptables-firewall: upgrade 2.1.0 -> 2.1.1 numactl: upgrade 2.0.13 -> 2.0.14 Zheng Ruoqin (1): dnf-plugin-tui: upgrade 1.1 -> 1.2 Zig Globulin (1): libuvc: add recipe Signed-off-by: Andrew Geissler Change-Id: I67cbdcd31a7ead9641a4bce3477ff706f33bb253 --- .../recipes-connectivity/crda/crda_3.18.bb | 2 +- .../firewalld/firewalld_0.8.3.bb | 90 --------------------- .../firewalld/firewalld_0.9.0.bb | 91 ++++++++++++++++++++++ .../0001-use-poll.h-instead-of-sys-poll.h.patch | 33 ++++++++ ...port_linux-Add-missing-include-sys-time.h.patch | 32 ++++++++ ...don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch | 37 +++++++++ .../libiec61850/libiec61850_1.4.2.1.bb | 39 ++++++++++ ...verseWords-available-for-big-and-little-e.patch | 32 ++++++++ .../recipes-connectivity/wolfssl/wolfssl_4.4.0.bb | 21 ----- .../recipes-connectivity/wolfssl/wolfssl_4.5.0.bb | 23 ++++++ 10 files changed, 288 insertions(+), 112 deletions(-) delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.8.3.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-use-poll.h-instead-of-sys-poll.h.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0002-serial_port_linux-Add-missing-include-sys-time.h.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0003-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.4.2.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl/0001-Make-ByteReverseWords-available-for-big-and-little-e.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.4.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.5.0.bb (limited to 'meta-openembedded/meta-networking/recipes-connectivity') diff --git a/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb index b380eaf94e..e59d2f437d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb @@ -35,4 +35,4 @@ do_install() { oe_runmake SBINDIR=${sbindir}/ install } -RDEPENDS_${PN} = "udev wireless-regdb" +RDEPENDS_${PN} = "udev wireless-regdb-static" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.8.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.8.3.bb deleted file mode 100644 index ddf5ff88ee..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.8.3.bb +++ /dev/null @@ -1,90 +0,0 @@ -SUMMARY = "Dynamic firewall daemon with a D-Bus interface" -HOMEPAGE = "https://firewalld.org/" -BUGTRACKER = "https://github.com/firewalld/firewalld/issues" -UPSTREAM_CHECK_URI = "https://github.com/firewalld/firewalld/releases" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ - file://firewalld.init \ -" -SRC_URI[sha256sum] = "4ecb16d82c2825ccfb8f109e543c0492cf6ea8c43e2d0f59901bddcead037dc6" - -# glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 -DEPENDS = "intltool-native glib-2.0-native" - -inherit gettext autotools bash-completion python3native gsettings systemd update-rc.d - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" -PACKAGECONFIG[docs] = "--with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog,--disable-docs,libxslt-native docbook-xsl-stylesheets-native" - -PACKAGES += "${PN}-zsh-completion" - -# iptables, ip6tables, ebtables, and ipset *should* be unnecessary -# when the nftables backend is available, because nftables supersedes all of them. -# However we still need iptables and ip6tables to be available otherwise any -# application relying on "direct passthrough" rules (such as docker) will break. -# /etc/sysconfig/firewalld is a Red Hat-ism, only referenced by -# the Red Hat-specific init script which we aren't using, so we disable that. -EXTRA_OECONF = "\ - --without-ipset \ - --with-iptables=${sbindir}/iptables \ - --with-iptables-restore=${sbindir}/iptables-restore \ - --with-ip6tables=${sbindir}/ip6tables \ - --with-ip6tables-restore=${sbindir}/ip6tables-restore \ - --without-ebtables \ - --without-ebtables-restore \ - --disable-sysconfig \ -" - -INITSCRIPT_NAME = "firewalld" -SYSTEMD_SERVICE_${PN} = "firewalld.service" - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - : - else - # firewalld ships an init script but it contains Red Hat-isms, replace it with our own - rm -rf ${D}${sysconfdir}/rc.d/ - install -d ${D}${sysconfdir}/init.d - install -m0755 ${WORKDIR}/firewalld.init ${D}${sysconfdir}/init.d/firewalld - fi - - # We ran ./configure with PYTHON pointed at the binary inside $STAGING_BINDIR_NATIVE - # so now we need to fix up any references to point at the proper path in the image. - # This hack is also in distutils.bbclass, but firewalld doesn't use distutils/setuptools. - if [ ${PN} != "${BPN}-native" ]; then - sed -i -e s:${STAGING_BINDIR_NATIVE}/python3-native/python3:${bindir}/python3:g \ - ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml - fi - sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \ - ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml - - # This file contains Red Hat-isms. Modules get loaded without it. - rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf -} - -FILES_${PN} += "\ - ${PYTHON_SITEPACKAGES_DIR}/firewall \ - ${nonarch_libdir}/firewalld \ - ${datadir}/dbus-1 \ - ${datadir}/polkit-1 \ - ${datadir}/metainfo \ -" -FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" - -RDEPENDS_${PN} = "\ - nftables \ - iptables \ - python3-core \ - python3-io \ - python3-fcntl \ - python3-shell \ - python3-syslog \ - python3-xml \ - python3-dbus \ - python3-slip-dbus \ - python3-decorator \ - python3-pygobject \ -" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.0.bb new file mode 100644 index 0000000000..a76877652c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.0.bb @@ -0,0 +1,91 @@ +SUMMARY = "Dynamic firewall daemon with a D-Bus interface" +HOMEPAGE = "https://firewalld.org/" +BUGTRACKER = "https://github.com/firewalld/firewalld/issues" +UPSTREAM_CHECK_URI = "https://github.com/firewalld/firewalld/releases" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ + file://firewalld.init \ +" +SRC_URI[sha256sum] = "7cfbf8a33f726151e60c07486af0921fa05cbbab097adf90ec1caef37b49d9a0" + +# glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 +DEPENDS = "intltool-native glib-2.0-native" + +inherit gettext autotools bash-completion python3native gsettings systemd update-rc.d + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" +PACKAGECONFIG[docs] = "--with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog,--disable-docs,libxslt-native docbook-xsl-stylesheets-native" + +PACKAGES += "${PN}-zsh-completion" + +# iptables, ip6tables, ebtables, and ipset *should* be unnecessary +# when the nftables backend is available, because nftables supersedes all of them. +# However we still need iptables and ip6tables to be available otherwise any +# application relying on "direct passthrough" rules (such as docker) will break. +# /etc/sysconfig/firewalld is a Red Hat-ism, only referenced by +# the Red Hat-specific init script which we aren't using, so we disable that. +EXTRA_OECONF = "\ + --without-ipset \ + --with-iptables=${sbindir}/iptables \ + --with-iptables-restore=${sbindir}/iptables-restore \ + --with-ip6tables=${sbindir}/ip6tables \ + --with-ip6tables-restore=${sbindir}/ip6tables-restore \ + --without-ebtables \ + --without-ebtables-restore \ + --disable-sysconfig \ +" + +INITSCRIPT_NAME = "firewalld" +SYSTEMD_SERVICE_${PN} = "firewalld.service" + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + : + else + # firewalld ships an init script but it contains Red Hat-isms, replace it with our own + rm -rf ${D}${sysconfdir}/rc.d/ + install -d ${D}${sysconfdir}/init.d + install -m0755 ${WORKDIR}/firewalld.init ${D}${sysconfdir}/init.d/firewalld + fi + + # We ran ./configure with PYTHON pointed at the binary inside $STAGING_BINDIR_NATIVE + # so now we need to fix up any references to point at the proper path in the image. + # This hack is also in distutils.bbclass, but firewalld doesn't use distutils/setuptools. + if [ ${PN} != "${BPN}-native" ]; then + sed -i -e s:${STAGING_BINDIR_NATIVE}/python3-native/python3:${bindir}/python3:g \ + ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml + fi + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \ + ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml + + # This file contains Red Hat-isms. Modules get loaded without it. + rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf +} + +FILES_${PN} += "\ + ${PYTHON_SITEPACKAGES_DIR}/firewall \ + ${nonarch_libdir}/firewalld \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ + ${datadir}/metainfo \ +" +FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +RDEPENDS_${PN} = "\ + nftables \ + iptables \ + python3-core \ + python3-io \ + python3-fcntl \ + python3-shell \ + python3-syslog \ + python3-xml \ + python3-dbus \ + python3-slip-dbus \ + python3-decorator \ + python3-pygobject \ + nftables-python \ +" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-use-poll.h-instead-of-sys-poll.h.patch b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-use-poll.h-instead-of-sys-poll.h.patch new file mode 100644 index 0000000000..a04473d218 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-use-poll.h-instead-of-sys-poll.h.patch @@ -0,0 +1,33 @@ +From 4cad505fc98240eb66eaabfae61a9694f8158dda Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 7 Apr 2020 20:58:37 +0200 +Subject: [PATCH] use instead of + +The manpage of poll(2) states that the prototype of poll is defined +in . Use that header file instead of to allow +compilation against musl-libc. + +Upstream status: Pending +https://github.com/mz-automation/libiec61850/pull/228 + +Signed-off-by: Romain Naour +--- + hal/ethernet/linux/ethernet_linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hal/ethernet/linux/ethernet_linux.c b/hal/ethernet/linux/ethernet_linux.c +index c3ab2e2..9aa5c28 100644 +--- a/hal/ethernet/linux/ethernet_linux.c ++++ b/hal/ethernet/linux/ethernet_linux.c +@@ -23,7 +23,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +-- +2.21.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0002-serial_port_linux-Add-missing-include-sys-time.h.patch b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0002-serial_port_linux-Add-missing-include-sys-time.h.patch new file mode 100644 index 0000000000..e1b8ca15b3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0002-serial_port_linux-Add-missing-include-sys-time.h.patch @@ -0,0 +1,32 @@ +From 661405eb6066b67dfe51d5ff9635e29f86bdd238 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 7 Apr 2020 21:02:54 +0200 +Subject: [PATCH] serial_port_linux: Add missing include sys/time.h + +POSIX says `struct timeval` is defined if is included. + +Adding this header allow to build against musl-libc. + +Upstream status: Pending +https://github.com/mz-automation/libiec61850/pull/228 + +Signed-off-by: Romain Naour +--- + hal/serial/linux/serial_port_linux.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hal/serial/linux/serial_port_linux.c b/hal/serial/linux/serial_port_linux.c +index e6308c0..15e5794 100644 +--- a/hal/serial/linux/serial_port_linux.c ++++ b/hal/serial/linux/serial_port_linux.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include "hal_serial.h" + #include "hal_time.h" +-- +2.21.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0003-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0003-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch new file mode 100644 index 0000000000..65567610b9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0003-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch @@ -0,0 +1,37 @@ +From 89f326a427c7ad13c115e2d3f2ac27807aa5a795 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 10 Jul 2020 17:08:34 +0200 +Subject: [PATCH] pyiec61850: don't break CMAKE_INSTALL_PATH by trying to find + python modules install path (site-packages) + +https://stackoverflow.com/questions/1242904/finding-python-site-packages-directory-with-cmake + +Signed-off-by: Romain Naour +--- + pyiec61850/CMakeLists.txt | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/pyiec61850/CMakeLists.txt b/pyiec61850/CMakeLists.txt +index 159ef4b..d1732a1 100644 +--- a/pyiec61850/CMakeLists.txt ++++ b/pyiec61850/CMakeLists.txt +@@ -31,14 +31,7 @@ endif() + + swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) + +-# Finding python modules install path +-execute_process( +- COMMAND ${PYTHON_EXECUTABLE} -c +- "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())" +- OUTPUT_VARIABLE PYTHON_SITE_DIR +-) +- +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${PYTHON_SITE_DIR}) +-install(TARGETS _iec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR}) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) ++install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) + + add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) +-- +2.21.3 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.4.2.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.4.2.1.bb new file mode 100644 index 0000000000..18cb0cd8ef --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.4.2.1.bb @@ -0,0 +1,39 @@ +SUMMARY = "Open source iec61850 implementation" +DESCRIPTION = "IEC 61850 is an international standard for \ +communication systems in Substation Automation Systems \ +(SAS) and management of Decentralized Energy Resources \ +(DER). It is seen as one of the communication standards \ +of the emerging Smart Grid. \ +The project libIEC61850 provides a server and client \ +library for the IEC 61850/MMS, IEC 61850/GOOSE and IEC \ +61850-9-2/Sampled Values communication protocols \ +written in C. It is available under the GPLv3 license." +HOMEPAGE = "http://libiec61850.com" +SECTION = "console/network" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +DEPENDS = "swig-native python3" +SRCREV = "d798814fb463115a835da597535a625b68a39cff" + +SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.4 \ + file://0001-use-poll.h-instead-of-sys-poll.h.patch \ + file://0002-serial_port_linux-Add-missing-include-sys-time.h.patch \ + file://0003-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ +" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig python3-dir python3native siteinfo + +EXTRA_OECMAKE = " \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_PYTHON_BINDINGS=ON \ +" + +RDEPENDS_${PN}-python = " python3-core " +RDEPENDS_${PN} = " python3-core " + +FILES_${PN} += " \ + ${libdir}/${PYTHON_DIR}/site-packages/iec61850.py \ + ${libdir}/${PYTHON_DIR}/site-packages/_iec61850.so \ +" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl/0001-Make-ByteReverseWords-available-for-big-and-little-e.patch b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl/0001-Make-ByteReverseWords-available-for-big-and-little-e.patch new file mode 100644 index 0000000000..4676769a43 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl/0001-Make-ByteReverseWords-available-for-big-and-little-e.patch @@ -0,0 +1,32 @@ +From b90acc91d0cd276befe7f08f87ba2dc5ee7122ff Mon Sep 17 00:00:00 2001 +From: Tesfa Mael +Date: Wed, 26 Aug 2020 10:13:06 -0700 +Subject: [PATCH] Make ByteReverseWords available for big and little endian + +--- + wolfcrypt/src/misc.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/wolfcrypt/src/misc.c b/wolfcrypt/src/misc.c +index fe66ee0a1..23bfa1adc 100644 +--- a/wolfcrypt/src/misc.c ++++ b/wolfcrypt/src/misc.c +@@ -120,7 +120,6 @@ WC_STATIC WC_INLINE word32 ByteReverseWord32(word32 value) + return rotlFixed(value, 16U); + #endif + } +-#if defined(LITTLE_ENDIAN_ORDER) + /* This routine performs a byte swap of words array of a given count. */ + WC_STATIC WC_INLINE void ByteReverseWords(word32* out, const word32* in, + word32 byteCount) +@@ -131,7 +130,6 @@ WC_STATIC WC_INLINE void ByteReverseWords(word32* out, const word32* in, + out[i] = ByteReverseWord32(in[i]); + + } +-#endif /* LITTLE_ENDIAN_ORDER */ + + #if defined(WORD64_AVAILABLE) && !defined(WOLFSSL_NO_WORD64_OPS) + +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.4.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.4.0.bb deleted file mode 100644 index db7b0d486b..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.4.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "wolfSSL Lightweight Embedded SSL/TLS Library" -DESCRIPTION = "wolfSSL, formerly CyaSSL, is a lightweight SSL library written \ - in C and optimized for embedded and RTOS environments. It can \ - be up to 20 times smaller than OpenSSL while still supporting \ - a full TLS client and server, up to TLS 1.3" -HOMEPAGE = "https://www.wolfssl.com/products/wolfssl" -BUGTRACKER = "https://github.com/wolfssl/wolfssl/issues" -SECTION = "libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -PROVIDES += "cyassl" -RPROVIDES_${PN} = "cyassl" - -SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https" -SRCREV = "e116c89a58af750421d82ece13f80516d2bde02e" -S = "${WORKDIR}/git" - -inherit autotools - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.5.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.5.0.bb new file mode 100644 index 0000000000..61cf1cc626 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.5.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "wolfSSL Lightweight Embedded SSL/TLS Library" +DESCRIPTION = "wolfSSL, formerly CyaSSL, is a lightweight SSL library written \ + in C and optimized for embedded and RTOS environments. It can \ + be up to 20 times smaller than OpenSSL while still supporting \ + a full TLS client and server, up to TLS 1.3" +HOMEPAGE = "https://www.wolfssl.com/products/wolfssl" +BUGTRACKER = "https://github.com/wolfssl/wolfssl/issues" +SECTION = "libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +PROVIDES += "cyassl" +RPROVIDES_${PN} = "cyassl" + +SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https \ + file://0001-Make-ByteReverseWords-available-for-big-and-little-e.patch \ +" +SRCREV = "0fa5af9929ce2ee99e8789996a3048f41a99830e" +S = "${WORKDIR}/git" + +inherit autotools + +BBCLASSEXTEND += "native nativesdk" -- cgit v1.2.3