From d221e0389dc9bafd72e541090a9c401a25a84ce3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 10 Jul 2020 16:13:21 -0500 Subject: meta-openembedded: subtree update:629696b64b..e93d527a33 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian (1): firewalld: upgrade 0.7.3 -> 0.7.5 Andre Carvalho (1): netcat: Set CVE_PRODUCT Andreas Müller (6): networkmanager: upgrade 1.22.10 -> 1.22.14 blueman: upgrade 2.1.1 -> 2.1.3 modemmanager: upgrade 1.12.10 -> 1.12.12 ibus: upgrade 1.5.21 -> 1.5.22 network-manager-applet: upgrade 1.16.0 -> 1.18.0 sysprof: remove linux-gnueabi-patch Armin Kuster (2): net-snmp: Security fix CVE-2019-20892 wireshark: Update to 3.2.5 Changqing Li (1): libmcrypt: set CLEANBROKEN Daniel Gomez (1): ttf-fonts: Update ttf-ubuntu-font-family recipe Fagundes, Paulo (1): redis-plus-plus: add recipe Hongxu Jia (1): networkmanager: fix Files/directories were installed but not shipped Jacopo Dall'Aglio (2): netplan: upgrade 0.98 -> 0.99 python3-libconf: add recipe version 2.0.1 Khem Raj (1): lirc: Inherit distutils-common-base Konrad Weihmann (6): ntop: remove static libs from dev package ruli: recipe cleanup postgresql: remove vacuumlo from contrib libconfig: remove cmake append from base package gattlib: remove includedir from base package openldap: packaging fixes Leon Anavi (63): python3-pyro4: Upgrade 4.77 -> 4.80 python3-rdflib: Upgrade 4.2.2 -> 5.0.0 python3-httplib2: Upgrade 0.17.3 -> 0.18.1 python3-cppy: Add new recipe python3-kiwisolver: Upgrade 1.1.0 -> 1.2.0 python3-sqlalchemy: Upgrade 1.3.17 -> 1.3.18 python3-greenlet: Upgrade 0.4.15 -> 0.4.16 python3-pkgconfig: Upgrade 1.4.0 -> 1.5.1 python3-msm: Upgrade 0.8.3 -> 0.8.7 python3-pulsectl: Upgrade 20.2.4 -> 20.5.1 python3-pybind11: Consolidate in a single file python3-pybind11: Upgrade 2.4.3 -> 2.5.0 python3-pyparted: Consolidate in a single file python3-pyparted: Upgrade 3.11.3 -> 3.11.6 python3-pywbem: Consolidate in a single file python3-pywbem: Upgrade 0.15.0 -> 0.17.2 python3-jsonrpcserver: Upgrade 4.1.2 -> 4.1.3 python3-humanize: Upgrade 2.4.0 -> 2.4.1 python3-autobahn: Upgrade 20.4.3 -> 20.6.2 python3-yappi: Upgrade 1.0 -> 1.2.5 python3-sympy: Upgrade 1.5.1 -> 1.6 python3-watchdog: Upgrade 0.10.2 -> 0.10.3 python3-tqdm: Upgrade 4.43.0 -> 4.47.0 python3-pyflakes: Upgrade 2.1.1 -> 2.2.0 python3-pymisp: Upgrade 2.4.122 -> 2.4.128 python3-pychromecast: Upgrade 4.2.3 -> 7.0.1 python3-py: Upgrade 1.8.2 -> 1.9.0 python3-html5lib: Upgrade 1.0.1 -> 1.1 python3-lz4: Upgrade 3.0.2 -> 3.1.0 python3-cassandra-driver: Upgrade 3.14.0 -> 3.24.0 python3-configargparse: Upgrade 0.15.1 -> 1.2.3 python3-cachetools: Upgrade 4.1.0 -> 4.1.1 python3-keras-preprocessing: Upgrade 1.1.0 -> 1.1.2 python3-pywbem: Upgrade 0.17.2 -> 0.17.3 python3-h2: Consolidate in a single file python3-h2: Upgrade 3.1.1 -> 3.2.0 python3-requests: Upgrade 2.23.0 -> 2.24.0 python3-google-api-python-client: Upgrade 1.7.11 -> 1.9.3 python3-pyperclip: Upgrade 1.7.0 -> 1.8.0 python3-pyhamcrest: Upgrade 1.9.0 -> 2.0.2 python3-pint: Upgrade 0.13 -> 0.14 python3-dbus-next: Upgrade 0.1.2 -> 0.1.3 python3-pybluez: Upgrade 0.22 -> 0.23 python3-stevedore: Upgrade 1.31.0 -> 2.0.1 python3-h5py: Upgrade 2.9.0 -> 2.10.0 python3-cryptography-vectors: Upgrade 2.8 -> 2.9.2 python3-importlib-metadata: Upgrade 1.6.1 -> 1.7.0 python3-websocket-client: Upgrade 0.56.0 -> 0.57.0 python3-sentry-sdk: Upgrade 0.14.0 -> 0.16.0 python3-regex: Upgrade 2020.1.8 -> 2020.6.8 python3-python-vlc: Upgrade 3.0.9113 -> 3.0.10114 python3-robotframework: Upgrade 3.0.4 -> 3.2.1 python3-pychromecast: Upgrade 7.0.1 -> 7.1.0 python3-pyasn1-modules: Consolidate in a single file python3-pyasn1-modules: Upgrade 0.2.7 -> 0.2.8 python3-sympy: Upgrade 1.6 -> 1.6.1 python3-pychromecast: Upgrade 7.1.0 -> 7.1.1 python3-imageio: Upgrade 2.8.0 -> 2.9.0 python3-humanize: Upgrade 2.4.1 -> 2.5.0 python3-tinyrecord: Upgrade 0.1.5 -> 0.2.0 python3-luma-oled: Upgrade 3.4.0 -> 3.5.0 python3-pyconnman: Consolidate in a single file python3-jsonref: Consolidate in a single file Pierre-Jean Texier (4): minicoredumper: update SRC_URI to use github instead tslib: upgrade 1.21 -> 1.22 haveged: upgrade 1.9.9 -> 1.9.13 xxhash: upgrade 0.7.3 -> 0.7.4 Qi.Chen@windriver.com (1): multipath-tools: disable parallel build as a workaround Robert Yang (1): drbd-utils: Add CLEANBROKEN to fix rebuild errors Sakib Sajal (2): python3-betamax: add recipe cunit: add ptest Wang Mingyu (2): nspr: upgrade 4.25 -> 4.26 python3-pytest: upgrade 5.4.2 -> 5.4.3 Zang Ruochen (20): python3-ansicolors: Enable ptest python3-anyjson: Enable ptest python3-atomicwrites: upgrade 1.3.0 -> 1.4.0 python3-backports-functools-lru-cache: Enable ptest python3-bcrypt: Enable ptest nftables: upgrade 0.9.5 -> 0.9.6 ccid: upgrade 1.4.32 -> 1.4.33 docopt.cpp: upgrade 0.6.2 -> 0.6.3 libiio: upgrade 0.20 -> 0.21 librelp: upgrade 1.5.0 -> 1.6.0 redis: upgrade 6.0.4 -> 6.0.5 rsyslog: upgrade 0.2004.0 -> 0.2006.0 libnet-dns-perl: upgrade 1.24 -> 1.25 python3-blinker: Enable ptest python3-cbor2: Enable ptest python3-click: Enable ptest python3-u-msgpack-python: Enable ptest fuse3: Enable ptest sshfs-fuse: Enable ptest python3-wcwidth: Enable ptest Zheng Ruoqin (7): Fix build error when enable multilib. tracker: Fix build error when enable multilib. mraa: Disable python2, otherwise, there is a build error when enable multilib. paho-mqtt-c: Fix build error when enable multilib. upm:Fix build error when enable multilib. python3-unidiff: Enable ptest python3-uritemplate: Enable ptest Signed-off-by: Andrew Geissler Change-Id: I26a4e709d5f1416e73ec42e6dfc0e702dd1079bb --- .../recipes-devtools/python/python3-pybind11_2.5.0.bb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb') diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb new file mode 100644 index 000000000..dc3b8f6ad --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Seamless operability between C++11 and Python" +HOMEPAGE = "https://github.com/wjakob/pybind11" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=beb87117af69fd10fbf9fb14c22a2e62" + +SRC_URI[md5sum] = "5355e1fd05c8eedef19cc9bfd3d82a77" +SRC_URI[sha256sum] = "ea5a4e7a880112915463826f1acbec5892df36dfe102ecb249229ac514fb54ad" + +inherit pypi setuptools3 -- cgit v1.2.3 From 748a483a8f515f7aa0ce999ebeeebed4ed17ae10 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 24 Jul 2020 16:24:21 -0500 Subject: meta-openembedded: subtree update:e93d527a33..76b83194b3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alejandro Enedino Hernandez Samaniego (1): Remmina: Upgrade to 1.4.7 Alistair Francis (1): python3-obd: Add missing setuptools RDEPENDS Andreas Müller (3): xfce4-whiskermenu-plugin: upgrade 2.4.4 -> 2.4.5 xfce4-time-out-plugin: upgrade 1.1.0 -> 1.1.1 graphene: upgrade 1.10.0 -> 1.10.2 Andrej Valek (1): python3-xlsxwriter: add recipe for v 1.2.9 Aníbal Limón (1): recipes-graphics: Add parallel-deqp-runner recipe Armin Kuster (10): python3-flask-babel: update to 1.0.0 and consolidate python3-fastnumbers: Add new package python3-icu: add new package python3-natsort: add new package python3-croniter: Fix missing rdep python3-gmpy2: add new package python3-ecdsa: add package python3-rsa: add new package python3-gnupg: add new package python3-qrcode: add package Changqing Li (2): rsyslog: get alias of syslog back radvd: add /etc/radvd.conf Christian Eggers (2): networkmanager: Package nmcli separately networkmanager: Fix udev dependency Colin McAllister (4): python3-cantools: Added recipe python3-dateparser: Added recipe python3-diskcache: Added recipe python3-bitstruct: Added recipe Dmitry Baryshkov (1): recipes-graphics: add Khronos OpenGL ES and Vulkan CTS recipes Julius Hemanth Pitti (1): netkit-telnetd: Fix buffer overflow in netoprintf Kai Kang (1): python3-pykickstart: 3.22 -> 3.26 Khem Raj (4): ace: Upgrade to 6.5.10 network-manager-applet: Add missing dependency on libgudev memcached: Upgrade to 1.6.6 samba: Fix conflicts with nss.h from glibc Leon Anavi (12): python3-cbor2: Upgrade 5.1.0 -> 5.1.1 python3-psutil: Upgrade 5.7.0 -> 5.7.2 python3-isort: Upgrade 4.3.21 -> 5.1.0 python3-netaddr: Upgrade 0.7.20 -> 0.8.0 python3-bitarray: Upgrade 1.2.2 -> 1.4.1 python3-pymysql: Upgrade 0.9.3 -> 0.10.0 python3-simplejson: Upgrade 3.17.0 -> 3.17.2 python3-isort: Upgrade 5.1.0 -> 5.1.4 python3-stevedore: Upgrade 2.0.1 -> 3.2.0 python3-mock: Upgrade 4.0.1 -> 4.0.2 python3-pychromecast: Upgrade 7.1.1 -> 7.1.2 python3-coverage: Upgrade 5.1 -> 5.2 Matt Hoosier (1): glmark2: don't build full OpenGL backends by default Mingde (Matthew) Zeng (1): net-snmp, openjpeg: add proper CVE tags to patches Mingli Yu (1): freeradius: fix the existed certificate error Ovidiu Panait (1): nss: upgrade 3.51.1 -> 3.54 Philip Balister (1): python3-pybind11: Use cmake to build and add -native version Ryan Rowe (2): python3-packaging: add -native version python3-pint: add setuptools and packaging to RDEPENDS Sakib Sajal (4): python3-mock: add recipe for v4.0.1 python3-pep8: add recipe for v1.7.1 python3-mccabe: add recipe for v0.2.1 python3-requests-toolbelt: add ptest Slater, Joseph (2): lvm2: reproducible binaries toybox-inittab: unpack to S Wang Mingyu (2): python3-idna: upgrade 2.9 -> 2.10 python3-pytz: upgrade 2019.3 -> 2020.1 Zang Ruochen (5): python3-requests-file: Enable ptest python3-semver: Enable ptest python3-smpplib: Enable ptest python3-soupsieve: Enable ptest python3-typeguard: Enable ptest Zheng Ruoqin (3): babeld: upgrade 1.9.1 -> 1.9.2 wireguard-module: upgrade 1.0.20200401 -> 1.0.20200712 wireguard-tools: upgrade 1.0.20200319 -> 1.0.20200513 Signed-off-by: Andrew Geissler Change-Id: I7d02cff7fbd61a6f8e1a96354e169f5f19edf023 --- .../network-manager-applet_1.18.0.bb | 2 +- .../recipes-gnome/graphene/graphene_1.10.0.bb | 19 -- .../recipes-gnome/graphene/graphene_1.10.2.bb | 19 ++ ...-Makefile-fix-the-existed-certificate-err.patch | 55 ++++ .../freeradius/freeradius_3.0.20.bb | 1 + .../networkmanager/networkmanager_1.22.14.bb | 11 +- ...stest.c-Avoid-nss-function-conflicts-with.patch | 96 +++++++ .../recipes-connectivity/samba/samba_4.10.15.bb | 1 + .../recipes-daemons/radvd/files/radvd.conf | 18 ++ .../recipes-daemons/radvd/radvd.inc | 5 +- .../wireguard/wireguard-module_1.0.20200401.bb | 35 --- .../wireguard/wireguard-module_1.0.20200712.bb | 35 +++ .../wireguard/wireguard-tools_1.0.20200319.bb | 25 -- .../wireguard/wireguard-tools_1.0.20200513.bb | 25 ++ ...ility.c-Fix-buffer-overflow-in-netoprintf.patch | 56 +++++ .../netkit-telnet/netkit-telnet_0.17.bb | 1 + .../recipes-protocols/babeld/babeld_1.9.1.bb | 29 --- .../recipes-protocols/babeld/babeld_1.9.2.bb | 29 +++ .../net-snmp/net-snmp/CVE-2019-20892.patch | 4 +- .../0001-Replace-sigignore-with-signal-API.patch | 74 ++++++ .../memcached/memcached-add-hugetlbfs-check.patch | 15 +- .../recipes-support/memcached/memcached_1.5.20.bb | 52 ---- .../recipes-support/memcached/memcached_1.6.6.bb | 52 ++++ .../recipes-benchmark/glmark2/glmark2_git.bb | 6 +- .../meta-oe/recipes-connectivity/ace/ace_6.5.10.bb | 42 ++++ .../meta-oe/recipes-connectivity/ace/ace_6.5.8.bb | 42 ---- .../recipes-connectivity/ace/files/no_sysctl.patch | 22 ++ .../recipes-core/toybox/toybox-inittab_0.8.2.bb | 15 +- .../recipes-extended/rsyslog/rsyslog_8.2006.0.bb | 4 + .../openjpeg/openjpeg/CVE-2020-6851.patch | 4 + .../openjpeg/openjpeg/CVE-2020-8112.patch | 4 + ...build-WORKAROUND-Remove-vulkan-dependency.patch | 42 ++++ .../parallel-deqp-runner_git.bb | 14 ++ .../files/fix-clang-private-operator.patch | 15 ++ .../vk-gl-cts/files/fix-musl.patch | 24 ++ .../recipes-graphics/vk-gl-cts/khronos-cts.inc | 36 +++ .../vk-gl-cts/opengl-es-cts_3.2.6.1.bb | 19 ++ .../vk-gl-cts/vulkan-cts_1.2.3.0.bb | 23 ++ .../lvm2/files/reproducible-build.patch | 24 ++ .../meta-oe/recipes-support/lvm2/lvm2.inc | 2 + .../nss/nss/0001-Enable-uint128-on-mips64.patch | 48 ---- ...a-configure-option-to-disable-ARM-HW-cryp.patch | 22 +- .../nss/0001-nss-fix-support-cross-compiling.patch | 10 +- .../nss/nss/disable-Wvarargs-with-clang.patch | 17 +- .../nss/nss-fix-incorrect-shebang-of-perl.patch | 107 ++++---- .../nss/nss/nss-fix-nsinstall-build.patch | 20 +- .../nss/nss/nss-no-rpath-for-cross-compiling.patch | 10 +- .../recipes-support/nss/nss/pqg.c-ULL_addend.patch | 21 +- .../meta-oe/recipes-support/nss/nss/riscv.patch | 36 --- .../meta-oe/recipes-support/nss/nss_3.51.1.bb | 279 --------------------- .../meta-oe/recipes-support/nss/nss_3.54.bb | 277 ++++++++++++++++++++ .../recipes-support/remmina/remmina_1.4.3.bb | 34 --- .../recipes-support/remmina/remmina_1.4.7.bb | 34 +++ .../recipes-devtools/python/python-flask-babel.inc | 16 -- .../recipes-devtools/python/python-idna.inc | 4 +- .../recipes-devtools/python/python-xlsxwriter.inc | 11 + .../python/python3-bitarray_1.2.2.bb | 11 - .../python/python3-bitarray_1.4.1.bb | 11 + .../python/python3-bitstruct_8.11.0.bb | 14 ++ .../python/python3-cantools_35.1.0.bb | 14 ++ .../recipes-devtools/python/python3-cbor2_5.1.0.bb | 29 --- .../recipes-devtools/python/python3-cbor2_5.1.1.bb | 30 +++ .../python/python3-coverage_5.1.bb | 10 - .../python/python3-coverage_5.2.bb | 10 + .../python/python3-croniter_0.3.34.bb | 2 +- .../python/python3-dateparser_0.7.6.bb | 21 ++ .../python/python3-diskcache_4.1.0.bb | 14 ++ .../recipes-devtools/python/python3-ecdsa_0.15.bb | 13 + .../python/python3-fastnumbers_3.0.0.bb | 9 + .../python/python3-flask-babel_0.12.2.bb | 2 - .../python/python3-flask-babel_1.0.0.bb | 15 ++ .../recipes-devtools/python/python3-gmpy2_2.0.8.bb | 13 + .../recipes-devtools/python/python3-gnupg_0.4.6.bb | 11 + .../python/python3-icu/fix_host_include.patch | 30 +++ .../recipes-devtools/python/python3-icu_2.5.bb | 13 + .../recipes-devtools/python/python3-idna_2.10.bb | 2 + .../recipes-devtools/python/python3-idna_2.9.bb | 2 - .../python/python3-isort_4.3.21.bb | 17 -- .../recipes-devtools/python/python3-isort_5.1.4.bb | 17 ++ .../python/python3-mccabe_0.2.1.bb | 15 ++ .../recipes-devtools/python/python3-mock_4.0.2.bb | 17 ++ .../python/python3-natsort_7.0.1.bb | 11 + .../python/python3-netaddr_0.7.20.bb | 13 - .../python/python3-netaddr_0.8.0.bb | 13 + .../recipes-devtools/python/python3-obd_0.7.1.bb | 2 +- .../python/python3-packaging_20.4.bb | 2 + .../recipes-devtools/python/python3-pep8_1.7.1.bb | 17 ++ .../recipes-devtools/python/python3-pint_0.14.bb | 5 + .../python/python3-psutil_5.7.0.bb | 25 -- .../python/python3-psutil_5.7.2.bb | 26 ++ ...t-check-pointer-size-when-cross-compiling.patch | 30 +++ .../0001-Do-not-strip-binaries.patch | 39 +++ .../python/python3-pybind11_2.5.0.bb | 17 +- .../python/python3-pychromecast_7.1.1.bb | 11 - .../python/python3-pychromecast_7.1.2.bb | 11 + .../python/python3-pymysql_0.10.0.bb | 17 ++ .../python/python3-pymysql_0.9.3.bb | 17 -- .../recipes-devtools/python/python3-pytz_2019.3.bb | 36 --- .../recipes-devtools/python/python3-pytz_2020.1.bb | 36 +++ .../recipes-devtools/python/python3-qrcode_6.1.bb | 11 + .../python/python3-requests-file/run-ptest | 3 + .../python/python3-requests-file_1.5.1.bb | 15 +- .../python/python3-requests-toolbelt/run-ptest | 3 + .../python/python3-requests-toolbelt_0.9.1.bb | 22 +- .../recipes-devtools/python/python3-rsa_3.4.2.bb | 44 ++++ .../python/python3-semver/run-ptest | 3 + .../python/python3-semver_2.10.2.bb | 14 +- .../python/python3-simplejson_3.17.0.bb | 25 -- .../python/python3-simplejson_3.17.2.bb | 25 ++ .../python/python3-smpplib/run-ptest | 3 + .../python/python3-smpplib_2.1.0.bb | 17 +- .../python/python3-soupsieve/run-ptest | 3 + .../python/python3-soupsieve_2.0.1.bb | 16 +- .../python/python3-stevedore_2.0.1.bb | 15 -- .../python/python3-stevedore_3.2.0.bb | 15 ++ .../python/python3-typeguard/run-ptest | 3 + .../python/python3-typeguard_2.9.1.bb | 17 +- .../python/python3-xlsxwriter_1.2.9.bb | 5 + ...0001-support-authentication-for-kickstart.patch | 10 +- .../python-pykickstart/python3-pykickstart_3.22.bb | 25 -- .../python-pykickstart/python3-pykickstart_3.26.bb | 25 ++ .../time-out/xfce4-time-out-plugin_1.1.0.bb | 10 - .../time-out/xfce4-time-out-plugin_1.1.1.bb | 10 + .../whiskermenu/xfce4-whiskermenu-plugin_2.4.4.bb | 11 - .../whiskermenu/xfce4-whiskermenu-plugin_2.4.5.bb | 11 + 125 files changed, 1961 insertions(+), 1013 deletions(-) delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch create mode 100644 meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.conf delete mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb create mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200712.bb delete mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200319.bb create mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb create mode 100644 meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnetd-utility.c-Fix-buffer-overflow-in-netoprintf.patch delete mode 100644 meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/memcached/memcached/0001-Replace-sigignore-with-signal-API.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.5.20.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/ace/files/no_sysctl.patch create mode 100644 meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch create mode 100644 meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch create mode 100644 meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch create mode 100644 meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc create mode 100644 meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/lvm2/files/reproducible-build.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/nss/nss/riscv.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/nss/nss_3.54.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.7.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-xlsxwriter.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.2.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.4.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.11.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_0.7.6.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_4.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.15.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.12.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_1.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-gmpy2_2.0.8.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.6.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-icu/fix_host_include.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.10.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.9.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.21.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.1.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.2.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.7.20.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.8.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.10.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.9.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2019.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2020.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_6.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_3.4.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-semver/run-ptest delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.17.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.17.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve/run-ptest delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_2.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_3.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.2.9.bb delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.26.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.4.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.5.bb (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb') diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb index 60e4c2205..f2bc24ea9 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb @@ -2,7 +2,7 @@ SUMMARY = "GTK+ applet for NetworkManager" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "gtk+3 libnma libnotify libsecret networkmanager iso-codes nss" +DEPENDS = "gtk+3 libnma libnotify libsecret libgudev networkmanager iso-codes nss" GNOMEBASEBUILDCLASS = "meson" inherit features_check gnomebase gsettings gtk-icon-cache gettext diff --git a/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.0.bb deleted file mode 100644 index f715dd23d..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A thin layer of graphic data types" -HOMEPAGE = "http://ebassi.github.io/graphene/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7d871d9e23c450c421a85bb2819f648" - -#DEPENDS = "gtk+3 iso-codes enchant2" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gobject-introspection gtk-doc - -SRC_URI[archive.md5sum] = "07f72436bc7a85d12f5edd9fcedd0184" -SRC_URI[archive.sha256sum] = "406d97f51dd4ca61e91f84666a00c3e976d3e667cd248b76d92fdb35ce876499" - -GTKDOC_MESON_OPTION = "gtk_doc" - -EXTRA_OEMESON = "-Dinstalled_tests=false" - -FILES_${PN} += "${libdir}/graphene-1.0" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.2.bb new file mode 100644 index 000000000..ef1898610 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.2.bb @@ -0,0 +1,19 @@ +SUMMARY = "A thin layer of graphic data types" +HOMEPAGE = "http://ebassi.github.io/graphene/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7d871d9e23c450c421a85bb2819f648" + +#DEPENDS = "gtk+3 iso-codes enchant2" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gobject-introspection gtk-doc + +SRC_URI[archive.md5sum] = "a2c26c4f44a02ca053e0e9afb63cc94c" +SRC_URI[archive.sha256sum] = "e97de8208f1aac4f913d4fa71ab73a7034e807186feb2abe55876e51c425a7f6" + +GTKDOC_MESON_OPTION = "gtk_doc" + +EXTRA_OEMESON = "-Dinstalled_tests=false" + +FILES_${PN} += "${libdir}/graphene-1.0" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch new file mode 100644 index 000000000..669f363e7 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch @@ -0,0 +1,55 @@ +From 084f5467672f2ae37003b77e8f8706772f3da3ec Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Mon, 13 Jul 2020 07:01:45 +0000 +Subject: [PATCH] raddb/certs/Makefile: fix the existed certificate error + +Fixes: + # ./bootstrap + [snip] +openssl ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key 'whatever' -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf +Using configuration from ./client.cnf +Check that the request matches the signature +Signature ok +ERROR:There is already a certificate for /C=FR/ST=Radius/O=Example Inc./CN=user@example.org/emailAddress=user@example.org +The matching entry has the following details +Type :Valid +Expires on :200908024833Z +Serial Number :02 +File name :unknown +Subject Name :/C=FR/ST=Radius/O=Example Inc./CN=user@example.org/emailAddress=user@example.org +make: *** [Makefile:128: client.crt] Error 1 + +Add the check to fix the above error and it does the same for server.crt. + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + raddb/certs/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile +index 5cbfd467ce..77eec9baa1 100644 +--- a/raddb/certs/Makefile ++++ b/raddb/certs/Makefile +@@ -92,7 +92,7 @@ server.csr server.key: server.cnf + chmod g+r server.key + + server.crt: server.csr ca.key ca.pem +- $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in server.csr -key $(PASSWORD_CA) -out server.crt -extensions xpserver_ext -extfile xpextensions -config ./server.cnf ++ @[ -f server.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in server.csr -key $(PASSWORD_CA) -out server.crt -extensions xpserver_ext -extfile xpextensions -config ./server.cnf + + server.p12: server.crt + $(OPENSSL) pkcs12 -export -in server.crt -inkey server.key -out server.p12 -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER) +@@ -117,7 +117,7 @@ client.csr client.key: client.cnf + chmod g+r client.key + + client.crt: client.csr ca.pem ca.key +- $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key $(PASSWORD_CA) -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf ++ @[ -f client.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key $(PASSWORD_CA) -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf + + client.p12: client.crt + $(OPENSSL) pkcs12 -export -in client.crt -inkey client.key -out client.p12 -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) +-- +2.26.2 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb index 005ca47da..d2046d72e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb @@ -27,6 +27,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0 file://freeradius-fix-error-for-expansion-of-macro.patch \ file://0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ file://0001-rlm_python3-add-PY_INC_DIR-in-search-dir.patch \ + file://0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch \ file://radiusd.service \ file://radiusd-volatiles.conf \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb index 5eb2aefa7..4e4217c1f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb @@ -11,7 +11,7 @@ DEPENDS = " \ intltool-native \ libxslt-native \ libnl \ - libgudev \ + udev \ util-linux \ libndp \ libnewt \ @@ -85,6 +85,7 @@ PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no" PACKAGES =+ " \ + ${PN}-nmcli ${PN}-nmcli-doc \ ${PN}-nmtui ${PN}-nmtui-doc \ ${PN}-adsl ${PN}-cloud-setup \ " @@ -134,6 +135,14 @@ FILES_${PN}-dev += " \ ${libdir}/NetworkManager/${PV}/*.la \ " +FILES_${PN}-nmcli = " \ + ${bindir}/nmcli \ +" + +FILES_${PN}-nmcli-doc = " \ + ${mandir}/man1/nmcli* \ +" + FILES_${PN}-nmtui = " \ ${bindir}/nmtui \ ${bindir}/nmtui-edit \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch new file mode 100644 index 000000000..2dbabdaa4 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch @@ -0,0 +1,96 @@ +From 9aba5ac17bb822f91f6b214f5b82dd1eb8c47616 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Jul 2020 22:42:09 -0700 +Subject: [PATCH] nsswitch/nsstest.c: Avoid nss function conflicts with glibc nss.h + +glibc 2.32 will define these varibles [1] which results in conflicts +with these static function names, therefore prefix these function names +with samba_ to avoid it + +[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=499a92df8b9fc64a054cf3b7f728f8967fc1da7d + +Upstream-Status: Submitted [https://gitlab.com/samba-team/samba/-/merge_requests/1477] + +Signed-off-by: Khem Raj +--- + nsswitch/nsstest.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/nsswitch/nsstest.c b/nsswitch/nsstest.c +index 6d92806..46f9679 100644 +--- a/nsswitch/nsstest.c ++++ b/nsswitch/nsstest.c +@@ -137,7 +137,7 @@ static struct passwd *nss_getpwuid(uid_t uid) + return &pwd; + } + +-static void nss_setpwent(void) ++static void samba_nss_setpwent(void) + { + NSS_STATUS (*_nss_setpwent)(void) = + (NSS_STATUS(*)(void))find_fn("setpwent"); +@@ -152,7 +152,7 @@ static void nss_setpwent(void) + } + } + +-static void nss_endpwent(void) ++static void samba_nss_endpwent(void) + { + NSS_STATUS (*_nss_endpwent)(void) = + (NSS_STATUS (*)(void))find_fn("endpwent"); +@@ -284,7 +284,7 @@ again: + return &grp; + } + +-static void nss_setgrent(void) ++static void samba_nss_setgrent(void) + { + NSS_STATUS (*_nss_setgrent)(void) = + (NSS_STATUS (*)(void))find_fn("setgrent"); +@@ -299,7 +299,7 @@ static void nss_setgrent(void) + } + } + +-static void nss_endgrent(void) ++static void samba_nss_endgrent(void) + { + NSS_STATUS (*_nss_endgrent)(void) = + (NSS_STATUS (*)(void))find_fn("endgrent"); +@@ -396,7 +396,7 @@ static void nss_test_users(void) + { + struct passwd *pwd; + +- nss_setpwent(); ++ samba_nss_setpwent(); + /* loop over all users */ + while ((pwd = nss_getpwent())) { + printf("Testing user %s\n", pwd->pw_name); +@@ -418,14 +418,14 @@ static void nss_test_users(void) + printf("initgroups: "); nss_test_initgroups(pwd->pw_name, pwd->pw_gid); + printf("\n"); + } +- nss_endpwent(); ++ samba_nss_endpwent(); + } + + static void nss_test_groups(void) + { + struct group *grp; + +- nss_setgrent(); ++ samba_nss_setgrent(); + /* loop over all groups */ + while ((grp = nss_getgrent())) { + printf("Testing group %s\n", grp->gr_name); +@@ -446,7 +446,7 @@ static void nss_test_groups(void) + printf("getgrgid: "); print_group(grp); + printf("\n"); + } +- nss_endgrent(); ++ samba_nss_endgrent(); + } + + static void nss_test_errors(void) +-- +2.27.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb index 2c74c27fb..01250cb43 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb @@ -27,6 +27,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch \ file://0002-util_sec.c-Move-__thread-variable-to-global-scope.patch \ file://0001-Add-options-to-configure-the-use-of-libbsd.patch \ + file://0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch \ " SRC_URI_append_libc-musl = " \ file://samba-pam.patch \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.conf b/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.conf new file mode 100644 index 000000000..c006f8631 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.conf @@ -0,0 +1,18 @@ +# NOTE: there is no such thing as a working "by-default" configuration file. +# At least the prefix needs to be specified. Please consult the radvd.conf(5) +# man page and/or /usr/share/doc/radvd-*/radvd.conf.example for help. +# +# +#interface eth0 +#{ +# AdvSendAdvert on; +# MinRtrAdvInterval 30; +# MaxRtrAdvInterval 100; +# prefix 2001:db8:1:0::/64 +# { +# AdvOnLink on; +# AdvAutonomous on; +# AdvRouterAddr off; +# }; +# +#}; diff --git a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc index 59a07d78d..802dbe34e 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc +++ b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc @@ -18,7 +18,8 @@ SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ file://radvd.init \ file://radvd.service \ file://volatiles.03_radvd \ - file://radvd.default" + file://radvd.default \ + file://radvd.conf" inherit autotools useradd pkgconfig systemd @@ -52,6 +53,8 @@ do_install_append () { for i in radvd.conf.example README; do \ install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ done + + install -m 0644 ${WORKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf } USERADD_PACKAGES = "${PN}" diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb deleted file mode 100644 index 73199592c..000000000 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb +++ /dev/null @@ -1,35 +0,0 @@ -require wireguard.inc - -SRCREV = "43f57dac7b8305024f83addc533c9eede6509129" - -SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat" - -inherit module kernel-module-split - -DEPENDS = "virtual/kernel libmnl" - -# This module requires Linux 3.10 higher and several networking related -# configuration options. For exact kernel requirements visit: -# https://www.wireguard.io/install/#kernel-requirements - -EXTRA_OEMAKE_append = " \ - KERNELDIR=${STAGING_KERNEL_DIR} \ - " - -MAKE_TARGETS = "module" - -RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" -MODULE_NAME = "wireguard" - -# Kernel module packages MUST begin with 'kernel-module-', otherwise -# multilib image generation can fail. -# -# The following line is only necessary if the recipe name does not begin -# with kernel-module-. -PKG_${PN} = "kernel-module-${MODULE_NAME}" - -module_do_install() { - install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} - install -m 0644 ${MODULE_NAME}.ko \ - ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko -} diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200712.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200712.bb new file mode 100644 index 000000000..bc94e29ea --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200712.bb @@ -0,0 +1,35 @@ +require wireguard.inc + +SRCREV = "d553aa7c52ac78c1963886afb74ba861b0b7b0fc" + +SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat" + +inherit module kernel-module-split + +DEPENDS = "virtual/kernel libmnl" + +# This module requires Linux 3.10 higher and several networking related +# configuration options. For exact kernel requirements visit: +# https://www.wireguard.io/install/#kernel-requirements + +EXTRA_OEMAKE_append = " \ + KERNELDIR=${STAGING_KERNEL_DIR} \ + " + +MAKE_TARGETS = "module" + +RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" +MODULE_NAME = "wireguard" + +# Kernel module packages MUST begin with 'kernel-module-', otherwise +# multilib image generation can fail. +# +# The following line is only necessary if the recipe name does not begin +# with kernel-module-. +PKG_${PN} = "kernel-module-${MODULE_NAME}" + +module_do_install() { + install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} + install -m 0644 ${MODULE_NAME}.ko \ + ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko +} diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200319.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200319.bb deleted file mode 100644 index f698b9a9a..000000000 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200319.bb +++ /dev/null @@ -1,25 +0,0 @@ -require wireguard.inc - -SRCREV = "a8063adc8ae9b4fc9848500e93f94bee8ad2e585" -SRC_URI = "git://git.zx2c4.com/wireguard-tools" - -inherit bash-completion systemd pkgconfig - -DEPENDS += "wireguard-module libmnl" - -do_install () { - oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \ - SYSTEMDUNITDIR="${systemd_unitdir}" \ - WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \ - WITH_BASHCOMPLETION=yes \ - WITH_WGQUICK=yes \ - install -} - -FILES_${PN} = " \ - ${sysconfdir} \ - ${systemd_unitdir} \ - ${bindir} \ -" - -RDEPENDS_${PN} = "wireguard-module bash" diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb new file mode 100644 index 000000000..c24e3438c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20200513.bb @@ -0,0 +1,25 @@ +require wireguard.inc + +SRCREV = "c45d422a93d57f6fdec429640ff7f96b396beed4" +SRC_URI = "git://git.zx2c4.com/wireguard-tools" + +inherit bash-completion systemd pkgconfig + +DEPENDS += "wireguard-module libmnl" + +do_install () { + oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \ + SYSTEMDUNITDIR="${systemd_unitdir}" \ + WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \ + WITH_BASHCOMPLETION=yes \ + WITH_WGQUICK=yes \ + install +} + +FILES_${PN} = " \ + ${sysconfdir} \ + ${systemd_unitdir} \ + ${bindir} \ +" + +RDEPENDS_${PN} = "wireguard-module bash" diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnetd-utility.c-Fix-buffer-overflow-in-netoprintf.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnetd-utility.c-Fix-buffer-overflow-in-netoprintf.patch new file mode 100644 index 000000000..8f983e40a --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnetd-utility.c-Fix-buffer-overflow-in-netoprintf.patch @@ -0,0 +1,56 @@ +From 9c81c8e5bc7782e8ae12c078615abc3c896059f2 Mon Sep 17 00:00:00 2001 +From: Julius Hemanth Pitti +Date: Tue, 14 Jul 2020 22:34:19 -0700 +Subject: [PATCH] telnetd/utility.c: Fix buffer overflow in netoprintf + +As per man page of vsnprintf, when formated +string size is greater than "size"(2nd argument), +then vsnprintf returns size of formated string, +not "size"(2nd argument). + +netoprintf() was not handling a case where +return value of vsnprintf is greater than +"size"(2nd argument), results in buffer overflow +while adjusting "nfrontp" pointer to point +beyond "netobuf" buffer. + +Here is one such case where "nfrontp" +crossed boundaries of "netobuf", and +pointing to another global variable. + +(gdb) p &netobuf[8255] +$5 = 0x55c93afe8b1f "" +(gdb) p nfrontp +$6 = 0x55c93afe8c20 "\377" +(gdb) p &terminaltype +$7 = (char **) 0x55c93afe8c20 +(gdb) + +This resulted in crash of telnetd service +with segmentation fault. + +Though this is DoS security bug, I couldn't +find any CVE ID for this. + +Upstream-Status: Pending + +Signed-off-by: Julius Hemanth Pitti +--- + telnetd/utility.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/telnetd/utility.c b/telnetd/utility.c +index b9a46a6..4811f14 100644 +--- a/telnetd/utility.c ++++ b/telnetd/utility.c +@@ -66,7 +66,7 @@ netoprintf(const char *fmt, ...) + len = vsnprintf(nfrontp, maxsize, fmt, ap); + va_end(ap); + +- if (len<0 || len==maxsize) { ++ if (len<0 || len>=maxsize) { + /* didn't fit */ + netflush(); + } +-- +2.19.1 diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb index 0e92add63..08dd532b6 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb @@ -13,6 +13,7 @@ SRC_URI = "http://ftp.linux.org.uk/pub/linux/Networking/netkit/${BP}.tar.gz \ file://0001-telnet-telnetd-Fix-print-format-strings.patch \ file://0001-telnet-telnetd-Fix-deadlock-on-cleanup.patch \ file://CVE-2020-10188.patch \ + file://0001-telnetd-utility.c-Fix-buffer-overflow-in-netoprintf.patch \ " UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netkit-telnet/" diff --git a/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb b/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb deleted file mode 100644 index 6dd15ad9f..000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Babel is a loop-avoiding distance-vector routing protocol" -DESCRIPTION = "\ -Babel is a loop-avoiding distance-vector routing protocol for IPv6 and \ -IPv4 with fast convergence properties. It is based on the ideas in DSDV, AODV \ -and Cisco's EIGRP, but is designed to work well not only in wired networks \ -but also in wireless mesh networks, and has been extended with support \ -for overlay networks. Babel is in the process of becoming an IETF Standard. \ -" -HOMEPAGE = "https://www.irif.fr/~jch/software/babel/" -SECTION = "net" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" - -SRC_URI = "git://github.com/jech/babeld.git;protocol=git" -SRCREV = "0835d5d894ea016ab7b81562466cade2c51a12d4" - -UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -do_compile () { - oe_runmake babeld -} - -do_install () { - oe_runmake install.minimal PREFIX=${D} -} - diff --git a/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.2.bb b/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.2.bb new file mode 100644 index 000000000..a7d7fc81f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.2.bb @@ -0,0 +1,29 @@ +SUMMARY = "Babel is a loop-avoiding distance-vector routing protocol" +DESCRIPTION = "\ +Babel is a loop-avoiding distance-vector routing protocol for IPv6 and \ +IPv4 with fast convergence properties. It is based on the ideas in DSDV, AODV \ +and Cisco's EIGRP, but is designed to work well not only in wired networks \ +but also in wireless mesh networks, and has been extended with support \ +for overlay networks. Babel is in the process of becoming an IETF Standard. \ +" +HOMEPAGE = "https://www.irif.fr/~jch/software/babel/" +SECTION = "net" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754" + +SRC_URI = "git://github.com/jech/babeld.git;protocol=git" +SRCREV = "a1043879225ac205614259b480d7f577025d8bb0" + +UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +do_compile () { + oe_runmake babeld +} + +do_install () { + oe_runmake install.minimal PREFIX=${D} +} + diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2019-20892.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2019-20892.patch index 3e2637eaa..ec1b6de8f 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2019-20892.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/CVE-2019-20892.patch @@ -8,9 +8,11 @@ This patch fixes https://sourceforge.net/p/net-snmp/bugs/2956/. Upstream-Status: Backport [ak: fixup for 5.8 context, changes to library/snmpusm.h] -CVE:CVE-2019-20892 + +CVE: CVE-2019-20892 Signed-off-by: Armin Kuster +Signed-off-by: Mingde (Matthew) Zeng --- snmplib/snmp_client.c | 22 +++---------- diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0001-Replace-sigignore-with-signal-API.patch b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0001-Replace-sigignore-with-signal-API.patch new file mode 100644 index 000000000..e4aa8fda3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0001-Replace-sigignore-with-signal-API.patch @@ -0,0 +1,74 @@ +From b9040acdba1245f8cdf5e94384830e3d04fde98a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Jul 2020 21:32:14 -0700 +Subject: [PATCH] Replace sigignore with signal API + +sigignore has been deprecated in glibc 2.32+ [1] and eventually it will be +removed, therefore substitute it + +[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=02802fafcf6e11ea3f998f685035ffe568dfddeb + +Upstream-Status: Submitted [https://github.com/memcached/memcached/pull/702] + +Signed-off-by: Khem Raj +--- + configure.ac | 1 - + memcached.c | 16 ++-------------- + 2 files changed, 2 insertions(+), 15 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ffc98b2..4567b30 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -630,7 +630,6 @@ AC_CHECK_FUNCS(mlockall) + AC_CHECK_FUNCS(getpagesizes) + AC_CHECK_FUNCS(sysconf) + AC_CHECK_FUNCS(memcntl) +-AC_CHECK_FUNCS(sigignore) + AC_CHECK_FUNCS(clock_gettime) + AC_CHECK_FUNCS(preadv) + AC_CHECK_FUNCS(pread) +diff --git a/memcached.c b/memcached.c +index 9cb778d..91ced9e 100644 +--- a/memcached.c ++++ b/memcached.c +@@ -8292,18 +8292,6 @@ static void sig_usrhandler(const int sig) { + stop_main_loop = GRACE_STOP; + } + +-#ifndef HAVE_SIGIGNORE +-static int sigignore(int sig) { +- struct sigaction sa = { .sa_handler = SIG_IGN, .sa_flags = 0 }; +- +- if (sigemptyset(&sa.sa_mask) == -1 || sigaction(sig, &sa, 0) == -1) { +- return -1; +- } +- return 0; +-} +-#endif +- +- + /* + * On systems that supports multiple page sizes we may reduce the + * number of TLB-misses by using the biggest available page size +@@ -9996,7 +9984,7 @@ int main (int argc, char **argv) { + /* daemonize if requested */ + /* if we want to ensure our ability to dump core, don't chdir to / */ + if (do_daemonize) { +- if (sigignore(SIGHUP) == -1) { ++ if (signal(SIGHUP, SIG_IGN) == SIG_ERR) { + perror("Failed to ignore SIGHUP"); + } + if (daemonize(maxcore, settings.verbose) == -1) { +@@ -10146,7 +10134,7 @@ int main (int argc, char **argv) { + * ignore SIGPIPE signals; we can use errno == EPIPE if we + * need that information + */ +- if (sigignore(SIGPIPE) == -1) { ++ if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) { + perror("failed to ignore SIGPIPE; sigaction"); + exit(EX_OSERR); + } +-- +2.27.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch index 544b840fe..45428ed23 100644 --- a/meta-openembedded/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch +++ b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch @@ -9,24 +9,19 @@ Signed-off-by: Chong Lu configure.ac | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 7f22f21..21691b9 100644 --- a/configure.ac +++ b/configure.ac -@@ -314,7 +314,12 @@ fi - dnl ---------------------------------------------------------------------------- +@@ -488,8 +488,12 @@ if test "x$enable_static" = "xyes"; then + fi - AC_SEARCH_LIBS(umem_cache_create, umem) --AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs) + dnl ---------------------------------------------------------------------------- +AC_ARG_ENABLE(hugetlbfs, + [AS_HELP_STRING([--enable-hugetlbfs],[Enable hugetlbfs])]) -+ + +-AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs) +if test "x$enable_hugetlbfs" = "xyes"; then + AC_SEARCH_LIBS(gethugepagesizes, hugetlbfs) +fi AC_HEADER_STDBOOL AH_BOTTOM([#if HAVE_STDBOOL_H --- -1.8.3.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.5.20.bb b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.5.20.bb deleted file mode 100644 index feb4f3f14..000000000 --- a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.5.20.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "A high-performance memory object caching system" -DESCRIPTION = "\ - memcached optimizes specific high-load serving applications that are designed \ - to take advantage of its versatile no-locking memory access system. Clients \ - are available in several different programming languages, to suit the needs \ - of the specific application. Traditionally this has been used in mod_perl \ - apps to avoid storing large chunks of data in Apache memory, and to share \ - this burden across several machines." -SECTION = "web" -HOMEPAGE = "http://memcached.org/" -LICENSE = "BSD-3-Clause" - -LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" - -inherit autotools - -DEPENDS += "libevent" -RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \ - perl-module-tie-hash bash \ - " - -SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ - file://memcached-add-hugetlbfs-check.patch \ - " -SRC_URI[md5sum] = "4b64296ea0eeccdee9168c035e0488ab" -SRC_URI[sha256sum] = "cfd7b023a9cefe7ae8a67184f51d841dbbf97994ed0e8a55e31ee092320ea1e4" - -# set the same COMPATIBLE_HOST as libhugetlbfs -COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" - -python __anonymous () { - endianness = d.getVar('SITEINFO_ENDIANNESS') - if endianness == 'le': - d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=little") - else: - d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=big") -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[hugetlbfs] = "--enable-hugetlbfs, --disable-hugetlbfs, libhugetlbfs" - -inherit update-rc.d - -INITSCRIPT_NAME = "memcached" -INITSCRIPT_PARAMS = "defaults" - -do_install_append() { - install -D -m 755 ${S}/scripts/memcached-init ${D}${sysconfdir}/init.d/memcached - mkdir -p ${D}/usr/share/memcached/scripts - install -m 755 ${S}/scripts/memcached-tool ${D}/usr/share/memcached/scripts - install -m 755 ${S}/scripts/start-memcached ${D}/usr/share/memcached/scripts -} diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.6.bb b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.6.bb new file mode 100644 index 000000000..2eb24db9a --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.6.bb @@ -0,0 +1,52 @@ +SUMMARY = "A high-performance memory object caching system" +DESCRIPTION = "\ + memcached optimizes specific high-load serving applications that are designed \ + to take advantage of its versatile no-locking memory access system. Clients \ + are available in several different programming languages, to suit the needs \ + of the specific application. Traditionally this has been used in mod_perl \ + apps to avoid storing large chunks of data in Apache memory, and to share \ + this burden across several machines." +SECTION = "web" +HOMEPAGE = "http://memcached.org/" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" + +inherit autotools + +DEPENDS += "libevent" +RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \ + perl-module-tie-hash bash \ + " + +SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ + file://memcached-add-hugetlbfs-check.patch \ + file://0001-Replace-sigignore-with-signal-API.patch \ + " +SRC_URI[sha256sum] = "908f0eecfa559129c9e44edc46f02e73afe8faca355b4efc5c86d902fc3e32f7" + +# set the same COMPATIBLE_HOST as libhugetlbfs +COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" + +python __anonymous () { + endianness = d.getVar('SITEINFO_ENDIANNESS') + if endianness == 'le': + d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=little") + else: + d.appendVar('EXTRA_OECONF', " ac_cv_c_endian=big") +} + +PACKAGECONFIG ??= "" +PACKAGECONFIG[hugetlbfs] = "--enable-hugetlbfs, --disable-hugetlbfs, libhugetlbfs" + +inherit update-rc.d + +INITSCRIPT_NAME = "memcached" +INITSCRIPT_PARAMS = "defaults" + +do_install_append() { + install -D -m 755 ${S}/scripts/memcached-init ${D}${sysconfdir}/init.d/memcached + mkdir -p ${D}/usr/share/memcached/scripts + install -m 755 ${S}/scripts/memcached-tool ${D}/usr/share/memcached/scripts + install -m 755 ${S}/scripts/start-memcached ${D}/usr/share/memcached/scripts +} diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 6d20bbdaf..82821ad63 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -24,9 +24,9 @@ inherit waf pkgconfig features_check REQUIRED_DISTRO_FEATURES += "opengl" -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gl x11-gles2', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gl wayland-gles2', '', d)} \ - drm-gl drm-gles2" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gles2', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gles2', '', d)} \ + drm-gles2" PACKAGECONFIG[x11-gl] = ",,virtual/libgl virtual/libx11" PACKAGECONFIG[x11-gles2] = ",,virtual/libgles2 virtual/libx11" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb new file mode 100644 index 000000000..df194f95a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb @@ -0,0 +1,42 @@ +SUMMARY = "C++ framework for implementing distributed and networked applications" +DESCRIPTION = "C++ network programming framework that implements many core \ +patterns for concurrent communication software" +LICENSE = "ACE-TAO-CIAO" +HOMEPAGE = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html" +LIC_FILES_CHKSUM = "file://COPYING;md5=d2c090e9c730fd91677782d8e2091d77" + +DEPENDS += "openssl gperf-native" + +SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_10/ACE-${PV}.tar.bz2 \ + file://ace_config.patch \ + file://no_sysctl.patch \ + " + +SRC_URI[sha256sum] = "90de437926928e98e9fd9132c7c3e886ca79f25567adeccbc24a5996f230d8e2" + +COMPATIBLE_HOST_libc-musl = "null" + +S = "${WORKDIR}/ACE_wrappers" +B = "${WORKDIR}/ACE_wrappers/ace" +export ACE_ROOT="${WORKDIR}/ACE_wrappers" + +inherit pkgconfig + +CXXFLAGS_append = " -fpermissive -Wnodeprecated-declarations" + +EXTRA_OEMAKE += "INSTALL_LIB=${baselib}" + +do_install() { + export D="${D}" + oe_runmake install + + for i in $(find ${D} -name "*.pc") ; do + sed -i -e s:${D}::g \ + -e s:/${TARGET_SYS}::g \ + $i + done + + rm -r ${D}/usr/share +} + +UPSTREAM_CHECK_URI = "https://github.com/DOCGroup/ACE_TAO/releases" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb deleted file mode 100644 index e35bce7f3..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.8.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "C++ framework for implementing distributed and networked applications" -DESCRIPTION = "C++ network programming framework that implements many core \ -patterns for concurrent communication software" -LICENSE = "ACE-TAO-CIAO" -HOMEPAGE = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html" -LIC_FILES_CHKSUM = "file://COPYING;md5=96ef88a5529594698e8ceabdd47df92c" - -DEPENDS += "openssl gperf-native" - -SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE-${PV}.tar.bz2 \ - file://ace_config.patch \ - " - -SRC_URI[md5sum] = "a6ba6a944612fe0696c90cbb5c3078ee" -SRC_URI[sha256sum] = "cda2a960dbb9970a907663627711b2e2b14b3484a2859ae936370bcad0b16923" - -COMPATIBLE_HOST_libc-musl = "null" - -S = "${WORKDIR}/ACE_wrappers" -B = "${WORKDIR}/ACE_wrappers/ace" -export ACE_ROOT="${WORKDIR}/ACE_wrappers" - -inherit pkgconfig - -CXXFLAGS_append = " -fpermissive -Wnodeprecated-declarations" - -EXTRA_OEMAKE += "INSTALL_LIB=${baselib}" - -do_install() { - export D="${D}" - oe_runmake install - - for i in $(find ${D} -name "*.pc") ; do - sed -i -e s:${D}::g \ - -e s:/${TARGET_SYS}::g \ - $i - done - - rm -r ${D}/usr/share -} - -UPSTREAM_CHECK_URI = "https://github.com/DOCGroup/ACE_TAO/releases" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/files/no_sysctl.patch b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/no_sysctl.patch new file mode 100644 index 000000000..278893114 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/files/no_sysctl.patch @@ -0,0 +1,22 @@ +glibc >= 2.32 has removed sys/sysctl.h see + +https://sourceware.org/git/?p=glibc.git;a=commit;h=076f09afbac1aa57756faa7a8feadb7936a724e4 + +This check therefore ensures that its only used on linux when glibc has support for it + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- a/ace/config-linux.h ++++ b/ace/config-linux.h +@@ -20,6 +20,10 @@ + + #include "ace/config-linux-common.h" + ++#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 32) ++# define ACE_LACKS_SYS_SYSCTL_H ++#endif ++ + #define ACE_HAS_BYTESEX_H + + #if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb index 9af1e3f14..f82f8e9ce 100644 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb @@ -2,10 +2,12 @@ SUMMARY = "Toybox Inittab Configuration" LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-0-Clause;md5=81eeb0083e31f11ab1e33ded846d521c" +# Unpack to ${S}/orig +# SRC_URI = "\ - file://inittab \ - file://rcK \ - file://rcS \ + file://inittab;subdir=${BP}/orig \ + file://rcK;subdir=${BP}/orig \ + file://rcS;subdir=${BP}/orig \ " PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -15,6 +17,9 @@ RCONFLICTS_${PN} = "\ sysvinit-inittab \ " +# Just being sure. +B = "${S}" + # most users may want to have getty enabled by default PACKAGECONFIG ??= "getty" @@ -26,9 +31,7 @@ do_patch[noexec] = "1" do_configure() { # copy over files now to have a fresh start on each config - for f in inittab rcK rcS; do - cp ${WORKDIR}/$f ${S} - done + cp orig/* . for config in ${PACKAGECONFIG_CONFARGS}; do if [[ ${config} == "enable_getty" ]]; then diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb index ff6699509..524cd9ead 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb @@ -152,6 +152,10 @@ do_install_append() { install -d 0755 ${D}${sysconfdir}/rsyslog.d echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf fi + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + sed -i -e "s#;Requires=syslog.socket#Requires=syslog.socket#g" ${D}${systemd_system_unitdir}/rsyslog.service + sed -i -e "s#;Alias=syslog.service#Alias=syslog.service#g" ${D}${systemd_system_unitdir}/rsyslog.service + fi } FILES_${PN} += "${bindir}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch index 9f2fc901f..1e14149c8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-6851.patch @@ -4,6 +4,10 @@ Date: Sat, 11 Jan 2020 01:51:19 +0100 Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose coordinates are beyond INT_MAX (fixes #1228) +CVE: CVE-2020-6851 + +Signed-off-by: Mingde (Matthew) Zeng + --- src/lib/openjp2/j2k.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch index cb250530e..6158601af 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2020-8112.patch @@ -6,6 +6,10 @@ Subject: [PATCH] opj_tcd_init_tile(): avoid integer overflow That could lead to later assertion failures. Fixes #1231 / CVE-2020-8112 + +CVE: CVE-2020-8112 + +Signed-off-by: Mingde (Matthew) Zeng --- src/lib/openjp2/tcd.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch new file mode 100644 index 000000000..0fedfad13 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch @@ -0,0 +1,42 @@ +From 2b74a5b160c0500291c554ab5c0944f502e72a42 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= +Date: Thu, 9 Jul 2020 20:00:53 +0200 +Subject: [PATCH] meson.build: WORKAROUND Remove vulkan dependency +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We need a patch in the source code to allow enable when DISTRO_FEATURES +contains vulkan. + +Signed-off-by: Aníbal Limón +--- + meson.build | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/meson.build b/meson.build +index db97c26..4c1b865 100644 +--- a/meson.build ++++ b/meson.build +@@ -3,21 +3,15 @@ project('parallel-deqp-runner', ['c', 'cpp'], + cpp = meson.get_compiler('cpp') + + thread_dep = dependency('threads') +-vulkan_dep = dependency('vulkan') + + fs_dep = cpp.find_library('stdc++fs', required : false) + if not fs_dep.found() + fs_dep = cpp.find_library('c++fs') + endif + +- + deqp_runner = executable('deqp-runner', + 'src/deqp-runner.cc', + dependencies : [thread_dep, fs_dep], + install : true) + +-executable('hang-detection', +- 'src/hang_detection.c', +- dependencies: [vulkan_dep]) +- + subdir('test') diff --git a/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb new file mode 100644 index 000000000..4c02cc55a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb @@ -0,0 +1,14 @@ +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4f59d6446bf2e004e80df1a0937129fa" + +SRC_URI = "git://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git;protocol=https \ + file://0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch \ + " + +# Modify these as desired +PV = "2020.06.15+git${SRCPV}" +SRCREV = "e1642fb691d29b1462504b58916f7f514a963e80" + +S = "${WORKDIR}/git" + +inherit pkgconfig meson diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch new file mode 100644 index 000000000..b4573b38b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch @@ -0,0 +1,15 @@ +Index: git/external/glslang/src/glslang/Include/PoolAlloc.h +=================================================================== +--- git.orig/external/glslang/src/glslang/Include/PoolAlloc.h ++++ git/external/glslang/src/glslang/Include/PoolAlloc.h +@@ -240,8 +240,9 @@ protected: + + int numCalls; // just an interesting statistic + size_t totalBytes; // just an interesting statistic +-private: ++public: + TPoolAllocator& operator=(const TPoolAllocator&); // don't allow assignment operator ++private: + TPoolAllocator(const TPoolAllocator&); // don't allow default copy constructor + }; + diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch new file mode 100644 index 000000000..4116ae7d1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch @@ -0,0 +1,24 @@ +Index: git/framework/delibs/dethread/CMakeLists.txt +=================================================================== +--- git.orig/framework/delibs/dethread/CMakeLists.txt ++++ git/framework/delibs/dethread/CMakeLists.txt +@@ -39,6 +39,7 @@ include_directories( + + if (DE_OS_IS_UNIX) + add_definitions(-D_GNU_SOURCE) ++ add_definitions(-D_XOPEN_SOURCE=600) + set(DETHREAD_LIBS ${DETHREAD_LIBS} pthread) + endif () + +Index: git/framework/qphelper/CMakeLists.txt +=================================================================== +--- git.orig/framework/qphelper/CMakeLists.txt ++++ git/framework/qphelper/CMakeLists.txt +@@ -28,6 +28,7 @@ set(QPHELPER_LIBS + if (DE_OS_IS_UNIX OR DE_OS_IS_QNX) + # For vsnprintf() + add_definitions(-D_XOPEN_SOURCE=600) ++ set(QPHELPER_LIBS ${QPHELPER_LIBS} execinfo) + endif () + + if (DE_OS_IS_WIN32 AND DE_COMPILER_IS_MSC) diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc new file mode 100644 index 000000000..bd75cdb1f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -0,0 +1,36 @@ +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "\ + git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;tag=${BPN}-${PV};name=vk-gl-cts \ + git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;branch=main \ + git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang \ + git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers \ + git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools \ + https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ +" + +S = "${WORKDIR}/git" + +SRCREV_FORMAT = "vk-gl-cts" + +S = "${WORKDIR}/git" + +inherit pkgconfig cmake + +DEPENDS += "libpng zlib virtual/libgles2 virtual/egl" + +SRC_URI_append_libc-musl = "\ + file://fix-musl.patch \ +" +DEPENDS_append_libc-musl = " libexecinfo" + +SRC_URI_append_toolchain-clang = "\ + file://fix-clang-private-operator.patch \ +" + +EXTRA_OECMAKE_append = " -DDEQP_TARGET=surfaceless" + +CTSDIR = "/usr/lib/${BPN}" + +FILES_${PN} += "${CTSDIR}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb new file mode 100644 index 000000000..3e336e45c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "OpenGL CTS" + +require khronos-cts.inc + +SRCREV_amber = "d26ee22dd7faab1845a531d410f7ec1db407402a" +SRCREV_glslang = "c538b5d796fb24dd418fdd650c7f76e56bcc3dd8" +SRCREV_spirv-headers = "e4322e3be589e1ddd44afb20ea842a977c1319b8" +SRCREV_spirv-tools = "1eb89172a82b436d8037e8a8c29c80f7e1f7df74" +SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}/${CTSDIR} + cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR} + rm -r ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles + rm -r ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles + rm -r ${D}/${CTSDIR}/common/subgroups/*.a ${D}/${CTSDIR}/common/subgroups/cmake_install.cmake ${D}/${CTSDIR}/common/subgroups/CMakeFiles +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.0.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.0.bb new file mode 100644 index 000000000..77064d4ed --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.3.0.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Vulkan CTS" + +require khronos-cts.inc + +SRCREV_amber = "a40bef4dba98d2d80b48e5a940d8574fbfceb197" +SRCREV_glslang = "b5f003d7a3ece37db45578a8a3140b370036fc64" +SRCREV_spirv-headers = "f8bf11a0253a32375c32cad92c841237b96696c0" +SRCREV_spirv-tools = "d2b486219495594f2e5d0e8d457fc234a3460b3b" +SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" + +S = "${WORKDIR}/git" + +REQUIRED_DISTRO_FEATURES = "vulkan" +inherit features_check + +DEPENDS += " vulkan-loader" + +do_install() { + install -d ${D}/${CTSDIR} + cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/ + rm -r ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles + rm -r ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles +} diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/reproducible-build.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/reproducible-build.patch new file mode 100644 index 000000000..db598a88c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/reproducible-build.patch @@ -0,0 +1,24 @@ +configure.ac: override CONFIGURE_LINE + +For reproducible binaries, we need to report a constant CONFIGURE_LINE. +This patched is only applied for such builds. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Joe Slater + + +--- git.orig/configure.ac ++++ git/configure.ac +@@ -15,7 +15,10 @@ AC_PREREQ(2.69) + ################################################################################ + dnl -- Process this file with autoconf to produce a configure script. + AC_INIT +-CONFIGURE_LINE="$0 $@" ++dnl The default CONFIGURE_LINE has been overridden for reproducible binaries ++dnl CONFIGURE_LINE="$0 $@" ++CONFIGURE_LINE="configure parameters are not available for reproducible builds" ++ + AC_CONFIG_SRCDIR([lib/device/dev-cache.h]) + AC_CONFIG_HEADERS([include/configure.h]) + diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index 01c9df45c..ab618b436 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -15,7 +15,9 @@ SRC_URI = "git://sourceware.org/git/lvm2.git \ file://0001-Avoid-bashisms-in-init-scripts.patch \ file://0005-do-not-build-manual.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ + ${@bb.utils.contains('BUILD_REPRODUCIBLE_BINARIES','1','file://reproducible-build.patch','', d)} \ " + SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch deleted file mode 100644 index 90ec379c6..000000000 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-Enable-uint128-on-mips64.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8cf7afb5417e23cd3ebf8141239bf020f5dd2ac8 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Thu, 30 Apr 2020 06:56:09 +0000 -Subject: [PATCH] Enable uint128 on mips64 - -Fix below error: -| verified/kremlin/kremlib/dist/minimal/FStar_UInt128.h:22:1: error: 'FStar_UInt128___proj__Mkuint128__item__low' declared 'static' but never defined [-Werror=unused-function] -| 22 | FStar_UInt128___proj__Mkuint128__item__low(FStar_UInt128_uint128 projectee); - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu ---- - .../freebl/verified/kremlin/include/kremlin/internal/types.h | 3 ++- - .../kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h b/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -index 801e78f..cdac61e 100644 ---- a/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -+++ b/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -@@ -57,7 +57,8 @@ typedef const char *Prims_string; - typedef __m128i FStar_UInt128_uint128; - #elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ - (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -- (defined(__riscv) && __riscv_xlen == 64)) -+ (defined(__riscv) && __riscv_xlen == 64) || \ -+ defined(__mips64)) - typedef unsigned __int128 FStar_UInt128_uint128; - #else - typedef struct FStar_UInt128_uint128_s { -diff --git a/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h b/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -index f38fda3..7ca67d2 100644 ---- a/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -+++ b/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -@@ -26,7 +26,8 @@ - #include - #if !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ - (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -- (defined(__riscv) && __riscv_xlen == 64)) -+ (defined(__riscv) && __riscv_xlen == 64) || \ -+ defined(__mips64)) - - /* GCC + using native unsigned __int128 support */ - --- -2.24.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index c380c1449..1a87a0577 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -1,4 +1,4 @@ -From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001 +From 8b67c22b057e158f61c9fdd5b01f37195c6f5ca4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 18 Dec 2019 12:29:50 +0100 Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto @@ -8,10 +8,14 @@ prior to armv8 does not. Upstream-Status: Pending Signed-off-by: Alexander Kanavin + --- - nss/lib/freebl/Makefile | 3 +++ - 1 file changed, 3 insertions(+) + nss/lib/freebl/Makefile | 4 ++++ + nss/lib/freebl/gcm.c | 2 ++ + 2 files changed, 6 insertions(+) +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index f99f769..b0ec81b 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile @@ -125,6 +125,9 @@ else @@ -22,9 +26,9 @@ Signed-off-by: Alexander Kanavin +ifdef NSS_USE_ARM_HW_CRYPTO + DEFINES += -DNSS_USE_ARM_HW_CRYPTO ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c -@@ -146,6 +149,7 @@ ifeq ($(CPU_ARCH),arm) + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2 + EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c +@@ -148,6 +151,7 @@ endif endif endif endif @@ -32,9 +36,11 @@ Signed-off-by: Alexander Kanavin ifeq ($(OS_TARGET),OSF1) DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD +diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c +index c2cc18d..b77f573 100644 --- a/nss/lib/freebl/gcm.c +++ b/nss/lib/freebl/gcm.c -@@ -17,6 +17,7 @@ +@@ -18,6 +18,7 @@ #include @@ -42,7 +48,7 @@ Signed-off-by: Alexander Kanavin /* old gcc doesn't support some poly64x2_t intrinsic */ #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -@@ -25,6 +26,7 @@ +@@ -27,6 +28,7 @@ /* We don't test on big endian platform, so disable this on big endian. */ #define USE_ARM_GCM #endif diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch index d5403397e..3d90e2d95 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch @@ -1,4 +1,4 @@ -From 0cf47ee432cc26a706864fcc09b2c3adc342a679 Mon Sep 17 00:00:00 2001 +From 8cea16e7550ae14494fbb3a8fe9f5452e6bd1407 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 22 Feb 2017 11:36:11 +0200 Subject: [PATCH] nss: fix support cross compiling @@ -8,13 +8,14 @@ Let some make variables be assigned from outside makefile. Upstream-Status: Inappropriate [configuration] Signed-off-by: Hongxu Jia Signed-off-by: Alexander Kanavin + --- nss/coreconf/arch.mk | 2 +- nss/lib/freebl/Makefile | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 06c276f..9c1eb51 100644 +index 790372d..2563134 100644 --- a/nss/coreconf/arch.mk +++ b/nss/coreconf/arch.mk @@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) @@ -27,7 +28,7 @@ index 06c276f..9c1eb51 100644 # diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 0ce1425..ebeb411 100644 +index 52d827c..f99f769 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile @@ -36,6 +36,12 @@ ifdef USE_64 @@ -43,6 +44,3 @@ index 0ce1425..ebeb411 100644 ifdef USE_ABI32_FPU DEFINES += -DNSS_USE_ABI32_FPU endif --- -2.11.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch index de812d27b..e87dc9f76 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch @@ -1,3 +1,8 @@ +From c5b2c6327f3692ed07bf8d212123e0bf08485722 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss,nspr: Add recipes + clang 3.9 add this warning to rightly flag undefined behavior, we relegate this to be just a warning instead of error and keep the behavior as it was. Right fix would @@ -18,10 +23,14 @@ for more details Signed-off-by: Khem Raj Upstream-Status: Pending -Index: nss-3.37.1/nss/coreconf/Werror.mk -=================================================================== ---- nss-3.37.1.orig/nss/coreconf/Werror.mk -+++ nss-3.37.1/nss/coreconf/Werror.mk +--- + nss/coreconf/Werror.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nss/coreconf/Werror.mk b/nss/coreconf/Werror.mk +index a569a49..687fe58 100644 +--- a/nss/coreconf/Werror.mk ++++ b/nss/coreconf/Werror.mk @@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS ifdef CC_IS_CLANG # -Qunused-arguments : clang objects to arguments that it doesn't understand diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch index 547594d5b..6f02dbcb4 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch @@ -1,82 +1,56 @@ -nss: fix incorrect shebang of perl +From 028ec9c7e9f7a6f083eec987f3ad7e7623398d9d Mon Sep 17 00:00:00 2001 +From: Ovidiu Panait +Date: Mon, 13 Jul 2020 12:12:31 +0300 +Subject: [PATCH] nss: fix incorrect shebang of perl Replace incorrect shebang of perl with `#!/usr/bin/env perl'. Signed-off-by: Hongxu Jia Upstream-Status: Pending +Signed-off-by: Ovidiu Panait + --- - nss/cmd/smimetools/smime | 2 +- - nss/coreconf/cpdist.pl | 2 +- - nss/coreconf/import.pl | 2 +- - nss/coreconf/jniregen.pl | 2 +- - nss/coreconf/outofdate.pl | 2 +- - nss/coreconf/release.pl | 2 +- - nss/coreconf/version.pl | 2 +- - nss/tests/clean_tbx | 2 +- - nss/tests/path_uniq | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) + nss/cmd/signver/examples/1/form.pl | 2 +- + nss/cmd/signver/examples/1/signedForm.pl | 2 +- + nss/cmd/smimetools/smime | 2 +- + nss/coreconf/version.pl | 2 +- + nss/tests/clean_tbx | 2 +- + nss/tests/iopr/server_scr/client.cgi | 2 +- + nss/tests/path_uniq | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) -diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime ---- a/nss/cmd/smimetools/smime -+++ b/nss/cmd/smimetools/smime +diff --git a/nss/cmd/signver/examples/1/form.pl b/nss/cmd/signver/examples/1/form.pl +index f2cfddc..af58d54 100755 +--- a/nss/cmd/signver/examples/1/form.pl ++++ b/nss/cmd/signver/examples/1/form.pl @@ -1,4 +1,4 @@ --#!/usr/local/bin/perl +-#! /usr/bin/perl +#!/usr/bin/env perl - # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl -index 800edfb..652187f 100755 ---- a/nss/coreconf/cpdist.pl -+++ b/nss/coreconf/cpdist.pl + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +diff --git a/nss/cmd/signver/examples/1/signedForm.pl b/nss/cmd/signver/examples/1/signedForm.pl +index 847814c..64a31ff 100755 +--- a/nss/cmd/signver/examples/1/signedForm.pl ++++ b/nss/cmd/signver/examples/1/signedForm.pl @@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl -index dd2d177..428eaa5 100755 ---- a/nss/coreconf/import.pl -+++ b/nss/coreconf/import.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl -index 2039180..5f4f69c 100755 ---- a/nss/coreconf/jniregen.pl -+++ b/nss/coreconf/jniregen.pl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl +-#! /usr/bin/perl +#!/usr/bin/env perl - # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl -index 33d80bb..01fc097 100755 ---- a/nss/coreconf/outofdate.pl -+++ b/nss/coreconf/outofdate.pl + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime +index e67f6be..6cd85e6 100755 +--- a/nss/cmd/smimetools/smime ++++ b/nss/cmd/smimetools/smime @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/env perl - # - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this -diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl -index 7cde19d..b5df2f6 100755 ---- a/nss/coreconf/release.pl -+++ b/nss/coreconf/release.pl -@@ -1,4 +1,4 @@ --#! /usr/local/bin/perl -+#!/usr/bin/env perl - # + # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl -index d2a4942..79359fe 100644 +index d2a4942..3ba7323 100644 --- a/nss/coreconf/version.pl +++ b/nss/coreconf/version.pl @@ -1,4 +1,4 @@ @@ -86,7 +60,7 @@ index d2a4942..79359fe 100644 # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx -index 4de9555..a7def9f 100755 +index 4de9555..c15a069 100755 --- a/nss/tests/clean_tbx +++ b/nss/tests/clean_tbx @@ -1,4 +1,4 @@ @@ -95,8 +69,18 @@ index 4de9555..a7def9f 100755 ####################################################################### # +diff --git a/nss/tests/iopr/server_scr/client.cgi b/nss/tests/iopr/server_scr/client.cgi +index 581ad06..34ea170 100644 +--- a/nss/tests/iopr/server_scr/client.cgi ++++ b/nss/tests/iopr/server_scr/client.cgi +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/usr/bin/env perl + + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq -index f29f60a..08fbffa 100755 +index f29f60a..850332a 100755 --- a/nss/tests/path_uniq +++ b/nss/tests/path_uniq @@ -1,4 +1,4 @@ @@ -105,6 +89,3 @@ index f29f60a..08fbffa 100755 ######################################################################## # --- -1.8.1.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch index 43c09d13e..fbfa828b2 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch @@ -1,4 +1,7 @@ -Fix nss multilib build on openSUSE 11.x 32bit +From 2701905e689cf7c1ee7ca2d116f20b5bbc146431 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will fail with error: @@ -16,10 +19,15 @@ Upstream-Status: Pending Signed-off-by: Wenzong Fan =================================================== -Index: nss-3.24/nss/coreconf/nsinstall/Makefile -=================================================================== ---- nss-3.24.orig/nss/coreconf/nsinstall/Makefile -+++ nss-3.24/nss/coreconf/nsinstall/Makefile + +--- + nss/coreconf/nsinstall/Makefile | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile +index 08dfbc2..e97fb5f 100644 +--- a/nss/coreconf/nsinstall/Makefile ++++ b/nss/coreconf/nsinstall/Makefile @@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 include $(DEPTH)/coreconf/config.mk @@ -33,4 +41,4 @@ Index: nss-3.24/nss/coreconf/nsinstall/Makefile + ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) PROGRAM = - else + TARGETS = diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch index 7661dc93a..7dbc1a372 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch @@ -1,12 +1,17 @@ -nss:no rpath for cross compiling +From dc51214895bcd63fc8eb8d1fe7941cd3e5500620 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss:no rpath for cross compiling Signed-off-by: Hongxu Jia Upstream-Status: Inappropriate [configuration] + --- nss/cmd/platlibs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +index 6401778..e5c4e16 100644 --- a/nss/cmd/platlibs.mk +++ b/nss/cmd/platlibs.mk @@ -18,9 +18,9 @@ endif @@ -21,6 +26,3 @@ diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk endif endif --- -1.8.1.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch index 3a817faaa..5505ae36a 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch @@ -1,4 +1,8 @@ -nss does not build on mips with clang because wrong types are used? +From a550bdf458f11dff46ebddbac94cf48c27d3471e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 7 Mar 2020 08:34:02 -0800 +Subject: [PATCH] nss does not build on mips with clang because wrong types are + used? pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] if (addend < MP_DIGIT_MAX) { @@ -6,11 +10,16 @@ pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression Signed-off-by: Khem Raj Upstream-Status: Pending -Index: nss-3.37.1/nss/lib/freebl/pqg.c -=================================================================== ---- nss-3.37.1.orig/nss/lib/freebl/pqg.c -+++ nss-3.37.1/nss/lib/freebl/pqg.c -@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_in + +--- + nss/lib/freebl/pqg.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c +index 626b2fb..052ad36 100644 +--- a/nss/lib/freebl/pqg.c ++++ b/nss/lib/freebl/pqg.c +@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H) static SECStatus addToSeed(const SECItem *seed, diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/riscv.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/riscv.patch deleted file mode 100644 index aef91a7c3..000000000 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/riscv.patch +++ /dev/null @@ -1,36 +0,0 @@ -Enable uint128 on riscv64 - -Fixes -| verified/kremlin/kremlib/dist/minimal/LowStar_Endianness.h:29:37: error: 'load128_be' declared 'static' but never defined [-Werror=unused-function] -| 29 | inline static FStar_UInt128_uint128 load128_be(uint8_t *x0); -| | ^~~~~~~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- a/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -+++ b/nss/lib/freebl/verified/kremlin/include/kremlin/internal/types.h -@@ -56,7 +56,8 @@ typedef const char *Prims_string; - #include - typedef __m128i FStar_UInt128_uint128; - #elif !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ -- (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__)) -+ (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -+ (defined(__riscv) && __riscv_xlen == 64)) - typedef unsigned __int128 FStar_UInt128_uint128; - #else - typedef struct FStar_UInt128_uint128_s { ---- a/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -+++ b/nss/lib/freebl/verified/kremlin/kremlib/dist/minimal/fstar_uint128_gcc64.h -@@ -23,9 +23,10 @@ - #include "FStar_UInt128.h" - #include "FStar_UInt_8_16_32_64.h" - #include "LowStar_Endianness.h" -- -+#include - #if !defined(KRML_VERIFIED_UINT128) && !defined(_MSC_VER) && \ -- (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__)) -+ (defined(__x86_64__) || defined(__x86_64) || defined(__aarch64__) || \ -+ (defined(__riscv) && __riscv_xlen == 64)) - - /* GCC + using native unsigned __int128 support */ - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb deleted file mode 100644 index 36e6cd8fc..000000000 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.51.1.bb +++ /dev/null @@ -1,279 +0,0 @@ -SUMMARY = "Mozilla's SSL and TLS implementation" -DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ -designed to support cross-platform development of \ -security-enabled client and server applications. \ -Applications built with NSS can support SSL v2 and v3, \ -TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ -v3 certificates, and other security standards." -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" -SECTION = "libs" - -DEPENDS = "sqlite3 nspr zlib nss-native" -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" - -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" - -LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ - file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" - -VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ - file://nss.pc.in \ - file://signlibs.sh \ - file://0001-nss-fix-support-cross-compiling.patch \ - file://nss-no-rpath-for-cross-compiling.patch \ - file://nss-fix-incorrect-shebang-of-perl.patch \ - file://disable-Wvarargs-with-clang.patch \ - file://pqg.c-ULL_addend.patch \ - file://blank-cert9.db \ - file://blank-key4.db \ - file://system-pkcs11.txt \ - file://nss-fix-nsinstall-build.patch \ - file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - file://riscv.patch \ - file://0001-Enable-uint128-on-mips64.patch \ - " - -SRC_URI[md5sum] = "6acaf1ddff69306ae30a908881c6f233" -SRC_URI[sha256sum] = "085c5eaceef040eddea639e2e068e70f0e368f840327a678ef74ae3d6c15ca78" - -UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" -UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes" - -inherit siteinfo - -TD = "${S}/tentative-dist" -TDS = "${S}/tentative-dist-staging" - -# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a -# which caused -march conflicts in gcc -TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure_prepend_libc-musl () { - sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk -} - -do_compile_prepend_class-native() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr - export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} - export NSS_ENABLE_WERROR=0 -} - -do_compile_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_compile_prepend_class-native() { - # Need to set RPATH so that chrpath will do its job correctly - RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" -} - -do_compile() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - # Additional defines needed on Centos 7 - export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - # We can modify CC in the environment, but if we set it via an - # argument to make, nsinstall, a host program, will also build with it! - # - # nss pretty much does its own thing with CFLAGS, so we put them into CC. - # Optimization will get clobbered, but most of the stuff will survive. - # The motivation for this is to point to the correct place for debug - # source files and CFLAGS does that. Nothing uses CCC. - # - export CC="${CC} ${CFLAGS}" - make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" -} - -do_compile[vardepsexclude] += "SITEINFO_BITS" - -do_install_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_install() { - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - CPU_ARCH=aarch64 - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - make -C ./nss \ - CCC="${CXX}" \ - OS_TEST=${OS_TEST} \ - SOURCE_LIB_DIR="${TD}/${libdir}" \ - SOURCE_BIN_DIR="${TD}/${bindir}" \ - install - - install -d ${D}/${libdir}/ - for file in ${S}/dist/*.OBJ/lib/*.so; do - echo "Installing `basename $file`..." - cp $file ${D}/${libdir}/ - done - - for shared_lib in ${TD}/${libdir}/*.so.*; do - if [ -f $shared_lib ]; then - cp $shared_lib ${D}/${libdir} - ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) - fi - done - for shared_lib in ${TD}/${libdir}/*.so; do - if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then - cp $shared_lib ${D}/${libdir} - fi - done - - install -d ${D}/${includedir}/nss3 - install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* - - install -d ${D}/${bindir} - for binary in ${TD}/${bindir}/*; do - install -m 755 -t ${D}/${bindir} $binary - done -} - -do_install[vardepsexclude] += "SITEINFO_BITS" - -do_install_append() { - # Create empty .chk files for the NSS libraries at build time. They could - # be regenerated at target's boot time. - for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do - touch ${D}/${libdir}/$file - chmod 755 ${D}/${libdir}/$file - done - install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh - - install -d ${D}${libdir}/pkgconfig/ - sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc -} - -do_install_append_class-target() { - # It used to call certutil to create a blank certificate with empty password at - # build time, but the checksum of key4.db changes every time when certutil is called. - # It causes non-determinism issue, so provide databases with a blank certificate - # which are originally from output of nss in qemux86-64 build. You can get these - # databases by: - # certutil -N -d sql:/database/path/ --empty-password - install -d ${D}${sysconfdir}/pki/nssdb/ - install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db - install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db - install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt -} - -PACKAGE_WRITE_DEPS += "nss-native" -pkg_postinst_${PN} () { - if [ -n "$D" ]; then - for I in $D${libdir}/lib*.chk; do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - shlibsign -i $FN - if [ $? -ne 0 ]; then - exit 1 - fi - done - else - signlibs.sh - fi -} - -PACKAGES =+ "${PN}-smime" -FILES_${PN}-smime = "\ - ${bindir}/smime \ -" - -FILES_${PN} = "\ - ${sysconfdir} \ - ${bindir} \ - ${libdir}/lib*.chk \ - ${libdir}/lib*.so \ - " - -FILES_${PN}-dev = "\ - ${libdir}/nss \ - ${libdir}/pkgconfig/* \ - ${includedir}/* \ - " - -RDEPENDS_${PN}-smime = "perl" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.54.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.54.bb new file mode 100644 index 000000000..4923f6868 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.54.bb @@ -0,0 +1,277 @@ +SUMMARY = "Mozilla's SSL and TLS implementation" +DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ +designed to support cross-platform development of \ +security-enabled client and server applications. \ +Applications built with NSS can support SSL v2 and v3, \ +TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ +v3 certificates, and other security standards." +HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" +SECTION = "libs" + +DEPENDS = "sqlite3 nspr zlib nss-native" +DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" + +LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" + +LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ + file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ + file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" + +VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" + +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ + file://nss.pc.in \ + file://signlibs.sh \ + file://0001-nss-fix-support-cross-compiling.patch \ + file://nss-no-rpath-for-cross-compiling.patch \ + file://nss-fix-incorrect-shebang-of-perl.patch \ + file://disable-Wvarargs-with-clang.patch \ + file://pqg.c-ULL_addend.patch \ + file://blank-cert9.db \ + file://blank-key4.db \ + file://system-pkcs11.txt \ + file://nss-fix-nsinstall-build.patch \ + file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ + " + +SRC_URI[sha256sum] = "dab18bbfcf5e347934cda664df75ce9fd912a5772686c40d3c805e53c08d6e43" + +UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" +UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes" + +inherit siteinfo + +TD = "${S}/tentative-dist" +TDS = "${S}/tentative-dist-staging" + +# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a +# which caused -march conflicts in gcc +TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_configure_prepend_libc-musl () { + sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk +} + +do_compile_prepend_class-native() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr + export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} + export NSS_ENABLE_WERROR=0 +} + +do_compile_prepend_class-nativesdk() { + export LDFLAGS="" +} + +do_compile_prepend_class-native() { + # Need to set RPATH so that chrpath will do its job correctly + RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" +} + +do_compile() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr + + export CROSS_COMPILE=1 + export NATIVE_CC="${BUILD_CC}" + # Additional defines needed on Centos 7 + export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" + export BUILD_OPT=1 + + export FREEBL_NO_DEPEND=1 + export FREEBL_LOWHASH=1 + + export LIBDIR=${libdir} + export MOZILLA_CLIENT=1 + export NS_USE_GCC=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + + ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} + + export OS_RELEASE=3.4 + export OS_TARGET=Linux + export OS_ARCH=Linux + + if [ "${TARGET_ARCH}" = "powerpc" ]; then + OS_TEST=ppc + elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + OS_TEST=ppc64 + elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then + OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + OS_TEST="aarch64" + else + OS_TEST="${TARGET_ARCH}" + fi + + if [ "${SITEINFO_BITS}" = "64" ]; then + export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 + fi + + export NSS_DISABLE_GTESTS=1 + + # We can modify CC in the environment, but if we set it via an + # argument to make, nsinstall, a host program, will also build with it! + # + # nss pretty much does its own thing with CFLAGS, so we put them into CC. + # Optimization will get clobbered, but most of the stuff will survive. + # The motivation for this is to point to the correct place for debug + # source files and CFLAGS does that. Nothing uses CCC. + # + export CC="${CC} ${CFLAGS}" + make -C ./nss CCC="${CXX} -g" \ + OS_TEST=${OS_TEST} \ + RPATH="${RPATH}" \ + autobuild +} + +do_compile[vardepsexclude] += "SITEINFO_BITS" + +do_install_prepend_class-nativesdk() { + export LDFLAGS="" +} + +do_install() { + export CROSS_COMPILE=1 + export NATIVE_CC="${BUILD_CC}" + export BUILD_OPT=1 + + export FREEBL_NO_DEPEND=1 + + export LIBDIR=${libdir} + export MOZILLA_CLIENT=1 + export NS_USE_GCC=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + + export OS_RELEASE=3.4 + export OS_TARGET=Linux + export OS_ARCH=Linux + + if [ "${TARGET_ARCH}" = "powerpc" ]; then + OS_TEST=ppc + elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + OS_TEST=ppc64 + elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then + OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + CPU_ARCH=aarch64 + OS_TEST="aarch64" + else + OS_TEST="${TARGET_ARCH}" + fi + if [ "${SITEINFO_BITS}" = "64" ]; then + export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 + fi + + export NSS_DISABLE_GTESTS=1 + + make -C ./nss \ + CCC="${CXX}" \ + OS_TEST=${OS_TEST} \ + SOURCE_LIB_DIR="${TD}/${libdir}" \ + SOURCE_BIN_DIR="${TD}/${bindir}" \ + install + + install -d ${D}/${libdir}/ + for file in ${S}/dist/*.OBJ/lib/*.so; do + echo "Installing `basename $file`..." + cp $file ${D}/${libdir}/ + done + + for shared_lib in ${TD}/${libdir}/*.so.*; do + if [ -f $shared_lib ]; then + cp $shared_lib ${D}/${libdir} + ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) + fi + done + for shared_lib in ${TD}/${libdir}/*.so; do + if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then + cp $shared_lib ${D}/${libdir} + fi + done + + install -d ${D}/${includedir}/nss3 + install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* + + install -d ${D}/${bindir} + for binary in ${TD}/${bindir}/*; do + install -m 755 -t ${D}/${bindir} $binary + done +} + +do_install[vardepsexclude] += "SITEINFO_BITS" + +do_install_append() { + # Create empty .chk files for the NSS libraries at build time. They could + # be regenerated at target's boot time. + for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do + touch ${D}/${libdir}/$file + chmod 755 ${D}/${libdir}/$file + done + install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh + + install -d ${D}${libdir}/pkgconfig/ + sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc +} + +do_install_append_class-target() { + # It used to call certutil to create a blank certificate with empty password at + # build time, but the checksum of key4.db changes every time when certutil is called. + # It causes non-determinism issue, so provide databases with a blank certificate + # which are originally from output of nss in qemux86-64 build. You can get these + # databases by: + # certutil -N -d sql:/database/path/ --empty-password + install -d ${D}${sysconfdir}/pki/nssdb/ + install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db + install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db + install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt +} + +PACKAGE_WRITE_DEPS += "nss-native" +pkg_postinst_${PN} () { + if [ -n "$D" ]; then + for I in $D${libdir}/lib*.chk; do + DN=`dirname $I` + BN=`basename $I .chk` + FN=$DN/$BN.so + shlibsign -i $FN + if [ $? -ne 0 ]; then + exit 1 + fi + done + else + signlibs.sh + fi +} + +PACKAGES =+ "${PN}-smime" +FILES_${PN}-smime = "\ + ${bindir}/smime \ +" + +FILES_${PN} = "\ + ${sysconfdir} \ + ${bindir} \ + ${libdir}/lib*.chk \ + ${libdir}/lib*.so \ + " + +FILES_${PN}-dev = "\ + ${libdir}/nss \ + ${libdir}/pkgconfig/* \ + ${includedir}/* \ + " + +RDEPENDS_${PN}-smime = "perl" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.3.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.3.bb deleted file mode 100644 index 3c93493f7..000000000 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.3.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "A feature rich Remote Desktop Application written in GTK+" -HOMEPAGE = "https://remmina.org" -SECTION = "Support" -LICENSE = "GPLv2 & openssl" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" -DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret libxkbfile" - - -DEPENDS_append_libc-musl = " libexecinfo" -LDFLAGS_append_libc-musl = " -lexecinfo" - -SRC_URI = "https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/Remmina-v${PV}.tar.bz2 \ -" -SRC_URI[sha256sum] = "3ed23be326be0bf3c98428c1b4f4c948c1ded2048bd27f107380e12574797930" - -S = "${WORKDIR}/Remmina-v${PV}" - -inherit cmake features_check mime-xdg -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" - -do_install_append(){ - # We dont need the extra stuff form other desktop environments - rm -rf ${D}/${datadir}/xsessions - rm -rf ${D}/${datadir}/metainfo - rm -rf ${D}/${datadir}/gnome-session -} - -PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" - -RDEPENDS_${PN} = "bash" - -FILES_${PN}_append = " ${datadir}/icons/hicolor/*" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.7.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.7.bb new file mode 100644 index 000000000..661673d6b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.7.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "A feature rich Remote Desktop Application written in GTK+" +HOMEPAGE = "https://remmina.org" +SECTION = "Support" +LICENSE = "GPLv2 & openssl" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" +DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret libxkbfile" + + +DEPENDS_append_libc-musl = " libexecinfo" +LDFLAGS_append_libc-musl = " -lexecinfo" + +SRC_URI = "https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/Remmina-v${PV}.tar.bz2 \ +" +SRC_URI[sha256sum] = "7614d447dc588403aff2ff97b253f46c5f03a6347d024618e84490b8ab4cd87b" + +S = "${WORKDIR}/Remmina-v${PV}" + +inherit cmake features_check mime-xdg +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" + +do_install_append(){ + # We dont need the extra stuff form other desktop environments + rm -rf ${D}/${datadir}/xsessions + rm -rf ${D}/${datadir}/metainfo + rm -rf ${D}/${datadir}/gnome-session +} + +PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" + +RDEPENDS_${PN} = "bash" + +FILES_${PN}_append = " ${datadir}/icons/hicolor/*" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc deleted file mode 100644 index 0e507f337..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "i18n and l10n support for Flask based on babel and pytz" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=51917f3e8e858f5ae295a7d0e2eb3cc9" - -SRC_URI[md5sum] = "fcf2f360ff279d3133e40974804efd72" -SRC_URI[sha256sum] = "316ad183e42003f3922957fa643d0a1e8e34a0f0301a88c3a8f605bc37ba5c86" - -PYPI_PACKAGE = "Flask-Babel" - -inherit pypi - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-speaklater \ - ${PYTHON_PN}-babel \ - ${PYTHON_PN}-flask \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-idna.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-idna.inc index adf26e027..4968f1072 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-idna.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-idna.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/kjd/idna" LICENSE = "BSD-3-Clause & Python-2.0 & Unicode" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=cf36c8682cc154d2d4aa57bd6246b9a1" -SRC_URI[md5sum] = "870b8b80267f00f0faf1b7ba4bdbf14e" -SRC_URI[sha256sum] = "7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb" +SRC_URI[md5sum] = "7a910c706db30d758f377db2762c0f9a" +SRC_URI[sha256sum] = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6" RDEPENDS_${PN}_class-target = "\ ${PYTHON_PN}-codecs \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-xlsxwriter.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-xlsxwriter.inc new file mode 100644 index 000000000..f5d56db00 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-xlsxwriter.inc @@ -0,0 +1,11 @@ +SUMMARY = "Python 2 and 3 compatibility library" +HOMEPAGE = "https://xlsxwriter.readthedocs.io" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0960d52d61b0801760f39463288c2672" + +inherit pypi + +PYPI_PACKAGE = "XlsxWriter" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.2.2.bb deleted file mode 100644 index c495738c4..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.2.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "A high-level Python efficient arrays of booleans -- C extension" -HOMEPAGE = "https://github.com/ilanschnell/bitarray" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=d331e1d54f5e78247388f5416c2ab928" - -SRC_URI[md5sum] = "81c48852b0bc538ac3ed25fae020360c" -SRC_URI[sha256sum] = "27a69ffcee3b868abab3ce8b17c69e02b63e722d4d64ffd91d659f81e9984954" - -inherit setuptools3 pypi - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.4.1.bb new file mode 100644 index 000000000..4866e8464 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.4.1.bb @@ -0,0 +1,11 @@ +SUMMARY = "A high-level Python efficient arrays of booleans -- C extension" +HOMEPAGE = "https://github.com/ilanschnell/bitarray" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" + +SRC_URI[md5sum] = "dfb3fe66ae989e4724747fcb0f704f56" +SRC_URI[sha256sum] = "9e26d3dc7fad932fed66e08da3fcf93dd15e8402aa84e764e1e2a9e1b6ae2b7f" + +inherit setuptools3 pypi + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.11.0.bb new file mode 100644 index 000000000..a25380418 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.11.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "This module performs conversions between Python values and C bit field structs represented as Python byte strings." +HOMEPAGE = "https://github.com/eerimoq/bitstruct" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" + +SRC_URI[md5sum] = "8eaf853c95e10ca4b6bca2fe5ff307c6" +SRC_URI[sha256sum] = "2b13f2c3e76b49e8cd854f7a1da590bb73ecbc6cbfacc2d479eacf2b88282d5d" + +PYPI_PACKAGE = "bitstruct" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.1.0.bb new file mode 100644 index 000000000..a9638fbd2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.1.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "CAN BUS tools in Python 3." +HOMEPAGE = "https://github.com/eerimoq/cantools" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" + +SRC_URI[md5sum] = "46b71bbfec33146d9dbba708489a8ae2" +SRC_URI[sha256sum] = "bd0ac5b16bb7fe2ada0c9436c91a0b3795217bed7126296dde1565919a3f44f1" + +PYPI_PACKAGE = "cantools" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.0.bb deleted file mode 100644 index 812539941..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "An implementation of RFC 7049 - Concise Binary Object Representation (CBOR)." -DEPENDS +="${PYTHON_PN}-setuptools-scm-native" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -SRC_URI[sha256sum] = "43ce11e8c2fe4971d386d1a60cf83bfa0a4a667b97668ba76acbf5e6398821aa" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-unixadmin \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-datetime \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.1.bb new file mode 100644 index 000000000..6b26da2a6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.1.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "An implementation of RFC 7049 - Concise Binary Object Representation (CBOR)." +DEPENDS +="${PYTHON_PN}-setuptools-scm-native" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +SRC_URI[sha256sum] = "09e9607ea50e2ebb718791d475f11620cb244b0cc3758ce2e76cf36e8372ad64" +SRC_URI[md5sum] = "b034d7edfd22c1f98e600aaedbd90f39" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unixadmin \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-datetime \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.1.bb deleted file mode 100644 index 7265d2c97..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Code coverage measurement for Python" -HOMEPAGE = "https://coverage.readthedocs.io" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" - -SRC_URI[md5sum] = "506e30fb011158abe5ce92f39866b271" -SRC_URI[sha256sum] = "f90bfc4ad18450c80b024036eaf91e4a246ae287701aaa88eaebebf150868052" - -inherit pypi setuptools3 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.2.bb new file mode 100644 index 000000000..72558e10c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.2.bb @@ -0,0 +1,10 @@ +SUMMARY = "Code coverage measurement for Python" +HOMEPAGE = "https://coverage.readthedocs.io" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" + +SRC_URI[md5sum] = "bfe80a336636160a3916467f55842bc5" +SRC_URI[sha256sum] = "1874bdc943654ba46d28f179c1846f5710eda3aeb265ff029e0ac2b52daae404" + +inherit pypi setuptools3 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.34.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.34.bb index 0c28948f6..123d17613 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.34.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_0.3.34.bb @@ -9,4 +9,4 @@ SRC_URI[sha256sum] = "7186b9b464f45cf3d3c83a18bc2344cc101d7b9fd35a05f2878437b149 inherit pypi setuptools3 -RDEPENDS_${PN} += " python3-dateutil" +RDEPENDS_${PN} += " python3-dateutil python3-natsort" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_0.7.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_0.7.6.bb new file mode 100644 index 000000000..e4683911e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateparser_0.7.6.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Provides modules to easily parse localized dates in almost any string formats commonly found on web pages" +HOMEPAGE = "https://github.com/scrapinghub/dateparser" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3d3ed25571191e7aa3f55d0a6efe0051" + +SRC_URI[md5sum] = "78b4bf317f9b844631562abad5ce040b" +SRC_URI[sha256sum] = "e875efd8c57c85c2d02b238239878db59ff1971f5a823457fcc69e493bf6ebfa" + +PYPI_PACKAGE = "dateparser" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-dateutil \ + ${PYTHON_PN}-tzlocal \ + ${PYTHON_PN}-ruamel-yaml \ +" + +# Ommitted ${PYTHON_PN}-convertdate, ${PYTHON_PN}-jdatetime ${PYTHON_PN}-umalqurra diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_4.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_4.1.0.bb new file mode 100644 index 000000000..91cff0cd1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_4.1.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Disk Cache -- Disk and file backed persistent cache." +HOMEPAGE = "http://www.grantjenks.com/docs/diskcache/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9e046ce8fae71087134866418f646ec3" + +SRC_URI[md5sum] = "21c9945e7707799e1c64956f8a54d4c3" +SRC_URI[sha256sum] = "bcee5a59f9c264e2809e58d01be6569a3bbb1e36a1e0fb83f7ef9b2075f95ce0" + +PYPI_PACKAGE = "diskcache" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.15.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.15.bb new file mode 100644 index 000000000..aba62f3ef --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ecdsa_0.15.bb @@ -0,0 +1,13 @@ +SUMMARY = "ECDSA cryptographic signature library (pure python)" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=66ffc5e30f76cbb5358fe54b645e5a1d" + +DEPENDS += "python3-pip python3-pbr" + +PYPI_PACKAGE = "ecdsa" +SRC_URI[sha256sum] = "8f12ac317f8a1318efa75757ef0a651abe12e51fc1af8838fb91079445227277" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "python3-six python3-gmpy2 python3-pbr" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.0.0.bb new file mode 100644 index 000000000..b0ecb9d56 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastnumbers_3.0.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Super-fast and clean conversions to numbers." +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f797665cf3d3e0fdc0d488f5200c6f55" + +PYPI_PACKAGE = "fastnumbers" +SRC_URI[sha256sum] = "93ce2f9516fbf2bbf46c85e4abef783cc569e5fbbc665352efb9cdddbae517ec" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.12.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.12.2.bb deleted file mode 100644 index 104e7c28f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.12.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-flask-babel.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_1.0.0.bb new file mode 100644 index 000000000..d968be3ee --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_1.0.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "i18n and l10n support for Flask based on babel and pytz" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=51917f3e8e858f5ae295a7d0e2eb3cc9" + +SRC_URI[sha256sum] = "d6a70468f9a8919d59fba2a291a003da3a05ff884275dddbd965f3b98b09ab3e" + +PYPI_PACKAGE = "Flask-Babel" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-speaklater \ + ${PYTHON_PN}-babel \ + ${PYTHON_PN}-flask \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmpy2_2.0.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmpy2_2.0.8.bb new file mode 100644 index 000000000..c6edcbb32 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmpy2_2.0.8.bb @@ -0,0 +1,13 @@ +SUMMARY = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x" +SECTION = "devel/python" +LICENSE = "GPL-3.0 | LGPL-3.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02" + +DEPENDS += "gmp mpfr libmpc" + +PYPI_PACKAGE = "gmpy2" +PYPI_PACKAGE_EXT = "zip" +SRC_URI[sha256sum] = "dd233e3288b90f21b0bb384bcc7a7e73557bb112ccf0032ad52aa614eb373d3f" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.6.bb new file mode 100644 index 000000000..ff0a91c6f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.6.bb @@ -0,0 +1,11 @@ +SUMMARY = "A wrapper for the Gnu Privacy Guard (GPG or GnuPG)" +SECTION = "devel/python" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b0b7ac63b60085b23fa9f7e1951daa1d" + +PYPI_PACKAGE = "python-gnupg" +SRC_URI[sha256sum] = "3aa0884b3bd414652c2385b9df39e7b87272c2eca1b8fcc3089bc9e58652019a" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "gnupg-gpg" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu/fix_host_include.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu/fix_host_include.patch new file mode 100644 index 000000000..1b6e89043 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu/fix_host_include.patch @@ -0,0 +1,30 @@ +Fixed host contamination of include files + +python3-icu-2.5-r0 do_package_qa: QA Issue: python3-icu: The compile log indicates that host include and/or library paths were used. + +Also, don't use icu-config + +Upstream-Status: [inappropriate] OE specific +Signed-off-by: Armin Kuster + +Index: PyICU-2.5/setup.py +=================================================================== +--- PyICU-2.5.orig/setup.py ++++ PyICU-2.5/setup.py +@@ -81,7 +81,7 @@ Building PyICU %s for ICU %s (max ICU ma + + CONFIGURE_WITH_ICU_CONFIG = { + 'darwin': True, +- 'linux': True, ++ 'linux': False, + 'freebsd': False, # not tested + 'win32': False, # no icu-config + 'sunos5': False, # not tested +@@ -274,7 +274,6 @@ setup(name="PyICU", + ext_modules=[Extension('_icu', + [filename for filename in sorted(os.listdir(os.curdir)) + if filename.endswith('.cpp')], +- include_dirs=_includes, + extra_compile_args=_cflags, + extra_link_args=_lflags, + libraries=_libraries)], diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.5.bb new file mode 100644 index 000000000..5e8c8a3a0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.5.bb @@ -0,0 +1,13 @@ +SUMMARY = "Python extension wrapping the ICU C++ API" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c7c4bfd81a21e3b6368bdcced992bf59" + +DEPENDS += "pkgconfig icu" + +PYPI_PACKAGE = "PyICU" +SRC_URI[sha256sum] = "a120b68c53f769f37bfb70b7e84ca12c3f4ab1e4df43e87a02dff05ae472cdbc" + +SRC_URI += "file://fix_host_include.patch" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.10.bb new file mode 100644 index 000000000..a08ca714a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.10.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-idna.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.9.bb deleted file mode 100644 index a08ca714a..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.9.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-idna.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.21.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.21.bb deleted file mode 100644 index e0b21ab55..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.21.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "A Python utility / library to sort Python imports." -HOMEPAGE = "https://pypi.python.org/pypi/isort" -LICENSE = "MIT" -SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" - -SRC_URI[md5sum] = "05d66f2eb7ce2c2d702e86bac24bf9e4" -SRC_URI[sha256sum] = "54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.1.4.bb new file mode 100644 index 000000000..59ff2ffe1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.1.4.bb @@ -0,0 +1,17 @@ +SUMMARY = "A Python utility / library to sort Python imports." +HOMEPAGE = "https://pypi.python.org/pypi/isort" +LICENSE = "MIT" +SECTION = "devel/python" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=8227180126797a0148f94f483f3e1489" + +SRC_URI[md5sum] = "64d552bbcef48219572cc39649c48fbd" +SRC_URI[sha256sum] = "145072eedc4927cc9c1f9478f2d83b2fc1e6469df4129c02ef4e8c742207a46c" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-shell \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.2.1.bb new file mode 100644 index 000000000..d3a9971e4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.2.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "McCabe checker, plugin for flake8" +HOMEPAGE = "https://github.com/dreamhost/cliff" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.rst;md5=aa0383f6aee4f5c20084a97cd13164c4" + +SRC_URI[md5sum] = "5a3f3fa6a4bad126c88aaaa7dab682f5" +SRC_URI[sha256sum] = "5a2a170e47de5593a6abfae1e9542bd2c3924ac62bbe4e6ed96c953c0352243a" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-prettytable \ + ${PYTHON_PN}-cmd2 \ + ${PYTHON_PN}-pyparsing \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.2.bb new file mode 100644 index 000000000..39ab6d01f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_4.0.2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A Python Mocking and Patching Library for Testing" +HOMEPAGE = "https://pypi.python.org/pypi/mock" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=de9dfbf780446b18aab11f00baaf5b7e" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-prettytable \ + ${PYTHON_PN}-cmd2 \ + ${PYTHON_PN}-pyparsing \ + ${PYTHON_PN}-mccabe \ + ${PYTHON_PN}-pep8 \ + ${PYTHON_PN}-pyflakes" + +SRC_URI[md5sum] = "6466619b89c2969dc57722ad73f85676" +SRC_URI[sha256sum] = "dd33eb70232b6118298d516bbcecd26704689c386594f0f3c4f13867b2c56f72" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.0.1.bb new file mode 100644 index 000000000..e20cdf0fa --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-natsort_7.0.1.bb @@ -0,0 +1,11 @@ +SUMMARY = "Simple yet flexible natural sorting in Python." +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6a96e5ad780a0eea866ecccec4463517" + +PYPI_PACKAGE = "natsort" +SRC_URI[sha256sum] = "a633464dc3a22b305df0f27abcb3e83515898aa1fd0ed2f9726c3571a27258cf" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "python3-fastnumbers python3-icu" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.7.20.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.7.20.bb deleted file mode 100644 index bc7598c46..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.7.20.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "A network address manipulation library for Python." -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e6345d695ffe3776f68a56fe7962db44" - -SRC_URI[md5sum] = "f254d6b61e07123f9e2643b1dcbd03df" -SRC_URI[sha256sum] = "d09252e5aec3913815d77eb8e8ea8fa6eb33521253e52f977f6abaa964776f3e" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-xml \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.8.0.bb new file mode 100644 index 000000000..a120b24f1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.8.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "A network address manipulation library for Python." +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e6345d695ffe3776f68a56fe7962db44" + +SRC_URI[md5sum] = "34cad578473b66ad77bc3b2a7613ed4a" +SRC_URI[sha256sum] = "d6cc57c7a07b1d9d2e917aa8b36ae8ce61c35ba3fcd1b83ca31c5a0ee2b5a243" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-xml \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb index eb8a5a747..8f17068a4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-obd_0.7.1.bb @@ -7,4 +7,4 @@ SRC_URI[sha256sum] = "8b81ea5896157b6e861af12e173c10b001cb6cca6ebb04db2c01d32681 inherit setuptools3 pypi -RDEPENDS_${PN} += "${PYTHON_PN}-pyserial ${PYTHON_PN}-pint ${PYTHON_PN}-setuptools" +RDEPENDS_${PN} += "${PYTHON_PN}-pyserial ${PYTHON_PN}-pint ${PYTHON_PN}-setuptools ${PYTHON_PN}-packaging" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_20.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_20.4.bb index 0f78fd016..c75707e69 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_20.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_20.4.bb @@ -8,5 +8,7 @@ SRC_URI[sha256sum] = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d55 inherit pypi setuptools3 +BBCLASSEXTEND = "native" + DEPENDS += "${PYTHON_PN}-setuptools-scm-native" RDEPENDS_${PN} += "${PYTHON_PN}-six ${PYTHON_PN}-pyparsing" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb new file mode 100644 index 000000000..8291281ca --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Python style guide checker" +HOMEPAGE = "https://github.com/dreamhost/cliff" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.rst;md5=d8ebbbe831259ce010179d2f310b0f3e" + +SRC_URI[md5sum] = "a03bb494859e87b42601b61b1b043a0c" +SRC_URI[sha256sum] = "603a46e5c358ce20ac4807a0eeafac7505d1125a4c1bd8378757ada06f61bed8" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-prettytable \ + ${PYTHON_PN}-cmd2 \ + ${PYTHON_PN}-pyparsing" + +SRC_URI[md5sum] = "603821d06db945c71d811b5a8d78423c" +SRC_URI[sha256sum] = "fe249b52e20498e59e0b5c5256aa52ee99fc295b26ec9eaa85776ffdb9fe6374" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.14.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.14.bb index 8e1630476..333b015a9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.14.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.14.bb @@ -21,6 +21,11 @@ SRC_URI += " \ file://run-ptest \ " +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-packaging \ +" + RDEPENDS_${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.0.bb deleted file mode 100644 index 170819d59..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "A cross-platform process and system utilities module for Python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e35fd9f271d19d5f742f20a9d1f8bb8b" - -SRC_URI[md5sum] = "ed7b0f11ed214bcabbe76b7cf52f3ae3" -SRC_URI[sha256sum] = "685ec16ca14d079455892f25bd124df26ff9137664af445563c1bd36629b5e0e" - -inherit pypi setuptools3 - -PACKAGES =+ "${PN}-tests" - -FILES_${PN}-tests += " \ - ${PYTHON_SITEPACKAGES_DIR}/psutil/test* \ - ${PYTHON_SITEPACKAGES_DIR}/psutil/__pycache__/test* \ -" - - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-xml \ - ${PYTHON_PN}-netclient \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.2.bb new file mode 100644 index 000000000..d61d501e9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.7.2.bb @@ -0,0 +1,26 @@ +SUMMARY = "A cross-platform process and system utilities module for Python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e35fd9f271d19d5f742f20a9d1f8bb8b" + +PYPI_SRC_URI = "https://files.pythonhosted.org/packages/aa/3e/d18f2c04cf2b528e18515999b0c8e698c136db78f62df34eee89cee205f1/psutil-${PV}.tar.gz" +SRC_URI[md5sum] = "50bf39b4faa268ba1da8a9730bb38bb6" +SRC_URI[sha256sum] = "90990af1c3c67195c44c9a889184f84f5b2320dce3ee3acbd054e3ba0b4a7beb" + +inherit pypi setuptools3 + +PACKAGES =+ "${PN}-tests" + +FILES_${PN}-tests += " \ + ${PYTHON_SITEPACKAGES_DIR}/psutil/test* \ + ${PYTHON_SITEPACKAGES_DIR}/psutil/__pycache__/test* \ +" + + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-xml \ + ${PYTHON_PN}-netclient \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch new file mode 100644 index 000000000..6455c95e7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-check-pointer-size-when-cross-compiling.patch @@ -0,0 +1,30 @@ +From 3abfa65517959ad279481021fafefba28f955e76 Mon Sep 17 00:00:00 2001 +From: Philip Balister +Date: Fri, 10 Jul 2020 10:14:59 -0400 +Subject: [PATCH] Do not check pointer size when cross compiling. + +It is reasonable to build for 32 machine on a 64 bit build machine. Prevents: +| CMake Error at tools/FindPythonLibsNew.cmake:127 (message): +| Python config failure: Python is 64-bit, chosen compiler is 32-bit + +Signed-off-by: Philip Balister +--- + tools/FindPythonLibsNew.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/FindPythonLibsNew.cmake b/tools/FindPythonLibsNew.cmake +index d0c8fa2..8479e70 100644 +--- a/tools/FindPythonLibsNew.cmake ++++ b/tools/FindPythonLibsNew.cmake +@@ -123,7 +123,7 @@ list(GET _PYTHON_VALUES 9 PYTHON_MULTIARCH) + + # Make sure the Python has the same pointer-size as the chosen compiler + # Skip if CMAKE_SIZEOF_VOID_P is not defined +-if(CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}")) ++if((NOT CMAKE_CROSSCOMPILING) AND CMAKE_SIZEOF_VOID_P AND (NOT "${PYTHON_SIZEOF_VOID_P}" STREQUAL "${CMAKE_SIZEOF_VOID_P}")) + if(PythonLibsNew_FIND_REQUIRED) + math(EXPR _PYTHON_BITS "${PYTHON_SIZEOF_VOID_P} * 8") + math(EXPR _CMAKE_BITS "${CMAKE_SIZEOF_VOID_P} * 8") +-- +2.25.4 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch new file mode 100644 index 000000000..07ab9a03b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch @@ -0,0 +1,39 @@ +From 918f3ef01c7a67f3beb67307966698474f144581 Mon Sep 17 00:00:00 2001 +From: Philip Balister +Date: Wed, 8 Jul 2020 09:41:43 -0400 +Subject: [PATCH] Do not strip binaries. + + * OpenEmbedded strips them after creating debug packages. + +Signed-off-by: Philip Balister +--- + tools/pybind11Tools.cmake | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/tools/pybind11Tools.cmake b/tools/pybind11Tools.cmake +index a3603ab..b4c8f63 100644 +--- a/tools/pybind11Tools.cmake ++++ b/tools/pybind11Tools.cmake +@@ -230,19 +230,6 @@ function(pybind11_add_module target_name) + + _pybind11_add_lto_flags(${target_name} ${ARG_THIN_LTO}) + +- if (NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo) +- # Strip unnecessary sections of the binary on Linux/Mac OS +- if(CMAKE_STRIP) +- if(APPLE) +- add_custom_command(TARGET ${target_name} POST_BUILD +- COMMAND ${CMAKE_STRIP} -x $) +- else() +- add_custom_command(TARGET ${target_name} POST_BUILD +- COMMAND ${CMAKE_STRIP} $) +- endif() +- endif() +- endif() +- + if(MSVC) + # /MP enables multithreaded builds (relevant when there are many files), /bigobj is + # needed for bigger binding projects due to the limit to 64k addressable sections +-- +2.25.4 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb index dc3b8f6ad..46bba8d8d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb @@ -3,7 +3,18 @@ HOMEPAGE = "https://github.com/wjakob/pybind11" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=beb87117af69fd10fbf9fb14c22a2e62" -SRC_URI[md5sum] = "5355e1fd05c8eedef19cc9bfd3d82a77" -SRC_URI[sha256sum] = "ea5a4e7a880112915463826f1acbec5892df36dfe102ecb249229ac514fb54ad" +DEPENDS = "boost" -inherit pypi setuptools3 +SRC_URI = "git://github.com/pybind/pybind11.git \ + file://0001-Do-not-strip-binaries.patch \ + file://0001-Do-not-check-pointer-size-when-cross-compiling.patch \ + " +SRCREV = "3b1dbebabc801c9cf6f0953a4c20b904d444f879" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" + +EXTRA_OECMAKE = "-DPYBIND11_TEST=OFF" + +inherit cmake python3native diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.1.bb deleted file mode 100644 index 3da979c0f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." -HOMEPAGE = "https://github.com/balloob/pychromecast" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" - -SRC_URI[md5sum] = "897e7acd6ac2c01f3df2e2d6b2e13c11" -SRC_URI[sha256sum] = "87fa9ad42425edd21e02a9240669e5763e52d975ee259a948a6fe07e6ab977b9" - -PYPI_PACKAGE = "PyChromecast" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.2.bb new file mode 100644 index 000000000..98dbf33b2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.2.bb @@ -0,0 +1,11 @@ +SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." +HOMEPAGE = "https://github.com/balloob/pychromecast" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" + +SRC_URI[md5sum] = "6ca5102b09009c85424a9ab628005992" +SRC_URI[sha256sum] = "adcf478d7fc539e9decde59b2db7b6a4b1d679c4cf78d515d880adb1c4bc1c30" + +PYPI_PACKAGE = "PyChromecast" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.10.0.bb new file mode 100644 index 000000000..895c47b03 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.10.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "A pure-Python MySQL client library" +DESCRIPTION = " \ + This package contains a pure-Python MySQL client library, based on PEP 249 \ + Most public APIs are compatible with mysqlclient and MySQLdb. \ + " +SECTION = "devel/python" +HOMEPAGE = "https://pymysql.readthedocs.io" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=528175c84163bb800d23ad835c7fa0fc" + +SRC_URI[md5sum] = "d08058b1592724d5808c43f56050f245" +SRC_URI[sha256sum] = "e14070bc84e050e0f80bf6063e31d276f03a0bb4d46b9eca2854566c4ae19837" + +PYPI_PACKAGE = "PyMySQL" +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-cryptography" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.9.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.9.3.bb deleted file mode 100644 index 6a64ccb16..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_0.9.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "A pure-Python MySQL client library" -DESCRIPTION = " \ - This package contains a pure-Python MySQL client library, based on PEP 249 \ - Most public APIs are compatible with mysqlclient and MySQLdb. \ - " -SECTION = "devel/python" -HOMEPAGE = "https://pymysql.readthedocs.io" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=528175c84163bb800d23ad835c7fa0fc" - -SRC_URI[md5sum] = "e5d9183cc0a775ac29f9e0365cca6556" -SRC_URI[sha256sum] = "d8c059dcd81dedb85a9f034d5e22dcb4442c0b201908bede99e306d65ea7c8e7" - -PYPI_PACKAGE = "PyMySQL" -inherit pypi setuptools3 - -RDEPENDS_${PN} += "${PYTHON_PN}-cryptography" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2019.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2019.3.bb deleted file mode 100644 index c28a0148b..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2019.3.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "World timezone definitions, modern and historical" -HOMEPAGE = "http://pythonhosted.org/pytz" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4878a915709225bceab739bdc2a18e8d" - -inherit pypi setuptools3 ptest - -SRC_URI[md5sum] = "c3d84a465fc56a4edd52cca8873ac0df" -SRC_URI[sha256sum] = "b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be" - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-threading \ -" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/pytz - install -d ${D}${PTEST_PATH}/pytz/tests - cp -rf ${S}/pytz/tests/* ${D}${PTEST_PATH}/pytz/tests/ - cp -f ${S}/README.txt ${D}${PTEST_PATH}/ - -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2020.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2020.1.bb new file mode 100644 index 000000000..198626311 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2020.1.bb @@ -0,0 +1,36 @@ +SUMMARY = "World timezone definitions, modern and historical" +HOMEPAGE = "http://pythonhosted.org/pytz" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a67fc46c1b596cce5d21209bbe75999" + +inherit pypi setuptools3 ptest + +SRC_URI[md5sum] = "0349106ac02f2bfe565dd6d5594e3a15" +SRC_URI[sha256sum] = "c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048" + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-doctest \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-threading \ +" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/pytz + install -d ${D}${PTEST_PATH}/pytz/tests + cp -rf ${S}/pytz/tests/* ${D}${PTEST_PATH}/pytz/tests/ + cp -f ${S}/README.rst ${D}${PTEST_PATH}/ + +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_6.1.bb new file mode 100644 index 000000000..df99d403d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_6.1.bb @@ -0,0 +1,11 @@ +SUMMARY = "QR Code image generator" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4b802d2a65df4626623c79757f486af9" + +PYPI_PACKAGE = "qrcode" +SRC_URI[sha256sum] = "505253854f607f2abf4d16092c61d4e9d511a3b4392e60bff957a68592b04369" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "python3-six python3-pillow" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb index 1c8bba40d..88915b8fb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb @@ -6,7 +6,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9cc728d6087e43796227b0a31422de6b" SRC_URI[md5sum] = "c96daf6b0c56687556e8a52748fd896c" SRC_URI[sha256sum] = "07d74208d3389d01c38ab89ef403af0cfec63957d53a0081d8eca738d0247d8e" -inherit pypi setuptools3 +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} RDEPENDS_${PN} += " \ python3-requests \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt_0.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt_0.9.1.bb index 3beb39718..cb1bc607b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt_0.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt_0.9.1.bb @@ -5,12 +5,30 @@ AUTHOR = "Ian Cordasco, Cory Benfield" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=71760e0f1dda8cff91b0bc9246caf571" +SRC_URI = "file://run-ptest \ + " + SRC_URI[md5sum] = "b1509735c4b4cf95df2619facbc3672e" SRC_URI[sha256sum] = "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0" -inherit setuptools3 -inherit pypi +inherit pypi setuptools3 ptest RDEPENDS_${PN} += " \ ${PYTHON_PN}-requests (>=2.0.1) \ " + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-betamax \ + ${PYTHON_PN}-mock \ + ${PYTHON_PN}-multiprocessing \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/setup.py ${D}${PTEST_PATH} + # remove test test_multipart_encoder.py as it fails, + # downloaded file is not supported + rm -f ${D}${PTEST_PATH}/tests/test_multipart_encoder.py +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_3.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_3.4.2.bb new file mode 100644 index 000000000..759214fa3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_3.4.2.bb @@ -0,0 +1,44 @@ +SUMMARY = "Pure-Python RSA implementation" +SECTION = "devel/python" +AUTHOR = "Sybren A. Stuvel" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c403f6882d4f97a9cd927df987d55634" + +SRC_URI[sha256sum] = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5" + +inherit pypi setuptools3 update-alternatives + +ALTERNATIVE_${PN} = "\ + pyrsa-decrypt \ + pyrsa-decrypt-bigfile \ + pyrsa-encrypt \ + pyrsa-encrypt-bigfile \ + pyrsa-keygen \ + pyrsa-priv2pub \ + pyrsa-sign \ + pyrsa-verify \ +" + +ALTERNATIVE_LINK_NAME[pyrsa-decrypt] = "${bindir}/pyrsa-decrypt" +ALTERNATIVE_LINK_NAME[pyrsa-decrypt-bigfile] = "${bindir}/pyrsa-decrypt-bigfile" +ALTERNATIVE_LINK_NAME[pyrsa-encrypt] = "${bindir}/pyrsa-encrypt" +ALTERNATIVE_LINK_NAME[pyrsa-encrypt-bigfile] = "${bindir}/pyrsa-encrypt-bigfile" +ALTERNATIVE_LINK_NAME[pyrsa-keygen] = "${bindir}/pyrsa-keygen" +ALTERNATIVE_LINK_NAME[pyrsa-priv2pub] = "${bindir}/pyrsa-priv2pub" +ALTERNATIVE_LINK_NAME[pyrsa-sign] = "${bindir}/pyrsa-sign" +ALTERNATIVE_LINK_NAME[pyrsa-verify] = "${bindir}/pyrsa-verify" +ALTERNATIVE_PRIORITY = "30" + + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-doctest \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-pickle \ +" + +RDEPENDS_${PN} += "${PYTHON_PN}-pyasn1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-semver/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver/run-ptest new file mode 100644 index 000000000..43c03b594 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO test_semver.py --disable-warnings| sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_2.10.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_2.10.2.bb index b41ef5ddc..71cb1acec 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_2.10.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_2.10.2.bb @@ -7,6 +7,18 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665 SRC_URI[md5sum] = "3e11ae9782121e8ffe9f8a8b763a8cb5" SRC_URI[sha256sum] = "c0a4a9d1e45557297a722ee9bac3de2ec2ea79016b6ffcaca609b0bc62cf4276" -inherit pypi setuptools3 +inherit pypi setuptools3 ptest BBCLASSEXTEND = "native nativesdk" + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + cp -f ${S}/test_semver.py ${D}${PTEST_PATH}/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.17.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.17.0.bb deleted file mode 100644 index b76ae5299..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.17.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Simple, fast, extensible JSON encoder/decoder for Python" -HOMEPAGE = "http://cheeseshop.python.org/pypi/simplejson" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c6338d7abd321c0b50a2a547e441c52e" - -SRC_URI[md5sum] = "8a5ed75c367b90fedc3d685742e2a1c7" -SRC_URI[sha256sum] = "2b4b2b738b3b99819a17feaf118265d0753d5536049ea570b3c43b51c4701e81" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-numbers \ -" - -PACKAGES =+ "${PN}-tests" -RDEPENDS_${PN}-tests = "${PN} ${PYTHON_PN}-unittest" -FILES_${PN}-tests+= " \ - ${PYTHON_SITEPACKAGES_DIR}/simplejson/tests \ - ${PYTHON_SITEPACKAGES_DIR}/simplejson/tool.py* \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.17.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.17.2.bb new file mode 100644 index 000000000..cab0da6a1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.17.2.bb @@ -0,0 +1,25 @@ +SUMMARY = "Simple, fast, extensible JSON encoder/decoder for Python" +HOMEPAGE = "http://cheeseshop.python.org/pypi/simplejson" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c6338d7abd321c0b50a2a547e441c52e" + +SRC_URI[md5sum] = "27fba3bc75a32318bd3b163b8a31aa7e" +SRC_URI[sha256sum] = "75ecc79f26d99222a084fbdd1ce5aad3ac3a8bd535cd9059528452da38b68841" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-numbers \ +" + +PACKAGES =+ "${PN}-tests" +RDEPENDS_${PN}-tests = "${PN} ${PYTHON_PN}-unittest" +FILES_${PN}-tests+= " \ + ${PYTHON_SITEPACKAGES_DIR}/simplejson/tests \ + ${PYTHON_SITEPACKAGES_DIR}/simplejson/tool.py* \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.1.0.bb index 948af58aa..15b326bad 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.1.0.bb @@ -6,4 +6,19 @@ LIC_FILES_CHKSUM = "file://README.md;md5=56a03d0ce7e492d4b9487b8aae957efe" PYPI_PACKAGE = "smpplib" SRC_URI[sha256sum] = "df4139a279b35fbb42a58f2a254a9c6daf362b04a7f94e208dc120e0b8a3fd4b" -inherit pypi setuptools3 +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + sed -i 's/mock/unittest.mock/g' ${D}${PTEST_PATH}/tests/* +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.0.1.bb index aa087c920..ae242af56 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.0.1.bb @@ -7,6 +7,20 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5a6fd3b0c24fc5a041a3d1bbb22c81b5" SRC_URI[md5sum] = "62a7481c7dbf6d8cc21e4e3a79c72034" SRC_URI[sha256sum] = "a59dc181727e95d25f781f0eb4fd1825ff45590ec8ff49eadfd7f1a537cc0232" -inherit pypi setuptools3 +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-beautifulsoup4 \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_2.0.1.bb deleted file mode 100644 index cf388fa7c..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_2.0.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Manage dynamic plugins for Python applications" -HOMEPAGE = "https://docs.openstack.org/stevedore/latest/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI[md5sum] = "d0f137ec4fe5d98978970671a860882d" -SRC_URI[sha256sum] = "609912b87df5ad338ff8e44d13eaad4f4170a65b79ae9cb0aa5632598994a1b7" - -DEPENDS += "${PYTHON_PN}-pbr-native" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "${PYTHON_PN}-pbr ${PYTHON_PN}-six" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_3.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_3.2.0.bb new file mode 100644 index 000000000..0a2bffdcc --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_3.2.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Manage dynamic plugins for Python applications" +HOMEPAGE = "https://docs.openstack.org/stevedore/latest/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI[md5sum] = "6a39764d7aecc63a0990cf4635cb430d" +SRC_URI[sha256sum] = "38791aa5bed922b0a844513c5f9ed37774b68edc609e5ab8ab8d8fe0ce4315e5" + +DEPENDS += "${PYTHON_PN}-pbr-native" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-pbr ${PYTHON_PN}-six" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.9.1.bb index a0167cf03..3786ccb85 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.9.1.bb @@ -6,7 +6,22 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f0e423eea5c91e7aa21bdb70184b3e53" SRC_URI[md5sum] = "411df8eefd76ffa014328a46342bdf38" SRC_URI[sha256sum] = "529ef3d88189cc457f4340388028412f71be8091c2c943465146d4170fb67288" -inherit pypi setuptools3 +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-typing-extensions \ + ${PYTHON_PN}-unixadmin \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} DEPENDS += "\ python3-distutils-extra-native \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.2.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.2.9.bb new file mode 100644 index 000000000..cba856143 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.2.9.bb @@ -0,0 +1,5 @@ +inherit setuptools3 +require python-xlsxwriter.inc + +SRC_URI[md5sum] = "20f8b7df7f1705fa2f7ac3f84789d2ca" +SRC_URI[sha256sum] = "828b3285fc95105f5b1946a6a015b31cf388bd5378fdc6604e4d1b7839df2e77" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch index e7533f476..0e64ce420 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch @@ -32,10 +32,10 @@ index bf08ac5..aada7aa 100644 And some warning classes: KickstartWarning - A generic warning class. -@@ -131,3 +134,17 @@ class KickstartDeprecationWarning(KickstartParseWarning, DeprecationWarning): +@@ -125,3 +128,17 @@ class KickstartDeprecationWarning(KickstartParseWarning, DeprecationWarning): + """A class for warnings occurring during parsing related to using deprecated commands and options. """ - pass + +class KickstartAuthError(KickstartError): + """An exception for errors relating to authentication failed while @@ -43,7 +43,7 @@ index bf08ac5..aada7aa 100644 + """ + def __init__(self, msg): + """Create a new KickstartAuthError exception instance with the -+ descriptive message val. val should be the return value of ++ descriptive message val. val should be the return value of + formatErrorMsg. + """ + KickstartError.__init__(self, msg) @@ -125,7 +125,7 @@ diff --git a/pykickstart/parser.py b/pykickstart/parser.py index d8880eb..22d14cb 100644 --- a/pykickstart/parser.py +++ b/pykickstart/parser.py -@@ -787,7 +787,7 @@ class KickstartParser(object): +@@ -801,7 +801,7 @@ class KickstartParser(object): i = PutBackIterator(s.splitlines(True) + [""]) self._stateMachine(i) @@ -134,7 +134,7 @@ index d8880eb..22d14cb 100644 """Process a kickstart file, given by the filename f.""" if reset: self._reset() -@@ -808,7 +808,7 @@ class KickstartParser(object): +@@ -822,7 +822,7 @@ class KickstartParser(object): self.currentdir[self._includeDepth] = cd try: diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb deleted file mode 100644 index 041abd3e8..000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.22.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "A python library for manipulating kickstart files" -HOMEPAGE = "http://fedoraproject.org/wiki/pykickstart" -LICENSE = "GPLv2+" - -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -DEPENDS = "python3" -RDEPENDS_${PN} = "python3 \ - python3-requests \ - python3-six \ -" - -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=master \ - file://0001-support-authentication-for-kickstart.patch \ - file://0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch \ - file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \ - file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ - " -SRCREV = "674c17b1e231f56a0d8a5ced4a204cdbc4c1edf3" - -UPSTREAM_CHECK_GITTAGREGEX = "r(?P\d+(\.\d+)+(-\d+)*)" - -inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.26.bb b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.26.bb new file mode 100644 index 000000000..7aeb5d6c9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.26.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "A python library for manipulating kickstart files" +HOMEPAGE = "http://fedoraproject.org/wiki/pykickstart" +LICENSE = "GPLv2+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +DEPENDS = "python3" +RDEPENDS_${PN} = "python3 \ + python3-requests \ + python3-six \ +" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=master \ + file://0001-support-authentication-for-kickstart.patch \ + file://0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch \ + file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \ + file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ + " +SRCREV = "4c93e84c8798da511da1c05f1912d2f908f8f85f" + +UPSTREAM_CHECK_GITTAGREGEX = "r(?P\d+(\.\d+)+(-\d+)*)" + +inherit setuptools3 diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb deleted file mode 100644 index c3de5964d..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "This plugin makes it possible to take periodical breaks" -HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "afa0ef865a49f28165098d3fe625df44" -SRC_URI[sha256sum] = "ee4a51a35076d50cba3824079f8312585373ff2f0d9ebc740d8f3c0426430a19" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.1.bb new file mode 100644 index 000000000..f4ef3f626 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "This plugin makes it possible to take periodical breaks" +HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "3087b3248e427822613e5583784b0ac0" +SRC_URI[sha256sum] = "194dbeb8751d8aaedf3850a7a9c770f09d32316a99683cde34d7d0fc5bdba31d" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.4.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.4.bb deleted file mode 100644 index 958ee644c..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "An alternate menu for the Xfce desktop environment" -HOMEPAGE = "http://gottcode.org/xfce4-whiskermenu-plugin/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -inherit xfce-panel-plugin cmake - -SRC_URI[md5sum] = "7f6faf5ae5ca276d073798a3ff8b0e5b" -SRC_URI[sha256sum] = "624acf6d46484bb35608a76424579571423e2aefa6579f6e444f5cfb5342ff9a" - -RRECOMMENDS_${PN} += "menulibre" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.5.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.5.bb new file mode 100644 index 000000000..65ceb8c54 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.5.bb @@ -0,0 +1,11 @@ +SUMMARY = "An alternate menu for the Xfce desktop environment" +HOMEPAGE = "http://gottcode.org/xfce4-whiskermenu-plugin/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin cmake + +SRC_URI[md5sum] = "adb064538b2e2cbc7ddd1d8ac57cec36" +SRC_URI[sha256sum] = "f5241910ea6411840b8c9f9471f0d262ab0583150bb82f9b280eccbaadb0ebbe" + +RRECOMMENDS_${PN} += "menulibre" -- cgit v1.2.3 From bffdb3e0d00e91bc943c2cc8d73cd5d0cd510fa5 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 21 Aug 2020 16:13:29 -0500 Subject: meta-openembedded: subtree update:76b83194b3..ae39f2e711 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (3): libpeas: gobject-introspection is mandatory and cannot be configured gnome-settings-daemon: smartcard support is optional, and needs nss gnome-settings-daemon: Remove duplicate outdated SRC_URI hashes Alex Kiernan (1): ostree: upgrade 2020.4 -> 2020.5 Andreas Müller (29): xfce4-whiskermenu-plugin: upgrade 2.4.5 -> 2.4.6 xfwm4: upgrade 4.14.2 -> 4.14.3 xfce4-timer-plugin: upgrade 1.7.0 -> 1.7.1 gnome-desktop3: upgrade 3.36.3.1 -> 3.36.4 evolution-data-server: upgrade 3.36.3 -> 3.36.4 gnome-control-center: upgrade 3.36.3 -> 3.36.4 gtksourceview4: upgrade 4.6.0 -> 4.6.1 libnma: upgrade 1.8.28 -> 1.8.30 libgweather: upgrade 3.36.0 -> 3.36.1 evince: upgrade 3.36.5 -> 3.36.7 exiv2: upgrade 0.27.1 -> 0.27.3 poppler: upgrade 0.89.0 -> 0.90.1 live555: merge recipe with inc live555: upgrade 20190828 -> 20200721 tumbler: upgrade 0.2.8 -> 0.2.9 xfwm4: upgrade 4.14.3 -> 4.14.4 geoclue: upgrade 2.5.3 -> 2.5.6 gnome-help.bbclass: remove double FILES_${PN}-help entry gnome-calendar: initial add 3.36.2 imagemagick: upgrade 7.0.9_13 -> 7.0.10_25 libpeas: disable tests when introspection is not enabled/available udisks2: upgrade 2.8.4+ -> 2.9.1 xfwm4: upgrade 4.14.4 -> 4.14.5 gnome-desktop3: upgrade 3.36.4 -> 3.36.5 file-roller: upgrade 3.36.2 -> 3.36.3 evolution-data-server: upgrade 3.36.4 -> 3.36.5 gnome-disk-utility: re-add 3.36.3 gdm: upgrade 3.36.2 -> 3.36.3 poppler: upgrade 0.90.1 -> 20.08.0 Andrey Konovalov (1): libcamera: fix packaging and installation Aníbal Limón (1): meta-oe: opengl-es-cts install deqp test runners Armin Kuster (2): jsoncpp: add PE do to dunfell reverts libpeas: this depends on gtk3+ add FEATURE CHECK Arthur She (1): xmlrpc-c: Upgrade 1.51.03 -> 1.54.02 Changqing Li (1): mozjs: fix multilib conflict Colin McAllister (6): python3-paramiko: Added recipe python3-lorem: Added recipe python3-textparser: Added recipe python3-jdatetime: Added recipe python3-pynacl: Added recipe autossh: Created recipe Daniel Dragomir (1): rasdaemon: update to 0.6.6 and fix SRC_URI broken link Gianfranco (4): dlt-daemon: update to 2.18.5 dlt-daemon: add new dlt-filetransfer PACKAGECONFIG option dlt-daemon: fix build failure when dlt-dbus is enabled, due to missing service file. dlt-daemon: enable some configurations by default in PACKAGECONFIG Gianfranco Costamagna (2): vboxguestdrivers: upgrade 6.1.6 -> 6.1.12 dlt-daemon: fix build with upstream-proposed patch for MUSL libc Hongxu Jia (1): vboxguestdrivers: fix failed to compile with kernel 5.8.0 Jack Mitchell (1): python3-pybind11: install both python wheel and cmake build Jacob Kroon (1): abseil-cpp: Use SkipRecipe exception James Feist (1): boost-url: Add recipe Jens Rehsack (1): bearssl: add new recipe Johan Jeppsson (1): nngpp: Add recipe Jyothi-k (1): fmt: 7.0.1 -> 7.0.3 Kai Kang (2): xfce4-eyes-plugin: 4.5.0 -> 4.5.1 rdist: fix parallel build Khem Raj (82): flashrom: Fix build failure with glibc 2.32 spdlog: Upgrade to 1.7.0 gerbera: Upgrade to 1.6.0 libqmi: Delete --enable-more-warnings configure option gnome-settings-daemon: Drop using autotools specific option gnome-settings-daemon: Add introspection to UNKNOWN_CONFIGURE_WHITELIST iwd: Module load dir should be relative to root_dir libcamera: Fix License names to match SPDX convention satyr: Upgrade to 0.30 gpm: Upgrade to latest master gensio: Upgrade to 2.1.4 freeglut: Use -fcommon always xfsprogs: Upgrade to 5.7.0 freerdp: Upgrade to 2.2.0 htop: Fix build with -fno-common dialog: Turn X11 support into a packageconfig option x11vnc: Update to latest on master vblade: Upgrade to version 24 netperf: Fix build with -fno-common netplan: Update to latest to fix build with -fno-common ncftp: Fix build with -fno-common iscsi-initiator-utils: Upgrade to _2.1.2 tftp-hpa: Fix build with -fno-common fwknop: Fix build with gcc10 dibbler: Update to latest quagga: Use -fcommon to compile drbd: Upgrade to 9.0.24-1 drbd-utils: Uphgrade to 9.13.1 snort: Upgrade to 2.9.16.1 daq: Upgrade to 2.0.7 openlldp: Update to latest master iftop: Fix build with -fno-common xfce4-sensors-plugin: Fix build with -fno-common xfce4-cpufreq-plugin: Fix build with -fno-common imsettings: Upgrade to 1.8.2 lcdproc: Fix compilation with GCC >= 10.x openal-soft: Update to 1.20.1 mimic: Upgrade to 1.3.0.1 minidlna: Fix build with -fno-common tvheadend: Update to latest tip monkey: Upgrade to 1.6.9 klibc: Compile with -fcommon kexecboot: Use -fcommon to compile python3-matplotlib: Use lld for linking when using clang python3-pandas: Add workaround to fix build with clang memtester: Fix build with -fno-common read-edid: Fix build with gcc-10+ owfs: Fix build with -fno-common sharutils: Fix build with -fno-common lprng: Fix build with -fno-common fluentbit: Use -fcommon to compile fbida: Upgrade to 2.14 ipmitool: Fix build with -fno-common smstools3: Fix build with -fno-common sblim-sfcb: Fix build with -fno-common cdrkit: Fix build with -fno-common openocd: Fix build with gcc10/-fno-common liblbxutil: Fix build with gcc10/-fno-common mg: Upgrade to 20200723 tag libforms: Fix build with -fno-common wifi-test-suite: Update to latest tip xf86-video-ati: Fix link failure with gcc 10 ifplugd: Fix build with gcc10/-fno-common tcsh: Fix build with -fno-common makedumpfile: Fix build with -fno-common nodejs: Upgrade to 12.18.3 opencl-headers: Upgrade to v2020.06.16 ocl-icd: Upgrade to latest opencl-icd-loader: Update beyond 2020.06.16 fwts: Upgrade to 20.07.00 pegtl: Disable type-limits warning opensaf: Fix build with -fno-common crash: Fix arm64 build with -fno-common minifi-cpp: Fix build with lto/clang libyui-ncurses: Disable werror with clang sedutils: Fix build with clang11 directfb: Disable dtor-typedef warning with clang11 gerbera: Disable PIE on rv64 opengl-es-cts: Use SECURITY_NOPIE_CFLAGS opencv: Upgrade to 4.4.0 minifi-cpp: Fix linking with libxml2 sdbus-c++: Fix ptest packaging Leon Anavi (80): python3-pytest-metadata: Upgrade 1.9.0 -> 1.10.0 python3-cmd2: Upgrade 1.1.0 -> 1.2.1 python3-aenum: Upgrade 2.2.3 -> 2.2.4 python3-bitarray: Upgrade 1.4.1 -> 1.4.2 python3-colorlog: Upgrade 4.1.0 -> 4.2.1 python3-matplotlib: Upgrade 3.2.2 -> 3.3.0 python3-urllib3: Upgrade 1.25.9 -> 1.25.10 python3-pywbem: Upgrade 0.17.3 -> 0.17.4 python3-lxml: Upgrade 4.5.1 -> 4.5.2 python3-gmqtt: Upgarde 0.6.5 -> 0.6.7 python3-pyroute2: Upgrade 0.5.12 -> 0.5.13 python3-pymongo: Upgrade 3.10.1 -> 3.11.0 python3-pid: Upgrade 3.0.3 -> 3.0.4 python3-pychromecast: Upgrade 7.1.2 -> 7.2.0 python3-dynamic-dispatch: Upgrade 1.0.2 -> 1.0.3 python3-cbor2: Upgrade 5.1.1 -> 5.1.2 python3-xlsxwriter: Consolidate in a single file python3-xlsxwriter: Upgrade 1.2.9 -> 1.3.0 python3-cffi: Upgrade 1.14.0 -> 1.14.1 python3-pandas: Upgrade 1.0.5 -> 1.1.0 python3-luma-core: Upgrade 1.14.0 -> 1.14.1 python3-tqdm: Upgrade 4.47.0 -> 4.48.0 python3-asn1crypto: Upgrade 1.3.0 -> 1.4.0 python3-pyalsaaudio: Consolidate in a single file python3-pyalsaaudio: Upgrade 0.8.4 -> 0.9.0 python3-autobahn: Upgrade 20.6.2 -> 20.7.1 python3-isort: Upgrade 5.1.4 -> 5.2.2 python3-ujson: Upgrade 3.0.0 -> 3.1.0 python3-yarl: Upgrade 1.4.2 -> 1.5.1 python3-openpyxl: Upgrade 3.0.3 -> 3.0.4 python3-cryptography: Upgrade 2.8 -> 3.0 python3-dnspython: Upgrade 1.16.0 -> 2.0.0 python3-regex: Upgrade 2020.6.8 -> 2020.7.14 python3-lazy-object-proxy: Upgrade 1.5.0 -> 1.5.1 python3-xxhash: Upgrade 1.4.4 -> 2.0.0 xxhash: Upgrade 0.7.4 -> 0.8.0 python3-parso: Upgrade 0.7.1 -> 0.8.0 python3-argexec: Upgrade 1.0.2 -> 1.0.3 python3-xlsxwriter: Upgrade 1.3.0 -> 1.3.2 python3-cantools: Upgrade 35.1.0 -> 35.3.0 python3-wtforms: Upgrade 2.3.1 -> 2.3.3 python3-prompt-toolkit: Upgrade 3.0.5 -> 3.0.6 python3-cmd2: Upgrade 1.2.1 -> 1.3.1 python3-luma-core: Upgrade 1.14.1 -> 1.15.0 python3-hyperlink: Upgrade 19.0.0 -> 20.0.1 python3-bitarray: Upgrade 1.4.2 -> 1.5.1 python3-isort: Upgrade 5.2.2 -> 5.3.2 python3-gast: Upgrade 0.3.3 -> 0.4.0 python3-tqdm: Upgrade 4.48.0 -> 4.48.2 python3-sympy: Upgrade 1.6.1 -> 1.6.2 python3-parse: Upgrade 1.15.0 -> 1.16.0 python3-flask-login: Consolidate in a single file python3-flask-login: Upgrade 0.4.1 -> 0.5.0 python3-graphviz: Upgrade 0.14 -> 0.14.1 python3-huey: Upgrade 2.2.0 -> 2.3.0 python3-rsa: Upgrade 3.4.2 -> 4.6 python3-cmd2: Upgrade 1.3.1 -> 1.3.2 python3-u-msgpack-python: Upgrade 2.6.0 -> 2.7.0 python3-pytest-timeout: Upgrade 1.4.1 -> 1.4.2 python3-javaobj-py3: Upgrade 0.4.0.1 -> 0.4.1 python3-sentry-sdk: Upgrade 0.16.0 -> 0.16.3 python3-coverage: Upgrade 5.2 -> 5.2.1 python3-redis: Upgrade 2.10.6 -> 3.5.3 mosquitto: Upgrade 1.6.10 -> 1.6.11 python3-matplotlib: Upgrade 3.3.0 -> 3.3.1 python3-humanize: Upgrade 2.5.0 -> 2.6.0 python3-bcrypt: Upgrade 3.1.7 -> 3.2.0 python3-isort: Upgrade 5.3.2 -> 5.4.2 python3-cffi: Upgrade 1.14.1 -> 1.14.2 python3-wheel: Upgrade 0.34.2 -> 0.35.1 python3-cmd2: Upgrade 1.3.2 -> 1.3.3 python3-google-api-python-client: Upgrade 1.9.3 -> 1.10.0 python3-bitarray: Upgrade 1.5.1 -> 1.5.2 python3-xlsxwriter: Upgrade 1.3.2 -> 1.3.3 python3-sqlalchemy: Upgrade 1.3.18 -> 1.3.19 python3-sentry-sdk: Upgrade 0.16.3 -> 0.16.5 python3-python-vlc: Upgrade 3.0.10114 -> 3.0.11115 python3-pytest-asyncio: Upgrade 0.12.0 -> 0.14.0 python3-djangorestframework: Consolidate in a single file python3-djangorestframework: Upgrade 3.9.0 -> 3.11.1 Martin Jansa (2): khronos-cts: add opengl to REQUIRED_DISTRO_FEATURES lcov: fix lcov-native build Mingli Yu (4): mariadb: upgrade to 10.5.4 mariadb: not use the bundled libpcre2 freeradius: fix the occasional verification failure fio: upgrade to 3.21 Oleksandr Kravchuk (49): iwd: update to 1.8 nvme-cli: update to 1.12 dialog: update to 1.3-20200327 libqmi: update to 1.26.0 libmbim: update to 1.24.2 libwebsockets: update to 4.0.20 libkcapi: update to 1.2.0 libbytesize: update to 2.3 libvdpau: update to 1.4 libcec: update to 6.0.2 dctl: update v69 pmdk: update to 1.9 libzip: update to 1.7.3 tmux: update to 3.1b libjcat: update to 0.1.3 leptonica: update to 1.79.0 libvncserver: update to 0.9.13 libopusenc: add recipe 0.2.1 broadcom-bt-firmware: update to 12.0.1.1105_p2 lsscsi: update to 0.31 opusfile: update to 0.12 libmpdclient: update to 2.19 crossguid: update to 0.2.2 libmediaart: update to 2.0_1.9.4 kronosnet: update to 1.18 keepalived: update to 2.1.5 valijson: update to 0.3 ostree: update to 2020.4 terminus-font: update to 4.48 libteam: update to 1.31 libimobiledevice: update to 1.3.0 libusbmuxd: update to 2.0.2 libplist: update to 2.2.0 usbmuxd: update to 1.1.1 ifuse: update to 1.1.4 libyui: update to 3.10.0 libyui-ncurses: update to 2.55.0 mpc: update to 0.33 ncmpc: update to 0.38 dhcpcd: update to 9.1.4 firewalld: update to 0.8.3 openconnect: update to 8.10 relayd: bump to latest revision fping: update to 4.4 nano: update to 5.0 broadcom-bt-firmware: add PE back libpeas: update to 1.26.0 ifenslave: update to 2.11 libupnp: update to 1.14.0 Shlomi Vaknin (11): monit: Set monit files in temporary locations python3-ipython: add recipe python3-traitlets: add recipe python3-ipython-genutils: add recipe python3-jedi: add recipe python3-pickleshare: add recipe python3-backcall: add recipe python3-parso: add recipe prompt-toolkit: fix recipe json-schema-validator: Add recipe python3-pybind11-json: Add recipe Slater, Joseph (4): lvm2: allow for reproducible binary builds python3-cryptography: fix two tests mozjs: specify TMPDIR aoetool: make builds reproducible Vijay Khemka (1): Adding recipe for exprtk William A. Kennington III (3): fmt: 6.2.0 -> 7.0.1 cli11: 1.9.0 -> 1.9.1 function2: 4.0.0 -> 4.1.0 Yi Zhao (2): libldb: upgrade 1.5.7 -> 1.5.8 samba: upgrade 4.10.15 -> 4.10.17 Yue Tao (1): lua: Security Advisory - lua - CVE-2020-15888 Zang Ruochen (25): fping: upgrade 4.2 -> 4.3 capnproto: upgrade 0.7.0 -> 0.8.0 c-ares: upgrade 1.16.0 -> 1.16.1 iozone3: upgrade 489 -> 490 ser2net: upgrade 4.1.8 -> 4.2.0 apache-websocket: upgrade 0.1.1 -> 0.1.2 hiawatha: upgrade 10.10 -> 10.11 nostromo: upgrade 1.9.7 -> 1.9.9 purple-skypeweb: upgrade 1.5 -> 1.6 dnsmasq: upgrade 2.81 -> 2.82 linuxptp: upgrade 2.0 -> 3.0 nlohmann-json: upgrade 3.7.3 -> 3.9.0 paho-mqtt-c: upgrade 1.3.2 -> 1.3.4 zlog: upgrade 1.2.14 -> 1.2.15 jasper: upgrade 2.0.16 -> 2.0.19 dash: upgrade 0.5.11 -> 0.5.11.1 libbytesize: upgrade 2.3 -> 2.4 jsonrpc: Fix build with libmicrohttpd 0.9.71 libmicrohttpd: upgrade 0.9.70 -> 0.9.71 rdma-core: upgrade 28.0 -> 30.0 ipc-run: upgrade 20180523.0 -> 20200505.0 uhubctl: upgrade 2.1.0 -> 2.2.0 gsoap: upgrade 2.8.103 -> 2.8.105 libcgi-perl: upgrade 4.48 -> 4.50 redis: upgrade 6.0.5 -> 6.0.6 wonjong.lee (1): minifi: Add recipe for c++ version Signed-off-by: Andrew Geissler Change-Id: I003021e0f4c267f79eedf704c43fbb6fdcdaf8b8 --- .../recipes-filesystems/ifuse/ifuse_1.1.2.bb | 15 - .../recipes-filesystems/ifuse/ifuse_1.1.4.bb | 13 + .../owfs/0001-Fix-compilation-with-GCC10.patch | 44 ++ .../recipes-filesystems/owfs/owfs_3.2p3.bb | 1 + .../recipes-utils/xfsprogs/xfsprogs_5.2.1.bb | 76 --- .../recipes-utils/xfsprogs/xfsprogs_5.7.0.bb | 73 +++ .../meta-gnome/classes/gnome-help.bbclass | 2 - .../recipes-connectivity/libnma/libnma_1.8.28.bb | 26 - .../recipes-connectivity/libnma/libnma_1.8.30.bb | 26 + .../recipes-gnome/evince/evince_3.36.5.bb | 55 -- .../recipes-gnome/evince/evince_3.36.7.bb | 55 ++ .../evolution-data-server.inc | 5 +- .../file-roller/file-roller_3.36.2.bb | 28 - .../file-roller/file-roller_3.36.3.bb | 27 + .../meta-gnome/recipes-gnome/gdm/gdm_3.36.2.bb | 56 -- .../meta-gnome/recipes-gnome/gdm/gdm_3.36.3.bb | 55 ++ .../gnome-calendar/gnome-calendar_3.36.2.bb | 32 ++ .../gnome-control-center_3.36.3.bb | 55 -- .../gnome-control-center_3.36.4.bb | 55 ++ .../gnome-desktop/gnome-desktop3_3.36.3.1.bb | 38 -- .../gnome-desktop/gnome-desktop3_3.36.5.bb | 37 ++ .../gnome-disk-utility_3.36.3.bb | 34 ++ .../gnome-settings-daemon_3.36.1.bb | 8 +- .../gtksourceview/gtksourceview4_4.6.0.bb | 26 - .../gtksourceview/gtksourceview4_4.6.1.bb | 26 + .../libgweather/libgweather_3.36.0.bb | 24 - .../libgweather/libgweather_3.36.1.bb | 24 + .../packagegroups/packagegroup-gnome-apps.bb | 2 + .../recipes-bsp/kexecboot/kexecboot_git.bb | 2 + .../recipes-devtools/klibc/klibc.inc | 2 +- .../recipes-connectivity/libupnp/libupnp_1.14.0.bb | 22 + .../recipes-connectivity/libupnp/libupnp_git.bb | 25 - .../0001-allocate-space-for-buf-on-heap.patch | 46 -- .../recipes-dvb/tvheadend/tvheadend_git.bb | 3 +- .../recipes-multimedia/gerbera/gerbera_1.6.0.bb | 30 + .../recipes-multimedia/gerbera/gerbera_git.bb | 29 - .../recipes-multimedia/libcamera/libcamera.bb | 21 +- .../mimic/mimic/0001-Fix-musl-compatibility.patch | 30 + ...ang-Make-cst_rx_not_indic-as-extern-decla.patch | 29 + .../recipes-multimedia/mimic/mimic_1.2.0.2.bb | 29 - .../recipes-multimedia/mimic/mimic_1.3.0.1.bb | 32 ++ .../recipes-multimedia/minidlna/minidlna.inc | 1 + ...001-Mark-setjmp_buffer-extern-declaration.patch | 29 + .../musicpd/libmpdclient_2.16.bb | 22 - .../musicpd/libmpdclient_2.19.bb | 22 + .../recipes-multimedia/musicpd/mpc_0.31.bb | 16 - .../recipes-multimedia/musicpd/mpc_0.33.bb | 13 + .../recipes-multimedia/musicpd/ncmpc_0.34.bb | 37 -- .../recipes-multimedia/musicpd/ncmpc_0.38.bb | 37 ++ ...0001-Use-BUILD_CC-to-compile-native-tools.patch | 30 +- ...002-makehrtf-Disable-Wstringop-truncation.patch | 12 +- .../openal/openal-soft_1.19.1.bb | 25 - .../openal/openal-soft_1.20.1.bb | 24 + .../recipes-multimedia/opusfile/opusfile_0.10.bb | 14 - .../recipes-multimedia/opusfile/opusfile_0.12.bb | 14 + .../recipes-support/crossguid/crossguid.bb | 25 - .../recipes-support/crossguid/crossguid_0.2.2.bb | 20 + .../libmediaart/libmediaart-2.0_1.9.0.bb | 7 - .../libmediaart/libmediaart-2.0_1.9.4.bb | 7 + .../recipes-connectivity/autossh/autossh_1.4g.bb | 30 + ...-Unix.mk-remove-fixed-command-definitions.patch | 57 ++ ...-test_x509.c-fix-potential-overflow-issue.patch | 41 ++ .../recipes-connectivity/bearssl/bearssl_0.6.bb | 35 ++ .../recipes-connectivity/daq/daq_2.0.6.bb | 35 -- .../recipes-connectivity/daq/daq_2.0.7.bb | 32 ++ .../recipes-connectivity/dhcpcd/dhcpcd_8.1.6.bb | 27 - .../recipes-connectivity/dhcpcd/dhcpcd_9.1.4.bb | 28 + ...port-Rename-pthread_mutex_t-variable-lock.patch | 74 --- .../recipes-connectivity/dibbler/dibbler_git.bb | 3 +- .../firewalld/firewalld_0.7.5.bb | 92 ---- .../firewalld/firewalld_0.8.3.bb | 90 +++ ...-Makefile-fix-the-occasional-verification.patch | 135 +++++ .../freeradius/freeradius_3.0.20.bb | 1 + .../mosquitto/mosquitto_1.6.10.bb | 89 --- .../mosquitto/mosquitto_1.6.11.bb | 89 +++ .../recipes-connectivity/nanomsg/nngpp_git.bb | 14 + .../netplan/0001-dbus-Remove-unused-variabes.patch | 33 ++ .../0001-src-parse.c-Initialize-key-to-NULL.patch | 32 ++ ...se-first-prerquisite-only-for-target-rule.patch | 35 ++ .../recipes-connectivity/netplan/netplan_0.99.bb | 5 +- ...rojans-tncc-wrapper.py-convert-to-python3.patch | 71 --- .../openconnect/openconnect_8.03.bb | 29 - .../openconnect/openconnect_8.10.bb | 32 ++ .../rdist-6.1.5-fix-parallel-build.patch | 31 ++ .../recipes-connectivity/rdist/rdist_6.1.5.bb | 1 + .../recipes-connectivity/relayd/relayd_git.bb | 2 +- .../0001-util-Simplify-input-validation.patch | 59 ++ ...ild-on-FreeBSD-by-avoiding-NSS_BUFLEN_PAS.patch | 79 +++ ...cate-larger-buffer-if-getpwuid_r-returns-.patch | 50 ++ .../recipes-connectivity/samba/samba_4.10.15.bb | 336 ------------ .../recipes-connectivity/samba/samba_4.10.17.bb | 339 ++++++++++++ .../recipes-connectivity/snort/snort_2.9.16.1.bb | 111 ++++ .../recipes-connectivity/snort/snort_2.9.16.bb | 113 ---- .../files/0001-Makefile-Do-not-set-Werror.patch | 31 ++ .../iscsi-initiator-utils_2.1.0.bb | 120 ---- .../iscsi-initiator-utils_2.1.2.bb | 117 ++++ .../keepalived/keepalived_2.0.20.bb | 45 -- .../recipes-daemons/keepalived/keepalived_2.1.5.bb | 46 ++ .../ncftp/ncftp/ncftp-3.2.5-gcc10.patch | 83 +++ .../recipes-daemons/ncftp/ncftp_3.2.6.bb | 1 + .../opensaf/0001-Fix-build-with-fno-common.patch | 311 +++++++++++ .../recipes-daemons/opensaf/opensaf_5.20.05.bb | 1 + ...tftp-Mark-toplevel-definition-as-external.patch | 30 + .../recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb | 1 + .../recipes-daemons/vblade/files/gcc-10.patch | 85 +++ .../recipes-daemons/vblade/vblade_22.bb | 55 -- .../recipes-daemons/vblade/vblade_24.bb | 56 ++ .../recipes-extended/kronosnet/kronosnet_1.15.bb | 23 - .../recipes-extended/kronosnet/kronosnet_1.18.bb | 30 + .../files/0001-cmds-fix-enum-conversion.patch | 91 ++++ .../0002-lldp_head-rename-and-make-extern.patch | 500 +++++++++++++++++ .../0003-lldp-add-packed-struct-definition.patch | 49 ++ .../openlldp/files/0004-lldptool-make-extern.patch | 41 ++ ...cisco_oui-match-encode-handler-prototypes.patch | 28 + ...p22-make-enum-a-type-rather-than-instance.patch | 33 ++ .../0007-lldp_8021qaz-extern-config-object.patch | 29 + ...008-stringops-fix-some-string-copy-errors.patch | 61 +++ ...09-8021qaz-mark-prio-map-functions-static.patch | 39 ++ .../recipes-protocols/openlldp/openlldp_1.0.1.bb | 12 +- .../recipes-protocols/quagga/quagga.inc | 2 + .../aoetools/aoetools/reproducible-build.patch | 12 + .../recipes-support/aoetools/aoetools_36.bb | 1 + .../recipes-support/dnsmasq/dnsmasq_2.81.bb | 8 - .../recipes-support/dnsmasq/dnsmasq_2.82.bb | 8 + ...-Make-setup_options-definitions-as-extern.patch | 32 ++ .../recipes-support/drbd/drbd-utils_9.12.0.bb | 60 -- .../recipes-support/drbd/drbd-utils_9.13.1.bb | 62 +++ .../recipes-support/drbd/drbd_9.0.19-1.bb | 25 - .../recipes-support/drbd/drbd_9.0.24-1.bb | 24 + .../recipes-support/fping/fping_4.2.bb | 25 - .../recipes-support/fping/fping_4.4.bb | 24 + ...tion-with-GCC-s-fno-common-flag-fixes-305.patch | 27 + .../recipes-support/fwknop/fwknop_2.6.10.bb | 1 + .../recipes-support/ifenslave/ifenslave_2.11.bb | 22 + .../recipes-support/ifenslave/ifenslave_2.9.bb | 27 - .../iftop/iftop/iftop-1.0-gcc10.patch | 68 +++ .../recipes-support/iftop/iftop_1.0pre4.bb | 4 +- .../recipes-support/libldb/libldb_1.5.7.bb | 71 --- .../recipes-support/libldb/libldb_1.5.8.bb | 71 +++ ...mni-Remove-duplicate-variable-definitions.patch | 37 ++ .../recipes-support/netperf/netperf_git.bb | 1 + ...0001-Remove-man-files-which-cant-be-built.patch | 45 +- .../recipes-support/rdma-core/rdma-core_28.0.bb | 42 -- .../recipes-support/rdma-core/rdma-core_30.0.bb | 42 ++ .../0001-Fix-compilation-with-GCC-10.x.patch | 46 ++ .../recipes-extended/lcdproc/lcdproc_git.bb | 1 + .../recipes-extended/mozjs/mozjs_60.9.0.bb | 12 +- .../recipes-support/rasdaemon/rasdaemon_0.6.5.bb | 55 -- .../recipes-support/rasdaemon/rasdaemon_0.6.6.bb | 55 ++ .../files/0001-update-the-interpreter-paths.patch | 83 --- .../fio/files/python3_shebangs.patch | 38 -- .../meta-oe/recipes-benchmark/fio/fio_3.17.bb | 47 -- .../meta-oe/recipes-benchmark/fio/fio_3.21.bb | 45 ++ .../recipes-benchmark/iozone3/iozone3_489.bb | 121 ---- .../recipes-benchmark/iozone3/iozone3_490.bb | 121 ++++ .../0001-Define-mword16-and-mword8-once.patch | 57 ++ .../recipes-benchmark/memtester/memtester_4.3.0.bb | 7 +- ...eck-for-last-line-only-from-preprocessed-.patch | 57 ++ .../meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb | 1 + .../meta-oe/recipes-bsp/lsscsi/lsscsi_0.30.bb | 14 - .../meta-oe/recipes-bsp/lsscsi/lsscsi_0.31.bb | 14 + .../nvme-cli/0001-fix-musl-compilation.patch | 26 - .../recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb | 35 -- .../meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.12.bb | 33 ++ ...filter-Rename-some-variables-to-tr_stdxxx.patch | 108 ---- .../recipes-connectivity/gensio/gensio_1.5.3.bb | 27 - .../recipes-connectivity/gensio/gensio_2.1.4.bb | 25 + ...c-interface.h-Make-declarations-as-extern.patch | 31 ++ .../recipes-connectivity/ifplugd/ifplugd_0.28.bb | 4 +- .../meta-oe/recipes-connectivity/iwd/iwd_1.7.bb | 54 -- .../meta-oe/recipes-connectivity/iwd/iwd_1.8.bb | 54 ++ .../files/configure-fix-largefile.patch | 38 -- .../libimobiledevice/libimobiledevice_1.3.0.bb | 17 + .../libimobiledevice/libimobiledevice_git.bb | 22 - .../recipes-connectivity/libmbim/libmbim_1.22.0.bb | 17 - .../recipes-connectivity/libmbim/libmbim_1.24.2.bb | 17 + .../recipes-connectivity/libqmi/libqmi_1.24.12.bb | 24 - .../recipes-connectivity/libqmi/libqmi_1.26.0.bb | 22 + .../libwebsockets/libwebsockets_4.0.1.bb | 35 -- .../libwebsockets/libwebsockets_4.0.20.bb | 35 ++ ...build-Allow-CC-and-prefix-to-be-overriden.patch | 4 +- .../linuxptp/linuxptp/time_t_maybe_long_long.patch | 135 ----- .../recipes-connectivity/linuxptp/linuxptp_2.0.bb | 23 - .../recipes-connectivity/linuxptp/linuxptp_3.0.bb | 22 + .../paho-mqtt-c/paho-mqtt-c_1.3.2.bb | 35 -- .../paho-mqtt-c/paho-mqtt-c_1.3.4.bb | 35 ++ .../recipes-connectivity/ser2net/ser2net_4.1.8.bb | 18 - .../recipes-connectivity/ser2net/ser2net_4.2.0.bb | 18 + ...-declarations-to-avoid-duplicate-var-defi.patch | 606 +++++++++++++++++++++ .../smstools3/smstools3_3.1.21.bb | 4 +- .../recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb | 22 + .../recipes-connectivity/usbmuxd/usbmuxd_git.bb | 21 - .../wifi-test-suite/files/fno-common.patch | 29 + .../wifi-test-suite/wifi-test-suite_git.bb | 3 +- .../meta-oe/recipes-core/ndctl/ndctl_v67.bb | 32 -- .../meta-oe/recipes-core/ndctl/ndctl_v69.bb | 32 ++ .../meta-oe/recipes-core/opencl/ocl-icd_git.bb | 4 +- .../recipes-core/opencl/opencl-headers_git.bb | 7 +- .../recipes-core/opencl/opencl-icd-loader_git.bb | 18 +- .../recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb | 11 +- ...e-__builtin_bswap32-on-Clang-if-supported.patch | 39 -- .../libkcapi/0001-kcapi-kdf-Move-code-to-fix.patch | 73 --- .../recipes-crypto/libkcapi/libkcapi_1.2.0.bb | 28 + .../recipes-crypto/libkcapi/libkcapi_git.bb | 33 -- .../recipes-dbs/mysql/mariadb-native_10.4.12.bb | 20 - .../recipes-dbs/mysql/mariadb-native_10.5.4.bb | 20 + .../meta-oe/recipes-dbs/mysql/mariadb.inc | 14 +- ...build-breakage-from-lock_guard-error-6161.patch | 32 -- ...RocksDB-undefined-reference-to-crc32c_arm.patch | 48 ++ .../recipes-dbs/mysql/mariadb/c11_atomics.patch | 37 +- ...CMakeLists.txt-fix-gen_lex_hash-not-found.patch | 26 +- .../meta-oe/recipes-dbs/mysql/mariadb_10.4.12.bb | 27 - .../meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb | 27 + .../recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 8 +- .../recipes-devtools/boost-url/boost-url_git.bb | 17 + .../recipes-devtools/capnproto/capnproto_0.7.0.bb | 24 - .../recipes-devtools/capnproto/capnproto_0.8.0.bb | 24 + .../json-schema-validator_2.1.0.bb | 14 + .../recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb | 2 + .../0001-Fix-build-with-libmicrohttpd.patch | 52 ++ .../recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb | 5 +- .../recipes-devtools/lua/lua/CVE-2020-15888.patch | 45 ++ .../meta-oe/recipes-devtools/lua/lua_5.3.5.bb | 1 + ...-Templatize-basic_json-ctor-from-json_ref.patch | 99 ---- .../nlohmann-json/0001-typo-fix.patch | 43 -- .../nlohmann-json/nlohmann-json_3.7.3.bb | 30 - .../nlohmann-json/nlohmann-json_3.9.0.bb | 28 + ...allow-passing-multiple-libs-to-pkg_config.patch | 41 -- .../0001-deps-V8-backport-3f8dc4b2e5ba.patch | 194 ------- ...uild-allow-use-of-system-installed-brotli.patch | 66 --- ...0003-Install-both-binaries-and-use-libdir.patch | 28 +- .../recipes-devtools/nodejs/nodejs_12.14.1.bb | 164 ------ .../recipes-devtools/nodejs/nodejs_12.18.3.bb | 160 ++++++ ...itbang-Make-bitbang_swd-extern-definition.patch | 42 ++ .../recipes-devtools/openocd/openocd_git.bb | 1 + .../recipes-devtools/perl/ipc-run_20180523.0.bb | 24 - .../recipes-devtools/perl/ipc-run_20200505.0.bb | 24 + .../recipes-devtools/valijson/valijson_0.3.bb | 36 ++ .../recipes-devtools/valijson/valijson_git.bb | 21 - .../recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb | 48 -- .../recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb | 49 ++ .../recipes-extended/dialog/dialog_1.3-20190808.bb | 29 - .../recipes-extended/dialog/dialog_1.3-20200327.bb | 33 ++ .../dlt-daemon/dlt-daemon/204.patch | 148 ----- .../dlt-daemon/dlt-daemon/238.patch | 35 ++ .../dlt-daemon/dlt-daemon/241.patch | 30 + .../dlt-daemon/dlt-daemon_2.18.4.bb | 62 --- .../dlt-daemon/dlt-daemon_2.18.5.bb | 68 +++ .../recipes-extended/fluentbit/fluentbit_1.3.5.bb | 2 + .../recipes-extended/libcec/libcec_6.0.2.bb | 37 ++ .../meta-oe/recipes-extended/libcec/libcec_git.bb | 39 -- .../libimobiledevice/libplist_2.1.0.bb | 29 - .../libimobiledevice/libplist_2.2.0.bb | 29 + .../libimobiledevice/libusbmuxd_2.0.2.bb | 16 + .../libimobiledevice/libusbmuxd_git.bb | 16 - .../recipes-extended/libzip/libzip_1.7.1.bb | 18 - .../recipes-extended/libzip/libzip_1.7.3.bb | 18 + ...ckpc-Do-not-define-Mail_fd-multiple-times.patch | 34 ++ .../meta-oe/recipes-extended/lprng/lprng_3.8.C.bb | 4 +- ...d-lxml2-to-linker-cmdline-of-xml-is-found.patch | 39 ++ ...-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch | 34 ++ .../minifi-cpp/files/fix-libressl-compile.patch | 43 ++ .../minifi-cpp/files/fix-minifi-compile.patch | 60 ++ .../minifi-cpp/files/fix-osspuuid-compile.patch | 36 ++ .../files/fix-osspuuid-cross-compile.patch | 37 ++ .../files/fix-osspuuid-musl-compile.patch | 25 + .../files/fix-rocksdb-cross-compile.patch | 12 + .../minifi-cpp/files/minifi.service | 13 + .../files/remove_const_due_to_std_lock_guard.patch | 38 ++ .../minifi-cpp/files/systemd-volatile.conf | 2 + .../minifi-cpp/files/sysvinit-volatile.conf | 2 + .../minifi-cpp/minifi-cpp_0.7.0.bb | 120 ++++ .../recipes-extended/ostree/ostree_2020.3.bb | 189 ------- .../recipes-extended/ostree/ostree_2020.5.bb | 189 +++++++ .../meta-oe/recipes-extended/pegtl/pegtl_2.8.3.bb | 2 + .../files/0001-examples-Initialize-child_idx.patch | 47 -- .../0002-Makefile-Don-t-install-the-docs.patch | 26 - .../meta-oe/recipes-extended/pmdk/pmdk_1.8.bb | 52 -- .../meta-oe/recipes-extended/pmdk/pmdk_1.9.bb | 49 ++ .../meta-oe/recipes-extended/redis/redis_6.0.5.bb | 66 --- .../meta-oe/recipes-extended/redis/redis_6.0.6.bb | 66 +++ .../recipes-extended/sblim-sfcb/files/sfcb.service | 11 - ...e-need-for-error.h-when-it-does-not-exist.patch | 124 ----- ...ude-stdint.h-system-header-for-UINT16_MAX.patch | 29 - .../sblim-sfcb-1.3.15-fix-provider-debugging.patch | 12 - .../sblim-sfcb-1.3.16-maxMsgLen.patch | 14 - .../sblim-sfcb-1.3.16-multilib-man-cfg.patch | 41 -- ...blim-sfcb-1.3.9-sfcbrepos-schema-location.patch | 42 -- .../sblim-sfcb-1.4.5-service.patch | 27 - .../sblim-sfcb-1.4.8-default-ecdh-curve-name.patch | 26 - .../sblim-sfcb-1.4.9-fix-ftbfs.patch | 12 - .../sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch | 31 -- ...Avoid-variable-definition-in-header-files.patch | 100 ++++ ...e-need-for-error.h-when-it-does-not-exist.patch | 124 +++++ ...ude-stdint.h-system-header-for-UINT16_MAX.patch | 29 + .../sblim-sfcb-1.3.15-fix-provider-debugging.patch | 12 + .../sblim-sfcb/sblim-sfcb-1.3.16-maxMsgLen.patch | 14 + .../sblim-sfcb-1.3.16-multilib-man-cfg.patch | 41 ++ ...blim-sfcb-1.3.9-sfcbrepos-schema-location.patch | 42 ++ .../sblim-sfcb/sblim-sfcb-1.4.5-service.patch | 27 + .../sblim-sfcb-1.4.8-default-ecdh-curve-name.patch | 26 + .../sblim-sfcb/sblim-sfcb-1.4.9-fix-ftbfs.patch | 12 + .../sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch | 31 ++ .../sblim-sfcb/sblim-sfcb/sfcb.service | 11 + .../sblim-sfcb/sblim-sfcb_1.4.9.bb | 1 + ...notatedDump-Add-typedef-name-to-the-union.patch | 34 ++ .../recipes-extended/sedutil/sedutil_git.bb | 1 + .../meta-oe/recipes-extended/tmux/tmux_2.6.bb | 25 - .../meta-oe/recipes-extended/tmux/tmux_3.1b.bb | 25 + .../meta-oe/recipes-extended/zlog/zlog_1.2.14.bb | 17 - .../meta-oe/recipes-extended/zlog/zlog_1.2.15.bb | 17 + .../meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb | 34 -- .../meta-oe/recipes-gnome/libjcat/libjcat_0.1.3.bb | 34 ++ ...d-tests-when-introspection-is-disabled-mi.patch | 36 ++ .../libpeas/add_missing_locale_include.patch | 21 + .../recipes-gnome/libpeas/libpeas_1.25.3.bb | 25 - .../recipes-gnome/libpeas/libpeas_1.26.0.bb | 32 ++ .../meta-oe/recipes-graphics/directfb/directfb.inc | 2 + .../meta-oe/recipes-graphics/fbida/fbida_2.10.bb | 73 --- .../meta-oe/recipes-graphics/fbida/fbida_2.14.bb | 75 +++ .../fbida/files/cairo-weak-detect.patch | 17 + .../recipes-graphics/fbida/files/fbida-gcc10.patch | 61 +++ .../fbida/files/fix-preprocessor.patch | 20 +- .../recipes-graphics/freeglut/freeglut_3.2.1.bb | 3 + .../recipes-graphics/jasper/jasper_2.0.16.bb | 24 - .../recipes-graphics/jasper/jasper_2.0.19.bb | 24 + .../recipes-graphics/leptonica/leptonica_1.74.4.bb | 18 - .../recipes-graphics/leptonica/leptonica_1.79.0.bb | 20 + ...1-Make-extern-declarations-in-header-file.patch | 46 ++ .../recipes-graphics/libforms/libforms_1.2.3.bb | 1 + .../libvncserver/libvncserver_0.9.12.bb | 53 -- .../libvncserver/libvncserver_0.9.13.bb | 52 ++ .../libyui/libyui-ncurses_2.52.0.bb | 50 -- .../libyui/libyui-ncurses_2.55.0.bb | 53 ++ .../recipes-graphics/libyui/libyui_3.10.0.bb | 42 ++ .../recipes-graphics/libyui/libyui_3.6.0.bb | 42 -- .../terminus-font/terminus-font_4.38.bb | 45 -- .../terminus-font/terminus-font_4.48.bb | 45 ++ .../meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb | 23 - .../meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb | 23 + .../recipes-graphics/vk-gl-cts/khronos-cts.inc | 4 +- .../vk-gl-cts/opengl-es-cts_3.2.6.1.bb | 9 + ...x-build-on-32bit-arches-with-64bit-time_t.patch | 111 ---- ...le.am-don-t-install-Xdummy-when-configure.patch | 37 -- .../x11vnc/files/remove-redundant-RPATH.patch | 86 --- ...c-cursor-fix-xfc-NULL-pointer-dereference.patch | 30 - .../recipes-graphics/x11vnc/x11vnc_0.9.16.bb | 7 +- .../0001-Fix-link-failure-with-gcc-10.patch | 34 ++ .../xorg-driver/xf86-video-ati_19.0.1.bb | 2 + ...0001-lbx_zlib-Mark-declration-with-extern.patch | 36 ++ .../recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb | 4 +- .../broadcom-bt-firmware_12.0.1.1105_p2.bb | 76 +++ .../broadcom-bt-firmware_git.bb | 76 --- ...ARM64-gcc-10-compilation-error.-Without-t.patch | 54 ++ .../meta-oe/recipes-kernel/crash/crash_7.2.8.bb | 1 + ...fwupg-move-variable-definition-to-.c-file.patch | 41 ++ .../recipes-kernel/ipmitool/ipmitool_1.8.18.bb | 1 + ...CH-Remove-duplicated-variable-definitions.patch | 104 ++++ .../makedumpfile/makedumpfile_1.6.7.bb | 1 + .../recipes-multimedia/cdrkit/cdrkit_1.1.11.bb | 1 + ...genisoimage-Add-missing-extern-definition.patch | 29 + .../libopusenc/libopusenc_0.2.1.bb | 19 + .../live555/files/config.linux-cross | 17 - .../meta-oe/recipes-multimedia/live555/live555.inc | 56 -- .../live555/live555/config.linux-cross | 17 + .../recipes-multimedia/live555/live555_20190828.bb | 11 - .../recipes-multimedia/live555/live555_20200721.bb | 62 +++ .../recipes-navigation/geoclue/geoclue_2.5.3.bb | 54 -- .../recipes-navigation/geoclue/geoclue_2.5.6.bb | 46 ++ .../meta-oe/recipes-shells/dash/dash_0.5.11.1.bb | 27 + .../meta-oe/recipes-shells/dash/dash_0.5.11.bb | 27 - ...01-Remove-defining-handle_interrupt-twice.patch | 28 + .../meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb | 1 + .../recipes-support/c-ares/c-ares_1.16.0.bb | 27 - .../recipes-support/c-ares/c-ares_1.16.1.bb | 27 + .../meta-oe/recipes-support/cli11/cli11_1.9.0.bb | 17 - .../meta-oe/recipes-support/cli11/cli11_1.9.1.bb | 17 + ...r-fcf-protection-only-if-compiler-arch-su.patch | 40 ++ .../meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb | 13 - .../meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb | 16 + .../meta-oe/recipes-support/fmt/fmt_6.2.0.bb | 15 - .../meta-oe/recipes-support/fmt/fmt_7.0.3.bb | 15 + .../recipes-support/freerdp/freerdp_2.2.0.bb | 85 +++ .../meta-oe/recipes-support/freerdp/freerdp_git.bb | 87 --- .../recipes-support/function2/function2_4.0.0.bb | 21 - .../recipes-support/function2/function2_4.1.0.bb | 21 + ...-sigemptyset-API-instead-of-__sigemptyset.patch | 34 -- .../meta-oe/recipes-support/gpm/gpm_git.bb | 3 +- .../meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb | 42 -- .../meta-oe/recipes-support/gsoap/gsoap_2.8.105.bb | 42 ++ .../recipes-support/htop/files/htop-gcc10.patch | 31 ++ .../meta-oe/recipes-support/htop/htop_2.2.0.bb | 1 + .../imagemagick/imagemagick_7.0.10.bb | 87 +++ .../imagemagick/imagemagick_7.0.9.bb | 87 --- .../meta-oe/recipes-support/lcov/lcov_1.14.bb | 7 +- .../recipes-support/libbytesize/libbytesize_2.2.bb | 30 - .../recipes-support/libbytesize/libbytesize_2.4.bb | 30 + .../libmicrohttpd/libmicrohttpd_0.9.70.bb | 30 - .../libmicrohttpd/libmicrohttpd_0.9.71.bb | 30 + .../recipes-support/libteam/libteam_1.30.bb | 40 -- .../recipes-support/libteam/libteam_1.31.bb | 40 ++ .../lvm2/files/reproducible-build.patch | 16 +- .../meta-oe/recipes-support/lvm2/lvm2.inc | 2 +- ...001-Undefine-REGEX-for-musl-based-systems.patch | 19 +- ...-fileio-Include-sys-param.h-for-MAXNAMLEN.patch | 5 - ...Define-DEFFILEMODE-if-platform-is-missing.patch | 11 +- .../meta-oe/recipes-support/mg/mg_20170401.bb | 37 -- .../meta-oe/recipes-support/mg/mg_20200723.bb | 38 ++ .../meta-oe/recipes-support/monit/monit/monitrc | 6 + .../meta-oe/recipes-support/nano/nano_4.9.3.bb | 22 - .../meta-oe/recipes-support/nano/nano_5.0.bb | 21 + .../0001-Use-Os-to-compile-tinyxml2.cpp.patch | 31 ++ .../meta-oe/recipes-support/opencv/opencv_4.3.0.bb | 206 ------- .../meta-oe/recipes-support/opencv/opencv_4.4.0.bb | 210 +++++++ .../recipes-support/pidgin/purple-skypeweb_git.bb | 4 +- .../poppler/poppler/basename-include.patch | 9 +- .../recipes-support/poppler/poppler_0.89.0.bb | 52 -- .../recipes-support/poppler/poppler_20.08.0.bb | 51 ++ .../0001-get-edid-define-quiet-once.patch | 44 ++ .../recipes-support/read-edid/read-edid_3.0.2.bb | 1 + .../meta-oe/recipes-support/satyr/satyr_0.28.bb | 31 -- .../meta-oe/recipes-support/satyr/satyr_0.30.bb | 34 ++ .../sharutils/0001-Fix-building-with-GCC-10.patch | 98 ++++ ...-Do-not-include-lib-md5.c-into-src-shar.c.patch | 40 ++ .../recipes-support/sharutils/sharutils_4.15.2.bb | 2 + .../meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb | 19 - .../meta-oe/recipes-support/spdlog/spdlog_1.7.0.bb | 21 + .../meta-oe/recipes-support/udisks/udisks2_git.bb | 11 +- .../recipes-support/uhubctl/uhubctl_2.1.0.bb | 21 - .../recipes-support/uhubctl/uhubctl_2.2.0.bb | 21 + .../0001-fixes_for_mm_struct.patch | 176 ++++++ .../0002-fixes_for_module_memory.patch | 65 +++ .../0003-fixes_for_changes_in_cpu_tlbstate.patch | 39 ++ .../vboxguestdrivers/kernel-5.8-4.patch | 19 + .../vboxguestdrivers/vboxguestdrivers_6.1.12.bb | 86 +++ .../vboxguestdrivers/vboxguestdrivers_6.1.6.bb | 81 --- .../meta-oe/recipes-support/xxhash/xxhash_0.7.4.bb | 21 - .../meta-oe/recipes-support/xxhash/xxhash_0.8.0.bb | 21 + .../fwts/fwts/0001-Remove-Werror-from-build.patch | 16 +- .../meta-oe/recipes-test/fwts/fwts_19.06.00.bb | 36 -- .../meta-oe/recipes-test/fwts/fwts_20.07.00.bb | 32 ++ .../recipes-perl/libcgi/libcgi-perl_4.48.bb | 51 -- .../recipes-perl/libcgi/libcgi-perl_4.50.bb | 51 ++ .../python/python-djangorestframework.inc | 16 - .../recipes-devtools/python/python-flask-login.inc | 14 - .../recipes-devtools/python/python-pyalsaaudio.inc | 11 - .../recipes-devtools/python/python-xlsxwriter.inc | 11 - .../recipes-devtools/python/python3-aenum_2.2.3.bb | 11 - .../recipes-devtools/python/python3-aenum_2.2.4.bb | 11 + .../python/python3-argexec_1.0.2.bb | 17 - .../python/python3-argexec_1.0.3.bb | 17 + .../python/python3-asn1crypto_1.3.0.bb | 25 - .../python/python3-asn1crypto_1.4.0.bb | 25 + .../python/python3-autobahn_20.6.2.bb | 24 - .../python/python3-autobahn_20.7.1.bb | 24 + .../python/python3-backcall_0.2.0.bb | 12 + .../python/python3-bcrypt_3.1.7.bb | 30 - .../python/python3-bcrypt_3.2.0.bb | 30 + .../python/python3-bitarray_1.4.1.bb | 11 - .../python/python3-bitarray_1.5.2.bb | 11 + .../python/python3-cantools_35.1.0.bb | 14 - .../python/python3-cantools_35.3.0.bb | 14 + .../recipes-devtools/python/python3-cbor2_5.1.1.bb | 30 - .../recipes-devtools/python/python3-cbor2_5.1.2.bb | 30 + .../recipes-devtools/python/python3-cffi_1.14.0.bb | 19 - .../recipes-devtools/python/python3-cffi_1.14.2.bb | 19 + .../recipes-devtools/python/python3-cmd2_1.1.0.bb | 20 - .../recipes-devtools/python/python3-cmd2_1.3.3.bb | 20 + .../python/python3-colorlog_4.1.0.bb | 11 - .../python/python3-colorlog_4.2.1.bb | 11 + .../python/python3-coverage_5.2.1.bb | 10 + .../python/python3-coverage_5.2.bb | 10 - .../python/python3-cryptography/h-test.patch | 10 + .../python/python3-cryptography_2.8.bb | 65 --- .../python/python3-cryptography_3.0.bb | 66 +++ .../python/python3-djangorestframework_3.11.1.bb | 16 + .../python/python3-djangorestframework_3.9.0.bb | 2 - .../python/python3-dnspython_1.16.0.bb | 33 -- .../python/python3-dnspython_2.0.0.bb | 33 ++ .../python/python3-dynamic-dispatch_1.0.2.bb | 18 - .../python/python3-dynamic-dispatch_1.0.3.bb | 19 + .../python/python3-flask-login_0.4.1.bb | 2 - .../python/python3-flask-login_0.5.0.bb | 16 + .../recipes-devtools/python/python3-gast_0.3.3.bb | 12 - .../recipes-devtools/python/python3-gast_0.4.0.bb | 12 + .../recipes-devtools/python/python3-gmqtt_0.6.5.bb | 21 - .../recipes-devtools/python/python3-gmqtt_0.6.7.bb | 21 + .../python3-google-api-python-client_1.10.0.bb | 9 + .../python3-google-api-python-client_1.9.3.bb | 9 - .../python/python3-graphviz_0.14.1.bb | 17 + .../python/python3-graphviz_0.14.bb | 16 - .../recipes-devtools/python/python3-huey_2.2.0.bb | 10 - .../recipes-devtools/python/python3-huey_2.3.0.bb | 12 + .../python/python3-humanize_2.5.0.bb | 20 - .../python/python3-humanize_2.6.0.bb | 20 + .../python/python3-hyperlink_19.0.0.bb | 17 - .../python/python3-hyperlink_20.0.1.bb | 17 + .../python/python3-ipython-genutils_0.2.0.bb | 12 + .../python/python3-ipython_7.17.0.bb | 29 + .../recipes-devtools/python/python3-isort_5.1.4.bb | 17 - .../recipes-devtools/python/python3-isort_5.4.2.bb | 17 + .../python/python3-javaobj-py3_0.4.0.1.bb | 15 - .../python/python3-javaobj-py3_0.4.1.bb | 15 + .../python/python3-jdatetime_3.6.2.bb | 18 + .../recipes-devtools/python/python3-jedi_0.17.2.bb | 14 + .../python/python3-lazy-object-proxy_1.5.0.bb | 12 - .../python/python3-lazy-object-proxy_1.5.1.bb | 12 + .../recipes-devtools/python/python3-lorem_0.1.1.bb | 16 + .../python/python3-luma-core_1.14.0.bb | 20 - .../python/python3-luma-core_1.15.0.bb | 20 + .../recipes-devtools/python/python3-lxml_4.5.1.bb | 42 -- .../recipes-devtools/python/python3-lxml_4.5.2.bb | 42 ++ .../python/python3-matplotlib_3.2.2.bb | 37 -- .../python/python3-matplotlib_3.3.1.bb | 46 ++ .../python/python3-openpyxl_3.0.3.bb | 15 - .../python/python3-openpyxl_3.0.4.bb | 15 + .../python/python3-pandas_1.0.5.bb | 23 - .../python/python3-pandas_1.1.0.bb | 25 + .../python/python3-paramiko_2.7.1.bb | 14 + .../python/python3-parse_1.15.0.bb | 26 - .../python/python3-parse_1.16.0.bb | 26 + .../recipes-devtools/python/python3-parso_0.8.0.bb | 12 + .../python/python3-pickleshare_0.7.5.bb | 12 + .../recipes-devtools/python/python3-pid_3.0.3.bb | 12 - .../recipes-devtools/python/python3-pid_3.0.4.bb | 12 + .../python/python3-prompt-toolkit_3.0.5.bb | 23 - .../python/python3-prompt-toolkit_3.0.6.bb | 24 + .../python/python3-pyalsaaudio_0.8.4.bb | 2 - .../python/python3-pyalsaaudio_0.9.0.bb | 13 + .../python/python3-pybind11-json_0.2.6.bb | 12 + .../python/python3-pybind11_2.5.0.bb | 16 +- .../python/python3-pychromecast_7.1.2.bb | 11 - .../python/python3-pychromecast_7.2.0.bb | 11 + .../python/python3-pymongo_3.10.1.bb | 31 -- .../python/python3-pymongo_3.11.0.bb | 31 ++ .../python/python3-pynacl_1.4.0.bb | 32 ++ .../python/python3-pyroute2_0.5.12.bb | 37 -- .../python/python3-pyroute2_0.5.13.bb | 37 ++ .../python/python3-pytest-asyncio_0.12.0.bb | 14 - .../python/python3-pytest-asyncio_0.14.0.bb | 15 + .../python/python3-pytest-metadata_1.10.0.bb | 18 + .../python/python3-pytest-metadata_1.9.0.bb | 17 - .../python/python3-pytest-timeout_1.4.1.bb | 13 - .../python/python3-pytest-timeout_1.4.2.bb | 13 + .../python/python3-python-vlc_3.0.10114.bb | 9 - .../python/python3-python-vlc_3.0.11115.bb | 9 + .../python/python3-redis_2.10.6.bb | 15 - .../recipes-devtools/python/python3-redis_3.5.3.bb | 15 + .../python/python3-regex_2020.6.8.bb | 11 - .../python/python3-regex_2020.7.14.bb | 11 + .../recipes-devtools/python/python3-rsa_3.4.2.bb | 44 -- .../recipes-devtools/python/python3-rsa_4.6.bb | 41 ++ .../python/python3-sentry-sdk_0.16.0.bb | 12 - .../python/python3-sentry-sdk_0.16.5.bb | 12 + .../python/python3-sqlalchemy_1.3.18.bb | 20 - .../python/python3-sqlalchemy_1.3.19.bb | 20 + .../recipes-devtools/python/python3-sympy_1.6.1.bb | 16 - .../recipes-devtools/python/python3-sympy_1.6.2.bb | 16 + .../python/python3-textparser_0.23.0.bb | 14 + .../recipes-devtools/python/python3-tqdm_4.47.0.bb | 13 - .../recipes-devtools/python/python3-tqdm_4.48.2.bb | 13 + .../python/python3-traitlets_4.3.3.bb | 18 + .../python/python3-u-msgpack-python_2.6.0.bb | 26 - .../python/python3-u-msgpack-python_2.7.0.bb | 27 + .../recipes-devtools/python/python3-ujson_3.0.0.bb | 32 -- .../recipes-devtools/python/python3-ujson_3.1.0.bb | 32 ++ .../python/python3-urllib3_1.25.10.bb | 23 + .../python/python3-urllib3_1.25.9.bb | 23 - .../python/python3-wheel_0.34.2.bb | 13 - .../python/python3-wheel_0.35.1.bb | 13 + .../python/python3-wtforms_2.3.1.bb | 17 - .../python/python3-wtforms_2.3.3.bb | 17 + .../python/python3-xlsxwriter_1.2.9.bb | 5 - .../python/python3-xlsxwriter_1.3.3.bb | 14 + .../python/python3-xxhash_1.4.4.bb | 22 - .../python/python3-xxhash_2.0.0.bb | 22 + .../recipes-devtools/python/python3-yarl_1.4.2.bb | 29 - .../recipes-devtools/python/python3-yarl_1.5.1.bb | 29 + .../pywbem/python3-pywbem_0.17.3.bb | 56 -- .../pywbem/python3-pywbem_0.17.4.bb | 56 ++ .../apache-mod/apache-websocket_git.bb | 4 +- .../recipes-httpd/hiawatha/hiawatha_10.10.bb | 64 --- .../recipes-httpd/hiawatha/hiawatha_10.11.bb | 64 +++ .../recipes-httpd/monkey/monkey_1.5.6.bb | 77 --- .../recipes-httpd/monkey/monkey_1.6.9.bb | 78 +++ .../recipes-httpd/nostromo/nostromo_1.9.7.bb | 64 --- .../recipes-httpd/nostromo/nostromo_1.9.9.bb | 64 +++ .../imsettings/imsettings/imsettings-gcc10.patch | 31 ++ .../imsettings/imsettings_1.8.1.bb | 33 -- .../imsettings/imsettings_1.8.2.bb | 34 ++ .../xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch | 33 ++ .../cpufreq/xfce4-cpufreq-plugin_1.2.1.bb | 4 +- .../eyes/xfce4-eyes-plugin_4.5.0.bb | 11 - .../eyes/xfce4-eyes-plugin_4.5.1.bb | 10 + ...multiple-definition-errors-under-GCC-10.0.patch | 118 ++++ .../sensors/xfce4-sensors-plugin_1.3.92.bb | 4 +- .../timer/xfce4-timer-plugin_1.7.0.bb | 10 - .../timer/xfce4-timer-plugin_1.7.1.bb | 10 + .../whiskermenu/xfce4-whiskermenu-plugin_2.4.5.bb | 11 - .../whiskermenu/xfce4-whiskermenu-plugin_2.4.6.bb | 11 + .../recipes-xfce/tumbler/tumbler_0.2.8.bb | 31 -- .../recipes-xfce/tumbler/tumbler_0.2.9.bb | 30 + .../meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb | 39 -- .../meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb | 38 ++ 604 files changed, 12945 insertions(+), 8860 deletions(-) delete mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.2.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch delete mode 100644 meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.7.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.30.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.5.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.7.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.3.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.36.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.36.3.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_3.36.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.3.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.4.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.3.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.5.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.6.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.6.1.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.1.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.0.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-allocate-space-for-buf-on-heap.patch create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.6.0.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic/0001-Fix-musl-compatibility.patch create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic/0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.19.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.31.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.33.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.34.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.38.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.19.1.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.12.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.0.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl/0001-conf-Unix.mk-remove-fixed-command-definitions.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl/0002-test-test_x509.c-fix-potential-overflow-issue.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.6.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_9.1.4.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler/0001-linux-port-Rename-pthread_mutex_t-variable-lock.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.5.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.8.3.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-raddb-certs-Makefile-fix-the-occasional-verification.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.10.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.11.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-src-parse.c-Initialize-key-to-NULL.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Use-first-prerquisite-only-for-target-rule.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect/0001-trojans-tncc-wrapper.py-convert-to-python3.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-parallel-build.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-util-Simplify-input-validation.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-util-Fix-build-on-FreeBSD-by-avoiding-NSS_BUFLEN_PAS.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0003-util-Reallocate-larger-buffer-if-getpwuid_r-returns-.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.17.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.16.1.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.16.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.0.20.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.1.5.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp/ncftp-3.2.5-gcc10.patch create mode 100644 meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-build-with-fno-common.patch create mode 100644 meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Mark-toplevel-definition-as-external.patch create mode 100644 meta-openembedded/meta-networking/recipes-daemons/vblade/files/gcc-10.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_22.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_24.bb delete mode 100644 meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb create mode 100644 meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.18.bb create mode 100644 meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0001-cmds-fix-enum-conversion.patch create mode 100644 meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0002-lldp_head-rename-and-make-extern.patch create mode 100644 meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0003-lldp-add-packed-struct-definition.patch create mode 100644 meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0004-lldptool-make-extern.patch create mode 100644 meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0005-cisco_oui-match-encode-handler-prototypes.patch create mode 100644 meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0006-ecp22-make-enum-a-type-rather-than-instance.patch create mode 100644 meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0007-lldp_8021qaz-extern-config-object.patch create mode 100644 meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0008-stringops-fix-some-string-copy-errors.patch create mode 100644 meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0009-8021qaz-mark-prio-map-functions-static.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/reproducible-build.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.82.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.19-1.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/fping/fping_4.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/fping/fping_4.4.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.9.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/iftop/iftop/iftop-1.0-gcc10.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.7.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.8.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/netperf/files/0001-nettest_omni-Remove-duplicate-variable-definitions.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_30.0.bb create mode 100644 meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch delete mode 100644 meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.5.bb create mode 100644 meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.17.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.21.bb delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_489.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch create mode 100644 meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-Makefile-Check-for-last-line-only-from-preprocessed-.patch delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/lsscsi/lsscsi_0.30.bb create mode 100644 meta-openembedded/meta-oe/recipes-bsp/lsscsi/lsscsi_0.31.bb delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.12.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.1.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/0001-src-interface.h-Make-declarations-as-extern.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.8.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/configure-fix-largefile.patch create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.22.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.12.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.0.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.0.20.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.2.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/0001-Make-extern-declarations-to-avoid-duplicate-var-defi.patch create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/fno-common.patch delete mode 100644 meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v67.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v69.bb delete mode 100644 meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Use-__builtin_bswap32-on-Clang-if-supported.patch delete mode 100644 meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kdf-Move-code-to-fix.patch create mode 100644 meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.4.12.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.4.12.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.7.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-Fix-build-with-libmicrohttpd.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/lua/lua/CVE-2020-15888.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json/0001-Templatize-basic_json-ctor-from-json_ref.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json/0001-typo-fix.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.9.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-V8-backport-3f8dc4b2e5ba.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-bitbang-Make-bitbang_swd-extern-definition.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20180523.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20200505.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_0.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190808.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20200327.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-compile.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-minifi-compile.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-compile.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-cross-compile.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-musl-compile.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-rocksdb-cross-compile.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-Replace-need-for-error.h-when-it-does-not-exist.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-include-stdint.h-system-header-for-UINT16_MAX.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.15-fix-provider-debugging.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-maxMsgLen.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-multilib-man-cfg.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.5-service.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-ftbfs.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Avoid-variable-definition-in-header-files.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Replace-need-for-error.h-when-it-does-not-exist.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-stdint.h-system-header-for-UINT16_MAX.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.15-fix-provider-debugging.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-maxMsgLen.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-multilib-man-cfg.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.5-service.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-ftbfs.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sfcb.service create mode 100644 meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-DtaAnnotatedDump-Add-typedef-name-to-the-union.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1b.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.14.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb delete mode 100644 meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch delete mode 100644 meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.25.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.10.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.14.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch create mode 100644 meta-openembedded/meta-oe/recipes-graphics/fbida/files/fbida-gcc10.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.19.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.79.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.10.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch create mode 100644 meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_git.bb create mode 100644 meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-an-ARM64-gcc-10-compilation-error.-Without-t.patch create mode 100644 meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-hpmfwupg-move-variable-definition-to-.c-file.patch create mode 100644 meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-missing-extern-definition.patch create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/live555/files/config.linux-cross delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/live555/live555/config.linux-cross delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190828.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200721.bb delete mode 100644 meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.bb create mode 100644 meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0001-Remove-defining-handle_interrupt-twice.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/fmt/fmt_6.2.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/function2/function2_4.0.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/function2/function2_4.1.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.105.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/htop/files/htop-gcc10.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.70.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.30.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.31.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/mg/mg_20170401.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/mg/mg_20200723.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/nano/nano_5.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.4.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.89.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.08.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.28.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.30.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.7.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.1.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.2.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fixes_for_mm_struct.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0002-fixes_for_module_memory.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0003-fixes_for_changes_in_cpu_tlbstate.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.8-4.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.8.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-test/fwts/fwts_19.06.00.bb create mode 100644 meta-openembedded/meta-oe/recipes-test/fwts/fwts_20.07.00.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.48.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.50.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-djangorestframework.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-flask-login.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyalsaaudio.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-xlsxwriter.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-argexec_1.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-argexec_1.0.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.4.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.6.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.7.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-backcall_0.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.4.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.5.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.2.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.2.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_2.8.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.11.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.16.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dynamic-dispatch_1.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dynamic-dispatch_1.0.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.4.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.5.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.3.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.4.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.10.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.9.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_2.5.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_2.6.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_19.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_20.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.17.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.1.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.4.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_3.6.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.17.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.14.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.15.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.5.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.5.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.2.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.0.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_2.7.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.15.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.16.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pid_3.0.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pid_3.0.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.8.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.9.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11-json_0.2.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.10.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pynacl_1.4.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.12.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.13.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.12.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.14.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.10.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.9.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_1.4.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_1.4.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.10114.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.11115.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-redis_2.10.6.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-redis_3.5.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.6.8.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.7.14.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_3.4.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.16.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.16.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.18.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.19.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.6.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.6.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-textparser_0.23.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.47.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.48.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_4.3.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.6.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.7.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_3.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_3.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.10.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.9.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.34.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.35.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.3.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.3.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.2.9.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_2.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.4.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.5.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.17.3.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.17.4.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.10.bb create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.11.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.7.bb create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb create mode 100644 meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.5.bb create mode 100644 meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.6.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.8.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.9.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb') diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.2.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.2.bb deleted file mode 100644 index f0b58b967..000000000 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "A fuse filesystem to access the contents of an iPhone or iPod Touch" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7" -HOMEPAGE ="http://www.libimobiledevice.org/" - -DEPENDS = "fuse libimobiledevice" - -SRC_URI = " \ - http://www.libimobiledevice.org/downloads/ifuse-${PV}.tar.bz2 \ -" - -SRC_URI[md5sum] = "4152526b2ac3c505cb41797d997be14d" -SRC_URI[sha256sum] = "47835c8afb72588b3202fe0b206d7ea37a68663d9aa4eaf73f0a4bcb6215fc05" - -inherit autotools pkgconfig diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb new file mode 100644 index 000000000..8a317cddb --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb @@ -0,0 +1,13 @@ +SUMMARY = "A fuse filesystem to access the contents of an iPhone or iPod Touch" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7" +HOMEPAGE ="http://www.libimobiledevice.org/" + +DEPENDS = "fuse libimobiledevice" + +SRC_URI = "https://github.com/libimobiledevice/ifuse/releases/download/${PV}/ifuse-${PV}.tar.bz2" + +SRC_URI[md5sum] = "cd31fbd0ea945b2ff1e39eac8d198fdd" +SRC_URI[sha256sum] = "3550702ef94b2f5f16c7db91c6b3282b2aed1340665834a03e47458e09d98d87" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch new file mode 100644 index 000000000..6426ecb24 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/0001-Fix-compilation-with-GCC10.patch @@ -0,0 +1,44 @@ +From a812202d22a2861318b8e39f1cd74cd222f8e76f Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" +Date: Tue, 9 Jun 2020 11:30:38 +0300 +Subject: [PATCH] Fix compilation with GCC10 + +Fixed compilation with -fno-common, which enabled in GCC 10 by default. +See https://bugs.gentoo.org/707438. + +Upstream-Status: Backport [https://github.com/owfs/owfs/pull/62] +Signed-off-by: Khem Raj +--- + module/owserver/src/c/owserver.c | 2 ++ + module/owserver/src/include/owserver.h | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/module/owserver/src/c/owserver.c b/module/owserver/src/c/owserver.c +index db29988e..2ed29161 100644 +--- a/module/owserver/src/c/owserver.c ++++ b/module/owserver/src/c/owserver.c +@@ -36,6 +36,8 @@ + + #include "owserver.h" + ++pthread_mutex_t persistence_mutex ; ++ + /* --- Prototypes ------------ */ + static void SetupAntiloop(int argc, char **argv); + +diff --git a/module/owserver/src/include/owserver.h b/module/owserver/src/include/owserver.h +index 8be582f0..a257ed02 100644 +--- a/module/owserver/src/include/owserver.h ++++ b/module/owserver/src/include/owserver.h +@@ -18,7 +18,7 @@ + #include "ow.h" + #include "ow_connection.h" + +-pthread_mutex_t persistence_mutex ; ++extern pthread_mutex_t persistence_mutex ; + #define PERSISTENCELOCK _MUTEX_LOCK( persistence_mutex ) ; + #define PERSISTENCEUNLOCK _MUTEX_UNLOCK( persistence_mutex ) ; + +-- +2.28.0 + diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb index 414084449..7f56c88fc 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb @@ -12,6 +12,7 @@ DEPENDS = "fuse virtual/libusb0" SRCREV = "3744375dfaa350e31c9b360eb1e1a517bbeb5c47" SRC_URI = "git://github.com/owfs/owfs \ file://0001-Add-build-rule-for-README.patch \ + file://0001-Fix-compilation-with-GCC10.patch \ file://owhttpd \ file://owserver \ " diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb deleted file mode 100644 index 433ce4773..000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.2.1.bb +++ /dev/null @@ -1,76 +0,0 @@ -SUMMARY = "XFS Filesystem Utilities" -HOMEPAGE = "http://oss.sgi.com/projects/xfs" -SECTION = "base" -LICENSE = "GPLv2 & LGPLv2.1" -LICENSE_libhandle = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038 \ - file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" -DEPENDS = "util-linux util-linux-native" -SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ - file://remove_flags_from_build_flags.patch \ - file://0001-Check-for-MAP_SYNC-in-sys-mman.h.patch \ - file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ - file://0001-support-usrmerge.patch \ - " -SRC_URI[md5sum] = "5ca3f79e76e3fb984a03d1b42a2e60ba" -SRC_URI[sha256sum] = "7b500e148cebd08f99e37cf744c7843817b37e7be2a32c4dc57d6ea16e3019ae" - -inherit autotools-brokensep - -PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" - -DEPENDS += "util-linux" - -RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" - -FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" -FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" -FILES_${PN}-repair = "${base_sbindir}/xfs_repair" - -FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" - -EXTRA_OECONF = "--enable-gettext=no \ - --enable-scrub=no \ - INSTALL_USER=root \ - INSTALL_GROUP=root \ - ac_cv_header_aio_h=yes \ - ac_cv_lib_rt_lio_listio=yes \ - OPTIMIZER='${SELECTED_OPTIMIZATION}' \ -" - -DISABLE_STATIC = "" -EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader" - -PACKAGECONFIG ??= "readline blkid" - -PACKAGECONFIG[readline] = "--enable-readline=yes,--enable-readline=no,readline" -PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" - -export DEBUG="-DNDEBUG" -export BUILD_VERBOSE="1" -export tagname="CC" - -EXTRA_OEMAKE = "DIST_ROOT='${D}'" - -do_configure () { - export BUILD_CC="${BUILD_CC} ${BUILD_CFLAGS}" - # Prevent Makefile from calling configure without arguments, - # when do_configure gets called for a second time. - rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure - # Recreate configure script. - oe_runmake configure - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} - oe_runconf -} - -do_install_append() { - oe_runmake 'DESTDIR=${D}' install-dev - rm ${D}${libdir}/*.la - rmdir --ignore-fail-on-non-empty ${D}${libdir} - - if [ ${libdir} != ${base_libdir} ];then - ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a - ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so - fi -} diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.7.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.7.0.bb new file mode 100644 index 000000000..9efcc5617 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.7.0.bb @@ -0,0 +1,73 @@ +SUMMARY = "XFS Filesystem Utilities" +HOMEPAGE = "http://oss.sgi.com/projects/xfs" +SECTION = "base" +LICENSE = "GPLv2 & LGPLv2.1" +LICENSE_libhandle = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \ + file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" +DEPENDS = "util-linux util-linux-native" +SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ + file://remove_flags_from_build_flags.patch \ + file://0001-Check-for-MAP_SYNC-in-sys-mman.h.patch \ + file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ + file://0001-support-usrmerge.patch \ + " +SRC_URI[sha256sum] = "8f2348a68a686a3f4491dda5d62dd32d885fbc52d32875edd41e2c296e7b4f35" +inherit autotools-brokensep + +PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" + +DEPENDS += "util-linux" + +RDEPENDS_${PN} = "${PN}-fsck ${PN}-mkfs ${PN}-repair" + +FILES_${PN}-fsck = "${base_sbindir}/fsck.xfs" +FILES_${PN}-mkfs = "${base_sbindir}/mkfs.xfs" +FILES_${PN}-repair = "${base_sbindir}/xfs_repair" + +FILES_libhandle = "${base_libdir}/libhandle${SOLIBS}" + +EXTRA_OECONF = "--enable-gettext=no \ + --enable-scrub=no \ + INSTALL_USER=root \ + INSTALL_GROUP=root \ + ac_cv_header_aio_h=yes \ + ac_cv_lib_rt_lio_listio=yes \ + OPTIMIZER='${SELECTED_OPTIMIZATION}' \ +" + +DISABLE_STATIC = "" +EXTRA_AUTORECONF += "-I ${S}/m4 --exclude=autoheader" + +PACKAGECONFIG ??= "blkid" + +PACKAGECONFIG[blkid] = "--enable-blkid=yes,--enable-blkid=no,util-linux" + +export DEBUG="-DNDEBUG" +export BUILD_VERBOSE="1" +export tagname="CC" + +EXTRA_OEMAKE = "DIST_ROOT='${D}'" + +do_configure () { + export BUILD_CC="${BUILD_CC} ${BUILD_CFLAGS}" + # Prevent Makefile from calling configure without arguments, + # when do_configure gets called for a second time. + rm -f ${B}/include/builddefs ${B}/include/platform_defs.h ${B}/configure + # Recreate configure script. + oe_runmake configure + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + oe_runconf +} + +do_install_append() { + oe_runmake 'DESTDIR=${D}' install-dev + rm ${D}${libdir}/*.la + rmdir --ignore-fail-on-non-empty ${D}${libdir} + + if [ ${libdir} != ${base_libdir} ];then + ln -sf -r ${D}${libdir}/libhandle.a ${D}${base_libdir}/libhandle.a + ln -sf -r ${D}${base_libdir}/libhandle.so ${D}${libdir}/libhandle.so + fi +} diff --git a/meta-openembedded/meta-gnome/classes/gnome-help.bbclass b/meta-openembedded/meta-gnome/classes/gnome-help.bbclass index 967091ba4..9c4771ddc 100644 --- a/meta-openembedded/meta-gnome/classes/gnome-help.bbclass +++ b/meta-openembedded/meta-gnome/classes/gnome-help.bbclass @@ -9,8 +9,6 @@ # else # pack all help files to ${PN}-help- -FILES_${PN}-help = "${datadir}/*/translations" - # Dummy to get yelp build & PACKAGE_NO_HELP_SPLIT set 1 PACKAGES_append = " ${PN}-help" FILES_${PN}-help = "${datadir}/help" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb deleted file mode 100644 index 3b1698e72..000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "NetworkManager GUI library" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "glib-2.0 gtk+3 networkmanager" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gtk-doc gettext vala features_check - -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)}" -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -SRC_URI[archive.md5sum] = "094c45d7694b153612cbdc3c713edcb5" -SRC_URI[archive.sha256sum] = "4af69552d131a3b2b8b6a2df584044258bf588448dcdb4bddfa12a07c134b726" - -PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info" -PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr" -PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes" -PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info" - -# go introspection is not supported for mipsn32/riscv32, but vapi needs it -# -EXTRA_OEMESON_mipsarchn32_append = " -Dvapi=false" -EXTRA_OEMESON_riscv32_append = " -Dvapi=false" - -GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.30.bb b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.30.bb new file mode 100644 index 000000000..3f3cb90b7 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.30.bb @@ -0,0 +1,26 @@ +SUMMARY = "NetworkManager GUI library" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "glib-2.0 gtk+3 networkmanager" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gobject-introspection gtk-doc gettext vala features_check + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)}" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI[archive.md5sum] = "e1ccac96405861ecab195be5524baae6" +SRC_URI[archive.sha256sum] = "da33e72a49e07d855d97a52aa9a8962a4c96f52b9168c4e0027117ad8ffdafb4" + +PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info" +PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr" +PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes" +PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info" + +# go introspection is not supported for mipsn32/riscv32, but vapi needs it +# +EXTRA_OEMESON_mipsarchn32_append = " -Dvapi=false" +EXTRA_OEMESON_riscv32_append = " -Dvapi=false" + +GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.5.bb deleted file mode 100644 index a82e44b02..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.5.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" -SECTION = "x11/office" -DEPENDS = " \ - gnome-common-native \ - yelp-tools-native \ - appstream-glib \ - gtk+3 \ - gspell \ - libsecret \ - poppler \ - gstreamer1.0-plugins-base \ - orc \ - adwaita-icon-theme \ - ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext mime-xdg gtk-doc - -SRC_URI[archive.md5sum] = "5d68c81a3d4c5d27754b97405451f04e" -SRC_URI[archive.sha256sum] = "6f0dd6e30639eb620f201a6ae40f21c4b78c030f0d6437f9e309f7240195e97c" -SRC_URI += " \ - file://0001-Add-format-attribute-to-_synctex_malloc.patch \ - file://0002-add-a-formatting-attribute-check.patch \ -" - -GTKDOC_MESON_OPTION = "gtk_doc" - -EXTRA_OEMESON = " \ - -Dsystemduserunitdir=no \ -" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs" -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[nautilus] = "-Dnautilus=true,-Dnautilus=false,nautilus" -PACKAGECONFIG[browser-plugin] = "-Dbrowser_plugin=true,-Dbrowser_plugin=false" - -RDEPENDS_${PN} += "glib-2.0-utils" -RRECOMMMENDS_${PN} = "adwaita-icon-theme" - -PACKAGES =+ "${PN}-nautilus-extension" -PACKAGES =+ "${PN}-browser-plugin" - -FILES_${PN} += "${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/thumbnailers \ -" -FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so" -FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.7.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.7.bb new file mode 100644 index 000000000..3ea54101c --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.7.bb @@ -0,0 +1,55 @@ +SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" +SECTION = "x11/office" +DEPENDS = " \ + gnome-common-native \ + yelp-tools-native \ + appstream-glib \ + gtk+3 \ + gspell \ + libsecret \ + poppler \ + gstreamer1.0-plugins-base \ + orc \ + adwaita-icon-theme \ + ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext mime-xdg gtk-doc + +SRC_URI[archive.md5sum] = "a7ebf1f76552579be71fc63947a15297" +SRC_URI[archive.sha256sum] = "65d61a423e3fbbe07001f65e87422dfb7d2e42b9edf0ca6a1d427af9a04b8f32" +SRC_URI += " \ + file://0001-Add-format-attribute-to-_synctex_malloc.patch \ + file://0002-add-a-formatting-attribute-check.patch \ +" + +GTKDOC_MESON_OPTION = "gtk_doc" + +EXTRA_OEMESON = " \ + -Dsystemduserunitdir=no \ +" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs" +} + +PACKAGECONFIG ??= "" +PACKAGECONFIG[nautilus] = "-Dnautilus=true,-Dnautilus=false,nautilus" +PACKAGECONFIG[browser-plugin] = "-Dbrowser_plugin=true,-Dbrowser_plugin=false" + +RDEPENDS_${PN} += "glib-2.0-utils" +RRECOMMMENDS_${PN} = "adwaita-icon-theme" + +PACKAGES =+ "${PN}-nautilus-extension" +PACKAGES =+ "${PN}-browser-plugin" + +FILES_${PN} += "${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/thumbnailers \ +" +FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so" +FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index 6150df167..f39440cc6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ inherit gnomebase upstream-version-is-even -SRC_URI[archive.md5sum] = "4990dbdbf5850cbbfc46727367776058" -SRC_URI[archive.sha256sum] = "1f5f48173d0f288219d73d4f193cb921ae631932ba84030f05751c42bb003db2" -PV = "3.36.3" +SRC_URI[archive.sha256sum] = "c555528c546d457be0dc0eaca5d766d4dfef7c408276cb05f9724c463bfe7fd9" +PV = "3.36.5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.2.bb deleted file mode 100644 index bf5e6f6d1..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "An archive manager utility for the GNOME Environment" -LICENSE="GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - glib-2.0-native \ - gtk+3 \ - libarchive \ - libnotify \ -" - -inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even mime-xdg - -SRC_URI[archive.md5sum] = "caa0103ab34d237a9760fbf5e1c72bc1" -SRC_URI[archive.sha256sum] = "268f7fdad8d2a78dfed5e82eb8710bad389c311b720666d6f07a04ed51056bd2" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'packagekit', '', d)}" - -PACKAGECONFIG[nautilus] = "-Dnautilus-actions=true,-Dnautilus-actions=false,nautilus" -PACKAGECONFIG[packagekit] = "-Dpackagekit=true,-Dpackagekit=false," - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${libdir}/nautilus \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.3.bb new file mode 100644 index 000000000..9af88f2a9 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.3.bb @@ -0,0 +1,27 @@ +SUMMARY = "An archive manager utility for the GNOME Environment" +LICENSE="GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + glib-2.0-native \ + gtk+3 \ + libarchive \ + libnotify \ +" + +inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even mime-xdg + +SRC_URI[archive.sha256sum] = "0959e10a5d7a7442809624be9879d95db462ca76e8c66ad6299310e6acdb81b7" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'packagekit', '', d)}" + +PACKAGECONFIG[nautilus] = "-Dnautilus-actions=true,-Dnautilus-actions=false,nautilus" +PACKAGECONFIG[packagekit] = "-Dpackagekit=true,-Dpackagekit=false," + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${libdir}/nautilus \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.36.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.36.2.bb deleted file mode 100644 index fbf25a30c..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.36.2.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "GNOME Display Manager" -LICENSE="GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = " \ - dconf-native \ - gtk+3 \ - accountsservice \ - libcanberra \ - libpam \ -" - -REQUIRED_DISTRO_FEATURES = "x11 systemd pam" - -inherit gnomebase gsettings gobject-introspection gettext systemd useradd upstream-version-is-even features_check - -SRC_URI[archive.md5sum] = "18384eb8345dbee5a8219916debf7e43" -SRC_URI[archive.sha256sum] = "3f561c10ae2e5942b03026f02c0aa7d8712e382708b17a0970874df8175b83a8" -SRC_URI += "file://0001-Ensure-pam-file-installation.patch" - -EXTRA_OECONF = " \ - --without-plymouth \ - --with-default-pam-config=openembedded \ - --with-pam-mod-dir=${base_libdir}/security \ -" - -do_install_append() { - rm -rf ${D}/run ${D}${localstatedir}/run -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm" - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" - -# Some gnome components - as gnome-panel and gnome-shell (!!) - require gdm -# components. To allow gnome-images using different display-manager, split them -# out into a seperate package. -PACKAGE_BEFORE_PN = "${PN}-base" -FILES_${PN}-base = " \ - ${datadir}/glib-2.0 \ - ${datadir}/gnome-session \ - ${libdir}/lib*${SOLIBS} \ - ${libdir}/girepository-1.0 \ -" - -CONFFILES_${PN} += "${sysconfdir}/gdm/custom.conf" -FILES_${PN} += " \ - ${datadir}/dconf \ - ${base_libdir}/security/pam_gdm.so \ - ${localstatedir} \ - ${systemd_unitdir} \ -" - -RDEPENDS_${PN} += "${PN}-base" - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.36.3.bb new file mode 100644 index 000000000..fb0b77bf4 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.36.3.bb @@ -0,0 +1,55 @@ +SUMMARY = "GNOME Display Manager" +LICENSE="GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = " \ + dconf-native \ + gtk+3 \ + accountsservice \ + libcanberra \ + libpam \ +" + +REQUIRED_DISTRO_FEATURES = "x11 systemd pam" + +inherit gnomebase gsettings gobject-introspection gettext systemd useradd upstream-version-is-even features_check + +SRC_URI[archive.sha256sum] = "3bfbb620cbc0d1cbd70b4c4376cf4b705db4dc36a37124e5be386ccc25fa7e81" +SRC_URI += "file://0001-Ensure-pam-file-installation.patch" + +EXTRA_OECONF = " \ + --without-plymouth \ + --with-default-pam-config=openembedded \ + --with-pam-mod-dir=${base_libdir}/security \ +" + +do_install_append() { + rm -rf ${D}/run ${D}${localstatedir}/run +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm" + +SYSTEMD_SERVICE_${PN} = "${BPN}.service" + +# Some gnome components - as gnome-panel and gnome-shell (!!) - require gdm +# components. To allow gnome-images using different display-manager, split them +# out into a seperate package. +PACKAGE_BEFORE_PN = "${PN}-base" +FILES_${PN}-base = " \ + ${datadir}/glib-2.0 \ + ${datadir}/gnome-session \ + ${libdir}/lib*${SOLIBS} \ + ${libdir}/girepository-1.0 \ +" + +CONFFILES_${PN} += "${sysconfdir}/gdm/custom.conf" +FILES_${PN} += " \ + ${datadir}/dconf \ + ${base_libdir}/security/pam_gdm.so \ + ${localstatedir} \ + ${systemd_unitdir} \ +" + +RDEPENDS_${PN} += "${PN}-base" + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_3.36.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_3.36.2.bb new file mode 100644 index 000000000..4605857f5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_3.36.2.bb @@ -0,0 +1,32 @@ +SUMMARY = "GNOME calendar" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" + +SECTION = "x11/gnome" + +DEPENDS = " \ + gtk+3 \ + libical \ + gsettings-desktop-schemas \ + evolution-data-server \ + libsoup-2.4 \ + libdazzle \ + libhandy \ + libgweather \ + geoclue \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "d0b05345c0555a085e6e5426eab49494aba2826c856eb06fd7fdb762ec0c4c1f" + +FILES_${PN} += " \ + ${datadir}/gnome-shell \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ +" + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.3.bb deleted file mode 100644 index 81f42438e..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.3.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "GNOME Settings" -DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gettext vala upstream-version-is-even bash-completion features_check - -DEPENDS = " \ - gdk-pixbuf-native \ - colord-gtk \ - udisks2 \ - upower \ - polkit \ - pulseaudio \ - accountsservice \ - samba \ - gsettings-desktop-schemas \ - gnome-settings-daemon \ - gnome-desktop3 \ - gnome-online-accounts \ - libnma \ - gnome-bluetooth \ - grilo \ - libgtop \ - gsound \ - libpwquality \ -" - -REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11" - -SRC_URI[archive.md5sum] = "fd99a8df0cc656e971415f2a1b310019" -SRC_URI[archive.sha256sum] = "bc174d970dbeca3ee19c26019de31e9edf78dc9c4abde16e763566ee38c3691c" -SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" - -PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" -PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" -PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" - -# Once we have (lib)cheese we can make cheese a PACKAGECONFIG -EXTRA_OEMESON = " \ - -Doe_sysroot=${STAGING_DIR_HOST} \ - -Dcheese=false \ -" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/gnome-shell \ - ${datadir}/metainfo \ -" - -FILES_${PN}-dev += "${datadir}/gettext" - -RDEPENDS_${PN} += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.4.bb new file mode 100644 index 000000000..86b8304b6 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.4.bb @@ -0,0 +1,55 @@ +SUMMARY = "GNOME Settings" +DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gettext vala upstream-version-is-even bash-completion features_check + +DEPENDS = " \ + gdk-pixbuf-native \ + colord-gtk \ + udisks2 \ + upower \ + polkit \ + pulseaudio \ + accountsservice \ + samba \ + gsettings-desktop-schemas \ + gnome-settings-daemon \ + gnome-desktop3 \ + gnome-online-accounts \ + libnma \ + gnome-bluetooth \ + grilo \ + libgtop \ + gsound \ + libpwquality \ +" + +REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11" + +SRC_URI[archive.md5sum] = "16c228d7de4e9d2d57550791fbca3390" +SRC_URI[archive.sha256sum] = "ac02346bcf3391aa5c86ed857d76689fdb6e43c2b4b20d3ec6eab0ea9fecf754" +SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" + +PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" +PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" +PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" + +# Once we have (lib)cheese we can make cheese a PACKAGECONFIG +EXTRA_OEMESON = " \ + -Doe_sysroot=${STAGING_DIR_HOST} \ + -Dcheese=false \ +" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/gnome-shell \ + ${datadir}/metainfo \ +" + +FILES_${PN}-dev += "${datadir}/gettext" + +RDEPENDS_${PN} += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.3.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.3.1.bb deleted file mode 100644 index b7ef7545a..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.3.1.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "GNOME library for reading .desktop files" -SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ -" - -BPN = "gnome-desktop" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" - -SRC_URI[archive.md5sum] = "75e828342e51c88c866dcdd46c021d26" -SRC_URI[archive.sha256sum] = "4bed119fa25ea0ff7880928142365c3c8726585fc072bc147157e66b63e96b7e" - -SRC_URI += " \ - file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ - file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ -" - -DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" - -inherit features_check gtk-doc -REQUIRED_DISTRO_FEATURES += "x11" - -GTKDOC_MESON_OPTION = "gtk_doc" -EXTRA_OEMESON = "-Ddesktop_docs=false" - -PACKAGES =+ "libgnome-desktop3" -FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" - -RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.5.bb new file mode 100644 index 000000000..fcdb2aee4 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.5.bb @@ -0,0 +1,37 @@ +SUMMARY = "GNOME library for reading .desktop files" +SECTION = "x11/gnome" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ +" + +BPN = "gnome-desktop" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +SRC_URI[archive.sha256sum] = "eea1242994109fa3f05793963ee25c3df23bc84b0f0b81f03ec3c294c27ab753" + +SRC_URI += " \ + file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ + file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ +" + +DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" + +inherit features_check gtk-doc +REQUIRED_DISTRO_FEATURES += "x11" + +GTKDOC_MESON_OPTION = "gtk_doc" +EXTRA_OEMESON = "-Ddesktop_docs=false" + +PACKAGES =+ "libgnome-desktop3" +FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" + +RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb new file mode 100644 index 000000000..08fd96472 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb @@ -0,0 +1,34 @@ +SUMMARY = "GNOME disk utility" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SECTION = "x11/gnome" + +DEPENDS = " \ + gtk+3 \ + libdvdread \ + libcanberra \ + libnotify \ + libsecret \ + libpwquality \ + udisks2 \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +# As soon as elogind is of interest this needs rework: meson option is combo +PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" + +SRC_URI[archive.sha256sum] = "dd033d3f36ab070bc72317cf3045e5b4927765543f1bce7612b2c7f96595167a" + +FILES_${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ +" + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb index a9f527409..d14d6b503 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb @@ -6,9 +6,6 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext features_check upstream-version-is-even -SRC_URI[archive.md5sum] = "528b0b7cc2dd22c6026a9c8739c71fa7" -SRC_URI[archive.sha256sum] = "7ce4979817866911a94ecb75b36db56797e038c0c524c5c1a81aefccafc17337" - DEPENDS = " \ colord \ geocode-glib \ @@ -26,11 +23,12 @@ DEPENDS = " \ # all these are mandatory REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" SRC_URI[archive.md5sum] = "102dc488a6a726e4050cf5ab7e967e8d" SRC_URI[archive.sha256sum] = "3e33dbd319b562a5ab602dcab6de3ca81b85f8346672e90ec632b36bbf15ee4b" +UNKNOWN_CONFIGURE_WHITELIST = "introspection" + # allow cross build mixed with build of native tools do_write_config_append() { cat >${WORKDIR}/meson.native < -Date: Wed, 25 Dec 2019 13:53:52 -0800 -Subject: [PATCH] allocate space for buf on heap - -Avoids -| src/epggrab/module/xmltv.c:204:47: error: '%s' directive output may be truncated writing between 2 and 2147483645 bytes into a region of size 115 [-Werror=format-truncation=] -| 204 | snprintf(buf, sizeof(buf)-1, "ddprogid://%s/%s", mod->id, s); -| | ^~ - -Upstream-Status: Submitted [https://github.com/tvheadend/tvheadend/pull/1324] -Signed-off-by: Khem Raj ---- - src/epggrab/module/xmltv.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/epggrab/module/xmltv.c b/src/epggrab/module/xmltv.c -index 34ab05bdb..b1a956614 100644 ---- a/src/epggrab/module/xmltv.c -+++ b/src/epggrab/module/xmltv.c -@@ -197,11 +197,12 @@ static void parse_xmltv_dd_progid - (epggrab_module_t *mod, const char *s, char **uri, char **suri, - epg_episode_num_t *epnum) - { -- char buf[128]; - if (strlen(s) < 2) return; - -+ char* buf = (char *)malloc(strlen(s) + strlen(mod->id) + 13); -+ buf[strlen(s) + strlen(mod->id) + 12] = '\0'; - /* Raw URI */ -- snprintf(buf, sizeof(buf)-1, "ddprogid://%s/%s", mod->id, s); -+ snprintf(buf, strlen(s) + strlen(mod->id) + 12, "ddprogid://%s/%s", mod->id, s); - - /* SH - series without episode id so ignore */ - if (strncmp("SH", s, 2)) -@@ -219,6 +220,7 @@ static void parse_xmltv_dd_progid - if (buf[e+1]) sscanf(&buf[e+1], "%hu", &(epnum->e_num)); - } - } -+ free(buf); - } - - /** --- -2.24.1 - diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb index 20faef047..82c2cbe08 100644 --- a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb @@ -10,10 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9cae5acac2e9ee2fc3aec01ac88ce5db" SRC_URI = "git://github.com/tvheadend/tvheadend.git \ file://0001-adjust-for-64bit-time_t.patch \ - file://0001-allocate-space-for-buf-on-heap.patch \ " -SRCREV = "fda89e85e0b6ae796d8a09e178d3937aa7869270" +SRCREV = "ce09077056f9c6558c188d135cec3be85cc9c200" PV = "4.3+git${SRCPV}" PKGV = "4.3+git${GITPKGV}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.6.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.6.0.bb new file mode 100644 index 000000000..7f2674183 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.6.0.bb @@ -0,0 +1,30 @@ +Description = "Gerbera - An UPnP media server" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" + +SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https \ +" + +SRCREV = "b219e22f09e346dd048f614a01ca2cbc55edd940" + +S = "${WORKDIR}/git" + +DEPENDS = "expat fmt spdlog pugixml libebml libmatroska zlib curl libupnp e2fsprogs sqlite3 libnsl2" + +SYSTEMD_SERVICE_${PN} = "gerbera.service" + +inherit cmake systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=TRUE,-DWITH_SYSTEMD=FALSE,systemd" +PACKAGECONFIG[taglib] = "-DWITH_TAGLIB=TRUE,-DWITH_TAGLIB=FALSE,taglib" +EXTRA_OECMAKE = "-DWITH_JS=FALSE -DWITH_MAGIC=FALSE -DWITH_EXIF=FALSE -DLIBUUID_INCLUDE_DIRS=${STAGING_INCDIR} -DLIBUUID_LIBRARIES=-luuid" + +do_install_append() { + install -d ${D}/root/.config/ +} + +FILES_${PN} += "/root/.config/" + +SECURITY_CFLAGS_riscv64 = "${SECURITY_NOPIE_CFLAGS}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb deleted file mode 100644 index c96e4c52e..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb +++ /dev/null @@ -1,29 +0,0 @@ -Description = "Gerbera - An UPnP media server" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" - -SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https \ -" - -PV = "1.3.2" -SRCREV = "42b035ea9098c02af503d6391a0ed56d973aaf23" - -S = "${WORKDIR}/git" - -DEPENDS = "expat zlib curl libupnp e2fsprogs sqlite3 libnsl2" - -SYSTEMD_SERVICE_${PN} = "gerbera.service" - -inherit cmake systemd - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=TRUE,-DWITH_SYSTEMD=FALSE,systemd" -PACKAGECONFIG[taglib] = "-DWITH_TAGLIB=TRUE,-DWITH_TAGLIB=FALSE,taglib" -EXTRA_OECMAKE = "-DWITH_JS=FALSE -DWITH_MAGIC=FALSE -DWITH_EXIF=FALSE -DLIBUUID_INCLUDE_DIRS=${STAGING_INCDIR} -DLIBUUID_LIBRARIES=-luuid" - -do_install_append() { - install -d ${D}/root/.config/ -} - -FILES_${PN} += "/root/.config/" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb index 00a5c480d..c66c93ec5 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb @@ -1,7 +1,7 @@ SUMMARY = "Linux libcamera framework" SECTION = "libs" -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" +LICENSE = "GPL-2.0+ & LGPL-2.1+" LIC_FILES_CHKSUM = "\ file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \ @@ -18,13 +18,30 @@ PV = "202006+git${SRCPV}" S = "${WORKDIR}/git" -DEPENDS = "python3-pyyaml-native udev gnutls boost" +DEPENDS = "python3-pyyaml-native udev gnutls boost chrpath-native" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}" RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland qt', 'qtwayland', '', d)}" inherit meson pkgconfig python3native +do_install_append() { + chrpath -d ${D}${libdir}/libcamera.so +} + +addtask do_recalculate_ipa_signatures_package after do_package before do_packagedata +do_recalculate_ipa_signatures_package() { + local modules + for module in $(find ${PKGD}/usr/lib/libcamera -name "*.so.sign"); do + module="${module%.sign}" + if [ -f "${module}" ] ; then + modules="${modules} ${module}" + fi + done + + ${S}/src/ipa/ipa-sign-install.sh ${B}/src/ipa-priv-key.pem "${modules}" +} + FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig" FILES_${PN} += " ${libdir}/libcamera.so" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic/0001-Fix-musl-compatibility.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic/0001-Fix-musl-compatibility.patch new file mode 100644 index 000000000..1352fdde6 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic/0001-Fix-musl-compatibility.patch @@ -0,0 +1,30 @@ +From d7d00ec681dc430192cf2192b3de7b7c30c4753d Mon Sep 17 00:00:00 2001 +From: Bart Ribbers +Date: Sat, 9 May 2020 11:42:32 +0200 +Subject: [PATCH] Fix musl compatibility + +Signed-off-by: Khem Raj +Upstream-Status: Backport [https://github.com/MycroftAI/mimic1/commit/5282ff075091c3d1a635fb20f2b8a35a377f4b42.patch] +--- + src/hts/hts_engine_API/lib/HTS_misc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/hts/hts_engine_API/lib/HTS_misc.c b/src/hts/hts_engine_API/lib/HTS_misc.c +index 72306cb..afcaaec 100644 +--- a/src/hts/hts_engine_API/lib/HTS_misc.c ++++ b/src/hts/hts_engine_API/lib/HTS_misc.c +@@ -247,8 +247,10 @@ size_t HTS_ftell(HTS_File * fp) + fgetpos((FILE *) fp->pointer, &pos); + #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) + return (size_t) pos; +-#else ++#elif defined(__GLIBC__) + return (size_t) pos.__pos; ++#else ++ return (size_t) ftell(fp->pointer); + #endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */ + } else if (fp->type == HTS_DATA) { + HTS_Data *d = (HTS_Data *) fp->pointer; +-- +2.28.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic/0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic/0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch new file mode 100644 index 000000000..e6bf9eb2b --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic/0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch @@ -0,0 +1,29 @@ +From 7d38a72f9ae14a2416f7a78e28152aa33685aec7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Aug 2020 16:47:27 -0700 +Subject: [PATCH] cmu_indic_lang: Make cst_rx_not_indic as extern declaration + +Fixes build with gcc-10 which has -fno-common turned on by default + +Upstream-Status: Submitted [https://github.com/MycroftAI/mimic1/pull/211] +Signed-off-by: Khem Raj +--- + lang/cmu_indic_lang/cmu_indic_lang.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lang/cmu_indic_lang/cmu_indic_lang.h b/lang/cmu_indic_lang/cmu_indic_lang.h +index 75ee46c..83e2afa 100644 +--- a/lang/cmu_indic_lang/cmu_indic_lang.h ++++ b/lang/cmu_indic_lang/cmu_indic_lang.h +@@ -51,7 +51,7 @@ void cmu_indic_lang_init(cst_voice *v); + extern const cst_phoneset cmu_indic_phoneset; + extern const cst_cart cmu_indic_phrasing_cart; + +-const cst_regex * const cst_rx_not_indic; ++extern const cst_regex * const cst_rx_not_indic; + + #ifdef __cplusplus + } /* extern "C" */ +-- +2.28.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb deleted file mode 100644 index b313b110c..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "A fast lightweight Text-to-speech engine" -DESCRIPTION = "Mimic is a fast, lightweight Text-to-speech engine developed by Mycroft A.I. and VocaliD, based on Carnegie Mellon University’s Flite (Festival-Lite) software. Mimic takes in text and reads it out loud to create a high quality voice." -HOMEPAGE = "https://mimic.mycroft.ai/" -SECTION = "multimedia" - -# "Mimic is available under permissive BSD-like licenses" -LICENSE = "MIT-X & \ - PD & \ - CMU-Tex & \ - BSD & \ - BSD-2-Clause & \ - BSD-3-Clause & \ - flite & \ - (flite & Sun) & \ - BellBird & \ - Apache-2.0 \ - " -LIC_FILES_CHKSUM = "file://COPYING;md5=416ef1ca5167707fe381d7be33664a33" - -DEPENDS = "curl-native icu" - -SRCREV = "67e43bf0fa56008276b878ec3790aa5f32eb2a16" -SRC_URI = "git://github.com/MycroftAI/mimic.git" - -inherit autotools - -S = "${WORKDIR}/git" - -CPPFLAGS_append = " -Wno-error" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb new file mode 100644 index 000000000..0cac2bea5 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb @@ -0,0 +1,32 @@ +SUMMARY = "A fast lightweight Text-to-speech engine" +DESCRIPTION = "Mimic is a fast, lightweight Text-to-speech engine developed by Mycroft A.I. and VocaliD, based on Carnegie Mellon University’s Flite (Festival-Lite) software. Mimic takes in text and reads it out loud to create a high quality voice." +HOMEPAGE = "https://mimic.mycroft.ai/" +SECTION = "multimedia" + +# "Mimic is available under permissive BSD-like licenses" +LICENSE = "MIT-X & \ + PD & \ + CMU-Tex & \ + BSD & \ + BSD-2-Clause & \ + BSD-3-Clause & \ + flite & \ + (flite & Sun) & \ + BellBird & \ + Apache-2.0 \ + " +LIC_FILES_CHKSUM = "file://COPYING;md5=a2c2c7371b58b9cdeae0dc68846fe9f1" + +DEPENDS = "curl-native libpcre2" + +SRCREV = "adf655da0399530ac1b586590257847eb61be232" +SRC_URI = "git://github.com/MycroftAI/mimic1.git \ + file://0001-Fix-musl-compatibility.patch \ + file://0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch \ + " + +inherit autotools + +S = "${WORKDIR}/git" + +CPPFLAGS_append = " -Wno-error" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc index 04648a5d2..433388759 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc @@ -13,6 +13,7 @@ SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \ file://minidlna.service \ file://0001-Update-Gettext-version.patch \ file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \ + file://0001-Mark-setjmp_buffer-extern-declaration.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch new file mode 100644 index 000000000..0a1e800c8 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch @@ -0,0 +1,29 @@ +From 1c6028f5f8bbfd3fd7327a43e1bb762c2c166167 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Aug 2020 18:10:54 -0700 +Subject: [PATCH] Mark setjmp_buffer extern declaration + +Fixes build with -fno-common + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + metadata.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/metadata.c b/metadata.c +index 8a10c77..c114091 100644 +--- a/metadata.c ++++ b/metadata.c +@@ -484,7 +484,7 @@ GetAudioMetadata(const char *path, const char *name) + } + + /* For libjpeg error handling */ +-jmp_buf setjmp_buffer; ++extern jmp_buf setjmp_buffer; + static void + libjpeg_error_handler(j_common_ptr cinfo) + { +-- +2.28.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb deleted file mode 100644 index 235e63e48..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "C client library for the Music Player Daemon" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=06b9dfd2f197dc514d8ef06549684b77" -HOMEPAGE = "https://www.musicpd.org/libs/libmpdclient/" - -inherit meson - -SRC_URI = " \ - git://github.com/MusicPlayerDaemon/libmpdclient \ -" -SRCREV = "4e8d990eb5239566ee948f1cd79b7248e008620a" -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "tcp" -PACKAGECONFIG[tcp] = "-Dtcp=true,-Dtcp=false" - -do_install_append() { - # libmpdclient's Vala bindings are outdated and unmaintained; it - # is likely that nobody will ever use them, so let's not install - # them - rm -rf ${D}${datadir}/vala -} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.19.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.19.bb new file mode 100644 index 000000000..32f9688ea --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.19.bb @@ -0,0 +1,22 @@ +SUMMARY = "C client library for the Music Player Daemon" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=06b9dfd2f197dc514d8ef06549684b77" +HOMEPAGE = "https://www.musicpd.org/libs/libmpdclient/" + +inherit meson + +SRC_URI = " \ + git://github.com/MusicPlayerDaemon/libmpdclient \ +" +SRCREV = "27767959442ef390aabb16790494ba93fed962ef" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "tcp" +PACKAGECONFIG[tcp] = "-Dtcp=true,-Dtcp=false" + +do_install_append() { + # libmpdclient's Vala bindings are outdated and unmaintained; it + # is likely that nobody will ever use them, so let's not install + # them + rm -rf ${D}${datadir}/vala +} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.31.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.31.bb deleted file mode 100644 index 41abe7108..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.31.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "A minimalist command line interface to the Music Player Daemon" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -HOMEPAGE = "https://www.musicpd.org/clients/mpc/" - -inherit meson - -DEPENDS += " \ - libmpdclient \ -" - -SRC_URI = " \ - git://github.com/MusicPlayerDaemon/mpc \ -" -SRCREV = "59875acdf34e5f0eac0c11453c49daef54f78413" -S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.33.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.33.bb new file mode 100644 index 000000000..dcfc3df0b --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.33.bb @@ -0,0 +1,13 @@ +SUMMARY = "A minimalist command line interface to the Music Player Daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE = "https://www.musicpd.org/clients/mpc/" + +inherit meson + +DEPENDS += "libmpdclient" + +SRC_URI = "git://github.com/MusicPlayerDaemon/mpc" +SRCREV = "ef16b280052ef0320cb80f79d74c8ce0324005ed" + +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.34.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.34.bb deleted file mode 100644 index 0c99c7c69..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.34.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "A curses client for the Music Player Daemon" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -HOMEPAGE = "https://www.musicpd.org/clients/ncmpc/" - -inherit meson - -DEPENDS += " \ - boost \ - ncurses \ - libmpdclient \ -" - -PACKAGECONFIG ??= "colors locale mouse nls regex help_screen library_screen search_screen song_screen key_screen lyrics_screen outputs_screen" - -PACKAGECONFIG[colors] = "-Dcolors=true,-Dcolors=false" -PACKAGECONFIG[lirc] = "-Dlirc=enabled,-Dlirc=disabled,lirc" -PACKAGECONFIG[locale] = "-Dlocale=enabled,-Dlocale=disabled" -PACKAGECONFIG[mini] = "-Dmini=true,-Dmini=false" -PACKAGECONFIG[mouse] = "-Dmouse=enabled,-Dmouse=disabled" -PACKAGECONFIG[nls] = "-Dnls=enabled,-Dnls=disabled,gettext-native" -PACKAGECONFIG[regex] = "-Dregex=enabled,-Dregex=disabled,pcre" - -PACKAGECONFIG[help_screen] = "-Dhelp_screen=true,-Dhelp_screen=false" -PACKAGECONFIG[library_screen] = "-Dlibrary_screen=true,-Dlibrary_screen=false" -PACKAGECONFIG[search_screen] = "-Dsearch_screen=true,-Dsearch_screen=false" -PACKAGECONFIG[song_screen] = "-Dsong_screen=true,-Dsong_screen=false" -PACKAGECONFIG[key_screen] = "-Dkey_screen=true,-Dkey_screen=false" -PACKAGECONFIG[lyrics_screen] = "-Dlyrics_screen=true,-Dlyrics_screen=false" -PACKAGECONFIG[outputs_screen] = "-Doutputs_screen=true,-Doutputs_screen=false" -PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false" - -SRC_URI = " \ - git://github.com/MusicPlayerDaemon/ncmpc \ -" -SRCREV = "79cf9905355f25bc5cc6d5a05d2846d75342f554" -S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.38.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.38.bb new file mode 100644 index 000000000..ebf5d290b --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.38.bb @@ -0,0 +1,37 @@ +SUMMARY = "A curses client for the Music Player Daemon" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE = "https://www.musicpd.org/clients/ncmpc/" + +inherit meson + +DEPENDS += " \ + boost \ + ncurses \ + libmpdclient \ +" + +PACKAGECONFIG ??= "colors locale mouse nls regex help_screen library_screen search_screen song_screen key_screen lyrics_screen outputs_screen" + +PACKAGECONFIG[colors] = "-Dcolors=true,-Dcolors=false" +PACKAGECONFIG[lirc] = "-Dlirc=enabled,-Dlirc=disabled,lirc" +PACKAGECONFIG[locale] = "-Dlocale=enabled,-Dlocale=disabled" +PACKAGECONFIG[mini] = "-Dmini=true,-Dmini=false" +PACKAGECONFIG[mouse] = "-Dmouse=enabled,-Dmouse=disabled" +PACKAGECONFIG[nls] = "-Dnls=enabled,-Dnls=disabled,gettext-native" +PACKAGECONFIG[regex] = "-Dregex=enabled,-Dregex=disabled,pcre" + +PACKAGECONFIG[help_screen] = "-Dhelp_screen=true,-Dhelp_screen=false" +PACKAGECONFIG[library_screen] = "-Dlibrary_screen=true,-Dlibrary_screen=false" +PACKAGECONFIG[search_screen] = "-Dsearch_screen=true,-Dsearch_screen=false" +PACKAGECONFIG[song_screen] = "-Dsong_screen=true,-Dsong_screen=false" +PACKAGECONFIG[key_screen] = "-Dkey_screen=true,-Dkey_screen=false" +PACKAGECONFIG[lyrics_screen] = "-Dlyrics_screen=true,-Dlyrics_screen=false" +PACKAGECONFIG[outputs_screen] = "-Doutputs_screen=true,-Doutputs_screen=false" +PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false" + +SRC_URI = " \ + git://github.com/MusicPlayerDaemon/ncmpc \ +" +SRCREV = "2c71add42152072c5e0490de2870315dfb3b71e1" +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch index 16f123fad..2bffd65c6 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch @@ -13,21 +13,19 @@ Signed-off-by: Khem Raj CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 39b80250..d6bdf8ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1288,11 +1288,10 @@ FILE(MAKE_DIRECTORY "${NATIVE_BIN_DIR}") - SET(BIN2H_COMMAND "${NATIVE_BIN_DIR}bin2h") - SET(BSINCGEN_COMMAND "${NATIVE_BIN_DIR}bsincgen") - ADD_CUSTOM_COMMAND(OUTPUT "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}" -- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "${NATIVE_SRC_DIR}" - COMMAND ${CMAKE_COMMAND} -E remove "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}" -- COMMAND ${CMAKE_COMMAND} --build . --config "Release" -+ COMMAND gcc "${NATIVE_SRC_DIR}bin2h.c" -o "${BIN2H_COMMAND}" -lm -+ COMMAND gcc "${NATIVE_SRC_DIR}bsincgen.c" -o "${BSINCGEN_COMMAND}" -lm - WORKING_DIRECTORY "${NATIVE_BIN_DIR}" -- DEPENDS "${NATIVE_SRC_DIR}CMakeLists.txt" - IMPLICIT_DEPENDS C "${NATIVE_SRC_DIR}bin2h.c" - C "${NATIVE_SRC_DIR}bsincgen.c" - VERBATIM +@@ -1085,11 +1085,10 @@ ELSE() + SET(BIN2H_COMMAND "${NATIVE_BIN_DIR}/bin2h") + SET(BSINCGEN_COMMAND "${NATIVE_BIN_DIR}/bsincgen") + ADD_CUSTOM_COMMAND(OUTPUT "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}" +- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "${NATIVE_SRC_DIR}" + COMMAND ${CMAKE_COMMAND} -E remove "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}" +- COMMAND ${CMAKE_COMMAND} --build . --config "Release" ++ COMMAND gcc "${NATIVE_SRC_DIR}/bin2h.c" -o "${BIN2H_COMMAND}" -lm ++ COMMAND gcc "${NATIVE_SRC_DIR}/bsincgen.c" -o "${BSINCGEN_COMMAND}" -lm + WORKING_DIRECTORY "${NATIVE_BIN_DIR}" +- DEPENDS "${NATIVE_SRC_DIR}/CMakeLists.txt" + IMPLICIT_DEPENDS + C "${NATIVE_SRC_DIR}/bin2h.c" + C "${NATIVE_SRC_DIR}/bsincgen.c" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch index 8420386e3..607ddab8d 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch @@ -6,14 +6,12 @@ Subject: [PATCH] makehrtf: Disable Wstringop-truncation Upstream-Status: Inappropriate [Should be fixed in code] Signed-off-by: Khem Raj --- - utils/makehrtf.c | 2 ++ + utils/makemhr/makemhr.cpp | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/utils/makehrtf.c b/utils/makehrtf.c -index 0bd36849..0abe4252 100644 ---- a/utils/makehrtf.c -+++ b/utils/makehrtf.c -@@ -862,6 +862,7 @@ static int TrReadOperator(TokenReaderT *tr, const char *op) +--- a/utils/makemhr/makemhr.cpp ++++ b/utils/makemhr/makemhr.cpp +@@ -161,6 +161,7 @@ enum ChannelIndex : uint { * pattern string are replaced with the replacement string. The result is * truncated if necessary. */ @@ -21,7 +19,7 @@ index 0bd36849..0abe4252 100644 static int StrSubst(const char *in, const char *pat, const char *rep, const size_t maxLen, char *out) { size_t inLen, patLen, repLen; -@@ -900,6 +901,7 @@ static int StrSubst(const char *in, const char *pat, const char *rep, const size +@@ -199,6 +200,7 @@ static int StrSubst(const char *in, cons return !truncated; } diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.19.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.19.1.bb deleted file mode 100644 index a9cdfac8a..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.19.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "OpenAL is a cross-platform 3D audio API" -HOMEPAGE = "http://kcat.strangesoft.net/openal.html" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=0f159f19f9377e1895fbb477d5a7953e" - -inherit cmake pkgconfig - -# openal-soft-1.19.1 -SRCREV = "6761218e51699f46bf25c377e65b3e9ea5e434b9" -SRC_URI = "git://github.com/kcat/openal-soft \ - file://0001-Use-BUILD_CC-to-compile-native-tools.patch \ - file://0002-makehrtf-Disable-Wstringop-truncation.patch \ - " - -S = "${WORKDIR}/git" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)}" -PACKAGECONFIG[alsa] = "-DALSA=TRUE, -DALSA=FALSE, alsa-lib" -PACKAGECONFIG[pulseaudio] = "-DPULSEAUDIO=TRUE, -DPULSEAUDIO=FALSE, pulseaudio" -# currently doesn't work with libav-9 -# PKG_CHECK_MODULES(FFMPEG libavcodec>=53.61.100 libavformat>=53.32.100 libavutil>=51.35.100) -# but alffmpeg.c:418:44: error: 'AV_CH_LAYOUT_MONO' undeclared (first use in this function) -PACKAGECONFIG[examples] = "-DEXAMPLES=TRUE, -DEXAMPLES=FALSE, libav" - -FILES_${PN} += "${datadir}/openal" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb new file mode 100644 index 000000000..d283cb361 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "OpenAL is a cross-platform 3D audio API" +HOMEPAGE = "http://kcat.strangesoft.net/openal.html" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=0f159f19f9377e1895fbb477d5a7953e" + +inherit cmake pkgconfig + +SRCREV = "f5e0eef34db3a3ab94b61a2f99f84f078ba947e7" +SRC_URI = "git://github.com/kcat/openal-soft \ + file://0001-Use-BUILD_CC-to-compile-native-tools.patch \ + file://0002-makehrtf-Disable-Wstringop-truncation.patch \ + " + +S = "${WORKDIR}/git" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)}" +PACKAGECONFIG[alsa] = "-DALSA=TRUE, -DALSA=FALSE, alsa-lib" +PACKAGECONFIG[pulseaudio] = "-DPULSEAUDIO=TRUE, -DPULSEAUDIO=FALSE, pulseaudio" +# currently doesn't work with libav-9 +# PKG_CHECK_MODULES(FFMPEG libavcodec>=53.61.100 libavformat>=53.32.100 libavutil>=51.35.100) +# but alffmpeg.c:418:44: error: 'AV_CH_LAYOUT_MONO' undeclared (first use in this function) +PACKAGECONFIG[examples] = "-DEXAMPLES=TRUE, -DEXAMPLES=FALSE, libav" + +FILES_${PN} += "${datadir}/openal" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb deleted file mode 100644 index 3f6dbb8e9..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Library for opening, seeking, and decoding opus audio files" -HOMEPAGE = "https://www.opus-codec.org/" -SECTION = "audio" - -DEPENDS = "libogg openssl libopus" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=6ac22b992dde6a891f8949c3e2da8576" - -SRC_URI = "https://downloads.xiph.org/releases/opus/${BP}.tar.gz" -SRC_URI[md5sum] = "ab3f7d15d766f5b36b0951ee435f9ebf" -SRC_URI[sha256sum] = "48e03526ba87ef9cf5f1c47b5ebe3aa195bd89b912a57060c36184a6cd19412f" - -inherit autotools pkgconfig diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.12.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.12.bb new file mode 100644 index 000000000..c775cef5a --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.12.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Library for opening, seeking, and decoding opus audio files" +HOMEPAGE = "https://www.opus-codec.org/" +SECTION = "audio" + +DEPENDS = "libogg openssl libopus" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ac22b992dde6a891f8949c3e2da8576" + +SRC_URI = "https://downloads.xiph.org/releases/opus/${BP}.tar.gz" +SRC_URI[md5sum] = "45e8c62f6cd413395223c82f06bfa8ec" +SRC_URI[sha256sum] = "118d8601c12dd6a44f52423e68ca9083cc9f2bfe72da7a8c1acb22a80ae3550b" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid.bb b/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid.bb deleted file mode 100644 index 228b8b654..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid.bb +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2017 Khem Raj -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "Lightweight cross platform C++ GUID/UUID library" -HOMEPAGE = "https://github.com/graeme-hill/crossguid" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1373274bc8d8001edc54933919f36f68" -DEPENDS += "util-linux" - -PV = "0.0+git${SRCPV}" - -SRCREV = "b56957ac453575e91ca1b63a80c0077c2b0d011a" -SRC_URI = "git://github.com/graeme-hill/crossguid;protocol=https" - -S = "${WORKDIR}/git" - -do_compile() { - ${CXX} -c guid.cpp -o guid.o ${CXXFLAGS} -std=c++11 -DGUID_LIBUUID - ${AR} rvs libcrossguid.a guid.o -} - -do_install() { - install -D -m 0644 ${B}/libcrossguid.a ${D}${libdir}/libcrossguid.a - install -D -m 0644 ${S}/guid.h ${D}${includedir}/guid.h -} diff --git a/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb b/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb new file mode 100644 index 000000000..744171663 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb @@ -0,0 +1,20 @@ +# Copyright (C) 2017 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Lightweight cross platform C++ GUID/UUID library" +HOMEPAGE = "https://github.com/graeme-hill/crossguid" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1373274bc8d8001edc54933919f36f68" +DEPENDS += "util-linux" + +SRCREV = "5b45cdd9a56ca9da35ee0f8845cb4e2603d245dc" +SRC_URI = "git://github.com/graeme-hill/crossguid;protocol=https" + +S = "${WORKDIR}/git" + +inherit cmake + +do_install() { + install -D -m 0644 ${B}/libxg.a ${D}${libdir}/libxg.a + install -D -m 0644 ${S}/Guid.hpp ${D}${includedir}/Guid.hpp +} diff --git a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.0.bb b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.0.bb deleted file mode 100644 index 44f135a21..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require libmediaart.inc - -SRC_URI = "${GNOME_MIRROR}/libmediaart/1.9/libmediaart-${PV}.tar.xz" -SRC_URI[md5sum] = "0b65d64398d2f3dff89534c9dfffab4f" -SRC_URI[sha256sum] = "94668adb29d4dc3115b0fd105942ebd5ca6f5f9dbb2afa8a191a73a747dd506f" - -S = "${WORKDIR}/libmediaart-${PV}" diff --git a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb new file mode 100644 index 000000000..56a7873fc --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb @@ -0,0 +1,7 @@ +require libmediaart.inc + +SRC_URI = "${GNOME_MIRROR}/libmediaart/1.9/libmediaart-${PV}.tar.xz" +SRC_URI[md5sum] = "9b960a6a764fba38135fb57219f2e6b4" +SRC_URI[sha256sum] = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d" + +S = "${WORKDIR}/libmediaart-${PV}" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb b/meta-openembedded/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb new file mode 100644 index 000000000..a84fd9ac1 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "autossh is a program to start a copy of ssh and monitor it, restarting it as necessary should it die or stop passing traffic" +HOMEPAGE = "https://www.harding.motd.ca/autossh/" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://autossh.spec;md5=80a6701134723fd3420e733b46a0eb97" + +SRC_URI = "https://www.harding.motd.ca/autossh/${BP}.tgz" +SRC_URI[md5sum] = "2b804bc1bf6d2f2afaa526d02df7c0a2" +SRC_URI[sha256sum] = "5fc3cee3361ca1615af862364c480593171d0c54ec156de79fc421e31ae21277" + +RDEPENDS_${PN} = "openssh" + +CFLAGS_prepend = "-I${WORKDIR}/build " + +inherit autotools + +EXTRA_OECONF="--with-ssh=/usr/bin/ssh" + +do_compile_append() { + cp ${WORKDIR}/autossh-${PV}/CHANGES ${WORKDIR}/build + cp ${WORKDIR}/autossh-${PV}/README ${WORKDIR}/build + cp ${WORKDIR}/autossh-${PV}/autossh.host ${WORKDIR}/build + cp ${WORKDIR}/autossh-${PV}/rscreen ${WORKDIR}/build + cp ${WORKDIR}/autossh-${PV}/autossh.1 ${WORKDIR}/build + cp ${WORKDIR}/autossh-${PV}/autossh.spec ${WORKDIR}/build +} + +do_install_append() { + rm -rf ${D}${datadir}/examples +} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl/0001-conf-Unix.mk-remove-fixed-command-definitions.patch b/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl/0001-conf-Unix.mk-remove-fixed-command-definitions.patch new file mode 100644 index 000000000..00be22499 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl/0001-conf-Unix.mk-remove-fixed-command-definitions.patch @@ -0,0 +1,57 @@ +From 4ba61c59d3488c263d106d486b656854a57ad79f Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Thu, 13 Aug 2020 15:26:30 +0200 +Subject: [PATCH 1/2] conf/Unix.mk: remove fixed command definitions + +For cross compiling in Yocto or with appropriate SDKs, commands like +`$CC` are reasonably predefined. + +Upstream-Status: Inappropriate + +Signed-off-by: Jens Rehsack +--- + conf/Unix.mk | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/conf/Unix.mk b/conf/Unix.mk +index 02f2b2b..05979fc 100644 +--- a/conf/Unix.mk ++++ b/conf/Unix.mk +@@ -37,23 +37,19 @@ RM = rm -f + MKDIR = mkdir -p + + # C compiler and flags. +-CC = cc +-CFLAGS = -W -Wall -Os -fPIC + CCOUT = -c -o + + # Static library building tool. +-AR = ar + ARFLAGS = -rcs + AROUT = + + # DLL building tool. +-LDDLL = cc ++LDDLL = $(CCLD) + LDDLLFLAGS = -shared + LDDLLOUT = -o + + # Static linker. +-LD = cc +-LDFLAGS = ++LD = $(CCLD) + LDOUT = -o + + # C# compiler; we assume usage of Mono. +@@ -63,7 +59,7 @@ RUNT0COMP = mono T0Comp.exe + # Set the values to 'no' to disable building of the corresponding element + # by default. Building can still be invoked with an explicit target call + # (e.g. 'make dll' to force build the DLL). +-#STATICLIB = no ++STATICLIB = no + #DLL = no + #TOOLS = no + #TESTS = no +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl/0002-test-test_x509.c-fix-potential-overflow-issue.patch b/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl/0002-test-test_x509.c-fix-potential-overflow-issue.patch new file mode 100644 index 000000000..94abd27fa --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl/0002-test-test_x509.c-fix-potential-overflow-issue.patch @@ -0,0 +1,41 @@ +From 542380a13f178d97851751b57054a6b5be555d1c Mon Sep 17 00:00:00 2001 +From: Jens Rehsack +Date: Thu, 13 Aug 2020 16:16:44 +0200 +Subject: [PATCH 2/2] test/test_x509.c: fix potential overflow issue + +Instead of doing a memcpy() which does static overflow checking, use +snprintf() for string copying which does the check dynamically. + +Fixes: +| In file included from .../recipe-sysroot/usr/include/string.h:519, +| from test/test_x509.c:27: +| In function 'memcpy', +| inlined from 'parse_keyvalue' at test/test_x509.c:845:2, +| inlined from 'process_conf_file' at test/test_x509.c:1360:7, +| inlined from 'main' at test/test_x509.c:2038:2: +| .../recipe-sysroot/usr/include/bits/string_fortified.h:34:10: warning: '__builtin_memcpy' specified bound 4294967295 exceeds maximum object size 2147483647 [-Wstringop-overflow=] +| 34 | return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest)); +| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Jens Rehsack +--- + test/test_x509.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/test/test_x509.c b/test/test_x509.c +index 2c61cf5..76f6ab9 100644 +--- a/test/test_x509.c ++++ b/test/test_x509.c +@@ -842,8 +842,7 @@ parse_keyvalue(HT *d) + return -1; + } + name = xmalloc(u + 1); +- memcpy(name, buf, u); +- name[u] = 0; ++ snprintf(name, u, "%s", buf); + if (HT_get(d, name) != NULL) { + xfree(name); + return -1; +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb new file mode 100644 index 000000000..a0f64e933 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb @@ -0,0 +1,35 @@ +SUMMARY = "BearSSL is an implementation of the SSL/TLS protocol (RFC 5246) written in C" +DESCRIPTION = "BearSSL is an implementation of the SSL/TLS protocol (RFC \ +5246) written in C. It aims at offering the following features: \ + * Be correct and secure. In particular, insecure protocol versions and \ + choices of algorithms are not supported, by design; cryptographic \ + algorithm implementations are constant-time by default. \ + * Be small, both in RAM and code footprint. For instance, a minimal \ + server implementation may fit in about 20 kilobytes of compiled code \ + and 25 kilobytes of RAM. \ + * Be highly portable. BearSSL targets not only “big” operating systems \ + like Linux and Windows, but also small embedded systems and even special \ + contexts like bootstrap code. \ + * Be feature-rich and extensible. SSL/TLS has many defined cipher suites \ + and extensions; BearSSL should implement most of them, and allow extra \ + algorithm implementations to be added afterwards, possibly from third \ + parties." +HOMEPAGE = "https://bearssl.org" + +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1fc37e1037ae673975fbcb96a98f7191" + +SRCREV = "8ef7680081c61b486622f2d983c0d3d21e83caad" +SRC_URI = "git://www.bearssl.org/git/BearSSL;protocol=https;nobranch=1 \ + file://0001-conf-Unix.mk-remove-fixed-command-definitions.patch \ + file://0002-test-test_x509.c-fix-potential-overflow-issue.patch \ + " + +# without compile errors like +# <..>/ld: build/obj/ghash_pclmul.o: warning: relocation against `br_ghash_pclmul' in read-only section `.text' +CFLAGS += "-fPIC" + +S = "${WORKDIR}/git" +B = "${S}" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb deleted file mode 100644 index 42ffb17a1..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "The dump DAQ test the various inline mode features " -HOMEPAGE = "http://www.snort.org" -SECTION = "libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=f9ce51a65dd738dc1ae631d8b21c40e0" - -PARALLEL_MAKE = "" - -DEPENDS = "libpcap libpcre libdnet bison-native" - -SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ - file://disable-run-test-program-while-cross-compiling.patch \ - file://0001-correct-the-location-of-unistd.h.patch \ - " - -# these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking -# this error from test-dependencies script: -# daq/daq/latest lost dependency on libdnet libmnl libnetfilter-queue libnfnetlink -# -# never look to /usr/local lib while cross compiling - -EXTRA_OECONF = "--disable-nfq-module --disable-ipq-module --includedir=${includedir} \ - --with-libpcap-includes=${STAGING_INCDIR} --with-dnet-includes=${STAGING_LIBDIR}" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -SRC_URI[md5sum] = "2cd6da422a72c129c685fc4bb848c24c" -SRC_URI[sha256sum] = "b40e1d1273e08aaeaa86e69d4f28d535b7e53bdb3898adf539266b63137be7cb" - -inherit autotools - -DISABLE_STATIC = "" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb b/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb new file mode 100644 index 000000000..8e5ee66a2 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb @@ -0,0 +1,32 @@ +SUMMARY = "The dump DAQ test the various inline mode features " +HOMEPAGE = "http://www.snort.org" +SECTION = "libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=f9ce51a65dd738dc1ae631d8b21c40e0" + +PARALLEL_MAKE = "" + +DEPENDS = "libpcap libpcre libdnet bison-native" + +SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ + file://disable-run-test-program-while-cross-compiling.patch \ + file://0001-correct-the-location-of-unistd.h.patch \ + " +SRC_URI[sha256sum] = "bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e" +# these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking +# this error from test-dependencies script: +# daq/daq/latest lost dependency on libdnet libmnl libnetfilter-queue libnfnetlink +# +# never look to /usr/local lib while cross compiling + +EXTRA_OECONF = "--disable-nfq-module --disable-ipq-module --includedir=${includedir} \ + --with-libpcap-includes=${STAGING_INCDIR} --with-dnet-includes=${STAGING_LIBDIR}" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +inherit autotools + +DISABLE_STATIC = "" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.6.bb deleted file mode 100644 index 1cb2af500..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_8.1.6.bb +++ /dev/null @@ -1,27 +0,0 @@ -SECTION = "console/network" -SUMMARY = "dhcpcd - a DHCP client" -DESCRIPTION = "dhcpcd runs on your machine and silently configures your computer to work on the attached networks without trouble and mostly without configuration." - -HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0531457992a97ecebc6975914a874a9d" - -UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" - -SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ - file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch" - -SRC_URI[md5sum] = "e1eea03388d12c9ad21ecd7c135fdf8b" -SRC_URI[sha256sum] = "6c2934a3e1e67a5cfd5bb15b1efa71f65c00314ac1ccb5c50da8eae3a0b8147f" - -inherit pkgconfig autotools-brokensep - -PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" - -PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" - -EXTRA_OECONF = "--enable-ipv4" - -FILES_${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_9.1.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_9.1.4.bb new file mode 100644 index 000000000..defd3420f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_9.1.4.bb @@ -0,0 +1,28 @@ +SECTION = "console/network" +SUMMARY = "dhcpcd - a DHCP client" +DESCRIPTION = "dhcpcd runs on your machine and silently configures your \ + computer to work on the attached networks without trouble \ + and mostly without configuration." + +HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9674cc803c5d71306941e6e8b5c002f2" + +UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" + +SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch" + +SRC_URI[sha256sum] = "5fe133e5497d8af6d26bd6e6b8dd48ab12d124d6cc4cefe6de6536ff97f76820" + +inherit pkgconfig autotools-brokensep + +PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" + +PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" + +EXTRA_OECONF = "--enable-ipv4" + +FILES_${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler/0001-linux-port-Rename-pthread_mutex_t-variable-lock.patch b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler/0001-linux-port-Rename-pthread_mutex_t-variable-lock.patch deleted file mode 100644 index 346a56a9a..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler/0001-linux-port-Rename-pthread_mutex_t-variable-lock.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 630086cf1b3fba71822319a268d3711734cd6aa8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 31 Jan 2019 12:56:13 -0800 -Subject: [PATCH] linux-port: Rename pthread_mutex_t variable 'lock' - -lock is also used by libc++ in std namespace and using it here causes -clang to fail e.g. - -dibbler-client.cpp:47:25: error: reference to 'lock' is ambiguous - pthread_mutex_lock(&lock); - ^ -../../../../../../../workspace/sources/dibbler/Port-linux/dibbler-client.cpp:29:26: note: candidate found by name lookup is 'lock' -extern ::pthread_mutex_t lock; - ^ -/mnt/a/yoe/build/tmp/work/aarch64-yoe-linux/dibbler/1.0.1+1.0.2RC1+gitc4b0ed52e751da7823dd9a36e91f93a6310e5525-r0/recipe-sysroot/usr/include/c++/v1/mutex:446:1: note: candidate found by name lookup is 'std::__1::lock' -lock(_L0& __l0, _L1& __l1, _L2& __l2, _L3& ...__l3) - -Upstream-Status: Submitted [https://github.com/tomaszmrugalski/dibbler/pull/37] - -Signed-off-by: Khem Raj ---- - Port-linux/dibbler-client.cpp | 6 +++--- - Port-linux/lowlevel-linux-link-state.c | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Port-linux/dibbler-client.cpp b/Port-linux/dibbler-client.cpp -index 78f34241..b5ebb9f0 100644 ---- a/Port-linux/dibbler-client.cpp -+++ b/Port-linux/dibbler-client.cpp -@@ -26,7 +26,7 @@ using namespace std; - - #define IF_RECONNECTED_DETECTED -1 - --extern pthread_mutex_t lock; -+extern pthread_mutex_t dibbler_lock; - - TDHCPClient* ptr = 0; - -@@ -44,8 +44,8 @@ void signal_handler(int n) { - #ifdef MOD_CLNT_CONFIRM - void signal_handler_of_linkstate_change(int n) { - Log(Notice) << "Network switch off event detected. initiating CONFIRM." << LogEnd; -- pthread_mutex_lock(&lock); -- pthread_mutex_unlock(&lock); -+ pthread_mutex_lock(&dibbler_lock); -+ pthread_mutex_unlock(&dibbler_lock); - } - #endif - -diff --git a/Port-linux/lowlevel-linux-link-state.c b/Port-linux/lowlevel-linux-link-state.c -index 76293ea1..e6b94063 100644 ---- a/Port-linux/lowlevel-linux-link-state.c -+++ b/Port-linux/lowlevel-linux-link-state.c -@@ -34,7 +34,7 @@ volatile int * notifier = 0; - int isDone = 0; - pthread_t parent_id; - pthread_t ntid; --pthread_mutex_t lock; -+pthread_mutex_t dibbler_lock; - - struct state { - int id; -@@ -86,9 +86,9 @@ void link_state_changed(int ifindex) - { - if (changed_links->cnt<16) - changed_links->ifindex[changed_links->cnt++] = ifindex; -- pthread_mutex_lock(&lock); -+ pthread_mutex_lock(&dibbler_lock); - *notifier = 1; /* notify that change has occured */ -- pthread_mutex_unlock(&lock); -+ pthread_mutex_unlock(&dibbler_lock); - pthread_kill(parent_id,SIGUSR1); - } else - { diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index 90051a319..c2f482716 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -5,11 +5,10 @@ HOMEPAGE = "http://klub.com.pl/dhcpv6" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3" -SRCREV = "c4b0ed52e751da7823dd9a36e91f93a6310e5525" +SRCREV = "a7c6cf58a88a510cb00841351e75030ce78d36bf" SRC_URI = "git://github.com/tomaszmrugalski/dibbler \ file://dibbler_fix_getSize_crash.patch \ - file://0001-linux-port-Rename-pthread_mutex_t-variable-lock.patch \ " PV = "1.0.1+1.0.2RC1+git${SRCREV}" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.5.bb deleted file mode 100644 index fbf586f76..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.7.5.bb +++ /dev/null @@ -1,92 +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[md5sum] = "b1aeede85a72adcf4f79d98019811244" -SRC_URI[sha256sum] = "45a8a7dbc084ef56ce306154d3834922e7f1fc2bf11b6c821f579cad51313226" - -# 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 = "\ - --with-nft=${sbindir}/nft \ - --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.8.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.8.3.bb new file mode 100644 index 000000000..ddf5ff88e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.8.3.bb @@ -0,0 +1,90 @@ +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/freeradius/files/0001-raddb-certs-Makefile-fix-the-occasional-verification.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-raddb-certs-Makefile-fix-the-occasional-verification.patch new file mode 100644 index 000000000..dce0427e1 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-raddb-certs-Makefile-fix-the-occasional-verification.patch @@ -0,0 +1,135 @@ +From 3eda5d35fbaf66ed6bdc86ada4320a0a18681b7e Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 5 Aug 2020 07:23:11 +0000 +Subject: [PATCH] raddb/certs/Makefile: fix the occasional verification failure + +Fixes: + # cd /etc/raddb/certs + # ./bootstrap +[snip] +chmod g+r ca.key +openssl pkcs12 -in server.p12 -out server.pem -passin pass:'whatever' -passout pass:'whatever' +chmod g+r server.pem +C = FR, ST = Radius, O = Example Inc., CN = Example Server Certificate, emailAddress = admin@example.org +error 7 at 0 depth lookup: certificate signature failure +140066667427072:error:04067084:rsa routines:rsa_ossl_public_decrypt:data too large for modulus:../openssl-1.1.1g/crypto/rsa/rsa_ossl.c:553: +140066667427072:error:0D0C5006:asn1 encoding routines:ASN1_item_verify:EVP lib:../openssl-1.1.1g/crypto/asn1/a_verify.c:170: +error server.pem: verification failed +make: *** [Makefile:107: server.vrfy] Error 2 + +It seems the ca.pem mismatchs server.pem which results in failing to +execute "openssl verify -CAfile ca.pem server.pem", so add to check +the file to avoid inconsistency. + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu +--- + raddb/certs/Makefile | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/raddb/certs/Makefile b/raddb/certs/Makefile +index 77eec9baa1..3dcb63fe71 100644 +--- a/raddb/certs/Makefile ++++ b/raddb/certs/Makefile +@@ -59,7 +59,7 @@ passwords.mk: server.cnf ca.cnf client.cnf inner-server.cnf + # + ###################################################################### + dh: +- $(OPENSSL) dhparam -out dh -2 $(DH_KEY_SIZE) ++ @[ -f dh ] || $(OPENSSL) dhparam -out dh -2 $(DH_KEY_SIZE) + + ###################################################################### + # +@@ -69,17 +69,17 @@ dh: + ca.key ca.pem: ca.cnf + @[ -f index.txt ] || $(MAKE) index.txt + @[ -f serial ] || $(MAKE) serial +- $(OPENSSL) req -new -x509 -keyout ca.key -out ca.pem \ ++ @[ -f ca.pem ] || $(OPENSSL) req -new -x509 -keyout ca.key -out ca.pem \ + -days $(CA_DEFAULT_DAYS) -config ./ca.cnf \ + -passin pass:$(PASSWORD_CA) -passout pass:$(PASSWORD_CA) + chmod g+r ca.key + + ca.der: ca.pem +- $(OPENSSL) x509 -inform PEM -outform DER -in ca.pem -out ca.der ++ @[ -f ca.der ] || $(OPENSSL) x509 -inform PEM -outform DER -in ca.pem -out ca.der + + ca.crl: ca.pem +- $(OPENSSL) ca -gencrl -keyfile ca.key -cert ca.pem -config ./ca.cnf -out ca-crl.pem -key $(PASSWORD_CA) +- $(OPENSSL) crl -in ca-crl.pem -outform der -out ca.crl ++ @[ -f ca-crl.pem ] || $(OPENSSL) ca -gencrl -keyfile ca.key -cert ca.pem -config ./ca.cnf -out ca-crl.pem -key $(PASSWORD_CA) ++ @[ -f ca.crl ] || $(OPENSSL) crl -in ca-crl.pem -outform der -out ca.crl + rm ca-crl.pem + + ###################################################################### +@@ -88,18 +88,18 @@ ca.crl: ca.pem + # + ###################################################################### + server.csr server.key: server.cnf +- $(OPENSSL) req -new -out server.csr -keyout server.key -config ./server.cnf ++ @[ -f server.csr ] || $(OPENSSL) req -new -out server.csr -keyout server.key -config ./server.cnf + chmod g+r server.key + + server.crt: server.csr ca.key ca.pem + @[ -f server.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in server.csr -key $(PASSWORD_CA) -out server.crt -extensions xpserver_ext -extfile xpextensions -config ./server.cnf + + server.p12: server.crt +- $(OPENSSL) pkcs12 -export -in server.crt -inkey server.key -out server.p12 -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER) ++ @[ -f server.p12 ] || $(OPENSSL) pkcs12 -export -in server.crt -inkey server.key -out server.p12 -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER) + chmod g+r server.p12 + + server.pem: server.p12 +- $(OPENSSL) pkcs12 -in server.p12 -out server.pem -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER) ++ @[ -f server.pem ] || $(OPENSSL) pkcs12 -in server.p12 -out server.pem -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER) + chmod g+r server.pem + + .PHONY: server.vrfy +@@ -113,18 +113,18 @@ server.vrfy: ca.pem + # + ###################################################################### + client.csr client.key: client.cnf +- $(OPENSSL) req -new -out client.csr -keyout client.key -config ./client.cnf ++ @[ -f client.csr ] || $(OPENSSL) req -new -out client.csr -keyout client.key -config ./client.cnf + chmod g+r client.key + + client.crt: client.csr ca.pem ca.key + @[ -f client.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in client.csr -key $(PASSWORD_CA) -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf + + client.p12: client.crt +- $(OPENSSL) pkcs12 -export -in client.crt -inkey client.key -out client.p12 -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) ++ @[ -f client.p12 ] || $(OPENSSL) pkcs12 -export -in client.crt -inkey client.key -out client.p12 -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) + chmod g+r client.p12 + + client.pem: client.p12 +- $(OPENSSL) pkcs12 -in client.p12 -out client.pem -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) ++ @[ -f client.pem ] || $(OPENSSL) pkcs12 -in client.p12 -out client.pem -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT) + chmod g+r client.pem + cp client.pem $(USER_NAME).pem + +@@ -139,18 +139,18 @@ client.vrfy: ca.pem client.pem + # + ###################################################################### + inner-server.csr inner-server.key: inner-server.cnf +- $(OPENSSL) req -new -out inner-server.csr -keyout inner-server.key -config ./inner-server.cnf ++ @[ -f inner-server.csr] || $(OPENSSL) req -new -out inner-server.csr -keyout inner-server.key -config ./inner-server.cnf + chmod g+r inner-server.key + + inner-server.crt: inner-server.csr ca.key ca.pem +- $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in inner-server.csr -key $(PASSWORD_CA) -out inner-server.crt -extensions xpserver_ext -extfile xpextensions -config ./inner-server.cnf ++ @[ -f inner-server.crt ] || $(OPENSSL) ca -batch -keyfile ca.key -cert ca.pem -in inner-server.csr -key $(PASSWORD_CA) -out inner-server.crt -extensions xpserver_ext -extfile xpextensions -config ./inner-server.cnf + + inner-server.p12: inner-server.crt +- $(OPENSSL) pkcs12 -export -in inner-server.crt -inkey inner-server.key -out inner-server.p12 -passin pass:$(PASSWORD_INNER) -passout pass:$(PASSWORD_INNER) ++ @[ -f inner-server.p12 ] || $(OPENSSL) pkcs12 -export -in inner-server.crt -inkey inner-server.key -out inner-server.p12 -passin pass:$(PASSWORD_INNER) -passout pass:$(PASSWORD_INNER) + chmod g+r inner-server.p12 + + inner-server.pem: inner-server.p12 +- $(OPENSSL) pkcs12 -in inner-server.p12 -out inner-server.pem -passin pass:$(PASSWORD_INNER) -passout pass:$(PASSWORD_INNER) ++ @[ -f inner-server.pem ] || $(OPENSSL) pkcs12 -in inner-server.p12 -out inner-server.pem -passin pass:$(PASSWORD_INNER) -passout pass:$(PASSWORD_INNER) + chmod g+r inner-server.pem + + .PHONY: inner-server.vrfy +-- +2.26.2 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb index d2046d72e..2c39c4c44 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.20.bb @@ -28,6 +28,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0 file://0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ file://0001-rlm_python3-add-PY_INC_DIR-in-search-dir.patch \ file://0001-raddb-certs-Makefile-fix-the-existed-certificate-err.patch \ + file://0001-raddb-certs-Makefile-fix-the-occasional-verification.patch \ file://radiusd.service \ file://radiusd-volatiles.conf \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.10.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.10.bb deleted file mode 100644 index 9f6080336..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.10.bb +++ /dev/null @@ -1,89 +0,0 @@ -SUMMARY = "Open source MQTT implementation" -DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker \ -that implements the MQ Telemetry Transport protocol version 3.1, 3.1.1 and \ -5, providing both an MQTT broker and several command-line clients. MQTT \ -provides a lightweight method of carrying out messaging using a \ -publish/subscribe model. " -HOMEPAGE = "http://mosquitto.org/" -SECTION = "console/network" -LICENSE = "EPL-1.0 | EDL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20 \ - file://edl-v10;md5=c09f121939f063aeb5235972be8c722c \ - file://epl-v10;md5=8d383c379e91d20ba18a52c3e7d3a979 \ - file://notice.html;md5=a00d6f9ab542be7babc2d8b80d5d2a4c \ -" -DEPENDS = "uthash" - -SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ - file://mosquitto.init \ - file://1571.patch \ - file://install-protocol.patch \ -" - -SRC_URI[md5sum] = "960f963b81b7f93982d7511cd28082e5" -SRC_URI[sha256sum] = "92d1807717f0f6d57d1ac1207ffdb952e8377e916c7b0bb4718f745239774232" - -inherit systemd update-rc.d useradd cmake - -PACKAGECONFIG ??= "ssl dlt websockets \ - ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ - " - -PACKAGECONFIG[dns-srv] = "-DWITH_SRV=ON,-DWITH_SRV=OFF,c-ares" -PACKAGECONFIG[ssl] = "-DWITH_TLS=ON -DWITH_TLS_PSK=ON -DWITH_EC=ON,-DWITH_TLS=OFF -DWITH_TLS_PSK=OFF -DWITH_EC=OFF,openssl" -PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" -PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF,libwebsockets" -PACKAGECONFIG[dlt] = "-DWITH_DLT=ON,-DWITH_DLT=OFF,dlt-daemon" - -EXTRA_OECMAKE = " \ - -DWITH_BUNDLED_DEPS=OFF \ - -DWITH_ADNS=ON \ -" - -do_install_append() { - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${S}/service/systemd/mosquitto.service.notify ${D}${systemd_unitdir}/system/mosquitto.service - - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto - sed -i -e 's,@SBINDIR@,${sbindir},g' \ - -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ - -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - ${D}${sysconfdir}/init.d/mosquitto -} - -PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients" - -PACKAGE_BEFORE_PN = "${PN}-examples" - -FILES_${PN} = "${sbindir}/mosquitto \ - ${bindir}/mosquitto_passwd \ - ${sysconfdir}/mosquitto \ - ${sysconfdir}/init.d \ - ${systemd_unitdir}/system/mosquitto.service \ -" - -CONFFILES_${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" - -FILES_libmosquitto1 = "${libdir}/libmosquitto.so.*" - -FILES_libmosquittopp1 = "${libdir}/libmosquittopp.so.*" - -FILES_${PN}-clients = "${bindir}/mosquitto_pub \ - ${bindir}/mosquitto_sub \ - ${bindir}/mosquitto_rr \ -" - -FILES_${PN}-examples = "${sysconfdir}/mosquitto/*.example" - -SYSTEMD_SERVICE_${PN} = "mosquitto.service" - -INITSCRIPT_NAME = "mosquitto" -INITSCRIPT_PARAMS = "defaults 30" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --shell /bin/false \ - --user-group mosquitto" - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.11.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.11.bb new file mode 100644 index 000000000..369034692 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.11.bb @@ -0,0 +1,89 @@ +SUMMARY = "Open source MQTT implementation" +DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker \ +that implements the MQ Telemetry Transport protocol version 3.1, 3.1.1 and \ +5, providing both an MQTT broker and several command-line clients. MQTT \ +provides a lightweight method of carrying out messaging using a \ +publish/subscribe model. " +HOMEPAGE = "http://mosquitto.org/" +SECTION = "console/network" +LICENSE = "EPL-1.0 | EDL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20 \ + file://edl-v10;md5=c09f121939f063aeb5235972be8c722c \ + file://epl-v10;md5=8d383c379e91d20ba18a52c3e7d3a979 \ + file://notice.html;md5=a00d6f9ab542be7babc2d8b80d5d2a4c \ +" +DEPENDS = "uthash" + +SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ + file://mosquitto.init \ + file://1571.patch \ + file://install-protocol.patch \ +" + +SRC_URI[md5sum] = "35925c7ccd1bac87e4201b635ffa66a1" +SRC_URI[sha256sum] = "b02d8f1368c40d5779ee125c37daf9003608eb47d7fbb04c5b938c76c1230a1f" + +inherit systemd update-rc.d useradd cmake + +PACKAGECONFIG ??= "ssl dlt websockets \ + ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ + " + +PACKAGECONFIG[dns-srv] = "-DWITH_SRV=ON,-DWITH_SRV=OFF,c-ares" +PACKAGECONFIG[ssl] = "-DWITH_TLS=ON -DWITH_TLS_PSK=ON -DWITH_EC=ON,-DWITH_TLS=OFF -DWITH_TLS_PSK=OFF -DWITH_EC=OFF,openssl" +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" +PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF,libwebsockets" +PACKAGECONFIG[dlt] = "-DWITH_DLT=ON,-DWITH_DLT=OFF,dlt-daemon" + +EXTRA_OECMAKE = " \ + -DWITH_BUNDLED_DEPS=OFF \ + -DWITH_ADNS=ON \ +" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${S}/service/systemd/mosquitto.service.notify ${D}${systemd_unitdir}/system/mosquitto.service + + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto + sed -i -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ + -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${sysconfdir}/init.d/mosquitto +} + +PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients" + +PACKAGE_BEFORE_PN = "${PN}-examples" + +FILES_${PN} = "${sbindir}/mosquitto \ + ${bindir}/mosquitto_passwd \ + ${sysconfdir}/mosquitto \ + ${sysconfdir}/init.d \ + ${systemd_unitdir}/system/mosquitto.service \ +" + +CONFFILES_${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" + +FILES_libmosquitto1 = "${libdir}/libmosquitto.so.*" + +FILES_libmosquittopp1 = "${libdir}/libmosquittopp.so.*" + +FILES_${PN}-clients = "${bindir}/mosquitto_pub \ + ${bindir}/mosquitto_sub \ + ${bindir}/mosquitto_rr \ +" + +FILES_${PN}-examples = "${sysconfdir}/mosquitto/*.example" + +SYSTEMD_SERVICE_${PN} = "mosquitto.service" + +INITSCRIPT_NAME = "mosquitto" +INITSCRIPT_PARAMS = "defaults 30" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --no-create-home --shell /bin/false \ + --user-group mosquitto" + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb new file mode 100644 index 000000000..517624dce --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nngpp_git.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "C++ wrapper around the nanomsg NNG API" +HOMEPAGE = "https://github.com/cwzx/nngpp" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://license.txt;md5=6d17d78c3597e0d4452fb1c63bf7c58e" +DEPENDS = "nng" + +SRCREV = "85294eda3f584281439649a074f46e2d3516b2a1" +PV = "1.2.4" + +SRC_URI = "git://github.com/cwzx/nngpp" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch new file mode 100644 index 000000000..22ecae304 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch @@ -0,0 +1,33 @@ +From 0edb96a5f79dcec4f4467193716c2bf015fe5132 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Aug 2020 10:38:07 -0700 +Subject: [PATCH 1/2] dbus: Remove unused variabes + +Fixes +src/dbus.c:49:23: error: unused variable 'stdout' [-Werror,-Wunused-variable] +g_autofree gchar *stdout = NULL; +^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/dbus.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/dbus.c b/src/dbus.c +index cb7ec38..a057236 100644 +--- a/src/dbus.c ++++ b/src/dbus.c +@@ -45,9 +45,6 @@ static int method_apply(sd_bus_message *m, void *userdata, sd_bus_error *ret_err + + static int method_info(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { + sd_bus_message *reply = NULL; +- g_autoptr(GError) err = NULL; +- g_autofree gchar *stdout = NULL; +- g_autofree gchar *stderr = NULL; + gint exit_status = 0; + + exit_status = sd_bus_message_new_method_return(m, &reply); +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-src-parse.c-Initialize-key-to-NULL.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-src-parse.c-Initialize-key-to-NULL.patch new file mode 100644 index 000000000..a710b1e57 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-src-parse.c-Initialize-key-to-NULL.patch @@ -0,0 +1,32 @@ +From 63de116c617a35ff3d54c785b3dfb5378bb07f46 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Aug 2020 22:39:17 -0700 +Subject: [PATCH] src/parse.c: Initialize key to NULL + +Fixes + +src/parse.c:810:22: note: 'key' was declared here +cc1: all warnings being treated as errors + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/parse.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/parse.c b/src/parse.c +index 63a0863..c66277f 100644 +--- a/src/parse.c ++++ b/src/parse.c +@@ -807,7 +807,7 @@ handle_addresses(yaml_document_t* doc, yaml_node_t* node, const void* _, GError* + char* prefix_len; + guint64 prefix_len_num; + yaml_node_t *entry = yaml_document_get_node(doc, *i); +- yaml_node_t *key, *value = NULL; ++ yaml_node_t *key = NULL, *value = NULL; + + if (entry->type != YAML_SCALAR_NODE && entry->type != YAML_MAPPING_NODE) { + return yaml_error(entry, error, "expected either scalar or mapping (check indentation)"); +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Use-first-prerquisite-only-for-target-rule.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Use-first-prerquisite-only-for-target-rule.patch new file mode 100644 index 000000000..e736529a8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Use-first-prerquisite-only-for-target-rule.patch @@ -0,0 +1,35 @@ +From 1da4451fd3470e6600b027cb78526b440e296f8b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Aug 2020 10:47:08 -0700 +Subject: [PATCH 2/2] Makefile: Use first prerquisite only for target rule + +This ensures that src/_features.h is not added to compiler cmdline which +can confuse the compiler as it may not understand .h as valid input and +complain + +| clang-11: error: cannot specify -o when generating multiple output files +| make: *** [Makefile:50: netplan-dbus] Error 1 +| make: *** Waiting for unfinished jobs.... + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 4495773..c05dea3 100644 +--- a/Makefile ++++ b/Makefile +@@ -47,7 +47,7 @@ generate: libnetplan.so.$(NETPLAN_SOVER) nm.o networkd.o generate.o sriov.o + $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -L. -lnetplan `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid` + + netplan-dbus: src/dbus.c src/_features.h +- $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ `pkg-config --cflags --libs libsystemd glib-2.0` ++ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< `pkg-config --cflags --libs libsystemd glib-2.0` + + src/_features.h: src/[^_]*.[hc] + printf "#include \nstatic const char *feature_flags[] __attribute__((__unused__)) = {\n" > $@ +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.99.bb b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.99.bb index 67ccddf6a..5546f300b 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.99.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.99.bb @@ -11,11 +11,14 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" S = "${WORKDIR}/git" -SRCREV = "1ccf7e0e3a7a91edbbe3f9f0669c8bbab8248cd1" +SRCREV = "85134d13eb1ee5a1a7d139cd74ffa10933d73677" PV = "0.99+git${SRCPV}" SRC_URI = " \ git://github.com/CanonicalLtd/netplan.git \ + file://0001-dbus-Remove-unused-variabes.patch \ + file://0002-Makefile-Use-first-prerquisite-only-for-target-rule.patch \ + file://0001-src-parse.c-Initialize-key-to-NULL.patch \ " DEPENDS = "glib-2.0 libyaml ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect/0001-trojans-tncc-wrapper.py-convert-to-python3.patch b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect/0001-trojans-tncc-wrapper.py-convert-to-python3.patch deleted file mode 100644 index 623ec101d..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect/0001-trojans-tncc-wrapper.py-convert-to-python3.patch +++ /dev/null @@ -1,71 +0,0 @@ -From de78bcac5e1fd13de0371c8e14b062b8786ade56 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Sun, 2 Feb 2020 15:53:05 +0000 -Subject: [PATCH] trojans/tncc-wrapper.py: convert to python3 - -Use 2to3 to convert the script to python3. - -Upstream-Status: Pending - -Signed-off-by: Max Krummenacher ---- - trojans/tncc-wrapper.py | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/trojans/tncc-wrapper.py b/trojans/tncc-wrapper.py -index 0d4587bf..1a9a1f4d 100755 ---- a/trojans/tncc-wrapper.py -+++ b/trojans/tncc-wrapper.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python2 -+#!/usr/bin/python3 - - # Lifted from Russ Dill's juniper-vpn-wrap.py, thus: - # -@@ -18,19 +18,19 @@ - - import subprocess - import mechanize --import cookielib -+import http.cookiejar - import getpass - import sys - import os - import zipfile --import urllib -+import urllib.request, urllib.parse, urllib.error - import socket - import ssl - import errno - import argparse - import atexit - import signal --import ConfigParser -+import configparser - import time - import binascii - import hmac -@@ -39,7 +39,7 @@ import hashlib - def mkdir_p(path): - try: - os.mkdir(path) -- except OSError, exc: -+ except OSError as exc: - if exc.errno == errno.EEXIST and os.path.isdir(path): - pass - else: -@@ -64,9 +64,9 @@ class Tncc: - if zipfile.ZipFile(self.tncc_jar, 'r').testzip() is not None: - raise Exception() - except: -- print 'Downloading tncc.jar...' -+ print('Downloading tncc.jar...') - mkdir_p(os.path.expanduser('~/.juniper_networks')) -- urllib.urlretrieve('https://' + self.vpn_host -+ urllib.request.urlretrieve('https://' + self.vpn_host - + '/dana-cached/hc/tncc.jar', self.tncc_jar) - - with zipfile.ZipFile(self.tncc_jar, 'r') as jar: --- -2.20.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb deleted file mode 100644 index 597c1920c..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.03.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Open client for Cisco AnyConnect VPN" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad" - -SRC_URI = " \ - git://git.infradead.org/users/dwmw2/openconnect.git \ - file://0001-trojans-tncc-wrapper.py-convert-to-python3.patch \ -" -SRCREV = "ea73851969ae7a6ea54fdd2d2b8c94776af24b2a" - -DEPENDS = "vpnc libxml2 krb5 gettext-native" -RDEPENDS_${PN} = "bash python3-core vpnc-script" - -PACKAGECONFIG ??= "gnutls lz4 libproxy" - -# config defaults -PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls," -PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," -PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy," - -# not config defaults -PACKAGECONFIG[pcsc-lite] = "--with-libpcsclite,--without-libpcsclite,pcsc-lite," - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -EXTRA_OECONF += "--with-vpnc-script=${sysconfdir}/vpnc/vpnc-script \ - --disable-static" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb new file mode 100644 index 000000000..a486cf0e0 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb @@ -0,0 +1,32 @@ +SUMMARY = "Open client for Cisco AnyConnect VPN" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad" + +SRC_URI = " \ + git://git.infradead.org/users/dwmw2/openconnect.git \ +" +SRCREV = "9d287e40c57233190a51b6434ba7345370e36f38" + +DEPENDS = "vpnc libxml2 krb5 gettext-native" +RDEPENDS_${PN} = "bash python3-core vpnc-script" + +PACKAGECONFIG ??= "gnutls lz4 libproxy" + +# config defaults +PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls," +PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," +PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy," + +# not config defaults +PACKAGECONFIG[pcsc-lite] = "--with-libpcsclite,--without-libpcsclite,pcsc-lite," + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig bash-completion + +EXTRA_OECONF += "--with-vpnc-script=${sysconfdir}/vpnc/vpnc-script \ + --disable-static" + +do_install_append() { + rm ${D}/usr/libexec/openconnect/hipreport-android.sh +} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-parallel-build.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-parallel-build.patch new file mode 100644 index 000000000..f35e96a34 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-parallel-build.patch @@ -0,0 +1,31 @@ +It fails to produce common.o when system load is high: + +| In file included from common.c:57: +| ../include/defs.h:49:10: fatal error: y.tab.h: No such file or directory +| 49 | #include "y.tab.h" +| | ^~~~~~~~~ +| compilation terminated. + +Make $(COMMONOBJS) which include common.o to depends on related header files +and y.tab.h to fix the parallel build failure. + +Upstream-Status: Inappropriate [no upstream] + +Signed-off-by: Kai Kang +--- + src/Makefile.real | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile.real b/src/Makefile.real +index e0f0dfc..53d4944 100644 +--- a/src/Makefile.real ++++ b/src/Makefile.real +@@ -41,7 +41,7 @@ $(SERVER_BIN): $(SERVEROBJS) $(COMMONOBJS) $(MISSINGOBJS) + $(CLIENT_BIN): $(CLIENTOBJS) $(COMMONOBJS) $(MISSINGOBJS) + $(CC) -o $@ $(CLIENTOBJS) $(COMMONOBJS) $(MISSINGOBJS) $(LIBS) $(LDFLAGS) + +-$(CLIENTOBJS) $(SERVEROBJS): $(HFILES) y.tab.h ++$(COMMONOBJS) $(CLIENTOBJS) $(SERVEROBJS): $(HFILES) y.tab.h + + y.tab.h: gram.c + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb index 3a27c2c5b..37b3eebe4 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb @@ -28,6 +28,7 @@ SRC_URI += "file://rdist-6.1.5-linux.patch \ file://rdist-6.1.5-fix-msgsndnotify-loop.patch \ file://rdist-6.1.5-bb-build.patch \ file://rdist-6.1.5-makefile-add-ldflags.patch \ + file://rdist-6.1.5-fix-parallel-build.patch \ " UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/rdist/files/rdist/" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb index e3134e41f..ebe64cb1b 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://git.openwrt.org/project/relayd.git \ file://0001-rtnl_flush-Error-on-failed-write.patch \ " -SRCREV = "ad0b25ad74345d367c62311e14b279f5ccb8ef13" +SRCREV = "f4d759be54ceb37714e9a6ca320d5b50c95e9ce9" PV = "0.0.1+git${SRCPV}" UPSTREAM_CHECK_COMMITS = "1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-util-Simplify-input-validation.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-util-Simplify-input-validation.patch new file mode 100644 index 000000000..e724c04bc --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-util-Simplify-input-validation.patch @@ -0,0 +1,59 @@ +From f9d9ba6cd06aca053c747c399ba700db80b1623c Mon Sep 17 00:00:00 2001 +From: Martin Schwenke +Date: Tue, 9 Jun 2020 11:52:50 +1000 +Subject: [PATCH 1/3] util: Simplify input validation + +It appears that snprintf(3) is being used for input validation. +However, this seems like overkill because it causes szPath to be +copied an extra time. The mostly likely protections being sought +here, according to https://cwe.mitre.org/data/definitions/20.html, +look to be DoS attacks involving CPU and memory usage. A simpler +check that uses strnlen(3) can mitigate against both of these and is +simpler. + +Signed-off-by: Martin Schwenke +Reviewed-by: Volker Lendecke +Reviewed-by: Bjoern Jacke +(cherry picked from commit 922bce2668994dd2a5988c17060f977e9bb0c229) + +Upstream-Status:Backport +[https://gitlab.com/samba-team/samba/-/commit/f9d9ba6cd06aca053c747c399ba700db80b1623c] + +Signed-off-by: Yi Zhao +--- + lib/util/util_paths.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/lib/util/util_paths.c b/lib/util/util_paths.c +index c0ee5c32c30..dec91772d9e 100644 +--- a/lib/util/util_paths.c ++++ b/lib/util/util_paths.c +@@ -69,21 +69,20 @@ static char *get_user_home_dir(TALLOC_CTX *mem_ctx) + struct passwd pwd = {0}; + struct passwd *pwdbuf = NULL; + char buf[NSS_BUFLEN_PASSWD] = {0}; ++ size_t len; + int rc; + + rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf); + if (rc != 0 || pwdbuf == NULL ) { +- int len_written; + const char *szPath = getenv("HOME"); + if (szPath == NULL) { + return NULL; + } +- len_written = snprintf(buf, sizeof(buf), "%s", szPath); +- if (len_written >= sizeof(buf) || len_written < 0) { +- /* Output was truncated or an error. */ ++ len = strnlen(szPath, PATH_MAX); ++ if (len >= PATH_MAX) { + return NULL; + } +- return talloc_strdup(mem_ctx, buf); ++ return talloc_strdup(mem_ctx, szPath); + } + + return talloc_strdup(mem_ctx, pwd.pw_dir); +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-util-Fix-build-on-FreeBSD-by-avoiding-NSS_BUFLEN_PAS.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-util-Fix-build-on-FreeBSD-by-avoiding-NSS_BUFLEN_PAS.patch new file mode 100644 index 000000000..dcd79044a --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-util-Fix-build-on-FreeBSD-by-avoiding-NSS_BUFLEN_PAS.patch @@ -0,0 +1,79 @@ +From 57bd719af1f138f44f71b2078995452582da0da6 Mon Sep 17 00:00:00 2001 +From: Martin Schwenke +Date: Fri, 5 Jun 2020 21:52:23 +1000 +Subject: [PATCH 2/3] util: Fix build on FreeBSD by avoiding NSS_BUFLEN_PASSWD + +NSS_BUFLEN_PASSWD is not defined on FreeBSD. Use +sysconf(_SC_GETPW_R_SIZE_MAX) instead, as per POSIX. + +Use a dynamically allocated buffer instead of trying to cram all of +the logic into the declarations. This will come in useful later +anyway. + +Signed-off-by: Martin Schwenke +Reviewed-by: Volker Lendecke +Reviewed-by: Bjoern Jacke +(cherry picked from commit 847208cd8ac68c4c7d1dae63767820db1c69292b) + +Upstream-Status:Backport +[https://gitlab.com/samba-team/samba/-/commit/57bd719af1f138f44f71b2078995452582da0da6] + +Signed-off-by: Yi Zhao +--- + lib/util/util_paths.c | 27 ++++++++++++++++++++++----- + 1 file changed, 22 insertions(+), 5 deletions(-) + +diff --git a/lib/util/util_paths.c b/lib/util/util_paths.c +index dec91772d9e..9bc6df37e5d 100644 +--- a/lib/util/util_paths.c ++++ b/lib/util/util_paths.c +@@ -68,24 +68,41 @@ static char *get_user_home_dir(TALLOC_CTX *mem_ctx) + { + struct passwd pwd = {0}; + struct passwd *pwdbuf = NULL; +- char buf[NSS_BUFLEN_PASSWD] = {0}; ++ char *buf = NULL; ++ char *out = NULL; ++ long int initlen; + size_t len; + int rc; + +- rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf); ++ initlen = sysconf(_SC_GETPW_R_SIZE_MAX); ++ if (initlen == -1) { ++ len = 1024; ++ } else { ++ len = (size_t)initlen; ++ } ++ buf = talloc_size(mem_ctx, len); ++ if (buf == NULL) { ++ return NULL; ++ } ++ ++ rc = getpwuid_r(getuid(), &pwd, buf, len, &pwdbuf); + if (rc != 0 || pwdbuf == NULL ) { + const char *szPath = getenv("HOME"); + if (szPath == NULL) { +- return NULL; ++ goto done; + } + len = strnlen(szPath, PATH_MAX); + if (len >= PATH_MAX) { + return NULL; + } +- return talloc_strdup(mem_ctx, szPath); ++ out = talloc_strdup(mem_ctx, szPath); ++ goto done; + } + +- return talloc_strdup(mem_ctx, pwd.pw_dir); ++ out = talloc_strdup(mem_ctx, pwd.pw_dir); ++done: ++ TALLOC_FREE(buf); ++ return out; + } + + char *path_expand_tilde(TALLOC_CTX *mem_ctx, const char *d) +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0003-util-Reallocate-larger-buffer-if-getpwuid_r-returns-.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0003-util-Reallocate-larger-buffer-if-getpwuid_r-returns-.patch new file mode 100644 index 000000000..53a3f6781 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0003-util-Reallocate-larger-buffer-if-getpwuid_r-returns-.patch @@ -0,0 +1,50 @@ +From 016e08ca07f86af9e0131a908a2df116bcb9a48e Mon Sep 17 00:00:00 2001 +From: Martin Schwenke +Date: Fri, 5 Jun 2020 22:05:42 +1000 +Subject: [PATCH 3/3] util: Reallocate larger buffer if getpwuid_r() returns + ERANGE + +Signed-off-by: Martin Schwenke +Reviewed-by: Volker Lendecke +Reviewed-by: Bjoern Jacke + +Autobuild-User(master): Martin Schwenke +Autobuild-Date(master): Tue Jun 9 21:07:24 UTC 2020 on sn-devel-184 + +(cherry picked from commit ddac6b2eb4adaec8fc5e25ca07387d2b9417764c) + +Upstream-Status:Backport +[https://gitlab.com/samba-team/samba/-/commit/016e08ca07f86af9e0131a908a2df116bcb9a48e] + +Signed-off-by: Yi Zhao +--- + lib/util/util_paths.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/lib/util/util_paths.c b/lib/util/util_paths.c +index 9bc6df37e5d..72cc0aab8de 100644 +--- a/lib/util/util_paths.c ++++ b/lib/util/util_paths.c +@@ -86,6 +86,19 @@ static char *get_user_home_dir(TALLOC_CTX *mem_ctx) + } + + rc = getpwuid_r(getuid(), &pwd, buf, len, &pwdbuf); ++ while (rc == ERANGE) { ++ size_t newlen = 2 * len; ++ if (newlen < len) { ++ /* Overflow */ ++ goto done; ++ } ++ len = newlen; ++ buf = talloc_realloc_size(mem_ctx, buf, len); ++ if (buf == NULL) { ++ goto done; ++ } ++ rc = getpwuid_r(getuid(), &pwd, buf, len, &pwdbuf); ++ } + if (rc != 0 || pwdbuf == NULL ) { + const char *szPath = getenv("HOME"); + if (szPath == NULL) { +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb deleted file mode 100644 index 01250cb43..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.15.bb +++ /dev/null @@ -1,336 +0,0 @@ -HOMEPAGE = "https://www.samba.org/" -SECTION = "console/network" - -LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ - file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 " - -SAMBA_MIRROR = "http://samba.org/samba/ftp" -MIRRORS += "\ -${SAMBA_MIRROR} http://mirror.internode.on.net/pub/samba \n \ -${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ -" - -SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ - file://smb.conf \ - file://16-do-not-check-xsltproc-manpages.patch \ - file://20-do-not-import-target-module-while-cross-compile.patch \ - file://21-add-config-option-without-valgrind.patch \ - file://netdb_defines.patch \ - file://glibc_only.patch \ - file://iconv-4.7.0.patch \ - file://dnsserver-4.7.0.patch \ - file://smb_conf-4.7.0.patch \ - file://volatiles.03_samba \ - file://0001-waf-add-support-of-cross_compile.patch \ - file://0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch \ - file://0002-util_sec.c-Move-__thread-variable-to-global-scope.patch \ - file://0001-Add-options-to-configure-the-use-of-libbsd.patch \ - file://0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch \ - " -SRC_URI_append_libc-musl = " \ - file://samba-pam.patch \ - file://samba-4.3.9-remove-getpwent_r.patch \ - file://cmocka-uintptr_t.patch \ - file://0001-samba-fix-musl-lib-without-innetgr.patch \ - " - -SRC_URI[md5sum] = "67e9f6b8c5140475641bf5121c93b3d4" -SRC_URI[sha256sum] = "0b8b62558b62fbb121015f28f40fae0f07522710b6bef77c508b51bb6914ced9" - -UPSTREAM_CHECK_REGEX = "samba\-(?P4\.10(\.\d+)+).tar.gz" - -inherit systemd waf-samba cpan-base perlnative update-rc.d -# remove default added RDEPENDS on perl -RDEPENDS_${PN}_remove = "perl" - -DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 jansson" - -inherit features_check -REQUIRED_DISTRO_FEATURES = "pam" - -DEPENDS_append_libc-musl = " libtirpc" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" - -INITSCRIPT_NAME = "samba" -INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." - -SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind" -SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" -SYSTEMD_SERVICE_${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" -SYSTEMD_SERVICE_winbind = "winbind.service" - -# There are prerequisite settings to enable ad-dc, so disable the service by default. -# Reference: -# https://wiki.samba.org/index.php/Setting_up_Samba_as_an_Active_Directory_Domain_Controller -SYSTEMD_AUTO_ENABLE_${PN}-ad-dc = "disable" - -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen -export WAF_NO_PREFORK="yes" - -# Use krb5. Build active domain controller. -# -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \ - acl cups ad-dc gnutls ldap mitkrb5 \ -" - -RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt" - -PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" -PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" -PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" -PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" -PACKAGECONFIG[sasl] = ",,cyrus-sasl" -PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" -PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" -PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" -PACKAGECONFIG[valgrind] = ",--without-valgrind,valgrind," -PACKAGECONFIG[lttng] = "--with-lttng, --without-lttng,lttng-ust" -PACKAGECONFIG[archive] = "--with-libarchive, --without-libarchive, libarchive" -PACKAGECONFIG[libunwind] = ", , libunwind" -PACKAGECONFIG[gpgme] = ",--without-gpgme,," -PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," -PACKAGECONFIG[libbsd] = "--with-libbsd, --without-libbsd, libbsd" - -# Building the AD (Active Directory) DC (Domain Controller) requires GnuTLS, -# And ad-dc doesn't work with mitkrb5 for versions prior to 4.7.0 according to: -# http://samba.2283325.n4.nabble.com/samba-4-6-6-Unknown-dependency-kdc-in-service-kdc-objlist-td4722096.html -# So the working combination is: -# 1) ad-dc: enable, gnutls: enable, mitkrb5: disable -# 2) ad-dc: disable, gnutls: enable/disable, mitkrb5: enable -# -# We are now at 4.7.0, so take the above with a grain of salt. We do not need to know where -# krb5kdc is unless ad-dc is enabled, but we tell configure anyhow. -# -PACKAGECONFIG[ad-dc] = "--with-experimental-mit-ad-dc,--without-ad-dc,," -PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," -PACKAGECONFIG[mitkrb5] = "--with-system-mitkrb5 --with-system-mitkdc=/usr/sbin/krb5kdc,,krb5," - -SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" -SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4" -SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4" -SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}" - -# These libraries are supposed to replace others supplied by packages, but decorate the names of -# .so files so there will not be a conflict. This is not done consistantly, so be very careful -# when adding to this list. -# -SAMBA4_LIBS="heimdal,cmocka,NONE" - -EXTRA_OECONF += "--enable-fhs \ - --with-piddir=/run \ - --with-sockets-dir=/run/samba \ - --with-modulesdir=${libdir}/samba \ - --with-lockdir=${localstatedir}/lib/samba \ - --with-cachedir=${localstatedir}/lib/samba \ - --disable-rpath-install \ - --with-shared-modules=${SAMBA4_MODULES} \ - --bundled-libraries=${SAMBA4_LIBS} \ - ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ - --with-cluster-support \ - --with-profiling-data \ - --with-libiconv=${STAGING_DIR_HOST}${prefix} \ - --with-pam --with-pammodulesdir=${base_libdir}/security \ - " - -LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" - -do_install_append() { - for section in 1 5 7; do - install -d ${D}${mandir}/man$section - install -m 0644 ctdb/doc/*.$section ${D}${mandir}/man$section - done - for section in 1 5 7 8; do - install -d ${D}${mandir}/man$section - install -m 0644 docs/manpages/*.$section ${D}${mandir}/man$section - done - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${S}/bin/default/packaging/systemd/*.service ${D}${systemd_system_unitdir}/ - sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \ - -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \ - -i ${D}${systemd_system_unitdir}/*.service - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'yes', 'no', d)}" = "no" ]; then - rm -f ${D}${systemd_system_unitdir}/samba.service - fi - - install -d ${D}${sysconfdir}/tmpfiles.d - install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf - echo "d ${localstatedir}/log/samba 0755 root root -" \ - >> ${D}${sysconfdir}/tmpfiles.d/samba.conf - install -d ${D}${sysconfdir}/init.d - install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba - sed -e 's,/opt/samba/bin,${sbindir},g' \ - -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ - -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ - -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ - -e 's,/usr/bin,${base_bindir},g' \ - -i ${D}${sysconfdir}/init.d/samba - - install -d ${D}${sysconfdir}/samba - echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts - install -m644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf - install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba - - install -d ${D}${sysconfdir}/default - install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba - - # the items are from ctdb/tests/run_tests.sh - for d in onnode takeover tool eventscripts cunit simple complex; do - testdir=${D}${datadir}/ctdb-tests/$d - install -d $testdir - cp ${S}/ctdb/tests/$d/*.sh $testdir - cp -r ${S}/ctdb/tests/$d/scripts ${S}/ctdb/tests/$d/stubs $testdir || true - done - - # fix file-rdeps qa warning - if [ -f ${D}${bindir}/onnode ]; then - sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode - fi - - chmod 0750 ${D}${sysconfdir}/sudoers.d || true - rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log - - for f in samba-gpupdate samba_upgradedns samba_spnupdate samba_kcc samba_dnsupdate; do - if [ -f "${D}${sbindir}/$f" ]; then - sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${sbindir}/$f - fi - done - if [ -f "${D}${bindir}/samba-tool" ]; then - sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${bindir}/samba-tool - fi - -} - -PACKAGES =+ "${PN}-python3 ${PN}-pidl \ - ${PN}-dsdb-modules ${PN}-testsuite registry-tools \ - winbind \ - ${PN}-common ${PN}-base ${PN}-ad-dc ${PN}-ctdb-tests \ - smbclient ${PN}-client ${PN}-server ${PN}-test" - -python samba_populate_packages() { - def module_hook(file, pkg, pattern, format, basename): - pn = d.getVar('PN') - d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg) - - mlprefix = d.getVar('MLPREFIX') or '' - pam_libdir = d.expand('${base_libdir}/security') - pam_pkgname = mlprefix + 'pam-plugin%s' - do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) - - libdir = d.getVar('libdir') - do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) - pkglibdir = '%s/samba' % libdir - do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) - moduledir = '%s/samba/auth' % libdir - do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) - moduledir = '%s/samba/pdb' % libdir - do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) -} - -PACKAGESPLITFUNCS_prepend = "samba_populate_packages " -PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" - -RDEPENDS_${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" -RDEPENDS_${PN}-python3 += "pytalloc python3-tdb" - -FILES_${PN}-base = "${sbindir}/nmbd \ - ${sbindir}/smbd \ - ${sysconfdir}/init.d \ - ${systemd_system_unitdir}/nmb.service \ - ${systemd_system_unitdir}/smb.service" - -FILES_${PN}-ad-dc = "${sbindir}/samba \ - ${systemd_system_unitdir}/samba.service \ - ${libdir}/krb5/plugins/kdb/samba.so \ -" -RDEPENDS_${PN}-ad-dc = "krb5-kdc" - -FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ - ${bindir}/ctdb_run_cluster_tests \ - ${sysconfdir}/ctdb/nodes \ - ${datadir}/ctdb-tests \ - ${datadir}/ctdb/tests \ - ${localstatedir}/lib/ctdb \ - " - -FILES_${BPN}-common = "${sysconfdir}/default \ - ${sysconfdir}/samba \ - ${sysconfdir}/tmpfiles.d \ - ${localstatedir}/lib/samba \ - ${localstatedir}/spool/samba \ -" - -FILES_${PN} += "${libdir}/vfs/*.so \ - ${libdir}/charset/*.so \ - ${libdir}/*.dat \ - ${libdir}/auth/*.so \ - ${datadir}/ctdb/events/* \ -" - -FILES_${PN}-dsdb-modules = "${libdir}/samba/ldb" - -FILES_${PN}-testsuite = "${bindir}/gentest \ - ${bindir}/locktest \ - ${bindir}/masktest \ - ${bindir}/ndrdump \ - ${bindir}/smbtorture" - -FILES_registry-tools = "${bindir}/regdiff \ - ${bindir}/regpatch \ - ${bindir}/regshell \ - ${bindir}/regtree" - -FILES_winbind = "${sbindir}/winbindd \ - ${bindir}/wbinfo \ - ${bindir}/ntlm_auth \ - ${libdir}/samba/idmap \ - ${libdir}/samba/nss_info \ - ${libdir}/winbind_krb5_locator.so \ - ${libdir}/winbind-krb5-localauth.so \ - ${sysconfdir}/init.d/winbind \ - ${systemd_system_unitdir}/winbind.service" - -FILES_${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" - -FILES_smbclient = "${bindir}/cifsdd \ - ${bindir}/rpcclient \ - ${bindir}/smbcacls \ - ${bindir}/smbclient \ - ${bindir}/smbcquotas \ - ${bindir}/smbget \ - ${bindir}/smbspool \ - ${bindir}/smbtar \ - ${bindir}/smbtree \ - ${libdir}/samba/smbspool_krb5_wrapper" - -RDEPENDS_${PN}-pidl_append = " perl" -FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse" - -RDEPENDS_${PN}-client = "\ - smbclient \ - winbind \ - registry-tools \ - ${PN}-pidl \ - " - -ALLOW_EMPTY_${PN}-client = "1" - -RDEPENDS_${PN}-server = "\ - ${PN} \ - winbind \ - registry-tools \ - " - -ALLOW_EMPTY_${PN}-server = "1" - -RDEPENDS_${PN}-test = "\ - ${PN}-ctdb-tests \ - ${PN}-testsuite \ - " - -ALLOW_EMPTY_${PN}-test = "1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.17.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.17.bb new file mode 100644 index 000000000..3ae5afbe9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.17.bb @@ -0,0 +1,339 @@ +HOMEPAGE = "https://www.samba.org/" +SECTION = "console/network" + +LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ + file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 " + +SAMBA_MIRROR = "http://samba.org/samba/ftp" +MIRRORS += "\ +${SAMBA_MIRROR} http://mirror.internode.on.net/pub/samba \n \ +${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ +" + +SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ + file://smb.conf \ + file://16-do-not-check-xsltproc-manpages.patch \ + file://20-do-not-import-target-module-while-cross-compile.patch \ + file://21-add-config-option-without-valgrind.patch \ + file://netdb_defines.patch \ + file://glibc_only.patch \ + file://iconv-4.7.0.patch \ + file://dnsserver-4.7.0.patch \ + file://smb_conf-4.7.0.patch \ + file://volatiles.03_samba \ + file://0001-waf-add-support-of-cross_compile.patch \ + file://0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch \ + file://0002-util_sec.c-Move-__thread-variable-to-global-scope.patch \ + file://0001-Add-options-to-configure-the-use-of-libbsd.patch \ + file://0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch \ + file://0001-util-Simplify-input-validation.patch \ + file://0002-util-Fix-build-on-FreeBSD-by-avoiding-NSS_BUFLEN_PAS.patch \ + file://0003-util-Reallocate-larger-buffer-if-getpwuid_r-returns-.patch \ + " +SRC_URI_append_libc-musl = " \ + file://samba-pam.patch \ + file://samba-4.3.9-remove-getpwent_r.patch \ + file://cmocka-uintptr_t.patch \ + file://0001-samba-fix-musl-lib-without-innetgr.patch \ + " + +SRC_URI[md5sum] = "f69cac9ba5035ee60257520a209a0a83" +SRC_URI[sha256sum] = "03dc9758e7bfa2faf7cdeb45b4d40997e2ee16a41e71996aa666bc069e70ba3e" + +UPSTREAM_CHECK_REGEX = "samba\-(?P4\.10(\.\d+)+).tar.gz" + +inherit systemd waf-samba cpan-base perlnative update-rc.d +# remove default added RDEPENDS on perl +RDEPENDS_${PN}_remove = "perl" + +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 jansson" + +inherit features_check +REQUIRED_DISTRO_FEATURES = "pam" + +DEPENDS_append_libc-musl = " libtirpc" +CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS_append_libc-musl = " -ltirpc" + +INITSCRIPT_NAME = "samba" +INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." + +SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind" +SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" +SYSTEMD_SERVICE_${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" +SYSTEMD_SERVICE_winbind = "winbind.service" + +# There are prerequisite settings to enable ad-dc, so disable the service by default. +# Reference: +# https://wiki.samba.org/index.php/Setting_up_Samba_as_an_Active_Directory_Domain_Controller +SYSTEMD_AUTO_ENABLE_${PN}-ad-dc = "disable" + +#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +#to cross Popen +export WAF_NO_PREFORK="yes" + +# Use krb5. Build active domain controller. +# +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \ + acl cups ad-dc gnutls ldap mitkrb5 \ +" + +RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt" + +PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" +PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" +PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" +PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" +PACKAGECONFIG[sasl] = ",,cyrus-sasl" +PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd" +PACKAGECONFIG[dmapi] = "--with-dmapi,--without-dmapi,dmapi" +PACKAGECONFIG[zeroconf] = "--enable-avahi,--disable-avahi,avahi" +PACKAGECONFIG[valgrind] = ",--without-valgrind,valgrind," +PACKAGECONFIG[lttng] = "--with-lttng, --without-lttng,lttng-ust" +PACKAGECONFIG[archive] = "--with-libarchive, --without-libarchive, libarchive" +PACKAGECONFIG[libunwind] = ", , libunwind" +PACKAGECONFIG[gpgme] = ",--without-gpgme,," +PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," +PACKAGECONFIG[libbsd] = "--with-libbsd, --without-libbsd, libbsd" + +# Building the AD (Active Directory) DC (Domain Controller) requires GnuTLS, +# And ad-dc doesn't work with mitkrb5 for versions prior to 4.7.0 according to: +# http://samba.2283325.n4.nabble.com/samba-4-6-6-Unknown-dependency-kdc-in-service-kdc-objlist-td4722096.html +# So the working combination is: +# 1) ad-dc: enable, gnutls: enable, mitkrb5: disable +# 2) ad-dc: disable, gnutls: enable/disable, mitkrb5: enable +# +# We are now at 4.7.0, so take the above with a grain of salt. We do not need to know where +# krb5kdc is unless ad-dc is enabled, but we tell configure anyhow. +# +PACKAGECONFIG[ad-dc] = "--with-experimental-mit-ad-dc,--without-ad-dc,," +PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," +PACKAGECONFIG[mitkrb5] = "--with-system-mitkrb5 --with-system-mitkdc=/usr/sbin/krb5kdc,,krb5," + +SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" +SAMBA4_PDB_MODULES="pdb_tdbsam,${@bb.utils.contains('PACKAGECONFIG', 'ldap', 'pdb_ldap,', '', d)}pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4" +SAMBA4_AUTH_MODULES="auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4" +SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODULES}" + +# These libraries are supposed to replace others supplied by packages, but decorate the names of +# .so files so there will not be a conflict. This is not done consistantly, so be very careful +# when adding to this list. +# +SAMBA4_LIBS="heimdal,cmocka,NONE" + +EXTRA_OECONF += "--enable-fhs \ + --with-piddir=/run \ + --with-sockets-dir=/run/samba \ + --with-modulesdir=${libdir}/samba \ + --with-lockdir=${localstatedir}/lib/samba \ + --with-cachedir=${localstatedir}/lib/samba \ + --disable-rpath-install \ + --with-shared-modules=${SAMBA4_MODULES} \ + --bundled-libraries=${SAMBA4_LIBS} \ + ${@oe.utils.conditional('TARGET_ARCH', 'x86_64', '', '--disable-glusterfs', d)} \ + --with-cluster-support \ + --with-profiling-data \ + --with-libiconv=${STAGING_DIR_HOST}${prefix} \ + --with-pam --with-pammodulesdir=${base_libdir}/security \ + " + +LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +do_install_append() { + for section in 1 5 7; do + install -d ${D}${mandir}/man$section + install -m 0644 ctdb/doc/*.$section ${D}${mandir}/man$section + done + for section in 1 5 7 8; do + install -d ${D}${mandir}/man$section + install -m 0644 docs/manpages/*.$section ${D}${mandir}/man$section + done + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${S}/bin/default/packaging/systemd/*.service ${D}${systemd_system_unitdir}/ + sed -e 's,\(ExecReload=\).*\(/kill\),\1${base_bindir}\2,' \ + -e 's,/etc/sysconfig/samba,${sysconfdir}/default/samba,' \ + -i ${D}${systemd_system_unitdir}/*.service + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'yes', 'no', d)}" = "no" ]; then + rm -f ${D}${systemd_system_unitdir}/samba.service + fi + + install -d ${D}${sysconfdir}/tmpfiles.d + install -m644 packaging/systemd/samba.conf.tmp ${D}${sysconfdir}/tmpfiles.d/samba.conf + echo "d ${localstatedir}/log/samba 0755 root root -" \ + >> ${D}${sysconfdir}/tmpfiles.d/samba.conf + install -d ${D}${sysconfdir}/init.d + install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba + sed -e 's,/opt/samba/bin,${sbindir},g' \ + -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ + -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ + -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba,g' \ + -e 's,/usr/bin,${base_bindir},g' \ + -i ${D}${sysconfdir}/init.d/samba + + install -d ${D}${sysconfdir}/samba + echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts + install -m644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf + install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba + + install -d ${D}${sysconfdir}/default + install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba + + # the items are from ctdb/tests/run_tests.sh + for d in onnode takeover tool eventscripts cunit simple complex; do + testdir=${D}${datadir}/ctdb-tests/$d + install -d $testdir + cp ${S}/ctdb/tests/$d/*.sh $testdir + cp -r ${S}/ctdb/tests/$d/scripts ${S}/ctdb/tests/$d/stubs $testdir || true + done + + # fix file-rdeps qa warning + if [ -f ${D}${bindir}/onnode ]; then + sed -i 's:\(#!/bin/\)bash:\1sh:' ${D}${bindir}/onnode + fi + + chmod 0750 ${D}${sysconfdir}/sudoers.d || true + rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log + + for f in samba-gpupdate samba_upgradedns samba_spnupdate samba_kcc samba_dnsupdate; do + if [ -f "${D}${sbindir}/$f" ]; then + sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${sbindir}/$f + fi + done + if [ -f "${D}${bindir}/samba-tool" ]; then + sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${bindir}/samba-tool + fi + +} + +PACKAGES =+ "${PN}-python3 ${PN}-pidl \ + ${PN}-dsdb-modules ${PN}-testsuite registry-tools \ + winbind \ + ${PN}-common ${PN}-base ${PN}-ad-dc ${PN}-ctdb-tests \ + smbclient ${PN}-client ${PN}-server ${PN}-test" + +python samba_populate_packages() { + def module_hook(file, pkg, pattern, format, basename): + pn = d.getVar('PN') + d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg) + + mlprefix = d.getVar('MLPREFIX') or '' + pam_libdir = d.expand('${base_libdir}/security') + pam_pkgname = mlprefix + 'pam-plugin%s' + do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM plugin for %s', extra_depends='', prepend=True) + + libdir = d.getVar('libdir') + do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True, allow_links=True) + pkglibdir = '%s/samba' % libdir + do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s library', extra_depends='${PN}-common', prepend=True) + moduledir = '%s/samba/auth' % libdir + do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-auth-%s', 'Samba %s authentication backend', hook=module_hook, extra_depends='', prepend=True) + moduledir = '%s/samba/pdb' % libdir + do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) +} + +PACKAGESPLITFUNCS_prepend = "samba_populate_packages " +PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" + +RDEPENDS_${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" +RDEPENDS_${PN}-python3 += "pytalloc python3-tdb" + +FILES_${PN}-base = "${sbindir}/nmbd \ + ${sbindir}/smbd \ + ${sysconfdir}/init.d \ + ${systemd_system_unitdir}/nmb.service \ + ${systemd_system_unitdir}/smb.service" + +FILES_${PN}-ad-dc = "${sbindir}/samba \ + ${systemd_system_unitdir}/samba.service \ + ${libdir}/krb5/plugins/kdb/samba.so \ +" +RDEPENDS_${PN}-ad-dc = "krb5-kdc" + +FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ + ${bindir}/ctdb_run_cluster_tests \ + ${sysconfdir}/ctdb/nodes \ + ${datadir}/ctdb-tests \ + ${datadir}/ctdb/tests \ + ${localstatedir}/lib/ctdb \ + " + +FILES_${BPN}-common = "${sysconfdir}/default \ + ${sysconfdir}/samba \ + ${sysconfdir}/tmpfiles.d \ + ${localstatedir}/lib/samba \ + ${localstatedir}/spool/samba \ +" + +FILES_${PN} += "${libdir}/vfs/*.so \ + ${libdir}/charset/*.so \ + ${libdir}/*.dat \ + ${libdir}/auth/*.so \ + ${datadir}/ctdb/events/* \ +" + +FILES_${PN}-dsdb-modules = "${libdir}/samba/ldb" + +FILES_${PN}-testsuite = "${bindir}/gentest \ + ${bindir}/locktest \ + ${bindir}/masktest \ + ${bindir}/ndrdump \ + ${bindir}/smbtorture" + +FILES_registry-tools = "${bindir}/regdiff \ + ${bindir}/regpatch \ + ${bindir}/regshell \ + ${bindir}/regtree" + +FILES_winbind = "${sbindir}/winbindd \ + ${bindir}/wbinfo \ + ${bindir}/ntlm_auth \ + ${libdir}/samba/idmap \ + ${libdir}/samba/nss_info \ + ${libdir}/winbind_krb5_locator.so \ + ${libdir}/winbind-krb5-localauth.so \ + ${sysconfdir}/init.d/winbind \ + ${systemd_system_unitdir}/winbind.service" + +FILES_${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" + +FILES_smbclient = "${bindir}/cifsdd \ + ${bindir}/rpcclient \ + ${bindir}/smbcacls \ + ${bindir}/smbclient \ + ${bindir}/smbcquotas \ + ${bindir}/smbget \ + ${bindir}/smbspool \ + ${bindir}/smbtar \ + ${bindir}/smbtree \ + ${libdir}/samba/smbspool_krb5_wrapper" + +RDEPENDS_${PN}-pidl_append = " perl" +FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse" + +RDEPENDS_${PN}-client = "\ + smbclient \ + winbind \ + registry-tools \ + ${PN}-pidl \ + " + +ALLOW_EMPTY_${PN}-client = "1" + +RDEPENDS_${PN}-server = "\ + ${PN} \ + winbind \ + registry-tools \ + " + +ALLOW_EMPTY_${PN}-server = "1" + +RDEPENDS_${PN}-test = "\ + ${PN}-ctdb-tests \ + ${PN}-testsuite \ + " + +ALLOW_EMPTY_${PN}-test = "1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.16.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.16.1.bb new file mode 100644 index 000000000..e967f7a03 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.16.1.bb @@ -0,0 +1,111 @@ +DESCRIPTION = "snort - a free lightweight network intrusion detection system for UNIX and Windows." +HOMEPAGE = "http://www.snort.org/" +SECTION = "net" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" + +DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native libtirpc bison-native" + +SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \ + file://snort.init \ + file://volatiles.99_snort \ + file://0001-libpcap-search-sysroot-for-headers.patch \ + file://fix-host-contamination-when-enable-static-daq.patch \ + file://disable-run-test-program-while-cross-compiling.patch \ + file://configure.in-disable-tirpc-checking-for-fedora.patch \ +" +SRC_URI[sha256sum] = "e3ac45a1a3cc2c997d52d19cd92f1adf5641c3a919387adab47a4d13a9dc9f8e" + +UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" +UPSTREAM_CHECK_REGEX = "snort-(?P\d+(\.\d+)+)\.tar" + +inherit autotools gettext update-rc.d pkgconfig + +INITSCRIPT_NAME = "snort" +INITSCRIPT_PARAMS = "defaults" + +EXTRA_OECONF = " \ + --enable-gre \ + --enable-linux-smp-stats \ + --enable-reload \ + --enable-reload-error-restart \ + --enable-targetbased \ + --enable-static-daq \ + --with-dnet-includes=${STAGING_INCDIR} \ + --with-dnet-libraries=${STAGING_LIBDIR} \ + --with-libpcre-includes=${STAGING_INCDIR} \ + --with-libpcre-libraries=${STAGING_LIBDIR} \ + --with-daq-includes=${STAGING_INCDIR} \ + --with-daq-libraries=${STAGING_LIBDIR} \ +" + +# if you want to disable it, you need to patch configure.in first +# AC_CHECK_HEADERS([openssl/sha.h],, SHA_H="no") +# is called even with --without-openssl-includes +PACKAGECONFIG ?= "openssl lzma" +PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," +PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," +PACKAGECONFIG[appid] = "--enable-open-appid, --disable-open-appid, luajit, bash" + +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDFLAGS += " -ltirpc" + +do_install_append() { + install -d ${D}${sysconfdir}/snort/rules + install -d ${D}${sysconfdir}/snort/preproc_rules + install -d ${D}${sysconfdir}/init.d + for i in map config conf dtd; do + cp ${S}/etc/*.$i ${D}${sysconfdir}/snort/ + done + + # fix the hardcoded path and lib name + # comment out the rules that are not provided + sed -i -e 's#/usr/local/lib#${libdir}#' \ + -e 's#\.\./\(.*rules\)#${sysconfdir}/snort/\1#' \ + -e 's#\(libsf_engine.so\)#\1.0#' \ + -e 's/^\(include $RULE_PATH\)/#\1/' \ + -e 's/^\(dynamicdetection\)/#\1/' \ + -e '/preprocessor reputation/,/blacklist/ s/^/#/' \ + ${D}${sysconfdir}/snort/snort.conf + + cp ${S}/preproc_rules/*.rules ${D}${sysconfdir}/snort/preproc_rules/ + install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort + + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort + + sed -i -e 's|-fdebug-prefix-map[^ ]*||g; s|-fmacro-prefix-map[^ ]*||g; s|${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc +} + +pkg_postinst_${PN}() { + if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi +} + +FILES_${PN} += " \ + ${libdir}/snort_dynamicengine/*.so.* \ + ${libdir}/snort_dynamicpreprocessor/*.so.* \ + ${libdir}/snort_dynamicrules/*.so.* \ +" +FILES_${PN}-dbg += " \ + ${libdir}/snort_dynamicengine/.debug \ + ${libdir}/snort_dynamicpreprocessor/.debug \ + ${libdir}/snort_dynamicrules/.debug \ +" +FILES_${PN}-staticdev += " \ + ${libdir}/snort_dynamicengine/*.a \ + ${libdir}/snort_dynamicpreprocessor/*.a \ + ${libdir}/snort_dynamicrules/*.a \ + ${libdir}/snort/dynamic_preproc/*.a \ + ${libdir}/snort/dynamic_output/*.a \ +" +FILES_${PN}-dev += " \ + ${libdir}/snort_dynamicengine/*.la \ + ${libdir}/snort_dynamicpreprocessor/*.la \ + ${libdir}/snort_dynamicrules/*.la \ + ${libdir}/snort_dynamicengine/*.so \ + ${libdir}/snort_dynamicpreprocessor/*.so \ + ${libdir}/snort_dynamicrules/*.so \ + ${prefix}/src/snort_dynamicsrc \ +" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.16.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.16.bb deleted file mode 100644 index d8073d865..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.16.bb +++ /dev/null @@ -1,113 +0,0 @@ -DESCRIPTION = "snort - a free lightweight network intrusion detection system for UNIX and Windows." -HOMEPAGE = "http://www.snort.org/" -SECTION = "net" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" - -DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native libtirpc bison-native" - -SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \ - file://snort.init \ - file://volatiles.99_snort \ - file://0001-libpcap-search-sysroot-for-headers.patch \ - file://fix-host-contamination-when-enable-static-daq.patch \ - file://disable-run-test-program-while-cross-compiling.patch \ - file://configure.in-disable-tirpc-checking-for-fedora.patch \ -" - -SRC_URI[md5sum] = "1cec58babaea3420014d61a93e6e1545" -SRC_URI[sha256sum] = "9688d8edf1da09dec6574000fb3c0e62f99c56428587616e17c60103c0bcbad7" - -UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" -UPSTREAM_CHECK_REGEX = "snort-(?P\d+(\.\d+)+)\.tar" - -inherit autotools gettext update-rc.d pkgconfig - -INITSCRIPT_NAME = "snort" -INITSCRIPT_PARAMS = "defaults" - -EXTRA_OECONF = " \ - --enable-gre \ - --enable-linux-smp-stats \ - --enable-reload \ - --enable-reload-error-restart \ - --enable-targetbased \ - --enable-static-daq \ - --with-dnet-includes=${STAGING_INCDIR} \ - --with-dnet-libraries=${STAGING_LIBDIR} \ - --with-libpcre-includes=${STAGING_INCDIR} \ - --with-libpcre-libraries=${STAGING_LIBDIR} \ - --with-daq-includes=${STAGING_INCDIR} \ - --with-daq-libraries=${STAGING_LIBDIR} \ -" - -# if you want to disable it, you need to patch configure.in first -# AC_CHECK_HEADERS([openssl/sha.h],, SHA_H="no") -# is called even with --without-openssl-includes -PACKAGECONFIG ?= "openssl lzma" -PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," -PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," -PACKAGECONFIG[appid] = "--enable-open-appid, --disable-open-appid, luajit, bash" - -CFLAGS += "-I${STAGING_INCDIR}/tirpc" -LDFLAGS += " -ltirpc" - -do_install_append() { - install -d ${D}${sysconfdir}/snort/rules - install -d ${D}${sysconfdir}/snort/preproc_rules - install -d ${D}${sysconfdir}/init.d - for i in map config conf dtd; do - cp ${S}/etc/*.$i ${D}${sysconfdir}/snort/ - done - - # fix the hardcoded path and lib name - # comment out the rules that are not provided - sed -i -e 's#/usr/local/lib#${libdir}#' \ - -e 's#\.\./\(.*rules\)#${sysconfdir}/snort/\1#' \ - -e 's#\(libsf_engine.so\)#\1.0#' \ - -e 's/^\(include $RULE_PATH\)/#\1/' \ - -e 's/^\(dynamicdetection\)/#\1/' \ - -e '/preprocessor reputation/,/blacklist/ s/^/#/' \ - ${D}${sysconfdir}/snort/snort.conf - - cp ${S}/preproc_rules/*.rules ${D}${sysconfdir}/snort/preproc_rules/ - install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort - - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort - - sed -i -e 's|-fdebug-prefix-map[^ ]*||g; s|-fmacro-prefix-map[^ ]*||g; s|${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc -} - -pkg_postinst_${PN}() { - if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then - ${sysconfdir}/init.d/populate-volatile.sh update - fi -} - -FILES_${PN} += " \ - ${libdir}/snort_dynamicengine/*.so.* \ - ${libdir}/snort_dynamicpreprocessor/*.so.* \ - ${libdir}/snort_dynamicrules/*.so.* \ -" -FILES_${PN}-dbg += " \ - ${libdir}/snort_dynamicengine/.debug \ - ${libdir}/snort_dynamicpreprocessor/.debug \ - ${libdir}/snort_dynamicrules/.debug \ -" -FILES_${PN}-staticdev += " \ - ${libdir}/snort_dynamicengine/*.a \ - ${libdir}/snort_dynamicpreprocessor/*.a \ - ${libdir}/snort_dynamicrules/*.a \ - ${libdir}/snort/dynamic_preproc/*.a \ - ${libdir}/snort/dynamic_output/*.a \ -" -FILES_${PN}-dev += " \ - ${libdir}/snort_dynamicengine/*.la \ - ${libdir}/snort_dynamicpreprocessor/*.la \ - ${libdir}/snort_dynamicrules/*.la \ - ${libdir}/snort_dynamicengine/*.so \ - ${libdir}/snort_dynamicpreprocessor/*.so \ - ${libdir}/snort_dynamicrules/*.so \ - ${prefix}/src/snort_dynamicsrc \ -" diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch new file mode 100644 index 000000000..d5e0deb89 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Makefile-Do-not-set-Werror.patch @@ -0,0 +1,31 @@ +From 31d88f46bfc67de2659991674253a5d5dfb92afc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Aug 2020 12:00:29 -0700 +Subject: [PATCH] Makefile: Do not set -Werror + +clang finds more warnings which causes build to fail, disable treating +warning as errors + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj +--- + usr/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usr/Makefile b/usr/Makefile +index 21bb154..0018605 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -35,7 +35,7 @@ endif + PKG_CONFIG = /usr/bin/pkg-config + + CFLAGS ?= -O2 -g +-WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common ++WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common + CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ + -I$(TOPDIR)/libopeniscsiusr + CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.0.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.0.bb deleted file mode 100644 index 97b556357..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.0.bb +++ /dev/null @@ -1,120 +0,0 @@ -SUMMARY = "iSCSI daemon and utility programs" -DESCRIPTION = "Open-iSCSI project is a high performance, transport \ -independent, multi-platform implementation of RFC3720. The iscsi package \ -provides the server daemon for the iSCSI protocol, as well as the utility \ -programs used to manage it. iSCSI is a protocol for distributed \ -disk access using SCSI commands sent over Internet Protocol networks." -HOMEPAGE = "http://www.open-iscsi.com/" -LICENSE = "GPLv2 & LGPLv2.1" -SECTION = "net" -DEPENDS = "openssl flex-native bison-native open-isns util-linux kmod" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRCREV ?= "549f8987be49583bb06b117a364bea3a8fc5250c" - -SRC_URI = "git://github.com/open-iscsi/open-iscsi \ - file://initd.debian \ - file://99_iscsi-initiator-utils \ - file://iscsi-initiator \ - file://iscsi-initiator.service \ - file://iscsi-initiator-targets.service \ - file://set_initiatorname \ - " -S = "${WORKDIR}/git" -B = "${WORKDIR}/build" - -PV .= "+git${SRCPV}" - -inherit update-rc.d systemd autotools pkgconfig - -EXTRA_OECONF = " \ - --target=${TARGET_SYS} \ - --host=${BUILD_SYS} \ -" - -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '--without-systemd', d)}" - -EXTRA_OEMAKE = ' \ - OS="${TARGET_SYS}" \ - TARGET="${TARGET_OS}" \ - BASE="${prefix}" \ - MANDIR="${mandir}" \ - OPTFLAGS="-DNO_SYSTEMD ${CFLAGS}" \ - PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" \ - NO_SYSTEMD=1 \ -' - - -do_configure () { - cd ${S}/iscsiuio ; autoreconf --install; ./configure ${EXTRA_OECONF} -} - -do_compile () { - # Make sure we DO NOT regenerate prom_lex.c. - if [ -f ${S}/utils/fwparam_ibft/prom_lex.l ]; then - mv ${S}/utils/fwparam_ibft/prom_lex.l ${S}/utils/fwparam_ibft/prom_lex.l.unused - fi - oe_runmake -C ${S} ${EXTRA_OEMAKE} user -} - -do_install () { - #install necessary directories - install -d ${D}${sbindir} \ - ${D}${sysconfdir}/init.d \ - ${D}${sysconfdir}/iscsi \ - ${D}${localstatedir}/lib/iscsi/nodes \ - ${D}${localstatedir}/lib/iscsi/send_targets \ - ${D}${localstatedir}/lib/iscsi/static \ - ${D}${localstatedir}/lib/iscsi/isns \ - ${D}${localstatedir}/lib/iscsi/slp \ - ${D}${localstatedir}/lib/iscsi/ifaces \ - ${D}${libdir} \ - ${D}${mandir}/man8 - - install -p -m 755 ${S}/usr/iscsid ${S}/usr/iscsiadm \ - ${S}/utils/iscsi-iname \ - ${S}/usr/iscsistart ${D}/${sbindir} - - cp -dR ${S}/libopeniscsiusr/libopeniscsiusr.so* ${D}${libdir} - install -p -m 644 ${S}/doc/iscsiadm.8 ${S}/doc/iscsid.8 ${D}/${mandir}/man8 - install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi - install -p -m 755 ${WORKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid - - sed -i -e "s:= /sbin/iscsid:= ${sbindir}/iscsid:" ${D}${sysconfdir}/iscsi/iscsid.conf - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /run/${BPN}/lock - - - -" \ - > ${D}${sysconfdir}/tmpfiles.d/iscsi.conf - install -d ${D}/etc/default/ - install -p -m 755 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ - - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/iscsi-initiator.service \ - ${WORKDIR}/iscsi-initiator-targets.service \ - ${D}${systemd_unitdir}/system/ - install -d ${D}${nonarch_libdir}/iscsi - install -m 0755 ${WORKDIR}/set_initiatorname ${D}${nonarch_libdir}/iscsi - else - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_iscsi-initiator-utils ${D}/etc/default/volatiles - fi -} - -pkg_postinst_${PN}() { - if [ "x$D" = "x" ]; then - if [ -e /etc/init.d/populate-volatile.sh ]; then - /etc/init.d/populate-volatile.sh update - elif command -v systemd-tmpfiles >/dev/null; then - systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/iscsi.conf - fi - fi -} - -SYSTEMD_SERVICE = " iscsi-initiator.service iscsi-initiator-targets.service " -INITSCRIPT_NAME = "iscsid" -INITSCRIPT_PARAMS = "start 30 1 2 3 4 5 . stop 70 0 1 2 3 4 5 6 ." - -FILES_${PN} += "${nonarch_libdir}/iscsi" diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb new file mode 100644 index 000000000..254362881 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.2.bb @@ -0,0 +1,117 @@ +SUMMARY = "iSCSI daemon and utility programs" +DESCRIPTION = "Open-iSCSI project is a high performance, transport \ +independent, multi-platform implementation of RFC3720. The iscsi package \ +provides the server daemon for the iSCSI protocol, as well as the utility \ +programs used to manage it. iSCSI is a protocol for distributed \ +disk access using SCSI commands sent over Internet Protocol networks." +HOMEPAGE = "http://www.open-iscsi.com/" +LICENSE = "GPLv2 & LGPLv2.1" +SECTION = "net" +DEPENDS = "openssl flex-native bison-native open-isns util-linux kmod" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRCREV ?= "802688debcd88c48edabe86deb7e7ed47ebadc26" + +SRC_URI = "git://github.com/open-iscsi/open-iscsi \ + file://0001-Makefile-Do-not-set-Werror.patch \ + file://initd.debian \ + file://99_iscsi-initiator-utils \ + file://iscsi-initiator \ + file://iscsi-initiator.service \ + file://iscsi-initiator-targets.service \ + file://set_initiatorname \ + " +S = "${WORKDIR}/git" + +inherit update-rc.d systemd autotools pkgconfig + +EXTRA_OECONF = " \ + --target=${TARGET_SYS} \ + --host=${BUILD_SYS} \ +" + +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '--without-systemd NO_SYSTEMD=1', d)}" + +EXTRA_OEMAKE = ' \ + OS="${TARGET_SYS}" \ + TARGET="${TARGET_OS}" \ + BASE="${prefix}" \ + MANDIR="${mandir}" \ + OPTFLAGS="-DNO_SYSTEMD ${CFLAGS}" \ + PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" \ +' + + +do_configure () { + cd ${S}/iscsiuio ; autoreconf --install; ./configure ${EXTRA_OECONF} +} + +do_compile () { + # Make sure we DO NOT regenerate prom_lex.c. + if [ -f ${S}/utils/fwparam_ibft/prom_lex.l ]; then + mv ${S}/utils/fwparam_ibft/prom_lex.l ${S}/utils/fwparam_ibft/prom_lex.l.unused + fi + oe_runmake -C ${S} ${EXTRA_OEMAKE} user +} + +do_install () { + #install necessary directories + install -d ${D}${sbindir} \ + ${D}${sysconfdir}/init.d \ + ${D}${sysconfdir}/iscsi \ + ${D}${localstatedir}/lib/iscsi/nodes \ + ${D}${localstatedir}/lib/iscsi/send_targets \ + ${D}${localstatedir}/lib/iscsi/static \ + ${D}${localstatedir}/lib/iscsi/isns \ + ${D}${localstatedir}/lib/iscsi/slp \ + ${D}${localstatedir}/lib/iscsi/ifaces \ + ${D}${libdir} \ + ${D}${mandir}/man8 + + install -p -m 755 ${S}/usr/iscsid ${S}/usr/iscsiadm \ + ${S}/utils/iscsi-iname \ + ${S}/usr/iscsistart ${D}/${sbindir} + + cp -dR ${S}/libopeniscsiusr/libopeniscsiusr.so* ${D}${libdir} + install -p -m 644 ${S}/doc/iscsiadm.8 ${S}/doc/iscsid.8 ${D}/${mandir}/man8 + install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi + install -p -m 755 ${WORKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid + + sed -i -e "s:= /sbin/iscsid:= ${sbindir}/iscsid:" ${D}${sysconfdir}/iscsi/iscsid.conf + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /run/${BPN}/lock - - - -" \ + > ${D}${sysconfdir}/tmpfiles.d/iscsi.conf + install -d ${D}/etc/default/ + install -p -m 755 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ + + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/iscsi-initiator.service \ + ${WORKDIR}/iscsi-initiator-targets.service \ + ${D}${systemd_unitdir}/system/ + install -d ${D}${nonarch_libdir}/iscsi + install -m 0755 ${WORKDIR}/set_initiatorname ${D}${nonarch_libdir}/iscsi + else + install -d ${D}/etc/default/volatiles + install -m 0644 ${WORKDIR}/99_iscsi-initiator-utils ${D}/etc/default/volatiles + fi +} + +pkg_postinst_${PN}() { + if [ "x$D" = "x" ]; then + if [ -e /etc/init.d/populate-volatile.sh ]; then + /etc/init.d/populate-volatile.sh update + elif command -v systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/iscsi.conf + fi + fi +} + +SYSTEMD_SERVICE = " iscsi-initiator.service iscsi-initiator-targets.service " +INITSCRIPT_NAME = "iscsid" +INITSCRIPT_PARAMS = "start 30 1 2 3 4 5 . stop 70 0 1 2 3 4 5 6 ." + +FILES_${PN} += "${nonarch_libdir}/iscsi" diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.0.20.bb b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.0.20.bb deleted file mode 100644 index f3c33dcb8..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.0.20.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "High Availability monitor built upon LVS, VRRP and service pollers" -DESCRIPTION = "Keepalived is a routing software written in C. The main goal \ -of this project is to provide simple and robust facilities for loadbalancing \ -and high-availability to Linux system and Linux based infrastructures. \ -Loadbalancing framework relies on well-known and widely used Linux Virtual \ -Server (IPVS) kernel module providing Layer4 loadbalancing \ -" -HOMEPAGE = "http://www.keepalived.org/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz" -SRC_URI[md5sum] = "a5966e8433b60998709c4a922a407bac" -SRC_URI[sha256sum] = "9670fbc5eb3dc113828be8b702549dc68ec9578cf83287520d935be76fc8f193" - -DEPENDS = "libnfnetlink openssl" - -inherit autotools pkgconfig systemd - -PACKAGECONFIG ??= "libnl snmp \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ -" -PACKAGECONFIG[libnl] = "--enable-libnl,--disable-libnl,libnl" -PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" -PACKAGECONFIG[systemd] = "--with-init=systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--with-init=SYSV,systemd" - -EXTRA_OECONF = "--disable-libiptc" -EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d" - -do_install_append() { - if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then - chmod 0755 ${D}${sysconfdir}/init.d/${BPN} - sed -i 's#rc.d/##' ${D}${sysconfdir}/init.d/${BPN} - fi - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -D -m 0644 ${B}/${BPN}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service - fi -} - -FILES_${PN} += "${datadir}/snmp/mibs/KEEPALIVED-MIB.txt" - -SYSTEMD_SERVICE_${PN} = "keepalived.service" -SYSTEMD_AUTO_ENABLE ?= "disable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.1.5.bb b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.1.5.bb new file mode 100644 index 000000000..1230fcaee --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.1.5.bb @@ -0,0 +1,46 @@ +SUMMARY = "High Availability monitor built upon LVS, VRRP and service pollers" +DESCRIPTION = "Keepalived is a routing software written in C. The main goal \ +of this project is to provide simple and robust facilities for loadbalancing \ +and high-availability to Linux system and Linux based infrastructures. \ +Loadbalancing framework relies on well-known and widely used Linux Virtual \ +Server (IPVS) kernel module providing Layer4 loadbalancing \ +" +HOMEPAGE = "http://www.keepalived.org/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz" +SRC_URI[md5sum] = "27e1cfff5b8dd95062ad415957e663e5" +SRC_URI[sha256sum] = "d94d7ccbc5c95ab39c95a0e5ae89a25a224f39b6811f2930d3a1885a69732259" + +UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" + +DEPENDS = "libnfnetlink openssl" + +inherit autotools pkgconfig systemd + +PACKAGECONFIG ??= "libnl snmp \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" +PACKAGECONFIG[libnl] = "--enable-libnl,--disable-libnl,libnl" +PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" +PACKAGECONFIG[systemd] = "--with-init=systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--with-init=SYSV,systemd" + +EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d" + +do_install_append() { + if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then + chmod 0755 ${D}${sysconfdir}/init.d/${BPN} + sed -i 's#rc.d/##' ${D}${sysconfdir}/init.d/${BPN} + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -D -m 0644 ${B}/${BPN}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service + fi +} + +FILES_${PN} += "${datadir}/snmp/mibs/KEEPALIVED-MIB.txt" + +SYSTEMD_SERVICE_${PN} = "keepalived.service" +SYSTEMD_AUTO_ENABLE ?= "disable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp/ncftp-3.2.5-gcc10.patch b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp/ncftp-3.2.5-gcc10.patch new file mode 100644 index 000000000..5dee824d7 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp/ncftp-3.2.5-gcc10.patch @@ -0,0 +1,83 @@ +Fix build with -fno-common + +Patch from https://src.fedoraproject.org/rpms/ncftp/raw/master/f/ncftp-3.2.5-gcc10.patch + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- a/ncftp/bookmark.h ++++ b/ncftp/bookmark.h +@@ -29,6 +29,8 @@ typedef struct Bookmark { + int reserved; + } Bookmark; + ++extern Bookmark gBm; ++ + #define kBookmarkVersion 8 + #define kBookmarkMinVersion 3 + #if (defined(WIN32) || defined(_WINDOWS)) && !defined(__CYGWIN__) +--- a/ncftp/cmds.c ++++ b/ncftp/cmds.c +@@ -98,7 +98,7 @@ extern char gPager[], gHome[], gShell[]; + extern char gOS[]; + extern int gAutoResume; + extern int gAutoSaveChangesToExistingBookmarks; +-extern Bookmark gBm; ++//extern Bookmark gBm; + extern int gLoadedBm, gConfirmClose, gSavePasswords, gScreenColumns; + extern char gLocalCWD[512], gPrevLocalCWD[512]; + extern int gMayCancelJmp; +--- a/ncftp/main.c ++++ b/ncftp/main.c +@@ -38,7 +38,7 @@ extern int gUnprocessedJobs; + char gLocalCWD[512], gPrevLocalCWD[512]; + + extern char gRemoteCWD[512], gPrevRemoteCWD[512]; +-extern Bookmark gBm; ++//extern Bookmark gBm; + extern int gLoadedBm; + extern int gFirewallType; + extern char gAutoAscii[]; +--- a/sh_util/gpshare.c ++++ b/sh_util/gpshare.c +@@ -28,7 +28,7 @@ + + static int gIsAtty1 = 1, gIsAtty2 = 1; + extern int gLoadedBm, gBookmarkMatchMode; +-Bookmark gBm; ++//Bookmark gBm; + + double + FileSize(double size, const char **uStr0, double *uMult0) +--- a/sh_util/ncftpget.c ++++ b/sh_util/ncftpget.c +@@ -40,7 +40,7 @@ extern unsigned int gFirewallPort; + extern char gFirewallExceptionList[256]; + extern int gFwDataPortMode; + extern const char gOS[], gVersion[]; +-extern Bookmark gBm; ++//extern Bookmark gBm; + + static void + #if (defined(__GNUC__)) && (__GNUC__ >= 2) +--- a/sh_util/ncftpls.c ++++ b/sh_util/ncftpls.c +@@ -39,7 +39,7 @@ extern unsigned int gFirewallPort; + extern char gFirewallExceptionList[256]; + extern int gFwDataPortMode; + extern const char gOS[], gVersion[]; +-extern Bookmark gBm; ++//extern Bookmark gBm; + + static int FTPRemoteRecursiveMList(FTPCIPtr cip, const char *const rdir, /* FTPFileInfoListPtr files, */ FTPLineListPtr lines); + +--- a/sh_util/ncftpput.c ++++ b/sh_util/ncftpput.c +@@ -41,7 +41,6 @@ extern unsigned int gFirewallPort; + extern char gFirewallExceptionList[256]; + extern int gFwDataPortMode; + extern const char gOS[], gVersion[]; +-extern Bookmark gBm; + extern int gSendfileInProgress; + + static void diff --git a/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb index 5f92f27fd..ee6da5737 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb @@ -8,6 +8,7 @@ DEPENDS = "ncurses" SRC_URI = "ftp://ftp.ncftp.com/${BPN}/${BP}-src.tar.xz \ file://ncftp-configure-use-BUILD_CC-for-ccdv.patch \ file://unistd.patch \ + file://ncftp-3.2.5-gcc10.patch \ " SRC_URI[md5sum] = "42d0f896d69a4d603ec097546444245f" SRC_URI[sha256sum] = "5f200687c05d0807690d9fb770327b226f02dd86155b49e750853fce4e31098d" diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-build-with-fno-common.patch b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-build-with-fno-common.patch new file mode 100644 index 000000000..b581c571b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-build-with-fno-common.patch @@ -0,0 +1,311 @@ +From 9a46462f08535e946d97fd40c79229a7ee8b7336 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 17 Aug 2020 00:00:00 -0700 +Subject: [PATCH] Fix build with -fno-common + +Mark the declarations with extern where needed in header files + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/ckpt/agent/cpa_cb.h | 2 +- + src/ckpt/ckptd/cpd_init.h | 2 +- + src/evt/agent/eda.h | 2 +- + src/evt/evtd/eds.h | 2 +- + src/evt/evtd/eds_amf.c | 2 ++ + src/evt/evtd/eds_amf.h | 2 +- + src/evt/evtd/eds_cb.h | 2 +- + src/imm/immd/immd.h | 2 +- + src/lck/lckd/gld_dl_api.h | 4 ++-- + src/lck/lcknd/glnd_cb.h | 4 ++-- + src/mds/mds_core.h | 34 +++++++++++++++++++--------------- + src/mds/mds_dt_tcp.c | 2 ++ + src/mds/mds_dt_tcp.h | 2 +- + src/mds/mds_main.c | 2 +- + src/msg/msgnd/mqnd_db.h | 2 +- + 15 files changed, 37 insertions(+), 29 deletions(-) + +diff --git a/src/ckpt/agent/cpa_cb.h b/src/ckpt/agent/cpa_cb.h +index ac48c6c..d633583 100644 +--- a/src/ckpt/agent/cpa_cb.h ++++ b/src/ckpt/agent/cpa_cb.h +@@ -119,7 +119,7 @@ typedef struct cpa_cb { + + } CPA_CB; + +-uint32_t gl_cpa_hdl; ++extern uint32_t gl_cpa_hdl; + + typedef struct cpa_prcess_evt_sync { + NCS_QELEM qelem; +diff --git a/src/ckpt/ckptd/cpd_init.h b/src/ckpt/ckptd/cpd_init.h +index 0c02642..cf3466b 100644 +--- a/src/ckpt/ckptd/cpd_init.h ++++ b/src/ckpt/ckptd/cpd_init.h +@@ -33,7 +33,7 @@ + #include + #include "cpd_cb.h" + +-uint32_t gl_cpd_cb_hdl; ++extern uint32_t gl_cpd_cb_hdl; + + /* Macro to get the component name for the component type */ + #define m_CPD_TASKNAME "CPD" +diff --git a/src/evt/agent/eda.h b/src/evt/agent/eda.h +index 4d1991c..138c910 100644 +--- a/src/evt/agent/eda.h ++++ b/src/evt/agent/eda.h +@@ -39,7 +39,7 @@ + #include "base/logtrace.h" + + /* EDA CB global handle declaration */ +-uint32_t gl_eda_hdl; ++extern uint32_t gl_eda_hdl; + + /* EDA Default MDS timeout value */ + #define EDA_MDS_DEF_TIMEOUT 100 +diff --git a/src/evt/evtd/eds.h b/src/evt/evtd/eds.h +index bc9c429..3545d77 100644 +--- a/src/evt/evtd/eds.h ++++ b/src/evt/evtd/eds.h +@@ -72,6 +72,6 @@ + #include "base/daemon.h" + + /* EDS CB global handle declaration */ +-uint32_t gl_eds_hdl; ++extern uint32_t gl_eds_hdl; + + #endif // EVT_EVTD_EDS_H_ +diff --git a/src/evt/evtd/eds_amf.c b/src/evt/evtd/eds_amf.c +index 97b71a5..adebf0c 100644 +--- a/src/evt/evtd/eds_amf.c ++++ b/src/evt/evtd/eds_amf.c +@@ -30,6 +30,8 @@ stuff. + #include "eds.h" + #include "eds_dl_api.h" + ++struct next_HAState nextStateInfo; ++ + /* HA AMF statemachine & State handler definitions */ + + /**************************************************************************** +diff --git a/src/evt/evtd/eds_amf.h b/src/evt/evtd/eds_amf.h +index e9aeaa6..f9803b4 100644 +--- a/src/evt/evtd/eds_amf.h ++++ b/src/evt/evtd/eds_amf.h +@@ -49,7 +49,7 @@ uint32_t eds_quiesced_state_handler(EDS_CB *cb, SaInvocationT invocation); + struct next_HAState { + uint8_t nextState1; + uint8_t nextState2; +-} nextStateInfo; /* AMF HA state can transit to a maximum of the two defined ++}; /* AMF HA state can transit to a maximum of the two defined + states */ + + #define VALIDATE_STATE(curr, next) \ +diff --git a/src/evt/evtd/eds_cb.h b/src/evt/evtd/eds_cb.h +index c127ead..19c48cd 100644 +--- a/src/evt/evtd/eds_cb.h ++++ b/src/evt/evtd/eds_cb.h +@@ -40,7 +40,7 @@ + #include "base/ncssysf_tmr.h" + + /* global variables */ +-uint32_t gl_eds_hdl; ++extern uint32_t gl_eds_hdl; + + struct eda_reg_list_tag; + +diff --git a/src/imm/immd/immd.h b/src/imm/immd/immd.h +index 7dc1da6..bab3945 100644 +--- a/src/imm/immd/immd.h ++++ b/src/imm/immd/immd.h +@@ -42,7 +42,7 @@ + #include "immd_sbedu.h" + #include "base/ncs_mda_pvt.h" + +-IMMD_CB *immd_cb; ++extern IMMD_CB *immd_cb; + + extern uint32_t initialize_for_assignment(IMMD_CB *cb, SaAmfHAStateT ha_state); + +diff --git a/src/lck/lckd/gld_dl_api.h b/src/lck/lckd/gld_dl_api.h +index 6476a71..3a67fd1 100644 +--- a/src/lck/lckd/gld_dl_api.h ++++ b/src/lck/lckd/gld_dl_api.h +@@ -33,7 +33,7 @@ + #include "base/ncsgl_defs.h" + #include "base/ncs_lib.h" + +-uint32_t gl_gld_hdl; +-uint32_t gld_lib_req(NCS_LIB_REQ_INFO *req_info); ++extern uint32_t gl_gld_hdl; ++extern uint32_t gld_lib_req(NCS_LIB_REQ_INFO *req_info); + + #endif // LCK_LCKD_GLD_DL_API_H_ +diff --git a/src/lck/lcknd/glnd_cb.h b/src/lck/lcknd/glnd_cb.h +index 3b82f60..77a1f88 100644 +--- a/src/lck/lcknd/glnd_cb.h ++++ b/src/lck/lcknd/glnd_cb.h +@@ -28,8 +28,8 @@ extern "C" { + #endif + + /* global variables */ +-uint32_t gl_glnd_hdl; +-NCSCONTEXT gl_glnd_task_hdl; ++extern uint32_t gl_glnd_hdl; ++extern NCSCONTEXT gl_glnd_task_hdl; + + /* macros for the global varibales */ + #define m_GLND_RETRIEVE_GLND_CB_HDL gl_glnd_hdl +diff --git a/src/mds/mds_core.h b/src/mds/mds_core.h +index dad62cd..ed69d3a 100644 +--- a/src/mds/mds_core.h ++++ b/src/mds/mds_core.h +@@ -26,6 +26,10 @@ + #ifndef MDS_MDS_CORE_H_ + #define MDS_MDS_CORE_H_ + ++#ifndef EXTERN ++#define EXTERN extern ++#endif ++ + #include + #include "base/ncsgl_defs.h" + #include "mds/mds_papi.h" +@@ -600,65 +604,65 @@ extern "C" { + /* ******************************************** */ + + /* Initialization of MDTM Module */ +-uint32_t (*mds_mdtm_init)(NODE_ID node_id, uint32_t *mds_tipc_ref); ++EXTERN uint32_t (*mds_mdtm_init)(NODE_ID node_id, uint32_t *mds_tipc_ref); + + /* Destroying the MDTM Module*/ +-uint32_t (*mds_mdtm_destroy)(void); ++EXTERN uint32_t (*mds_mdtm_destroy)(void); + +-uint32_t (*mds_mdtm_send)(MDTM_SEND_REQ *req); ++EXTERN uint32_t (*mds_mdtm_send)(MDTM_SEND_REQ *req); + + /* SVC Install */ +-uint32_t (*mds_mdtm_svc_install)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, ++EXTERN uint32_t (*mds_mdtm_svc_install)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, + NCSMDS_SCOPE_TYPE install_scope, + V_DEST_RL role, MDS_VDEST_ID vdest_id, + NCS_VDEST_TYPE vdest_policy, + MDS_SVC_PVT_SUB_PART_VER mds_svc_pvt_ver); + + /* SVC Uninstall */ +-uint32_t (*mds_mdtm_svc_uninstall)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, ++EXTERN uint32_t (*mds_mdtm_svc_uninstall)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, + NCSMDS_SCOPE_TYPE install_scope, + V_DEST_RL role, MDS_VDEST_ID vdest_id, + NCS_VDEST_TYPE vdest_policy, + MDS_SVC_PVT_SUB_PART_VER mds_svc_pvt_ver); + + /* SVC Subscribe */ +-uint32_t (*mds_mdtm_svc_subscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, ++EXTERN uint32_t (*mds_mdtm_svc_subscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, + NCSMDS_SCOPE_TYPE subscribe_scope, + MDS_SVC_HDL local_svc_hdl, + MDS_SUBTN_REF_VAL *subtn_ref_val); + + /* added svc_hdl */ + /* SVC Unsubscribe */ +-uint32_t (*mds_mdtm_svc_unsubscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, ++EXTERN uint32_t (*mds_mdtm_svc_unsubscribe)(PW_ENV_ID pwe_id, MDS_SVC_ID svc_id, + NCSMDS_SCOPE_TYPE subscribe_scope, + MDS_SUBTN_REF_VAL subtn_ref_val); + + /* VDEST Install */ +-uint32_t (*mds_mdtm_vdest_install)(MDS_VDEST_ID vdest_id); ++EXTERN uint32_t (*mds_mdtm_vdest_install)(MDS_VDEST_ID vdest_id); + + /* VDEST Uninstall */ +-uint32_t (*mds_mdtm_vdest_uninstall)(MDS_VDEST_ID vdest_id); ++EXTERN uint32_t (*mds_mdtm_vdest_uninstall)(MDS_VDEST_ID vdest_id); + + /* VDEST Subscribe */ +-uint32_t (*mds_mdtm_vdest_subscribe)(MDS_VDEST_ID vdest_id, ++EXTERN uint32_t (*mds_mdtm_vdest_subscribe)(MDS_VDEST_ID vdest_id, + MDS_SUBTN_REF_VAL *subtn_ref_val); + + /* VDEST Unsubscribe */ +-uint32_t (*mds_mdtm_vdest_unsubscribe)(MDS_VDEST_ID vdest_id, ++EXTERN uint32_t (*mds_mdtm_vdest_unsubscribe)(MDS_VDEST_ID vdest_id, + MDS_SUBTN_REF_VAL subtn_ref_val); + + /* Tx Register (For incrementing the use count) */ +-uint32_t (*mds_mdtm_tx_hdl_register)(MDS_DEST adest); ++EXTERN uint32_t (*mds_mdtm_tx_hdl_register)(MDS_DEST adest); + + /* Tx Unregister (For decrementing the use count) */ +-uint32_t (*mds_mdtm_tx_hdl_unregister)(MDS_DEST adest); ++EXTERN uint32_t (*mds_mdtm_tx_hdl_unregister)(MDS_DEST adest); + + /* Node subscription */ +-uint32_t (*mds_mdtm_node_subscribe)(MDS_SVC_HDL svc_hdl, ++EXTERN uint32_t (*mds_mdtm_node_subscribe)(MDS_SVC_HDL svc_hdl, + MDS_SUBTN_REF_VAL *subtn_ref_val); + + /* Node unsubscription */ +-uint32_t (*mds_mdtm_node_unsubscribe)(MDS_SUBTN_REF_VAL subtn_ref_val); ++EXTERN uint32_t (*mds_mdtm_node_unsubscribe)(MDS_SUBTN_REF_VAL subtn_ref_val); + + #ifdef __cplusplus + } +diff --git a/src/mds/mds_dt_tcp.c b/src/mds/mds_dt_tcp.c +index 4a37246..e73cef4 100644 +--- a/src/mds/mds_dt_tcp.c ++++ b/src/mds/mds_dt_tcp.c +@@ -70,6 +70,8 @@ NCS_PATRICIA_TREE mdtm_reassembly_list; + + /* Get the pid of the process */ + pid_t mdtm_pid; ++ ++MDTM_TCP_CB *tcp_cb; + + static void mds_mdtm_enc_init(MDS_MDTM_DTM_MSG *init, uint8_t *buff); + static uint32_t mdtm_create_rcv_task(void); +diff --git a/src/mds/mds_dt_tcp.h b/src/mds/mds_dt_tcp.h +index 1065464..350d534 100644 +--- a/src/mds/mds_dt_tcp.h ++++ b/src/mds/mds_dt_tcp.h +@@ -50,7 +50,7 @@ typedef struct mdtm_tcp_cb { + + } MDTM_TCP_CB; + +-MDTM_TCP_CB *tcp_cb; ++extern MDTM_TCP_CB *tcp_cb; + + typedef enum mds_mdtm_dtm_msg_types { + MDS_MDTM_DTM_PID_TYPE = 1, +diff --git a/src/mds/mds_main.c b/src/mds/mds_main.c +index 0bcb2f9..5671ed3 100644 +--- a/src/mds/mds_main.c ++++ b/src/mds/mds_main.c +@@ -20,7 +20,7 @@ + #endif + + #include "osaf/configmake.h" +- ++#define EXTERN + /***************************************************************************** + .............................................................................. + +diff --git a/src/msg/msgnd/mqnd_db.h b/src/msg/msgnd/mqnd_db.h +index b78024e..fee43e5 100644 +--- a/src/msg/msgnd/mqnd_db.h ++++ b/src/msg/msgnd/mqnd_db.h +@@ -33,7 +33,7 @@ + #include + #include + /* Decleration for global variable */ +-uint32_t gl_mqnd_cb_hdl; ++extern uint32_t gl_mqnd_cb_hdl; + + /* Macros for reading global database */ + #define m_MQND_STORE_HDL(hdl) (gl_mqnd_cb_hdl = (hdl)) +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.05.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.05.bb index f11df49f8..bd972e346 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.05.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.20.05.bb @@ -27,6 +27,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://0001-Add-configure-time-check-for-gettid-API.patch \ file://0001-create_empty_library-Use-CC-variable-intead-of-hardc.patch \ file://0001-immom_python-convert-to-python3.patch \ + file://0001-Fix-build-with-fno-common.patch \ " SRC_URI[md5sum] = "d56bacf4c234c134e60e9b25f6f26671" SRC_URI[sha256sum] = "2478e298c0bce3b2cfdeb20875022cc11d7d3b53ecd3255422d22eb64c04953b" diff --git a/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Mark-toplevel-definition-as-external.patch b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Mark-toplevel-definition-as-external.patch new file mode 100644 index 000000000..646757c78 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/0001-tftp-Mark-toplevel-definition-as-external.patch @@ -0,0 +1,30 @@ +From 2a12174a5059e84d4ff6fad8f983a4d0f2127e73 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Aug 2020 12:17:31 -0700 +Subject: [PATCH] tftp: Mark toplevel definition as external + +Fixes +multiple definition of `toplevel'; tftp.o:/usr/src/debug/tftp-hpa/5.2-r0/tftp-hpa-5.2/tftp/tftp.c:51: first defined here + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + tftp/tftp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tftp/tftp.c b/tftp/tftp.c +index 9d15022..109848c 100644 +--- a/tftp/tftp.c ++++ b/tftp/tftp.c +@@ -48,7 +48,7 @@ extern int maxtimeout; + #define PKTSIZE SEGSIZE+4 + char ackbuf[PKTSIZE]; + int timeout; +-sigjmp_buf toplevel; ++extern sigjmp_buf toplevel; + sigjmp_buf timeoutbuf; + + static void nak(int, const char *); +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index 413950be1..4c62da818 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb @@ -28,6 +28,7 @@ SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.t file://tftp-hpa-bug-fix-on-separated-CR-and-LF.patch \ file://fix-writing-emtpy-file.patch \ file://0001-__progname-is-provided-by-libc.patch \ + file://0001-tftp-Mark-toplevel-definition-as-external.patch \ file://tftpd-hpa.socket \ file://tftpd-hpa.service \ " diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/files/gcc-10.patch b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/gcc-10.patch new file mode 100644 index 000000000..9a42aa369 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/gcc-10.patch @@ -0,0 +1,85 @@ +From af17efc862b9acfd63ce2ecb21f75ed890a93a5d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=C3=B6lbl?= +Date: Thu, 9 Jul 2020 14:29:18 +0200 +Subject: [PATCH] Fix linkage of global identifiers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Align the code to the standard and modern compilers. + +Upstream-Status: Submitted [https://github.com/OpenAoE/vblade/pull/15] +Signed-off-by: Andreas Kölbl +--- + dat.c | 12 ++++++++++++ + dat.h | 19 ++++++++++--------- + makefile | 7 +++++-- + 3 files changed, 27 insertions(+), 11 deletions(-) + create mode 100644 dat.c + +--- /dev/null ++++ b/dat.c +@@ -0,0 +1,12 @@ ++/* dat.c: Global memory for vblade AoE target */ ++#include "dat.h" ++ ++int shelf, slot; ++ulong aoetag; ++uchar mac[6]; ++int bfd; // block file descriptor ++int sfd; // socket file descriptor ++vlong size; // size of vblade ++vlong offset; ++char *progname; ++char serial[Nserial+1]; +--- a/dat.h ++++ b/dat.h +@@ -1,4 +1,5 @@ + /* dat.h: include file for vblade AoE target */ ++#include + + #define nil ((void *)0) + /* +@@ -163,12 +164,12 @@ enum { + Nserial= 20, + }; + +-int shelf, slot; +-ulong aoetag; +-uchar mac[6]; +-int bfd; // block file descriptor +-int sfd; // socket file descriptor +-vlong size; // size of vblade +-vlong offset; +-char *progname; +-char serial[Nserial+1]; ++extern int shelf, slot; ++extern ulong aoetag; ++extern uchar mac[6]; ++extern int bfd; // block file descriptor ++extern int sfd; // socket file descriptor ++extern vlong size; // size of vblade ++extern vlong offset; ++extern char *progname; ++extern char serial[Nserial+1]; +--- a/makefile ++++ b/makefile +@@ -8,7 +8,7 @@ sbindir = ${prefix}/sbin + sharedir = ${prefix}/share + mandir = ${sharedir}/man + +-O=aoe.o bpf.o ${PLATFORM}.o ata.o ++O=aoe.o bpf.o ${PLATFORM}.o ata.o dat.o + + vblade: $O + ${CC} ${LDFLAGS} -o vblade $O +@@ -25,6 +25,9 @@ ata.o : ata.c config.h dat.h fns.h makef + bpf.o : bpf.c + ${CC} ${CFLAGS} -c $< + ++dat.o : dat.c ++ ${CC} ${CFLAGS} -c $< ++ + config.h : config/config.h.in makefile + @if ${CC} ${CFLAGS} config/u64.c > /dev/null 2>&1; then \ + sh -xc "cp config/config.h.in config.h"; \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_22.bb b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_22.bb deleted file mode 100644 index a52a1e92b..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_22.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Virtual EtherDrive blade AoE target" -SECTION = "admin" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/aoetools/files/vblade/" - -SRC_URI = "${SOURCEFORGE_MIRROR}/aoetools/${BP}.tar.gz \ - file://cross.patch \ - file://makefile-add-ldflags.patch \ - file://${BPN}.conf \ - file://${BPN}.init \ - file://${BPN}.service \ - file://volatiles.99_vblade \ - " - -SRC_URI[md5sum] = "510d98ba0f231284a5fbe2da11cb2d6e" -SRC_URI[sha256sum] = "a990378f273f10eb431e42954a871aed52714035bbab28c54cef600c458356bb" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/aoetools/files/vblade/" - -inherit autotools-brokensep update-rc.d systemd - -do_install() { - install -D -m 0755 ${S}/vblade ${D}/${sbindir}/vblade - install -D -m 0755 ${S}/vbladed ${D}/${sbindir}/vbladed - install -D -m 0644 ${S}/vblade.8 ${D}/${mandir}/man8/vblade.8 - - install -D -m 0644 ${WORKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN}.conf - install -D -m 0755 ${WORKDIR}/${BPN}.init ${D}/${sysconfdir}/init.d/${BPN} - - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}/${sysconfdir}/default/volatiles - install -m 0755 ${WORKDIR}/volatiles.99_vblade ${D}/${sysconfdir}/default/volatiles/99_vblade - fi - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/${BPN}.init ${D}/${bindir}/ - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /var/run/${BPN} 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/vblade.service ${D}${systemd_system_unitdir} - sed -e 's,@BINDIR@,${bindir},g' -i ${D}${systemd_system_unitdir}/*.service - fi - -} - -INITSCRIPT_NAME = "vblade" -INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." - -SYSTEMD_SERVICE_${PN} = "vblade.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_24.bb b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_24.bb new file mode 100644 index 000000000..09ba8cfd9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_24.bb @@ -0,0 +1,56 @@ +SUMMARY = "Virtual EtherDrive blade AoE target" +SECTION = "admin" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/aoetools/files/vblade/" + +SRCREV = "a7f48bda5bf1646f6450601049bf4b74053adbb3" +SRC_URI = "git://github.com/OpenAoE/vblade \ + file://cross.patch \ + file://makefile-add-ldflags.patch \ + file://gcc-10.patch \ + file://${BPN}.conf \ + file://${BPN}.init \ + file://${BPN}.service \ + file://volatiles.99_vblade \ + " + +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/OpenAoE/vblade/archive/" + +inherit autotools-brokensep update-rc.d systemd + +do_install() { + install -D -m 0755 ${S}/vblade ${D}/${sbindir}/vblade + install -D -m 0755 ${S}/vbladed ${D}/${sbindir}/vbladed + install -D -m 0644 ${S}/vblade.8 ${D}/${mandir}/man8/vblade.8 + + install -D -m 0644 ${WORKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN}.conf + install -D -m 0755 ${WORKDIR}/${BPN}.init ${D}/${sysconfdir}/init.d/${BPN} + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}/${sysconfdir}/default/volatiles + install -m 0755 ${WORKDIR}/volatiles.99_vblade ${D}/${sysconfdir}/default/volatiles/99_vblade + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}/${bindir} + install -m 0755 ${WORKDIR}/${BPN}.init ${D}/${bindir}/ + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /var/run/${BPN} 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/vblade.service ${D}${systemd_system_unitdir} + sed -e 's,@BINDIR@,${bindir},g' -i ${D}${systemd_system_unitdir}/*.service + fi + +} + +INITSCRIPT_NAME = "vblade" +INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." + +SYSTEMD_SERVICE_${PN} = "vblade.service" +SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb deleted file mode 100644 index 6bf268da9..000000000 --- a/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (C) 2020 Khem Raj -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = " Kronosnet, often referred to as knet, is a network abstraction layer designed for High Availability use cases, where redundancy, security, fault tolerance and fast fail-over are the core requirements of your application." -HOMEPAGE = "https://kronosnet.org/" -LICENSE = "GPL-2.0+ & LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa882bbe \ - file://COPYING.libraries;md5=2d5025d4aa3495befef8f17206a5b0a1" -SECTION = "libs" -DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" - -SRCREV = "0ba5985c3ddec8429b989f0e7bd3324f53e0a9b0" -SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1" - -inherit autotools - -S = "${WORKDIR}/git" - -# libknet/transport_udp.c:326:48: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare] -# for (cmsg = CMSG_FIRSTHDR(&msg);cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { -# ^~~~~~~~~~~~~~~~~~~~~~~ -CFLAGS_append_toolchain-clang = " -Wno-sign-compare" - diff --git a/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.18.bb b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.18.bb new file mode 100644 index 000000000..7b1dfc241 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.18.bb @@ -0,0 +1,30 @@ +# Copyright (C) 2020 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Kronosnet, often referred to as knet, is a network abstraction layer \ + designed for High Availability use cases, where redundancy, security, \ + fault tolerance and fast fail-over are the core requirements of your application." +HOMEPAGE = "https://kronosnet.org/" +LICENSE = "GPL-2.0+ & LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYING.libraries;md5=2d5025d4aa3495befef8f17206a5b0a1" +SECTION = "libs" +DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" + +SRCREV = "e1f3d4fb4906a26bf155a0e3fff2b6cb02be4dd2" +SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1" + +UPSTREAM_CHECK_URI = "https://github.com/kronosnet/kronosnet/releases" + +inherit autotools + +S = "${WORKDIR}/git" + +# libknet/transport_udp.c:326:48: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare] +# for (cmsg = CMSG_FIRSTHDR(&msg);cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { +# ^~~~~~~~~~~~~~~~~~~~~~~ +CFLAGS_append_toolchain-clang = " -Wno-sign-compare" + +PACKAGECONFIG[man] = "enable_man="yes", --disable-man, " + +PACKAGECONFIG_remove = "man" diff --git a/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0001-cmds-fix-enum-conversion.patch b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0001-cmds-fix-enum-conversion.patch new file mode 100644 index 000000000..680f6b67d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0001-cmds-fix-enum-conversion.patch @@ -0,0 +1,91 @@ +From 090854e09fe18ebf1ba428864895a690086f78ee Mon Sep 17 00:00:00 2001 +From: Aaron Conole +Date: Mon, 19 Aug 2019 11:41:13 -0400 +Subject: [PATCH 1/9] cmds: fix enum conversion + +Multiple modules use implicit conversion between enum types, but +this triggers warnings with some compilers. ex: + + qbg/vdp_cmds.c:110:39: error: implicit conversion from enumeration type + 'lldp_cmd' to different enumeration type 'cmd_status' + [-Werror,-Wenum-conversion] + cmd_status good_cmd = vdp_cmdok(cmd, cmd_gettlv); + +Reported-at: https://github.com/intel/openlldp/issues/53 +Signed-off-by: Aaron Conole +--- + lldp_evb22_cmds.c | 2 +- + lldp_evb_cmds.c | 2 +- + qbg/vdp22_cmds.c | 2 +- + qbg/vdp_cmds.c | 2 +- + vdptool.c | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lldp_evb22_cmds.c b/lldp_evb22_cmds.c +index cebfeb2..51810bc 100644 +--- a/lldp_evb22_cmds.c ++++ b/lldp_evb22_cmds.c +@@ -225,7 +225,7 @@ int evb22_conf_enabletx(char *ifname, enum agent_type type) + TLVID(OUI_IEEE_8021Qbg22, LLDP_EVB22_SUBTYPE)); + } + +-static int evb22_cmdok(struct cmd *cmd, cmd_status expected) ++static int evb22_cmdok(struct cmd *cmd, int expected) + { + if (cmd->cmd != expected) + return cmd_invalid; +diff --git a/lldp_evb_cmds.c b/lldp_evb_cmds.c +index eec4f33..e6af03b 100644 +--- a/lldp_evb_cmds.c ++++ b/lldp_evb_cmds.c +@@ -163,7 +163,7 @@ int evb_conf_enabletx(char *ifname, enum agent_type type) + return is_tlv_txenabled(ifname, type, TLVID_8021Qbg(LLDP_EVB_SUBTYPE)); + } + +-static int evb_cmdok(struct cmd *cmd, cmd_status expected) ++static int evb_cmdok(struct cmd *cmd, int expected) + { + if (cmd->cmd != expected) + return cmd_invalid; +diff --git a/qbg/vdp22_cmds.c b/qbg/vdp22_cmds.c +index 479b1b0..2e1bbbd 100644 +--- a/qbg/vdp22_cmds.c ++++ b/qbg/vdp22_cmds.c +@@ -296,7 +296,7 @@ int vdp22_sendevent(struct vdpnl_vsi *p) + return 0; + } + +-static int vdp22_cmdok(struct cmd *cmd, cmd_status expected) ++static int vdp22_cmdok(struct cmd *cmd, int expected) + { + if (cmd->cmd != expected) + return cmd_invalid; +diff --git a/qbg/vdp_cmds.c b/qbg/vdp_cmds.c +index 95bcfb1..50f2781 100644 +--- a/qbg/vdp_cmds.c ++++ b/qbg/vdp_cmds.c +@@ -85,7 +85,7 @@ static char *print_mode(char *s, size_t length, struct vsi_profile *p) + return s; + } + +-static int vdp_cmdok(struct cmd *cmd, cmd_status expected) ++static int vdp_cmdok(struct cmd *cmd, int expected) + { + if (cmd->cmd != expected) + return cmd_invalid; +diff --git a/vdptool.c b/vdptool.c +index 9872348..8f36277 100644 +--- a/vdptool.c ++++ b/vdptool.c +@@ -141,7 +141,7 @@ static char *print_status(cmd_status status) + str = "TLV does not support agent type"; + break; + default: +- str = print_vdp_status(status); ++ str = print_vdp_status((enum vdp22_cmd_status)status); + break; + } + return str; +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0002-lldp_head-rename-and-make-extern.patch b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0002-lldp_head-rename-and-make-extern.patch new file mode 100644 index 000000000..8f65b799f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0002-lldp_head-rename-and-make-extern.patch @@ -0,0 +1,500 @@ +From 07a83c583b9d508c7040dc6254a6a7113b2ce55f Mon Sep 17 00:00:00 2001 +From: Aaron Conole +Date: Mon, 3 Aug 2020 15:05:42 -0400 +Subject: [PATCH 2/9] lldp_head: rename and make extern + +Try to resolve this silly mod issue + +Signed-off-by: Aaron Conole +--- + config.c | 4 ++-- + event_iface.c | 4 ++-- + include/lldp_mod.h | 2 +- + lldp/agent.c | 2 +- + lldp/rx.c | 4 ++-- + lldp/tx.c | 4 ++-- + lldp_dcbx.c | 8 ++++---- + lldp_mand_cmds.c | 8 ++++---- + lldpad.c | 12 +++++++----- + lldptool.c | 14 ++++++++------ + lldptool_cmds.c | 2 +- + qbg/ecp22.c | 8 ++++---- + qbg/vdp.c | 4 ++-- + qbg/vdp22.c | 6 +++--- + qbg/vdp22_cmds.c | 2 +- + vdptool.c | 16 +++++++++------- + 16 files changed, 53 insertions(+), 47 deletions(-) + +diff --git a/config.c b/config.c +index be458fd..bc3fbae 100644 +--- a/config.c ++++ b/config.c +@@ -185,7 +185,7 @@ void scan_port(UNUSED void *eloop_data, UNUSED void *user_ctx) + LIST_FOREACH(agent, &port->agent_head, entry) { + LLDPAD_DBG("%s: calling ifdown for agent %p.\n", + __func__, agent); +- LIST_FOREACH(np, &lldp_head, lldp) { ++ LIST_FOREACH(np, &lldp_mod_head, lldp) { + ops = np->ops; + if (ops->lldp_mod_ifdown) + ops->lldp_mod_ifdown(ifname, agent); +@@ -394,7 +394,7 @@ void init_ports(void) + LIST_FOREACH(agent, &port->agent_head, entry) { + LLDPAD_DBG("%s: calling ifup for agent %p.\n", + __func__, agent); +- LIST_FOREACH(np, &lldp_head, lldp) { ++ LIST_FOREACH(np, &lldp_mod_head, lldp) { + if (np->ops->lldp_mod_ifup) + np->ops->lldp_mod_ifup(p->if_name, agent); + } +diff --git a/event_iface.c b/event_iface.c +index 43a95c7..1be2963 100644 +--- a/event_iface.c ++++ b/event_iface.c +@@ -216,7 +216,7 @@ int oper_add_device(char *device_name) + LIST_FOREACH(agent, &port->agent_head, entry) { + LLDPAD_DBG("%s: calling ifup for agent %p.\n", + __func__, agent); +- LIST_FOREACH(np, &lldp_head, lldp) { ++ LIST_FOREACH(np, &lldp_mod_head, lldp) { + if (np->ops->lldp_mod_ifup) + np->ops->lldp_mod_ifup(device_name, agent); + } +@@ -283,7 +283,7 @@ static void event_if_decode_nlmsg(int route_type, void *data, int len) + LIST_FOREACH(agent, &port->agent_head, entry) { + LLDPAD_DBG("%s: calling ifdown for agent %p.\n", + __func__, agent); +- LIST_FOREACH(np, &lldp_head, lldp) { ++ LIST_FOREACH(np, &lldp_mod_head, lldp) { + ops = np->ops; + if (ops->lldp_mod_ifdown) + ops->lldp_mod_ifdown(device_name, +diff --git a/include/lldp_mod.h b/include/lldp_mod.h +index 49a50e4..9733595 100644 +--- a/include/lldp_mod.h ++++ b/include/lldp_mod.h +@@ -96,7 +96,7 @@ struct lldp_module { + }; + + LIST_HEAD(lldp_head, lldp_module); +-struct lldp_head lldp_head; ++extern struct lldp_head lldp_mod_head; + + static inline struct lldp_module *find_module_by_id(struct lldp_head *head, int id) + { +diff --git a/lldp/agent.c b/lldp/agent.c +index 333929a..aa4a8d1 100644 +--- a/lldp/agent.c ++++ b/lldp/agent.c +@@ -163,7 +163,7 @@ static void timer(UNUSED void *eloop_data, UNUSED void *user_ctx) + run_rx_sm(port, agent); + update_rx_timers(agent); + +- LIST_FOREACH(n, &lldp_head, lldp) { ++ LIST_FOREACH(n, &lldp_mod_head, lldp) { + if (n->ops && n->ops->timer) + n->ops->timer(port, agent); + } +diff --git a/lldp/rx.c b/lldp/rx.c +index 12d07bc..43aeeba 100644 +--- a/lldp/rx.c ++++ b/lldp/rx.c +@@ -359,7 +359,7 @@ void rxProcessFrame(struct port *port, struct lldp_agent *agent) + } + + /* rx per lldp module */ +- LIST_FOREACH(np, &lldp_head, lldp) { ++ LIST_FOREACH(np, &lldp_mod_head, lldp) { + if (!np->ops || !np->ops->lldp_mod_rchange) + continue; + +@@ -402,7 +402,7 @@ u8 mibDeleteObjects(struct port *port, struct lldp_agent *agent) + { + struct lldp_module *np; + +- LIST_FOREACH(np, &lldp_head, lldp) { ++ LIST_FOREACH(np, &lldp_mod_head, lldp) { + if (!np->ops || !np->ops->lldp_mod_mibdelete) + continue; + np->ops->lldp_mod_mibdelete(port, agent); +diff --git a/lldp/tx.c b/lldp/tx.c +index c3a5c62..0746e34 100644 +--- a/lldp/tx.c ++++ b/lldp/tx.c +@@ -71,7 +71,7 @@ bool mibConstrInfoLLDPDU(struct port *port, struct lldp_agent *agent) + fb_offset += sizeof(struct l2_ethhdr); + + /* Generic TLV Pack */ +- LIST_FOREACH(np, &lldp_head, lldp) { ++ LIST_FOREACH(np, &lldp_mod_head, lldp) { + if (!np->ops || !np->ops->lldp_mod_gettlv) + continue; + +@@ -206,7 +206,7 @@ bool mibConstrShutdownLLDPDU(struct port *port, struct lldp_agent *agent) + memcpy(agent->tx.frameout, (void *)ð, sizeof(struct l2_ethhdr)); + fb_offset += sizeof(struct l2_ethhdr); + +- np = find_module_by_id(&lldp_head, LLDP_MOD_MAND); ++ np = find_module_by_id(&lldp_mod_head, LLDP_MOD_MAND); + if (!np) + goto error; + if (!np->ops || !np->ops->lldp_mod_gettlv) +diff --git a/lldp_dcbx.c b/lldp_dcbx.c +index 7e53c0f..809086f 100644 +--- a/lldp_dcbx.c ++++ b/lldp_dcbx.c +@@ -129,7 +129,7 @@ struct dcbx_tlvs *dcbx_data(const char *ifname) + struct dcbd_user_data *dud; + struct dcbx_tlvs *tlv = NULL; + +- dud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_DCBX); ++ dud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_DCBX); + if (dud) { + LIST_FOREACH(tlv, &dud->head, entry) { + if (!strncmp(tlv->ifname, ifname, IFNAMSIZ)) +@@ -148,7 +148,7 @@ int dcbx_tlvs_rxed(const char *ifname, struct lldp_agent *agent) + if (agent->type != NEAREST_BRIDGE) + return 0; + +- dud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_DCBX); ++ dud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_DCBX); + if (dud) { + LIST_FOREACH(tlv, &dud->head, entry) { + if (!strncmp(tlv->ifname, ifname, IFNAMSIZ)) +@@ -172,7 +172,7 @@ int dcbx_check_active(const char *ifname) + struct dcbd_user_data *dud; + struct dcbx_tlvs *tlv = NULL; + +- dud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_DCBX); ++ dud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_DCBX); + if (dud) { + LIST_FOREACH(tlv, &dud->head, entry) { + if (!strncmp(tlv->ifname, ifname, IFNAMSIZ)) +@@ -507,7 +507,7 @@ void dcbx_ifup(char *ifname, struct lldp_agent *agent) + ifindex = get_ifidx(ifname); + port = port_find_by_ifindex(ifindex); + +- dud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_DCBX); ++ dud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_DCBX); + tlvs = dcbx_data(ifname); + + if (!port) +diff --git a/lldp_mand_cmds.c b/lldp_mand_cmds.c +index 8a88177..1c43bf4 100644 +--- a/lldp_mand_cmds.c ++++ b/lldp_mand_cmds.c +@@ -466,7 +466,7 @@ int handle_get_args(struct cmd *cmd, UNUSED char *arg, char *argvalue, + nbuf = obuf; + nbuf_len = obuf_len; + +- LIST_FOREACH(np, &lldp_head, lldp) { ++ LIST_FOREACH(np, &lldp_mod_head, lldp) { + if (!np->ops->get_arg_handler) + continue; + if (!(ah = np->ops->get_arg_handler())) +@@ -496,7 +496,7 @@ int handle_get_arg(struct cmd *cmd, char *arg, char *argvalue, + struct arg_handlers *ah; + int rval, status = cmd_not_applicable; + +- LIST_FOREACH(np, &lldp_head, lldp) { ++ LIST_FOREACH(np, &lldp_mod_head, lldp) { + if (!np->ops->get_arg_handler) + continue; + if (!(ah = np->ops->get_arg_handler())) +@@ -593,7 +593,7 @@ int handle_test_arg(struct cmd *cmd, char *arg, char *argvalue, + struct arg_handlers *ah; + int rval, status = cmd_not_applicable; + +- LIST_FOREACH(np, &lldp_head, lldp) { ++ LIST_FOREACH(np, &lldp_mod_head, lldp) { + if (!np->ops->get_arg_handler) + continue; + if (!(ah = np->ops->get_arg_handler())) +@@ -626,7 +626,7 @@ int handle_set_arg(struct cmd *cmd, char *arg, char *argvalue, + struct arg_handlers *ah; + int rval, status = cmd_not_applicable; + +- LIST_FOREACH(np, &lldp_head, lldp) { ++ LIST_FOREACH(np, &lldp_mod_head, lldp) { + if (!np->ops->get_arg_handler) + continue; + if (!(ah = np->ops->get_arg_handler())) +diff --git a/lldpad.c b/lldpad.c +index 01fb588..65e92c7 100644 +--- a/lldpad.c ++++ b/lldpad.c +@@ -80,6 +80,8 @@ struct lldp_module *(*register_tlv_table[])(void) = { + NULL, + }; + ++struct lldp_head lldp_mod_head; ++ + char *cfg_file_name = NULL; + bool daemonize = 0; + int loglvl = LOG_WARNING; +@@ -98,7 +100,7 @@ static void init_modules(void) + struct lldp_module *premod = NULL; + int i = 0; + +- LIST_INIT(&lldp_head); ++ LIST_INIT(&lldp_mod_head); + for (i = 0; register_tlv_table[i]; i++) { + module = register_tlv_table[i](); + if (!module) +@@ -106,7 +108,7 @@ static void init_modules(void) + if (premod) + LIST_INSERT_AFTER(premod, module, lldp); + else +- LIST_INSERT_HEAD(&lldp_head, module, lldp); ++ LIST_INSERT_HEAD(&lldp_mod_head, module, lldp); + premod = module; + } + } +@@ -115,9 +117,9 @@ void deinit_modules(void) + { + struct lldp_module *module; + +- while (lldp_head.lh_first != NULL) { +- module = lldp_head.lh_first; +- LIST_REMOVE(lldp_head.lh_first, lldp); ++ while (lldp_mod_head.lh_first != NULL) { ++ module = lldp_mod_head.lh_first; ++ LIST_REMOVE(lldp_mod_head.lh_first, lldp); + module->ops->lldp_mod_unregister(module); + } + } +diff --git a/lldptool.c b/lldptool.c +index 2b14f61..664a248 100644 +--- a/lldptool.c ++++ b/lldptool.c +@@ -64,6 +64,8 @@ + #include "lldp_util.h" + #include "lldpad_status.h" + ++struct lldp_head lldp_mod_head; ++ + static int show_raw; + + static const char *cli_version = +@@ -199,7 +201,7 @@ static void init_modules(void) + if (premod) + LIST_INSERT_AFTER(premod, module, lldp); + else +- LIST_INSERT_HEAD(&lldp_head, module, lldp); ++ LIST_INSERT_HEAD(&lldp_mod_head, module, lldp); + premod = module; + } + } +@@ -208,9 +210,9 @@ void deinit_modules(void) + { + struct lldp_module *module; + +- while (lldp_head.lh_first != NULL) { +- module = lldp_head.lh_first; +- LIST_REMOVE(lldp_head.lh_first, lldp); ++ while (lldp_mod_head.lh_first != NULL) { ++ module = lldp_mod_head.lh_first; ++ LIST_REMOVE(lldp_mod_head.lh_first, lldp); + module->ops->lldp_mod_unregister(module); + } + } +@@ -346,7 +348,7 @@ cli_cmd_help(UNUSED struct clif *clif, UNUSED int argc, UNUSED char *argv[], + printf("%s\n%s\n%s", commands_usage, commands_options, commands_help); + + printf("\nTLV identifiers:\n"); +- LIST_FOREACH(np, &lldp_head, lldp) ++ LIST_FOREACH(np, &lldp_mod_head, lldp) + if (np->ops->print_help) + np->ops->print_help(); + return 0; +@@ -406,7 +408,7 @@ u32 lookup_tlvid(char *tlvid_str) + struct lldp_module *np; + u32 tlvid = INVALID_TLVID; + +- LIST_FOREACH(np, &lldp_head, lldp) { ++ LIST_FOREACH(np, &lldp_mod_head, lldp) { + if (np->ops->lookup_tlv_name) { + tlvid = np->ops->lookup_tlv_name(tlvid_str); + if (tlvid != INVALID_TLVID) +diff --git a/lldptool_cmds.c b/lldptool_cmds.c +index daef8c8..70b7b0d 100644 +--- a/lldptool_cmds.c ++++ b/lldptool_cmds.c +@@ -464,7 +464,7 @@ static void print_tlvs(struct cmd *cmd, char *ibuf) + offset += 8; + + printed = 0; +- LIST_FOREACH(np, &lldp_head, lldp) { ++ LIST_FOREACH(np, &lldp_mod_head, lldp) { + if (np->ops->print_tlv(tlvid, tlv_len, ibuf+offset)) { + printed = 1; + break; +diff --git a/qbg/ecp22.c b/qbg/ecp22.c +index 6561d14..825392b 100644 +--- a/qbg/ecp22.c ++++ b/qbg/ecp22.c +@@ -774,7 +774,7 @@ void ecp22_start(char *ifname) + struct ecp22 *ecp; + + LLDPAD_DBG("%s:%s start ecp\n", __func__, ifname); +- eud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_ECP22); ++ eud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_ECP22); + if (!eud) { + LLDPAD_DBG("%s:%s no ECP module\n", __func__, ifname); + return; +@@ -837,7 +837,7 @@ void ecp22_stop(char *ifname) + struct ecp22 *ecp; + + LLDPAD_DBG("%s:%s stop ecp\n", __func__, ifname); +- eud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_ECP22); ++ eud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_ECP22); + ecp = find_ecpdata(ifname, eud); + if (ecp) + ecp22_remove(ecp); +@@ -852,7 +852,7 @@ static int ecp22_data_from_evb(char *ifname, struct evb22_to_ecp22 *ptr) + struct ecp22_user_data *eud; + struct ecp22 *ecp; + +- eud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_ECP22); ++ eud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_ECP22); + ecp = find_ecpdata(ifname, eud); + if (ecp) { + ecp->max_rte = ptr->max_rte; +@@ -930,7 +930,7 @@ static int ecp22_req2send(char *ifname, unsigned short subtype, + + LLDPAD_DBG("%s:%s subtype:%d\n", __func__, ifname, subtype); + +- eud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_ECP22); ++ eud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_ECP22); + ecp = find_ecpdata(ifname, eud); + if (!ecp) { + rc = -ENODEV; +diff --git a/qbg/vdp.c b/qbg/vdp.c +index d131560..c26bbd6 100644 +--- a/qbg/vdp.c ++++ b/qbg/vdp.c +@@ -188,7 +188,7 @@ struct vdp_data *vdp_data(char *ifname) + struct vdp_user_data *ud; + struct vdp_data *vd = NULL; + +- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_VDP02); ++ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_VDP02); + if (ud) { + LIST_FOREACH(vd, &ud->head, entry) { + if (!strncmp(ifname, vd->ifname, IFNAMSIZ)) +@@ -1624,7 +1624,7 @@ void vdp_ifup(char *ifname, struct lldp_agent *agent) + + LIST_INIT(&vd->profile_head); + +- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_VDP02); ++ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_VDP02); + LIST_INSERT_HEAD(&ud->head, vd, entry); + + out_start_again: +diff --git a/qbg/vdp22.c b/qbg/vdp22.c +index cf02310..81ea3a8 100644 +--- a/qbg/vdp22.c ++++ b/qbg/vdp22.c +@@ -694,7 +694,7 @@ static struct vdp22 *vdp22_findif(const char *ifname, + struct vdp22 *vdp = 0; + + if (!ud) { +- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_VDP22); ++ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_VDP22); + if (!ud) + LLDPAD_DBG("%s:%s no VDP22 module\n", __func__, + ifname); +@@ -794,7 +794,7 @@ void vdp22_stop(char *ifname) + struct vsi22 *vsi; + + LLDPAD_DBG("%s:%s stop vdp\n", __func__, ifname); +- vud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_VDP22); ++ vud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_VDP22); + if (!vud) { + LLDPAD_ERR("%s:%s no VDP22 module\n", __func__, ifname); + return; +@@ -874,7 +874,7 @@ void vdp22_start(const char *ifname, int role) + struct vsi22 *vsi; + + LLDPAD_DBG("%s:%s start vdp\n", __func__, ifname); +- vud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_VDP22); ++ vud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_VDP22); + if (!vud) { + LLDPAD_ERR("%s:%s no VDP22 module\n", __func__, ifname); + return; +diff --git a/qbg/vdp22_cmds.c b/qbg/vdp22_cmds.c +index 2e1bbbd..a8025ee 100644 +--- a/qbg/vdp22_cmds.c ++++ b/qbg/vdp22_cmds.c +@@ -57,7 +57,7 @@ static struct lldp_module *get_my_module(int thisid) + { + struct lldp_module *np = NULL; + +- LIST_FOREACH(np, &lldp_head, lldp) ++ LIST_FOREACH(np, &lldp_mod_head, lldp) + if (thisid == np->id) + break; + return np; +diff --git a/vdptool.c b/vdptool.c +index 8f36277..f1d946c 100644 +--- a/vdptool.c ++++ b/vdptool.c +@@ -61,6 +61,8 @@ + #define OUI_ENCODE_HNDLR(name) name##_oui_encode_hndlr + #define OUI_PRNT_DECODE_HNDLR(name) name##_oui_print_decode_hndlr + ++struct lldp_head lldp_mod_head; ++ + #define EXTERN_OUI_FN(name) \ + extern bool name##_oui_encode_hndlr(char *, char *, size_t); \ + extern void name##_oui_print_decode_hndlr(char *) +@@ -796,13 +798,13 @@ static void init_modules(void) + struct lldp_module *premod = NULL; + int i = 0; + +- LIST_INIT(&lldp_head); ++ LIST_INIT(&lldp_mod_head); + for (i = 0; register_tlv_table[i]; i++) { + module = register_tlv_table[i](); + if (premod) + LIST_INSERT_AFTER(premod, module, lldp); + else +- LIST_INSERT_HEAD(&lldp_head, module, lldp); ++ LIST_INSERT_HEAD(&lldp_mod_head, module, lldp); + premod = module; + } + } +@@ -811,9 +813,9 @@ void deinit_modules(void) + { + struct lldp_module *module; + +- while (lldp_head.lh_first != NULL) { +- module = lldp_head.lh_first; +- LIST_REMOVE(lldp_head.lh_first, lldp); ++ while (lldp_mod_head.lh_first != NULL) { ++ module = lldp_mod_head.lh_first; ++ LIST_REMOVE(lldp_mod_head.lh_first, lldp); + module->ops->lldp_mod_unregister(module); + } + } +@@ -953,7 +955,7 @@ cli_cmd_help(UNUSED struct clif *clif, UNUSED int argc, UNUSED char *argv[], + printf("%s\n%s\n%s", commands_usage, commands_options, commands_help); + + printf("\nTLV identifiers:\n"); +- LIST_FOREACH(np, &lldp_head, lldp) ++ LIST_FOREACH(np, &lldp_mod_head, lldp) + if (np->ops->print_help) + np->ops->print_help(); + return 0; +@@ -1006,7 +1008,7 @@ u32 lookup_tlvid(char *tlvid_str) + struct lldp_module *np; + u32 tlvid = INVALID_TLVID; + +- LIST_FOREACH(np, &lldp_head, lldp) { ++ LIST_FOREACH(np, &lldp_mod_head, lldp) { + if (np->ops->lookup_tlv_name) { + tlvid = np->ops->lookup_tlv_name(tlvid_str); + if (tlvid != INVALID_TLVID) +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0003-lldp-add-packed-struct-definition.patch b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0003-lldp-add-packed-struct-definition.patch new file mode 100644 index 000000000..4d0594cb6 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0003-lldp-add-packed-struct-definition.patch @@ -0,0 +1,49 @@ +From 702dd20f43d9ca7e0bcb917e8acfec3f1acdcb5c Mon Sep 17 00:00:00 2001 +From: Aaron Conole +Date: Mon, 3 Aug 2020 15:14:50 -0400 +Subject: [PATCH 3/9] lldp: add packed struct definition + +Signed-off-by: Aaron Conole +--- + include/lldp.h | 6 ++++++ + lldp/l2_packet.h | 5 ++--- + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/include/lldp.h b/include/lldp.h +index fb5ee93..de6a4ad 100644 +--- a/include/lldp.h ++++ b/include/lldp.h +@@ -255,5 +255,11 @@ enum { + #define LLDP_EVB_DEFAULT_RTE 15 + #define LLDP_EVB_DEFAULT_MAX_RTE 31 + ++#ifndef _MSC_VER ++#define STRUCT_PACKED(STRUCT) STRUCT __attribute__((__packed__)) ++#else ++#define STRUCT_PACKED(STRUCT) __pragma(pack(push, 1)) STRUCT __pragma(pack(pop)) ++#endif ++ + void somethingChangedLocal(const char *ifname, int type); + #endif /* _LLDP_H */ +diff --git a/lldp/l2_packet.h b/lldp/l2_packet.h +index 607b8a3..831958c 100644 +--- a/lldp/l2_packet.h ++++ b/lldp/l2_packet.h +@@ -58,12 +58,11 @@ + */ + struct l2_packet_data; + +- +-struct l2_ethhdr { ++STRUCT_PACKED(struct l2_ethhdr { + u8 h_dest[ETH_ALEN]; + u8 h_source[ETH_ALEN]; + u16 h_proto; +-} STRUCT_PACKED; ++}); + + /** + * l2_packet_init - Initialize l2_packet interface +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0004-lldptool-make-extern.patch b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0004-lldptool-make-extern.patch new file mode 100644 index 000000000..16b7def68 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0004-lldptool-make-extern.patch @@ -0,0 +1,41 @@ +From 8229f4fb700ba4fcb2ec3e9956491bf5ee8c0ae2 Mon Sep 17 00:00:00 2001 +From: Aaron Conole +Date: Mon, 3 Aug 2020 15:17:31 -0400 +Subject: [PATCH 4/9] lldptool: make extern + +This should only exist per final linked object. + +Signed-off-by: Aaron Conole +--- + include/lldptool.h | 2 +- + lldptool.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/lldptool.h b/include/lldptool.h +index c919873..a190009 100644 +--- a/include/lldptool.h ++++ b/include/lldptool.h +@@ -29,7 +29,7 @@ + + #include "clif.h" + +-struct lldp_head lldp_cli_head; ++extern struct lldp_head lldp_cli_head; + + int clif_command(struct clif *clif, char *cmd, int raw); + void print_raw_message(char *msg, int print); +diff --git a/lldptool.c b/lldptool.c +index 664a248..d76cc48 100644 +--- a/lldptool.c ++++ b/lldptool.c +@@ -64,6 +64,7 @@ + #include "lldp_util.h" + #include "lldpad_status.h" + ++struct lldp_head lldp_cli_head; + struct lldp_head lldp_mod_head; + + static int show_raw; +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0005-cisco_oui-match-encode-handler-prototypes.patch b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0005-cisco_oui-match-encode-handler-prototypes.patch new file mode 100644 index 000000000..4bdc5f2f6 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0005-cisco_oui-match-encode-handler-prototypes.patch @@ -0,0 +1,28 @@ +From 9203dec731e53fb72e1c0d62639e6e54378f66cc Mon Sep 17 00:00:00 2001 +From: Aaron Conole +Date: Mon, 3 Aug 2020 15:20:59 -0400 +Subject: [PATCH 5/9] cisco_oui: match encode handler prototypes + +The EXTERN_FN prototype generated requires size_t be the third parameter. + +Signed-off-by: Aaron Conole +--- + vdptool_cisco_oui.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vdptool_cisco_oui.c b/vdptool_cisco_oui.c +index 7003521..3f88c76 100644 +--- a/vdptool_cisco_oui.c ++++ b/vdptool_cisco_oui.c +@@ -28,7 +28,7 @@ + #include "lldp_util.h" + #include "vdp_cisco.h" + +-bool cisco_oui_encode_hndlr(char *dst, char *src, int len) ++bool cisco_oui_encode_hndlr(char *dst, char *src, size_t len) + { + char *src_temp = strdup(src); + char *key, *data; +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0006-ecp22-make-enum-a-type-rather-than-instance.patch b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0006-ecp22-make-enum-a-type-rather-than-instance.patch new file mode 100644 index 000000000..2b0289df2 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0006-ecp22-make-enum-a-type-rather-than-instance.patch @@ -0,0 +1,33 @@ +From 2723219c08726efa08a6bad04ffb775f850a96bc Mon Sep 17 00:00:00 2001 +From: Aaron Conole +Date: Mon, 3 Aug 2020 15:23:28 -0400 +Subject: [PATCH 6/9] ecp22: make enum a type rather than instance + +The enum defined in the qbg header is setup as a discreet instance +rather than a type. Fix this. + +Signed-off-by: Aaron Conole +--- + include/qbg_ecp22.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/qbg_ecp22.h b/include/qbg_ecp22.h +index 567f6df..fe66bb3 100644 +--- a/include/qbg_ecp22.h ++++ b/include/qbg_ecp22.h +@@ -49,10 +49,10 @@ enum { /* ECP Transmit states */ + ECP22_TX_ERROR + }; + +-enum { ++enum ecp22_mode { + ECP22_REQUEST = 0, + ECP22_ACK +-} ecp22_mode; ++}; + + struct ecp22_hdr { /* ECP22 header */ + u16 ver_op_sub; /* ECP22 version, operation, subtype */ +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0007-lldp_8021qaz-extern-config-object.patch b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0007-lldp_8021qaz-extern-config-object.patch new file mode 100644 index 000000000..36b575c56 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0007-lldp_8021qaz-extern-config-object.patch @@ -0,0 +1,29 @@ +From 275fe9da663193a843de450f03e810daedc06955 Mon Sep 17 00:00:00 2001 +From: Aaron Conole +Date: Mon, 3 Aug 2020 15:25:38 -0400 +Subject: [PATCH 7/9] lldp_8021qaz: extern config object + +The config object only exists as part of the config translation unit +so remove the extra config object in the 8021qaz module. + +Signed-off-by: Aaron Conole +--- + lldp_8021qaz.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lldp_8021qaz.c b/lldp_8021qaz.c +index a42fd11..673d758 100644 +--- a/lldp_8021qaz.c ++++ b/lldp_8021qaz.c +@@ -49,7 +49,7 @@ + + + struct lldp_head lldp_head; +-struct config_t lldpad_cfg; ++extern config_t lldpad_cfg; + extern bool read_only_8021qaz; + + static int ieee8021qaz_check_pending(struct port *port, struct lldp_agent *); +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0008-stringops-fix-some-string-copy-errors.patch b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0008-stringops-fix-some-string-copy-errors.patch new file mode 100644 index 000000000..501b66699 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0008-stringops-fix-some-string-copy-errors.patch @@ -0,0 +1,61 @@ +From 61291de03cb6dd1aea2a633eb72951f3fe453e7f Mon Sep 17 00:00:00 2001 +From: Aaron Conole +Date: Mon, 3 Aug 2020 15:33:08 -0400 +Subject: [PATCH 8/9] stringops: fix some string copy errors + +Reported when using gcc-10. + +Signed-off-by: Aaron Conole +--- + dcb_protocol.c | 13 ++++--------- + lldp/ports.c | 2 +- + 2 files changed, 5 insertions(+), 10 deletions(-) + +diff --git a/dcb_protocol.c b/dcb_protocol.c +index 75ca139..930251b 100644 +--- a/dcb_protocol.c ++++ b/dcb_protocol.c +@@ -2257,13 +2257,8 @@ cmd_status get_bwg_descrpt(char *device_name, u8 bwgid, char **name) + + if ((it != NULL) && + (bwgid < it->second->max_pgid_desc)) { +- size = (int)strlen(it->second->pgid_desc[bwgid]) + +- sizeof(char); /* Localization OK */ +- *name = (char*)malloc(size); +- if (*name != NULL) { +- strncpy(*name, it->second->pgid_desc[bwgid], +- size); /* Localization OK */ +- } else { ++ *name = strdup(it->second->pgid_desc[bwgid]); ++ if (*name == NULL) { + goto Error; + } + } else { +@@ -2272,9 +2267,9 @@ cmd_status get_bwg_descrpt(char *device_name, u8 bwgid, char **name) + size = (int)strlen( + attribs.descript.pgid_desc[bwgid]) + + sizeof(char); +- *name = (char*)malloc(size); ++ *name = (char*)calloc(size, sizeof(char)); + if (*name != NULL) { +- memcpy(*name, attribs.descript.pgid_desc[bwgid], size); /* Localization OK */ ++ memcpy(*name, attribs.descript.pgid_desc[bwgid], size - 1); /* Localization OK */ + } else { + goto Error; + } +diff --git a/lldp/ports.c b/lldp/ports.c +index 6384f14..9b681f7 100644 +--- a/lldp/ports.c ++++ b/lldp/ports.c +@@ -264,7 +264,7 @@ struct port *add_port(int ifindex, const char *ifname) + memset(newport, 0, sizeof(*newport)); + newport->ifindex = ifindex; + newport->next = NULL; +- strncpy(newport->ifname, ifname, IFNAMSIZ); ++ strncpy(newport->ifname, ifname, IFNAMSIZ - 1); + + newport->bond_master = is_bond(ifname); + /* Initialize relevant port variables */ +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0009-8021qaz-mark-prio-map-functions-static.patch b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0009-8021qaz-mark-prio-map-functions-static.patch new file mode 100644 index 000000000..0f84426f9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/0009-8021qaz-mark-prio-map-functions-static.patch @@ -0,0 +1,39 @@ +From 7ae79b0dff53a23fa0a964f77b9e3bb387a293c4 Mon Sep 17 00:00:00 2001 +From: Aaron Conole +Date: Tue, 4 Aug 2020 09:17:50 -0400 +Subject: [PATCH 9/9] 8021qaz: mark prio map functions static + +Inline is not the correct way to mark a function for inclusion +in a single translation unit. Use 'static' to restrict export +of these functions. + +Signed-off-by: Aaron Conole +--- + lldp_8021qaz.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lldp_8021qaz.c b/lldp_8021qaz.c +index 673d758..16ae167 100644 +--- a/lldp_8021qaz.c ++++ b/lldp_8021qaz.c +@@ -397,7 +397,7 @@ static int read_cfg_file(char *ifname, struct lldp_agent *agent, + return 0; + } + +-inline int get_prio_map(u32 prio_map, int prio) ++static int get_prio_map(u32 prio_map, int prio) + { + if (prio > 7) + return 0; +@@ -405,7 +405,7 @@ inline int get_prio_map(u32 prio_map, int prio) + return (prio_map >> (4 * (7-prio))) & 0xF; + } + +-inline void set_prio_map(u32 *prio_map, u8 prio, int tc) ++static void set_prio_map(u32 *prio_map, u8 prio, int tc) + { + u32 mask = ~(0xffffffff & (0xF << (4 * (7-prio)))); + *prio_map &= mask; +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb b/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb index 5fbf0645e..d8a0d6913 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb @@ -12,11 +12,21 @@ inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} DEPENDS = "libnl libconfig readline" -SRCREV = "36d729de7ce5b56cf061d94d610cf0510154820c" +SRCREV = "b71bfb87fefb31c4b1a6a7ae351791c90966c3a8" +PV .= "+git${SRCPV}" SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=master \ file://0001-Fix-musl-libc-build-issue.patch \ file://0001-autotools-Add-include-path-to-generated-version.h.patch \ file://0001-autotools-Add-option-to-disable-installation-of-syst.patch \ + file://0001-cmds-fix-enum-conversion.patch \ + file://0002-lldp_head-rename-and-make-extern.patch \ + file://0003-lldp-add-packed-struct-definition.patch \ + file://0004-lldptool-make-extern.patch \ + file://0005-cisco_oui-match-encode-handler-prototypes.patch \ + file://0006-ecp22-make-enum-a-type-rather-than-instance.patch \ + file://0007-lldp_8021qaz-extern-config-object.patch \ + file://0008-stringops-fix-some-string-copy-errors.patch \ + file://0009-8021qaz-mark-prio-map-functions-static.patch \ " # Makefile.am adds -Werror to AM_CFLAGS. There are warnings so disable it. diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc index 134a33d47..70c32b7a4 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc @@ -42,6 +42,8 @@ PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" inherit autotools update-rc.d useradd systemd pkgconfig multilib_header +CFLAGS += "-fcommon" + SYSTEMD_PACKAGES = "${PN} ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" SYSTEMD_SERVICE_${PN}-bgpd = "bgpd.service" SYSTEMD_SERVICE_${PN}-isisd = "isisd.service" diff --git a/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/reproducible-build.patch b/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/reproducible-build.patch new file mode 100644 index 000000000..4939ab25c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/reproducible-build.patch @@ -0,0 +1,12 @@ +--- a/Makefile ++++ b/Makefile +@@ -40,7 +40,8 @@ NPERSHELF=16 + CONF_SCRIPTS = aoe-discover aoe-interfaces aoe-mkshelf aoe-revalidate aoe-flush aoe-stat + PROGS = aoeping aoecfg aoe-sancheck + COMMANDS := ${CONF_SCRIPTS} aoe-mkdevs aoe-version coraid-update ${PROGS} +-CFLAGS = -Wall -O -g ++# We could still override this on the command line. ++CFLAGS += -Wall -O -g + SANCHECKLIBS = -lpthread + + AOE_PING_OBJ = aoeping.o linux.o diff --git a/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb b/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb index 9b73b442a..60f3dc9b2 100644 --- a/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb +++ b/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb @@ -13,6 +13,7 @@ RRECOMMENDS_${PN} = "kernel-module-aoe" SRC_URI = "http://sourceforge.net/projects/${BPN}/files/${BPN}/${BPN}-${PV}.tar.gz \ file://aoe-stat-no-bashism.patch \ file://makefile-add-ldflags.patch \ + file://reproducible-build.patch \ " SRC_URI[md5sum] = "bff30daa988a65f69d4448ce4726a6db" SRC_URI[sha256sum] = "fb5e2cd0de7644cc1ec04ee3aeb43211cf7445a0c19e13d6b3ed5a8fbdf215ff" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb deleted file mode 100644 index 92415386c..000000000 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.81.bb +++ /dev/null @@ -1,8 +0,0 @@ -require dnsmasq.inc - -SRC_URI[dnsmasq-2.81.md5sum] = "e43808177a773014b5892ccba238f7a8" -SRC_URI[dnsmasq-2.81.sha256sum] = "3c28c68c6c2967c3a96e9b432c0c046a5df17a426d3a43cffe9e693cf05804d0" -SRC_URI += "\ - file://lua.patch \ -" - diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.82.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.82.bb new file mode 100644 index 000000000..4ca1f3cc9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.82.bb @@ -0,0 +1,8 @@ +require dnsmasq.inc + +SRC_URI[dnsmasq-2.82.md5sum] = "3c710dee3edba510ed11a6e3d9e0d9cb" +SRC_URI[dnsmasq-2.82.sha256sum] = "62f33bfac1a1b4a5dab8461b4664e414f7d6ced1d2cf141e9cdf9c3c2a424f65" +SRC_URI += "\ + file://lua.patch \ +" + diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch new file mode 100644 index 000000000..6702f3bde --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-v84-Make-setup_options-definitions-as-extern.patch @@ -0,0 +1,32 @@ +From d095caf6f8f77fe056fb90ccd5d89c207a7f346d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Aug 2020 12:59:38 -0700 +Subject: [PATCH] v84: Make setup_options definitions as extern + +This is already defined in drbdadm_main.c, therefore make this +declaration to be extern for other modules + +Fixes compatibility with gcc-10 which uses -fno-common by default + +Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/7] +Signed-off-by: Khem Raj +--- + user/v84/drbdadm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/user/v84/drbdadm.h b/user/v84/drbdadm.h +index ed63d78c..8469f1c4 100644 +--- a/user/v84/drbdadm.h ++++ b/user/v84/drbdadm.h +@@ -251,7 +251,7 @@ struct setup_option { + bool explicit; + char *option; + }; +-struct setup_option *setup_options; ++extern struct setup_option *setup_options; + + extern void add_setup_option(bool explicit, char *option); + +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb deleted file mode 100644 index 5dabdd51d..000000000 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.12.0.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "Distributed block device driver for Linux" -DESCRIPTION = "DRBD mirrors a block device over the network to another machine.\ -DRBD mirrors a block device over the network to another machine.\ -Think of it as networked raid 1. It is a building block for\ -setting up high availability (HA) clusters." -HOMEPAGE = "http://www.drbd.org/" -SECTION = "admin" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" - -SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils \ - git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers \ - ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ - " -# v9.12.0 -SRCREV_drbd-utils = "91629a4cce49ca0d4f917fe0bffa25cfe8db3052" -SRCREV_drbd-headers = "233006b4d26cf319638be0ef6d16ec7dee287b66" - -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases" - -SYSTEMD_SERVICE_${PN} = "drbd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -DEPENDS = "flex-native" - -inherit autotools-brokensep systemd - -EXTRA_OECONF = " \ - --with-initdir=/etc/init.d \ - --without-pacemaker \ - --without-rgmanager \ - --without-bashcompletion \ - --with-distro debian \ - --with-initscripttype=both \ - --with-systemdunitdir=${systemd_unitdir}/system \ - --without-manual \ - " - -# If we have inherited reproducible_build, we want to use it. -export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" - -do_install_append() { - # don't install empty /var/lock and /var/run to avoid conflict with base-files - rm -rf ${D}${localstatedir}/lock - rm -rf ${D}${localstatedir}/run -} - -RDEPENDS_${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" - -# The drbd items are explicitly put under /lib when installed. -# -FILES_${PN} += "/run" -FILES_${PN} += "${nonarch_base_libdir}/drbd \ - ${nonarch_libdir}/drbd \ - ${nonarch_libdir}/tmpfiles.d" -FILES_${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" - -CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb new file mode 100644 index 000000000..5b0979f96 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb @@ -0,0 +1,62 @@ +SUMMARY = "Distributed block device driver for Linux" +DESCRIPTION = "DRBD mirrors a block device over the network to another machine.\ +DRBD mirrors a block device over the network to another machine.\ +Think of it as networked raid 1. It is a building block for\ +setting up high availability (HA) clusters." +HOMEPAGE = "http://www.drbd.org/" +SECTION = "admin" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" + +SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=${PV} \ + git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers \ + file://0001-v84-Make-setup_options-definitions-as-extern.patch \ + ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ + " +SRCREV_drbd-utils = "b24b0f7e42d500d3538d7eeffa017ec78d08f918" +SRCREV_drbd-headers = "c757cf357edef67751b8f45a6ea894d287180087" + +SRCREV_FORMAT = "drbd-utils_drbd-headers" + +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases" + +SYSTEMD_SERVICE_${PN} = "drbd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +DEPENDS = "flex-native" + +inherit autotools-brokensep systemd + +EXTRA_OECONF = " \ + --with-initdir=/etc/init.d \ + --without-pacemaker \ + --without-rgmanager \ + --without-bashcompletion \ + --with-distro debian \ + --with-initscripttype=both \ + --with-systemdunitdir=${systemd_unitdir}/system \ + --without-manual \ + " + +# If we have inherited reproducible_build, we want to use it. +export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" + +do_install_append() { + # don't install empty /var/lock and /var/run to avoid conflict with base-files + rm -rf ${D}${localstatedir}/lock + rm -rf ${D}${localstatedir}/run +} + +RDEPENDS_${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" + +# The drbd items are explicitly put under /lib when installed. +# +FILES_${PN} += "/run" +FILES_${PN} += "${nonarch_base_libdir}/drbd \ + ${nonarch_libdir}/drbd \ + ${nonarch_libdir}/tmpfiles.d" +FILES_${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.19-1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.19-1.bb deleted file mode 100644 index c296c3bc1..000000000 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.19-1.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Distributed block device driver for Linux" -DESCRIPTION = "DRBD is a block device which is designed to build high \ - availability clusters. This is done by mirroring a whole \ - block device via (a dedicated) network. You could see \ - it as a network raid-1." -HOMEPAGE = "http://oss.linbit.com/drbd/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" -DEPENDS = "virtual/kernel" - -SRC_URI = "http://www.linbit.com/downloads/drbd/9.0/drbd-${PV}.tar.gz \ - file://check_existence_of_modules_before_installing.patch \ - " -SRC_URI[md5sum] = "bd1202eaaf81641752d0c9b003b10f6c" -SRC_URI[sha256sum] = "5b3d2bcb99542940e40af903dea783cf04524e9f41cc530e210d2c15ef84fa58" - -inherit module - -EXTRA_OEMAKE += "KDIR='${STAGING_KERNEL_DIR}'" - -do_install () { - oe_runmake install DESTDIR="${D}" -} - -PNBLACKLIST[drbd] ?= "Kernel module Needs forward porting to kernel 5.2+" diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb new file mode 100644 index 000000000..3ce63c457 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb @@ -0,0 +1,24 @@ +SUMMARY = "Distributed block device driver for Linux" +DESCRIPTION = "DRBD is a block device which is designed to build high \ + availability clusters. This is done by mirroring a whole \ + block device via (a dedicated) network. You could see \ + it as a network raid-1." +HOMEPAGE = "http://oss.linbit.com/drbd/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" +DEPENDS = "virtual/kernel" + +SRC_URI = "http://www.linbit.com/downloads/drbd/9.0/drbd-${PV}.tar.gz \ + file://check_existence_of_modules_before_installing.patch \ + " +SRC_URI[sha256sum] = "14970459f55bc465503b88b24d1a266b2ace0d69fe3cb387005b8477cd6475ed" + +inherit module + +EXTRA_OEMAKE += "KDIR='${STAGING_KERNEL_DIR}' SPAAS=true" + +do_install () { + oe_runmake install DESTDIR="${D}" +} + +PNBLACKLIST[drbd] ?= "Needs coccinelle to build with SPAAS" diff --git a/meta-openembedded/meta-networking/recipes-support/fping/fping_4.2.bb b/meta-openembedded/meta-networking/recipes-support/fping/fping_4.2.bb deleted file mode 100644 index 594f5b9cf..000000000 --- a/meta-openembedded/meta-networking/recipes-support/fping/fping_4.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "sends ICMP ECHO_REQUEST packets to network hosts" -DESCRIPTION = "fping is a ping like program which uses the Internet Control \ -Message Protocol (ICMP) echo request to determine if a target host is \ -responding. fping differs from ping in that you can specify any number of \ -targets on the command line, or specify a file containing the lists of \ -targets to ping. Instead of sending to one target until it times out or \ -replies, fping will send out a ping packet and move on to the next target \ -in a round-robin fashion." -HOMEPAGE = "http://www.fping.org/" -SECTION = "net" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=c6170fbadddfcd74f011515291d96901" - -SRC_URI = "http://www.fping.org/dist/fping-${PV}.tar.gz" -SRC_URI[md5sum] = "218e71764177a8ce25564a7810f8e729" -SRC_URI[sha256sum] = "7d339674b6a95aae1d8ad487ff5056fd95b474c3650938268f6a905c3771b64a" - -S = "${WORKDIR}/fping-${PV}" - -inherit autotools - -EXTRA_OECONF = "--enable-ipv4" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta-openembedded/meta-networking/recipes-support/fping/fping_4.4.bb b/meta-openembedded/meta-networking/recipes-support/fping/fping_4.4.bb new file mode 100644 index 000000000..125fdfa70 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/fping/fping_4.4.bb @@ -0,0 +1,24 @@ +SUMMARY = "sends ICMP ECHO_REQUEST packets to network hosts" +DESCRIPTION = "fping is a ping like program which uses the Internet Control \ +Message Protocol (ICMP) echo request to determine if a target host is \ +responding. fping differs from ping in that you can specify any number of \ +targets on the command line, or specify a file containing the lists of \ +targets to ping. Instead of sending to one target until it times out or \ +replies, fping will send out a ping packet and move on to the next target \ +in a round-robin fashion." +HOMEPAGE = "http://www.fping.org/" +SECTION = "net" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=c6170fbadddfcd74f011515291d96901" + +SRC_URI = "http://www.fping.org/dist/fping-${PV}.tar.gz" +SRC_URI[sha256sum] = "9f854b65a52dc7b1749d6743e35d0a6268179d1a724267339fc9a066b2b72d11" + +S = "${WORKDIR}/fping-${PV}" + +inherit autotools + +EXTRA_OECONF = "--enable-ipv4" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch new file mode 100644 index 000000000..e696ac4ea --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch @@ -0,0 +1,27 @@ +From 5aea816f27a71e6c88ad50e7326fa6584eeb7ad9 Mon Sep 17 00:00:00 2001 +From: Francois Marier +Date: Fri, 24 Jul 2020 21:22:47 -0700 +Subject: [PATCH] Fix compilation with GCC's -fno-common flag (fixes #305) + +Upstream-Status: Submitted [https://github.com/mrash/fwknop/pull/319] +Signed-off-by: Khem Raj +--- + client/log_msg.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/log_msg.h b/client/log_msg.h +index cc17716..3dda161 100644 +--- a/client/log_msg.h ++++ b/client/log_msg.h +@@ -38,7 +38,7 @@ enum + LOG_VERBOSITY_INFO, /*!< Constant to define a INFO message */ + LOG_VERBOSITY_DEBUG, /*!< Constant to define a DEBUG message */ + LOG_LAST_VERBOSITY +-} log_level_t; ++}; + + #define LOG_DEFAULT_VERBOSITY LOG_VERBOSITY_NORMAL /*!< Default verbosity to use */ + +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb index 3eca3ab62..c3681f925 100644 --- a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ inherit autotools-brokensep SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \ + file://0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch \ " SRC_URI[md5sum] = "47a9c7c214c40dceb5dc2aa8832e4f32" SRC_URI[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77" diff --git a/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb b/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb new file mode 100644 index 000000000..72a7eeec5 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb @@ -0,0 +1,22 @@ +SUMMARY = "Configure network interfaces for parallel routing" +HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bonding" +SECTION = "net" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=acc89812938cf9ad6b1debc37cea0253" + +inherit manpages +MAN_PKG = "${PN}" + +SRCREV = "c26e9310f552e69d0d44eb48746e02c9ae4b4f6f" +SRC_URI = "git://salsa.debian.org/debian/ifenslave.git;protocol=https" + +S = "${WORKDIR}/git/" + +do_install() { + install -m 0755 -D ${S}/debian/ifenslave.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/ifenslave + install -m 0755 -D ${S}/debian/ifenslave.if-post-down ${D}${sysconfdir}/network/if-post-down.d/ifenslave + install -m 0755 -D ${S}/debian/ifenslave.if-up ${D}${sysconfdir}/network/if-up.d/ifenslave +} + +FILES_${PN}-doc_remove = "${mandir}" diff --git a/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.9.bb b/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.9.bb deleted file mode 100644 index 125b59e76..000000000 --- a/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.9.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Configure network interfaces for parallel routing" -HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bonding" -SECTION = "net" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=acc89812938cf9ad6b1debc37cea0253" - -inherit manpages -MAN_PKG = "${PN}" - -SRCREV = "42bfbb9beb924672ca86b86e9679ac3d6b87d992" -SRC_URI = "git://salsa.debian.org/debian/ifenslave.git;protocol=https" - -S = "${WORKDIR}/git" - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${S}/ifenslave ${D}${sbindir}/ - - install -m 0755 -D ${S}/debian/ifenslave.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/ifenslave - install -m 0755 -D ${S}/debian/ifenslave.if-post-down ${D}${sysconfdir}/network/if-post-down.d/ifenslave - install -m 0755 -D ${S}/debian/ifenslave.if-up ${D}${sysconfdir}/network/if-up.d/ifenslave - install -m 0644 -D ${S}/debian/ifenslave.8 ${D}${mandir}/man8/ifenslave.8 -} - -FILES_${PN}-doc_remove = "${mandir}" -FILES_${PN} += "${mandir}/man8/ifenslave.8" diff --git a/meta-openembedded/meta-networking/recipes-support/iftop/iftop/iftop-1.0-gcc10.patch b/meta-openembedded/meta-networking/recipes-support/iftop/iftop/iftop-1.0-gcc10.patch new file mode 100644 index 000000000..28391a57c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/iftop/iftop/iftop-1.0-gcc10.patch @@ -0,0 +1,68 @@ +Patch by Robert Scheck for iftop <= 1.0pre4 to avoid a +GCC 10 related build failure due to global variables in a header file with omitted +"extern" declaration, see also: https://gcc.gnu.org/gcc-10/porting_to.html + +Example build failure output: +/usr/bin/ld: ui_common.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:36: multiple definition of `screen_list'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:36: first defined here +/usr/bin/ld: ui_common.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peaktotal'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: ui_common.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peakrecv'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: ui_common.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peaksent'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: ui_common.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:37: multiple definition of `totals'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:37: first defined here +/usr/bin/ld: ui_common.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:40: multiple definition of `screen_hash'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:40: first defined here +/usr/bin/ld: ui_common.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:41: multiple definition of `service_hash'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:41: first defined here +/usr/bin/ld: ui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:36: multiple definition of `screen_list'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:36: first defined here +/usr/bin/ld: ui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peaksent'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: ui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peakrecv'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: ui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peaktotal'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: ui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:37: multiple definition of `totals'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:37: first defined here +/usr/bin/ld: ui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:40: multiple definition of `screen_hash'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:40: first defined here +/usr/bin/ld: ui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:41: multiple definition of `service_hash'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:41: first defined here +/usr/bin/ld: tui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:36: multiple definition of `screen_list'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:36: first defined here +/usr/bin/ld: tui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:37: multiple definition of `totals'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:37: first defined here +/usr/bin/ld: tui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peaksent'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: tui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peakrecv'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: tui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: multiple definition of `peaktotal'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:38: first defined here +/usr/bin/ld: tui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:40: multiple definition of `screen_hash'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:40: first defined here +/usr/bin/ld: tui.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:41: multiple definition of `service_hash'; iftop.o:/builddir/build/BUILD/iftop-1.0pre4/ui_common.h:41: first defined here +collect2: error: ld returned 1 exit status + +Patch from https://src.fedoraproject.org/rpms/iftop/raw/master/f/iftop-1.0-gcc10.patch + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- a/ui_common.h ++++ b/ui_common.h +@@ -33,12 +33,12 @@ typedef struct host_pair_line_tag { + + extern options_t options; + +-sorted_list_type screen_list; +-host_pair_line totals; +-int peaksent, peakrecv, peaktotal; ++extern sorted_list_type screen_list; ++extern host_pair_line totals; ++extern int peaksent, peakrecv, peaktotal; + extern history_type history_totals; +-hash_type* screen_hash; +-hash_type* service_hash; ++extern hash_type* screen_hash; ++extern hash_type* service_hash; + + void analyse_data(void); + void screen_list_init(void); +--- a/ui_common.c ++++ b/ui_common.c +@@ -24,6 +24,12 @@ int history_divs[HISTORY_DIVISIONS] = {1 + char* unit_bits[UNIT_DIVISIONS] = { "b", "Kb", "Mb", "Gb"}; + char* unit_bytes[UNIT_DIVISIONS] = { "B", "KB", "MB", "GB"}; + ++sorted_list_type screen_list; ++host_pair_line totals; ++int peaksent, peakrecv, peaktotal; ++hash_type* screen_hash; ++hash_type* service_hash; ++ + extern hash_type* history; + extern int history_pos; + extern int history_len; diff --git a/meta-openembedded/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb b/meta-openembedded/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb index 0c8e494c1..c71ecb32e 100644 --- a/meta-openembedded/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb +++ b/meta-openembedded/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb @@ -6,7 +6,9 @@ DEPENDS = "libpcap ncurses" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=76498170798db0f4f0fb685a225f702f" -SRC_URI = "http://www.ex-parrot.com/pdw/iftop/download/iftop-${PV}.tar.gz" +SRC_URI = "http://www.ex-parrot.com/pdw/iftop/download/iftop-${PV}.tar.gz \ + file://iftop-1.0-gcc10.patch \ + " SRC_URI[md5sum] = "7e6decb4958e8a4890cccac335239f24" SRC_URI[sha256sum] = "f733eeea371a7577f8fe353d86dd88d16f5b2a2e702bd96f5ffb2c197d9b4f97" diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.7.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.7.bb deleted file mode 100644 index da77a2389..000000000 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.7.bb +++ /dev/null @@ -1,71 +0,0 @@ -SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://ldb.samba.org" -SECTION = "libs" -LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" - -DEPENDS += "libtdb libtalloc libtevent popt" -RDEPENDS_pyldb += "python3" - -SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ - file://do-not-import-target-module-while-cross-compile.patch \ - file://libldb-fix-musl-libc-unkown-type-error.patch \ - file://libldb-fix-musl-libc-conflict-type-error.patch \ - file://0001-waf-add-support-of-cross_compile.patch \ - file://options-1.5.4.patch \ - " - -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ -" -PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" -PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" -PACKAGECONFIG[ldap] = ",,openldap" -PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" -PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" -PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" -PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," - -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://avoid-openldap-unless-wanted.patch', d)}" - -LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9adade \ - file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ - file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" - -SRC_URI[md5sum] = "4d72bbfe7c7fcdf592482a98c853d222" -SRC_URI[sha256sum] = "b9eeb77ecb94f3b53caeff7cbc1850b6294fa937be4364c53a92a62c6548c001" - -inherit waf-samba - -S = "${WORKDIR}/ldb-${PV}" - -#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen -#to cross Popen -export WAF_NO_PREFORK="yes" - -EXTRA_OECONF += "--disable-rpath \ - --disable-rpath-install \ - --bundled-libraries=cmocka \ - --builtin-libraries=replace \ - --with-modulesdir=${libdir}/ldb/modules \ - --with-privatelibdir=${libdir}/ldb \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - " - -PACKAGES =+ "pyldb pyldb-dbg pyldb-dev" - -NOAUTOPACKAGEDEBUG = "1" - -FILES_${PN} += "${libdir}/ldb/*" -FILES_${PN}-dbg += "${bindir}/.debug/* \ - ${libdir}/.debug/* \ - ${libdir}/ldb/.debug/* \ - ${libdir}/ldb/modules/ldb/.debug/*" - -FILES_pyldb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ - ${libdir}/libpyldb-util.*.so.* \ - " -FILES_pyldb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ - ${libdir}/.debug/libpyldb-util.*.so.*" -FILES_pyldb-dev = "${libdir}/libpyldb-util.*.so" diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.8.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.8.bb new file mode 100644 index 000000000..199db797a --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.8.bb @@ -0,0 +1,71 @@ +SUMMARY = "Hierarchical, reference counted memory pool system with destructors" +HOMEPAGE = "http://ldb.samba.org" +SECTION = "libs" +LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" + +DEPENDS += "libtdb libtalloc libtevent popt" +RDEPENDS_pyldb += "python3" + +SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ + file://do-not-import-target-module-while-cross-compile.patch \ + file://libldb-fix-musl-libc-unkown-type-error.patch \ + file://libldb-fix-musl-libc-conflict-type-error.patch \ + file://0001-waf-add-support-of-cross_compile.patch \ + file://options-1.5.4.patch \ + " + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[ldap] = ",,openldap" +PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" +PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," + +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://avoid-openldap-unless-wanted.patch', d)}" + +LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9adade \ + file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ + file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" + +SRC_URI[md5sum] = "d9b4bea8b48cd4c4d0c492e65881164b" +SRC_URI[sha256sum] = "ddf7f770643e0a0dda60f2818913f883caeed37fa1e8d6eda0dfe9588c1e3a83" + +inherit waf-samba + +S = "${WORKDIR}/ldb-${PV}" + +#cross_compile cannot use preforked process, since fork process earlier than point subproces.popen +#to cross Popen +export WAF_NO_PREFORK="yes" + +EXTRA_OECONF += "--disable-rpath \ + --disable-rpath-install \ + --bundled-libraries=cmocka \ + --builtin-libraries=replace \ + --with-modulesdir=${libdir}/ldb/modules \ + --with-privatelibdir=${libdir}/ldb \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " + +PACKAGES =+ "pyldb pyldb-dbg pyldb-dev" + +NOAUTOPACKAGEDEBUG = "1" + +FILES_${PN} += "${libdir}/ldb/*" +FILES_${PN}-dbg += "${bindir}/.debug/* \ + ${libdir}/.debug/* \ + ${libdir}/ldb/.debug/* \ + ${libdir}/ldb/modules/ldb/.debug/*" + +FILES_pyldb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ + ${libdir}/libpyldb-util.*.so.* \ + " +FILES_pyldb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ + ${libdir}/.debug/libpyldb-util.*.so.*" +FILES_pyldb-dev = "${libdir}/libpyldb-util.*.so" diff --git a/meta-openembedded/meta-networking/recipes-support/netperf/files/0001-nettest_omni-Remove-duplicate-variable-definitions.patch b/meta-openembedded/meta-networking/recipes-support/netperf/files/0001-nettest_omni-Remove-duplicate-variable-definitions.patch new file mode 100644 index 000000000..08376417b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/netperf/files/0001-nettest_omni-Remove-duplicate-variable-definitions.patch @@ -0,0 +1,37 @@ +From 6dd5b2b1f3ae3479647e2ef66e390d031066defe Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Aug 2020 09:57:23 -0700 +Subject: [PATCH] nettest_omni: Remove duplicate variable definitions + +These defines are already defined in nettest_bsd.c and exported by +nettest_bsd.h this should fix build with -fno-common + +Upstream-Status: Submitted [https://github.com/HewlettPackard/netperf/pull/46] + +Signed-off-by: Khem Raj +--- + src/nettest_omni.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/src/nettest_omni.c b/src/nettest_omni.c +index 852eeb1..862088a 100644 +--- a/src/nettest_omni.c ++++ b/src/nettest_omni.c +@@ -458,14 +458,6 @@ static int client_port_max = 65535; + + /* different options for the sockets */ + +-int +- loc_nodelay, /* don't/do use NODELAY locally */ +- rem_nodelay, /* don't/do use NODELAY remotely */ +- loc_sndavoid, /* avoid send copies locally */ +- loc_rcvavoid, /* avoid recv copies locally */ +- rem_sndavoid, /* avoid send copies remotely */ +- rem_rcvavoid; /* avoid recv_copies remotely */ +- + extern int + loc_tcpcork, + rem_tcpcork, +-- +2.28.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb index d48f3aeab..a084fb4c1 100644 --- a/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb @@ -13,6 +13,7 @@ SRC_URI = "git://github.com/HewlettPackard/netperf.git \ file://vfork.patch \ file://init \ file://0001-netlib.c-Move-including-sched.h-out-og-function.patch \ + file://0001-nettest_omni-Remove-duplicate-variable-definitions.patch \ " SRCREV = "f482bab49fcedee46fc5b755da127f608325cd13" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch index feed0213c..4b2e33e9a 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-Remove-man-files-which-cant-be-built.patch @@ -1,6 +1,6 @@ -From 5a8a2f81ef8650f06d1d9d268add612ab46025f1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 12 Jun 2018 22:57:04 -0700 +From cfcfb8a110b72b9d92cf7c56f374478f65473653 Mon Sep 17 00:00:00 2001 +From: Zang Ruochen +Date: Wed, 5 Aug 2020 17:21:14 +0900 Subject: [PATCH] Remove man files which cant be built Remove need for pandoc-prebuilt during cross build @@ -18,15 +18,17 @@ Signed-off-by: Khem Raj Update for version 26.1. Remove more man files which can no be built. Signed-off-by: Kai Kang + +Signed-off-by: Zang Ruochen --- - infiniband-diags/man/CMakeLists.txt | 34 ------------------- - libibumad/man/CMakeLists.txt | 2 -- - libibverbs/man/CMakeLists.txt | 52 ----------------------------- - librdmacm/man/CMakeLists.txt | 2 -- - providers/efa/man/CMakeLists.txt | 2 -- + infiniband-diags/man/CMakeLists.txt | 34 ------------ + libibumad/man/CMakeLists.txt | 2 - + libibverbs/man/CMakeLists.txt | 53 ------------------- + librdmacm/man/CMakeLists.txt | 2 - + providers/efa/man/CMakeLists.txt | 2 - providers/mlx4/man/CMakeLists.txt | 1 - - providers/mlx5/man/CMakeLists.txt | 65 ------------------------------------- - 7 files changed, 158 deletions(-) + providers/mlx5/man/CMakeLists.txt | 82 ----------------------------- + 7 files changed, 176 deletions(-) diff --git a/infiniband-diags/man/CMakeLists.txt b/infiniband-diags/man/CMakeLists.txt index 1f1f91c9..094a389f 100644 @@ -92,7 +94,7 @@ index 185584a0..857a4b8b 100644 - umad_init.3 umad_done.3 ) diff --git a/libibverbs/man/CMakeLists.txt b/libibverbs/man/CMakeLists.txt -index e1d5edf8..92c68611 100644 +index 87f00185..92c68611 100644 --- a/libibverbs/man/CMakeLists.txt +++ b/libibverbs/man/CMakeLists.txt @@ -1,24 +1,18 @@ @@ -120,7 +122,7 @@ index e1d5edf8..92c68611 100644 ibv_create_qp.3 ibv_create_qp_ex.3 ibv_create_rwq_ind_table.3 -@@ -27,16 +21,8 @@ rdma_man_pages( +@@ -27,17 +21,8 @@ rdma_man_pages( ibv_create_wq.3 ibv_devices.1 ibv_devinfo.1 @@ -129,6 +131,7 @@ index e1d5edf8..92c68611 100644 ibv_get_async_event.3 ibv_get_cq_event.3 - ibv_get_device_guid.3.md +- ibv_get_device_index.3.md - ibv_get_device_list.3.md - ibv_get_device_name.3.md - ibv_get_pkey_index.3.md @@ -137,7 +140,7 @@ index e1d5edf8..92c68611 100644 ibv_modify_qp.3 ibv_modify_qp_rate_limit.3 ibv_modify_srq.3 -@@ -51,24 +37,15 @@ rdma_man_pages( +@@ -52,24 +37,15 @@ rdma_man_pages( ibv_post_srq_recv.3 ibv_query_device.3 ibv_query_device_ex.3 @@ -162,7 +165,7 @@ index e1d5edf8..92c68611 100644 ibv_xsrq_pingpong.1 ) rdma_alias_man_pages( -@@ -79,47 +56,18 @@ rdma_alias_man_pages( +@@ -80,47 +56,18 @@ rdma_alias_man_pages( ibv_alloc_mw.3 ibv_dealloc_mw.3 ibv_alloc_pd.3 ibv_dealloc_pd.3 ibv_alloc_td.3 ibv_dealloc_td.3 @@ -251,10 +254,10 @@ index 3df77caf..99a75101 100644 mlx4dv.7 ) diff --git a/providers/mlx5/man/CMakeLists.txt b/providers/mlx5/man/CMakeLists.txt -index 0bd9eba1..876b6fcf 100644 +index c3ad70a2..876b6fcf 100644 --- a/providers/mlx5/man/CMakeLists.txt +++ b/providers/mlx5/man/CMakeLists.txt -@@ -1,81 +1,7 @@ +@@ -1,89 +1,7 @@ rdma_man_pages( - mlx5dv_alloc_dm.3.md - mlx5dv_alloc_var.3.md @@ -280,8 +283,11 @@ index 0bd9eba1..876b6fcf 100644 mlx5dv_get_clock_info.3 mlx5dv_init_obj.3 - mlx5dv_is_supported.3.md +- mlx5dv_modify_qp_lag_port.3.md - mlx5dv_open_device.3.md +- mlx5dv_pp_alloc.3.md mlx5dv_query_device.3 +- mlx5dv_query_qp_lag_port.3.md mlx5dv_ts_to_ns.3 - mlx5dv_wr_post.3.md mlx5dv.7 @@ -314,6 +320,7 @@ index 0bd9eba1..876b6fcf 100644 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_dest_vport.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_counter.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_drop.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_action_create_default_miss.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_flow_meter.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_modify_header.3 - mlx5dv_dr_flow.3 mlx5dv_dr_action_create_packet_reformat.3 @@ -323,6 +330,7 @@ index 0bd9eba1..876b6fcf 100644 - mlx5dv_dr_flow.3 mlx5dv_dr_domain_create.3 - mlx5dv_dr_flow.3 mlx5dv_dr_domain_destroy.3 - mlx5dv_dr_flow.3 mlx5dv_dr_domain_sync.3 +- mlx5dv_dr_flow.3 mlx5dv_dr_domain_set_reclaim_device_memory.3 - mlx5dv_dr_flow.3 mlx5dv_dr_matcher_create.3 - mlx5dv_dr_flow.3 mlx5dv_dr_matcher_destroy.3 - mlx5dv_dr_flow.3 mlx5dv_dr_rule_create.3 @@ -333,9 +341,12 @@ index 0bd9eba1..876b6fcf 100644 - mlx5dv_dump.3 mlx5dv_dump_dr_matcher.3 - mlx5dv_dump.3 mlx5dv_dump_dr_rule.3 - mlx5dv_dump.3 mlx5dv_dump_dr_table.3 +- mlx5dv_pp_alloc.3 mlx5dv_pp_free.3 - mlx5dv_wr_post.3 mlx5dv_wr_set_dc_addr.3 - mlx5dv_wr_post.3 mlx5dv_qp_ex_from_ibv_qp_ex.3 +- mlx5dv_wr_post.3 mlx5dv_wr_mr_interleaved.3 +- mlx5dv_wr_post.3 mlx5dv_wr_mr_list.3 -) -- -2.17.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb deleted file mode 100644 index 15fd7ff66..000000000 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_28.0.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Userspace support for InfiniBand/RDMA verbs" -DESCRIPTION = "This is the userspace components for the Linux Kernel's drivers Infiniband/RDMA subsystem." -SECTION = "libs" - -DEPENDS = "libnl" -RDEPENDS_${PN} = "bash perl" - -BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}" -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \ - file://0001-Remove-man-files-which-cant-be-built.patch \ - " -SRCREV = "f12c953f0864691eacc9fcc4cda489b92ffd5a85" -S = "${WORKDIR}/git" - -#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md -LICENSE = "BSD-2-Clause | GPLv2" -LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ - file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -EXTRA_OECMAKE = " \ - -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ - -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ -" - -FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/*" -INSANE_SKIP_${PN} += "dev-so" - -inherit cmake cpan-base systemd - -SYSTEMD_SERVICE_${PN} = " \ - srp_daemon.service \ - iwpmd.service \ - ibacm.socket \ - rdma-load-modules@.service \ - srp_daemon_port@.service \ - rdma-hw.target \ - ibacm.service \ -" -SYSTEMD_AUTO_ENABLE = "disable" - -OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_30.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_30.0.bb new file mode 100644 index 000000000..18c34fb59 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_30.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "Userspace support for InfiniBand/RDMA verbs" +DESCRIPTION = "This is the userspace components for the Linux Kernel's drivers Infiniband/RDMA subsystem." +SECTION = "libs" + +DEPENDS = "libnl" +RDEPENDS_${PN} = "bash perl" + +BRANCH = "stable-v${@d.getVar('PV').split('.')[0]}" +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=${BRANCH} \ + file://0001-Remove-man-files-which-cant-be-built.patch \ + " +SRCREV = "0f4dd71d38a0f1b005635a3ff344e15791d2afa7" +S = "${WORKDIR}/git" + +#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md +LICENSE = "BSD-2-Clause | GPLv2" +LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ + file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ +" + +FILES_SOLIBSDEV = "" +FILES_${PN} += "${libdir}/*" +INSANE_SKIP_${PN} += "dev-so" + +inherit cmake cpan-base systemd + +SYSTEMD_SERVICE_${PN} = " \ + srp_daemon.service \ + iwpmd.service \ + ibacm.socket \ + rdma-load-modules@.service \ + srp_daemon_port@.service \ + rdma-hw.target \ + ibacm.service \ +" +SYSTEMD_AUTO_ENABLE = "disable" + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch new file mode 100644 index 000000000..35634dd9b --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch @@ -0,0 +1,46 @@ +From 9b07f6a472c24f5e1b65746756764391be0d55e4 Mon Sep 17 00:00:00 2001 +From: Harald Geyer +Date: Mon, 10 Feb 2020 13:15:10 +0100 +Subject: [PATCH] Fix compilation with GCC >= 10.x + +Starting with GCC >= 10.x, -fno-common is used as default +instead of -fcommon. This patch fixes the compilation. + +Closes: #148 + +Upstream-Status: Backport +Suggested-by: Conrad Kostecki +Signed-off-by: Harald Geyer +--- + clients/lcdproc/iface.c | 1 + + clients/lcdproc/iface.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c +index 40e50cb7..1ac355bd 100644 +--- a/clients/lcdproc/iface.c ++++ b/clients/lcdproc/iface.c +@@ -32,6 +32,7 @@ + #define UNSET_INT -1 + #define UNSET_STR "\01" + ++IfaceInfo iface[MAX_INTERFACES]; + + static int iface_count = 0; /* number of interfaces */ + static char unit_label[10] = "B"; /* default unit label is Bytes */ +diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h +index cc6dbaaf..c1bd6b5b 100644 +--- a/clients/lcdproc/iface.h ++++ b/clients/lcdproc/iface.h +@@ -18,7 +18,7 @@ + /** max number of interfaces in multi-interface mode */ + #define MAX_INTERFACES 3 + +-IfaceInfo iface[MAX_INTERFACES]; /* interface info */ ++extern IfaceInfo iface[MAX_INTERFACES]; /* interface info */ + + /** Update screen content */ + int iface_screen(int rep, int display, int *flags_ptr); +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb index 275b984e4..35585d069 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb @@ -15,6 +15,7 @@ SRC_URI = "git://github.com/lcdproc/lcdproc \ file://0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch \ file://0002-Include-limits.h-for-PATH_MAX-definition.patch \ file://0003-Fix-non-x86-platforms-on-musl.patch \ + file://0001-Fix-compilation-with-GCC-10.x.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb index f13a184b6..130ff13ec 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb @@ -100,7 +100,9 @@ do_configure() { autoconf213 --macrodir=${STAGING_DATADIR_NATIVE}/autoconf213 old-configure.in > old-configure cd ${B} - ${S}/js/src/configure ${EXTRA_OECONF} + # use of /tmp can causes problems on heavily loaded hosts + mkdir -p "${B}/lcl_tmp" + TMPDIR="${B}/lcl_tmp" ${S}/js/src/configure ${EXTRA_OECONF} # Make standard Makefile checks pass touch ${S}/js/src/configure @@ -117,6 +119,14 @@ do_install_prepend() { export PYTHONPATH=`cat ${B}/PYTHONPATH` } +inherit multilib_script multilib_header + +MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js60-config" + +do_install_append() { + oe_multilib_header mozjs-60/js-config.h +} + PACKAGES =+ "lib${BPN}" FILES_lib${BPN} += "${libdir}/lib*.so" FILES_${PN}-dev += "${bindir}/js60-config" diff --git a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.5.bb b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.5.bb deleted file mode 100644 index 93f624882..000000000 --- a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.5.bb +++ /dev/null @@ -1,55 +0,0 @@ -DESCRIPTION = "Tools to provide a way to get Platform Reliability, Availability and Serviceability (RAS) reports made via the Kernel tracing events" -HOMEPAGE = "http://git.infradead.org/users/mchehab/rasdaemon.git" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc" - -SRC_URI = "git://git.infradead.org/users/mchehab/rasdaemon.git;branch=master \ - file://0001-Fix-system-header-includes.patch \ - file://rasdaemon.service \ - file://init" - -SRCREV = "25533c0c55426eeb2ad25dcbdb2b5e4ba4e83d80" - -S = "${WORKDIR}/git" - -RDEPENDS_${BPN} = "perl perl-module-file-basename perl-module-file-find perl-module-file-spec perl-module-getopt-long \ - perl-module-posix perl-module-file-glob libdbi-perl libdbd-sqlite-perl" - -inherit autotools pkgconfig update-rc.d systemd - -PACKAGECONFIG ??= "sqlite3 mce aer extlog devlink diskerror" -PACKAGECONFIG[sqlite3] = "--enable-sqlite3,--disable-sqlite3,sqlite3" -PACKAGECONFIG[mce] = "--enable-mce,--disable-mce" -PACKAGECONFIG[aer] = "--enable-aer,--disable-aer" -PACKAGECONFIG[extlog] = "--enable-extlog,--disable-extlog" -PACKAGECONFIG[devlink] = "--enable-devlink,--disable-devlink" -PACKAGECONFIG[diskerror] = "--enable-diskerror,--disable-diskerror" -PACKAGECONFIG[arm] = "--enable-arm,--disable-arm" -PACKAGECONFIG[hisi-ns-decode] = "--enable-hisi-ns-decode,--disable-hisi-ns-decode" -PACKAGECONFIG[non-standard] = "--enable-non-standard,--disable-non-standard" -PACKAGECONFIG[abrt-report] = "--enable-abrt-report,--disable-abrt-report" - -DEPENDS_append_libc-musl = " argp-standalone" -LDFLAGS_append_libc-musl = " -largp" - -do_configure_prepend () { - ( cd ${S}; autoreconf -vfi ) -} - -do_install_append() { - install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/rasdaemon.service ${D}${systemd_unitdir}/system -} - -FILES_${PN} += "${sbindir}/rasdaemon \ - ${sysconfdir}/init.d \ - ${systemd_unitdir}/system/rasdaemon.service" - -SYSTEMD_SERVICE_${PN} = "rasdaemon.service" -SYSTEMD_AUTO_ENABLE = "enable" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "rasdaemon" -INITSCRIPT_PARAMS_${PN} = "defaults 89" diff --git a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.6.bb b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.6.bb new file mode 100644 index 000000000..93e00e6e0 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.6.bb @@ -0,0 +1,55 @@ +DESCRIPTION = "Tools to provide a way to get Platform Reliability, Availability and Serviceability (RAS) reports made via the Kernel tracing events" +HOMEPAGE = "http://git.infradead.org/users/mchehab/rasdaemon.git" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc" + +SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master \ + file://0001-Fix-system-header-includes.patch \ + file://rasdaemon.service \ + file://init" + +SRCREV = "32b978fcf73215c90ce7383580224e4295930ae7" + +S = "${WORKDIR}/git" + +RDEPENDS_${BPN} = "perl perl-module-file-basename perl-module-file-find perl-module-file-spec perl-module-getopt-long \ + perl-module-posix perl-module-file-glob libdbi-perl libdbd-sqlite-perl" + +inherit autotools pkgconfig update-rc.d systemd + +PACKAGECONFIG ??= "sqlite3 mce aer extlog devlink diskerror" +PACKAGECONFIG[sqlite3] = "--enable-sqlite3,--disable-sqlite3,sqlite3" +PACKAGECONFIG[mce] = "--enable-mce,--disable-mce" +PACKAGECONFIG[aer] = "--enable-aer,--disable-aer" +PACKAGECONFIG[extlog] = "--enable-extlog,--disable-extlog" +PACKAGECONFIG[devlink] = "--enable-devlink,--disable-devlink" +PACKAGECONFIG[diskerror] = "--enable-diskerror,--disable-diskerror" +PACKAGECONFIG[arm] = "--enable-arm,--disable-arm" +PACKAGECONFIG[hisi-ns-decode] = "--enable-hisi-ns-decode,--disable-hisi-ns-decode" +PACKAGECONFIG[non-standard] = "--enable-non-standard,--disable-non-standard" +PACKAGECONFIG[abrt-report] = "--enable-abrt-report,--disable-abrt-report" + +DEPENDS_append_libc-musl = " argp-standalone" +LDFLAGS_append_libc-musl = " -largp" + +do_configure_prepend () { + ( cd ${S}; autoreconf -vfi ) +} + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/rasdaemon.service ${D}${systemd_unitdir}/system +} + +FILES_${PN} += "${sbindir}/rasdaemon \ + ${sysconfdir}/init.d \ + ${systemd_unitdir}/system/rasdaemon.service" + +SYSTEMD_SERVICE_${PN} = "rasdaemon.service" +SYSTEMD_AUTO_ENABLE = "enable" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME_${PN} = "rasdaemon" +INITSCRIPT_PARAMS_${PN} = "defaults 89" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch b/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch deleted file mode 100644 index c9c3a08df..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 55078e494bdf7da7dd9cb76077fa7ac2a66b6dd6 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Fri, 20 Jul 2018 02:33:25 -0700 -Subject: [PATCH] update the interpreter paths - -Update the interpreter path to make it more -compatible - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu ---- - tools/fio_jsonplus_clat2csv | 2 +- - tools/fiologparser.py | 2 +- - tools/genfio | 2 +- - tools/hist/fiologparser_hist.py | 2 +- - tools/hist/half-bins.py | 2 +- - tools/plot/fio2gnuplot | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/tools/fio_jsonplus_clat2csv b/tools/fio_jsonplus_clat2csv -index 78a007e5..0524b6e6 100755 ---- a/tools/fio_jsonplus_clat2csv -+++ b/tools/fio_jsonplus_clat2csv -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.7 -+#!/usr/bin/env python - # Note: this script is python2 and python3 compatible. - # - # fio_jsonplus_clat2csv -diff --git a/tools/fiologparser.py b/tools/fiologparser.py -index cc29f1c7..ea60e783 100755 ---- a/tools/fiologparser.py -+++ b/tools/fiologparser.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.7 -+#!/usr/bin/env python - # Note: this script is python2 and python 3 compatible. - # - # fiologparser.py -diff --git a/tools/genfio b/tools/genfio -index 286d814d..8518bbcc 100755 ---- a/tools/genfio -+++ b/tools/genfio -@@ -1,4 +1,4 @@ --#!/usr/bin/bash -+#!/bin/bash - # - # Copyright (C) 2013 eNovance SAS - # Author: Erwan Velu -diff --git a/tools/hist/fiologparser_hist.py b/tools/hist/fiologparser_hist.py -index 8910d5fa..b77c2933 100755 ---- a/tools/hist/fiologparser_hist.py -+++ b/tools/hist/fiologparser_hist.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.7 -+#!/usr/bin/env python - """ - Utility for converting *_clat_hist* files generated by fio into latency statistics. - -diff --git a/tools/hist/half-bins.py b/tools/hist/half-bins.py -index 1bba8ff7..58d53e36 100755 ---- a/tools/hist/half-bins.py -+++ b/tools/hist/half-bins.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.7 -+#!/usr/bin/env python - """ Cut the number bins in half in fio histogram output. Example usage: - - $ half-bins.py -c 2 output_clat_hist.1.log > smaller_clat_hist.1.log -diff --git a/tools/plot/fio2gnuplot b/tools/plot/fio2gnuplot -index 4d1815cf..509141af 100755 ---- a/tools/plot/fio2gnuplot -+++ b/tools/plot/fio2gnuplot -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.7 -+#!/usr/bin/env python - # Note: this script is python2 and python3 compatible. - # - # Copyright (C) 2013 eNovance SAS --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch b/meta-openembedded/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch deleted file mode 100644 index 068b02164..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch +++ /dev/null @@ -1,38 +0,0 @@ -python3: change four shebangs to python3 - -Upstream-Status: Pending - -Signed-off-by: Joe Slater - ---- a/tools/fio_jsonplus_clat2csv -+++ b/tools/fio_jsonplus_clat2csv -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # Note: this script is python2 and python3 compatible. - # - # fio_jsonplus_clat2csv ---- a/tools/fiologparser.py -+++ b/tools/fiologparser.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # Note: this script is python2 and python 3 compatible. - # - # fiologparser.py ---- a/tools/hist/fiologparser_hist.py -+++ b/tools/hist/fiologparser_hist.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """ - Utility for converting *_clat_hist* files generated by fio into latency statistics. - ---- a/tools/plot/fio2gnuplot -+++ b/tools/plot/fio2gnuplot -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # Note: this script is python2 and python3 compatible. - # - # Copyright (C) 2013 eNovance SAS diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.17.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.17.bb deleted file mode 100644 index 759d1087c..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.17.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Filesystem and hardware benchmark and stress tool" -DESCRIPTION = "fio is an I/O tool meant to be used both for benchmark and \ -stress/hardware verification. It has support for a number of I/O engines, \ -I/O priorities (for newer Linux kernels), rate I/O, forked or threaded jobs, \ -and much more. It can work on block devices as well as files. fio accepts \ -job descriptions in a simple-to-understand text format. Several example job \ -files are included. fio displays all sorts of I/O performance information." -HOMEPAGE = "http://freecode.com/projects/fio" -SECTION = "console/tests" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "libaio zlib coreutils-native" -DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'pmem', 'pmdk', '', d)}" -RDEPENDS_${PN} = "python3-core bash" - -PACKAGECONFIG_NUMA = "numa" -# ARM does not currently support NUMA -PACKAGECONFIG_NUMA_arm = "" -PACKAGECONFIG_NUMA_armeb = "" - -PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" -PACKAGECONFIG[numa] = ",--disable-numa,numactl" - -SRCREV = "08ce9dc20b8a4e55db7af6d869ddfa49b4a02d03" -SRC_URI = "git://git.kernel.dk/fio.git \ - file://0001-update-the-interpreter-paths.patch \ - file://python3_shebangs.patch \ -" - -S = "${WORKDIR}/git" - -# avoids build breaks when using no-static-libs.inc -DISABLE_STATIC = "" - -EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" -EXTRA_OECONF = "${@bb.utils.contains('MACHINE_FEATURES', 'x86', '--disable-optimizations', '', d)}" - -do_configure() { - ./configure ${EXTRA_OECONF} -} - -do_install() { - oe_runmake install DESTDIR=${D} prefix=${prefix} mandir=${mandir} - install -d ${D}/${docdir}/${PN} - cp -R --no-dereference --preserve=mode,links -v ${S}/examples ${D}/${docdir}/${PN}/ -} diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.21.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.21.bb new file mode 100644 index 000000000..83f38fc7b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.21.bb @@ -0,0 +1,45 @@ +SUMMARY = "Filesystem and hardware benchmark and stress tool" +DESCRIPTION = "fio is an I/O tool meant to be used both for benchmark and \ +stress/hardware verification. It has support for a number of I/O engines, \ +I/O priorities (for newer Linux kernels), rate I/O, forked or threaded jobs, \ +and much more. It can work on block devices as well as files. fio accepts \ +job descriptions in a simple-to-understand text format. Several example job \ +files are included. fio displays all sorts of I/O performance information." +HOMEPAGE = "http://freecode.com/projects/fio" +SECTION = "console/tests" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libaio zlib coreutils-native" +DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'pmem', 'pmdk', '', d)}" +RDEPENDS_${PN} = "python3-core bash" + +PACKAGECONFIG_NUMA = "numa" +# ARM does not currently support NUMA +PACKAGECONFIG_NUMA_arm = "" +PACKAGECONFIG_NUMA_armeb = "" + +PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" +PACKAGECONFIG[numa] = ",--disable-numa,numactl" + +SRCREV = "d13596b225baf61425a9ca92b0583fc3fa97765d" +SRC_URI = "git://git.kernel.dk/fio.git \ +" + +S = "${WORKDIR}/git" + +# avoids build breaks when using no-static-libs.inc +DISABLE_STATIC = "" + +EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" +EXTRA_OECONF = "${@bb.utils.contains('MACHINE_FEATURES', 'x86', '--disable-optimizations', '', d)}" + +do_configure() { + ./configure ${EXTRA_OECONF} +} + +do_install() { + oe_runmake install DESTDIR=${D} prefix=${prefix} mandir=${mandir} + install -d ${D}/${docdir}/${PN} + cp -R --no-dereference --preserve=mode,links -v ${S}/examples ${D}/${docdir}/${PN}/ +} diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_489.bb b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_489.bb deleted file mode 100644 index e4b7e4f49..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_489.bb +++ /dev/null @@ -1,121 +0,0 @@ -SUMMARY = "Filesystem and Disk Benchmarking Tool" -HOMEPAGE = "http://www.iozone.org/" -AUTHOR = "Don Capps , William D. Norcott " -SECTION = "console/tests" -LICENSE = "iozone3" -LIC_FILES_CHKSUM = "file://iozone.c;beginline=37;endline=48;md5=7331260091868dcad0f9edea735b5f4b \ - file://iozone.c;beginline=276;endline=282;md5=77f9ee51e45b57a7e7519c4fa0b4f00b \ -" -SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ - file://parallelism.patch \ - file://0001-let-system-headers-provide-pread64.patch \ - file://copyright.txt \ -" -SRC_URI[md5sum] = "e863281987689cd6d9729e535637b77d" -SRC_URI[sha256sum] = "6155850d1019f2450dc926bbdb5a24abf423ee3bb928ab1e68569cf60a908584" - -UPSTREAM_CHECK_REGEX = "iozone3_(?P\d+).tar" - -S = "${WORKDIR}/${BPN}_${PV}/src/current/" - -# -# All other arches can use the default OEMAKE except those -# explicitly listed below. Another, the iozone3 Makefile -# needs to be told about the cross-compiler explicitly here. -# -EXTRA_OEMAKE_powerpc = "linux-powerpc CC='${CC}' GCC='${CC}'" -EXTRA_OEMAKE_powerpc64 = "linux-powerpc64 CC='${CC}' GCC='${CC}'" -EXTRA_OEMAKE_powerpc64le = "linux-powerpc64 CC='${CC}' GCC='${CC}'" -EXTRA_OEMAKE_x86-64 = "linux-AMD64 CC='${CC}' GCC='${CC}'" -EXTRA_OEMAKE_arm = "linux-arm CC='${CC}' GCC='${CC}'" -EXTRA_OEMAKE = "linux CC='${CC}' GCC='${CC}'" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - install -d ${D}${bindir} \ - ${D}${mandir}/man1 \ - ${D}${datadir}/doc/${BPN}/examples - - install -m 0755 ${S}/iozone ${D}${bindir} - install -m 0755 ${S}/fileop ${D}${bindir} - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/iozone.1 ${D}${mandir}/man1/ - install -m 0644 ${WORKDIR}/copyright.txt ${D}${datadir}/doc/${BPN}/ - - install -m 0644 ${S}/*.dem ${D}${datadir}/doc/${BPN}/examples - install -m 0644 ${S}/client_list ${D}${datadir}/doc/${BPN}/examples - install -m 0644 ${S}/Gnuplot.txt ${D}${datadir}/doc/${BPN}/examples - - install -m 0755 ${S}/Generate_Graphs ${D}${datadir}/doc/${BPN}/examples - install -m 0755 ${S}/gengnuplot.sh ${D}${datadir}/doc/${BPN}/examples - install -m 0755 ${S}/report.pl ${D}${datadir}/doc/${BPN}/examples - - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Iozone_ps.gz ${D}${datadir}/doc/${BPN}/ - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${BPN}/ - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Run_rules.doc ${D}${datadir}/doc/${BPN}/ -} - -FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt" - -# LICENSE: -# -# Copyright 1991, 1992, 1994, 1998, 1999, 2002 William D. Norcott -# -# License to freely use and distribute this software is hereby granted -# by the author, subject to the condition that this copyright notice -# remains intact. The author retains the exclusive right to publish -# derivative works based on this work, including, but not limited to -# revised versions of this work. -# - -# -# Below is author reply to question about distributing iozone3 in -# OpenEmbedded: -# -# ======================================================================== -# -# Marcin, -# -# Re-distribution is permitted as long as the copyright is -# maintained and the source code is not changed. I do not -# see a problem with your mods to enable fileop for Linux-arm, -# as these mods have been returned to the Iozone folks, -# and they have been accepted for inclusion in the next -# release :-) -# -# Thank you for your contribution, -# Don Capps -# -# ----- Original Message ----- -# From: "Marcin Juszkiewicz" -# To: "Don Capps" ; "William D. Norcott" -# -# Sent: Sunday, October 29, 2006 4:55 PM -# Subject: iozone3 263 patch for arm and License question -# -# -# > Morning -# > -# > I want to include iozone3 in OpenEmbedded [1] metadata to give it for -# > other developers. Currently OE is used to build few distributions for -# > misc platforms: ARM, SH3, SH4, x86, PowerPC and different types of -# > machines (PDA, settopbox, devboards, desktops, thin clients, routers). -# > -# > According to your distribution of derivations is forbidden. Packaging -# > iozone3 in OpenEmbedded will not involve any source code changes. But -# > when I was building it for ARM I discovered that fileop binary was not -# > built - so I created patch for it (attached). Not yet tested it on target -# > device. -# > -# > Thus, I seek your written permission via e-mail to distribute a package of -# > the unmodified source code and also a package of the pre-compiled binary. -# > Your copyright statement will be included in the package. -# > -# > -# > 1. http://www.openembedded.org/ -# > -# > Regards -# > -- -# > JID: hrw-jabber.org -# > OpenEmbedded developer/consultant - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb new file mode 100644 index 000000000..ecf08cb33 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb @@ -0,0 +1,121 @@ +SUMMARY = "Filesystem and Disk Benchmarking Tool" +HOMEPAGE = "http://www.iozone.org/" +AUTHOR = "Don Capps , William D. Norcott " +SECTION = "console/tests" +LICENSE = "iozone3" +LIC_FILES_CHKSUM = "file://iozone.c;beginline=37;endline=48;md5=7331260091868dcad0f9edea735b5f4b \ + file://iozone.c;beginline=276;endline=282;md5=77f9ee51e45b57a7e7519c4fa0b4f00b \ +" +SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ + file://parallelism.patch \ + file://0001-let-system-headers-provide-pread64.patch \ + file://copyright.txt \ +" +SRC_URI[md5sum] = "95cb73dfdd58a0dfa42804f016dbb83c" +SRC_URI[sha256sum] = "5eadb4235ae2a956911204c50ebf2d8d8d59ddcd4a2841a1baf42f3145ad4fed" + +UPSTREAM_CHECK_REGEX = "iozone3_(?P\d+).tar" + +S = "${WORKDIR}/${BPN}_${PV}/src/current/" + +# +# All other arches can use the default OEMAKE except those +# explicitly listed below. Another, the iozone3 Makefile +# needs to be told about the cross-compiler explicitly here. +# +EXTRA_OEMAKE_powerpc = "linux-powerpc CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE_powerpc64 = "linux-powerpc64 CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE_powerpc64le = "linux-powerpc64 CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE_x86-64 = "linux-AMD64 CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE_arm = "linux-arm CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE = "linux CC='${CC}' GCC='${CC}'" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install() { + install -d ${D}${bindir} \ + ${D}${mandir}/man1 \ + ${D}${datadir}/doc/${BPN}/examples + + install -m 0755 ${S}/iozone ${D}${bindir} + install -m 0755 ${S}/fileop ${D}${bindir} + install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/iozone.1 ${D}${mandir}/man1/ + install -m 0644 ${WORKDIR}/copyright.txt ${D}${datadir}/doc/${BPN}/ + + install -m 0644 ${S}/*.dem ${D}${datadir}/doc/${BPN}/examples + install -m 0644 ${S}/client_list ${D}${datadir}/doc/${BPN}/examples + install -m 0644 ${S}/Gnuplot.txt ${D}${datadir}/doc/${BPN}/examples + + install -m 0755 ${S}/Generate_Graphs ${D}${datadir}/doc/${BPN}/examples + install -m 0755 ${S}/gengnuplot.sh ${D}${datadir}/doc/${BPN}/examples + install -m 0755 ${S}/report.pl ${D}${datadir}/doc/${BPN}/examples + + install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Iozone_ps.gz ${D}${datadir}/doc/${BPN}/ + install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${BPN}/ + install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Run_rules.doc ${D}${datadir}/doc/${BPN}/ +} + +FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt" + +# LICENSE: +# +# Copyright 1991, 1992, 1994, 1998, 1999, 2002 William D. Norcott +# +# License to freely use and distribute this software is hereby granted +# by the author, subject to the condition that this copyright notice +# remains intact. The author retains the exclusive right to publish +# derivative works based on this work, including, but not limited to +# revised versions of this work. +# + +# +# Below is author reply to question about distributing iozone3 in +# OpenEmbedded: +# +# ======================================================================== +# +# Marcin, +# +# Re-distribution is permitted as long as the copyright is +# maintained and the source code is not changed. I do not +# see a problem with your mods to enable fileop for Linux-arm, +# as these mods have been returned to the Iozone folks, +# and they have been accepted for inclusion in the next +# release :-) +# +# Thank you for your contribution, +# Don Capps +# +# ----- Original Message ----- +# From: "Marcin Juszkiewicz" +# To: "Don Capps" ; "William D. Norcott" +# +# Sent: Sunday, October 29, 2006 4:55 PM +# Subject: iozone3 263 patch for arm and License question +# +# +# > Morning +# > +# > I want to include iozone3 in OpenEmbedded [1] metadata to give it for +# > other developers. Currently OE is used to build few distributions for +# > misc platforms: ARM, SH3, SH4, x86, PowerPC and different types of +# > machines (PDA, settopbox, devboards, desktops, thin clients, routers). +# > +# > According to your distribution of derivations is forbidden. Packaging +# > iozone3 in OpenEmbedded will not involve any source code changes. But +# > when I was building it for ARM I discovered that fileop binary was not +# > built - so I created patch for it (attached). Not yet tested it on target +# > device. +# > +# > Thus, I seek your written permission via e-mail to distribute a package of +# > the unmodified source code and also a package of the pre-compiled binary. +# > Your copyright statement will be included in the package. +# > +# > +# > 1. http://www.openembedded.org/ +# > +# > Regards +# > -- +# > JID: hrw-jabber.org +# > OpenEmbedded developer/consultant + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch b/meta-openembedded/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch new file mode 100644 index 000000000..ffd9b9f26 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch @@ -0,0 +1,57 @@ +From 01f1c05702eb534271777648c976ab6402a5145b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Aug 2020 23:18:30 -0700 +Subject: [PATCH] Define mword16 and mword8 once + +Defining them in .h meant they are defined in all .c files including +this .h file + +Fixes build with gcc 10+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + tests.c | 9 +++++++++ + types.h | 9 --------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/tests.c b/tests.c +index be1b350..4305bed 100644 +--- a/tests.c ++++ b/tests.c +@@ -27,6 +27,15 @@ char progress[] = "-\\|/"; + #define PROGRESSOFTEN 2500 + #define ONE 0x00000001L + ++union { ++ unsigned char bytes[UL_LEN/8]; ++ ul val; ++} mword8; ++ ++union { ++ unsigned short u16s[UL_LEN/16]; ++ ul val; ++} mword16; + /* Function definitions. */ + + int compare_regions(ulv *bufa, ulv *bufb, size_t count) { +diff --git a/types.h b/types.h +index ad7ce73..e14ea32 100644 +--- a/types.h ++++ b/types.h +@@ -25,12 +25,3 @@ struct test { + int (*fp)(); + }; + +-union { +- unsigned char bytes[UL_LEN/8]; +- ul val; +-} mword8; +- +-union { +- unsigned short u16s[UL_LEN/16]; +- ul val; +-} mword16; +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb index 0964c0487..3d2905578 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb @@ -5,9 +5,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz" -SRC_URI += "file://Makefile.patch" - +SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz \ + file://Makefile.patch \ + file://0001-Define-mword16-and-mword8-once.patch \ + " SRC_URI[md5sum] = "598f41b7308e1f736164bca3ab84ddbe" SRC_URI[sha256sum] = "f9dfe2fd737c38fad6535bbab327da9a21f7ce4ea6f18c7b3339adef6bf5fd88" diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-Makefile-Check-for-last-line-only-from-preprocessed-.patch b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-Makefile-Check-for-last-line-only-from-preprocessed-.patch new file mode 100644 index 000000000..7a8be8374 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-Makefile-Check-for-last-line-only-from-preprocessed-.patch @@ -0,0 +1,57 @@ +From 3c078497e506bd6acb406da5cde7ce20e8896353 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 23 Jul 2020 14:13:59 -0700 +Subject: [PATCH] Makefile: Check for last line only from preprocessed output + +This started to fail with glibc 2.32 since glibc added additional +attributes to functions in signal.h therefore existing regexp started to +fail as it is not able to handle these functions e.g. + +extern int siginterrupt (int __sig, int __interrupt) __attribute__ ((__nothrow__ , __leaf__)) + __attribute__ ((__deprecated__ ("Use sigaction with SA_RESTART instead"))); + +grep -v '^\#' | grep '"' | cut -f 2 -d'"' +bit outside of fd_set selected +Use sigaction with SA_RESTART instead +arm + +So changing it to +tail -1 | grep '"' | cut -f 2 -d'"' +arm + +Produces the expected result, this was hidden until now + +Upstream-Status: Submitted [https://review.coreboot.org/c/flashrom/+/43770] +Signed-off-by: Khem Raj +Change-Id: I123a046e142d54632f12d54e2aa09b0928c02b91 +--- + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 803529f..3795681 100644 +--- a/Makefile ++++ b/Makefile +@@ -106,7 +106,7 @@ endif + # IMPORTANT: The following line must be placed before TARGET_OS is ever used + # (of course), but should come after any lines setting CC because the line + # below uses CC itself. +-override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) ++override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | tail -1 | grep '"' | cut -f 2 -d'"')) + + ifeq ($(TARGET_OS), Darwin) + override CPPFLAGS += -I/opt/local/include -I/usr/local/include +@@ -460,8 +460,8 @@ endif + # IMPORTANT: The following line must be placed before ARCH is ever used + # (of course), but should come after any lines setting CC because the line + # below uses CC itself. +-override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) +-override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null | grep -v '^\#')) ++override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null | tail -1 | grep '"' | cut -f 2 -d'"')) ++override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null | tail -1)) + + # Disable the internal programmer on unsupported architectures (everything but x86 and mipsel) + ifneq ($(ARCH)-little, $(filter $(ARCH),x86 mips)-$(ENDIAN)) +-- +2.27.0 + diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb index 642cec159..66ae34af9 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb @@ -7,6 +7,7 @@ DEPENDS = "pciutils libusb libusb-compat" SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \ file://0001-typecast-enum-conversions-explicitly.patch \ + file://0001-Makefile-Check-for-last-line-only-from-preprocessed-.patch \ " SRC_URI[md5sum] = "7f8e4b87087eb12ecee0fcc5445b4956" SRC_URI[sha256sum] = "e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b" diff --git a/meta-openembedded/meta-oe/recipes-bsp/lsscsi/lsscsi_0.30.bb b/meta-openembedded/meta-oe/recipes-bsp/lsscsi/lsscsi_0.30.bb deleted file mode 100644 index af34cdc48..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/lsscsi/lsscsi_0.30.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "The lsscsi command lists information about SCSI devices in Linux" -HOMEPAGE = "http://sg.danny.cz/scsi/lsscsi.html" -LICENSE = "GPLv2" -SECTION = "base" -LIC_FILES_CHKSUM="file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -SRC_URI = "http://sg.danny.cz/scsi/${BP}.tgz" - -SRC_URI[md5sum] = "298a700cd50bb4be1382d618f7b038f4" -SRC_URI[sha256sum] = "619a2187405f02c5f57682f3478bffc75326803cd08839e39d434250c5518b15" - -inherit autotools - -S = "${WORKDIR}/lsscsi-030r154" diff --git a/meta-openembedded/meta-oe/recipes-bsp/lsscsi/lsscsi_0.31.bb b/meta-openembedded/meta-oe/recipes-bsp/lsscsi/lsscsi_0.31.bb new file mode 100644 index 000000000..2c96de163 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/lsscsi/lsscsi_0.31.bb @@ -0,0 +1,14 @@ +SUMMARY = "The lsscsi command lists information about SCSI devices in Linux" +HOMEPAGE = "http://sg.danny.cz/scsi/lsscsi.html" +LICENSE = "GPLv2" +SECTION = "base" +LIC_FILES_CHKSUM="file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +SRC_URI = "http://sg.danny.cz/scsi/${BP}.tgz" + +SRC_URI[md5sum] = "efb68946f51860e8eedc18d6784afdae" +SRC_URI[sha256sum] = "12bf1973014803c6fd6d547e7594a4c049f0eef3bf5d22190d4be29d7c09f3ca" + +inherit autotools + +S = "${WORKDIR}/lsscsi-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch deleted file mode 100644 index be5d0dac7..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f Mon Sep 17 00:00:00 2001 -From: Neel Chotai -Date: Fri, 14 Feb 2020 17:56:23 +0000 -Subject: [PATCH] fix musl compilation - -Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f] -Signed-off-by: Pierre-Jean Texier ---- - plugins/micron/micron-nvme.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c -index 8240887..165fcf0 100644 ---- a/plugins/micron/micron-nvme.c -+++ b/plugins/micron/micron-nvme.c -@@ -13,6 +13,7 @@ - #include "nvme-print.h" - #include "nvme-ioctl.h" - #include -+#include - - #define CREATE_CMD - #include "micron-nvme.h" --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb deleted file mode 100644 index 4f4bb2dfa..000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "NVMe management command line interface" -AUTHOR = "Stefan Wiehler " -HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" -DEPENDS = "util-linux" -PV .= "+git${SRCPV}" - -SRC_URI = "git://github.com/linux-nvme/nvme-cli.git \ - file://0001-fix-musl-compilation.patch \ -" -SRCREV = "1d84d6ae0c7d7ceff5a73fe174dde8b0005f6108" - -S = "${WORKDIR}/git" - -inherit bash-completion systemd - -do_install() { - oe_runmake install-spec DESTDIR=${D} PREFIX=${prefix} \ - UDEVDIR=${nonarch_base_libdir}/udev SYSTEMDDIR=${systemd_unitdir} -} - -pkg_postinst_ontarget_${PN}() { - ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn - ${bindir}/uuidgen > ${sysconfdir}/nvme/hostid -} - -PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" - -FILES_${PN} += "${systemd_system_unitdir}" -FILES_${PN}-dracut = "${nonarch_libdir}/dracut/dracut.conf.d" -FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" - -RDEPENDS_${PN} = "util-linux-uuidgen" diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.12.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.12.bb new file mode 100644 index 000000000..a18b71a7c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.12.bb @@ -0,0 +1,33 @@ +SUMMARY = "NVMe management command line interface" +AUTHOR = "Stefan Wiehler " +HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" +SECTION = "console/utils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" +DEPENDS = "util-linux" +PV .= "+git${SRCPV}" + +SRC_URI = "git://github.com/linux-nvme/nvme-cli.git" +SRCREV = "949d0aea730136d04af1fb9e0efd4427c20dee6d" + +S = "${WORKDIR}/git" + +inherit bash-completion systemd + +do_install() { + oe_runmake install-spec DESTDIR=${D} PREFIX=${prefix} \ + UDEVDIR=${nonarch_base_libdir}/udev SYSTEMDDIR=${systemd_unitdir} +} + +pkg_postinst_ontarget_${PN}() { + ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn + ${bindir}/uuidgen > ${sysconfdir}/nvme/hostid +} + +PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" + +FILES_${PN} += "${systemd_system_unitdir}" +FILES_${PN}-dracut = "${nonarch_libdir}/dracut/dracut.conf.d" +FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +RDEPENDS_${PN} = "util-linux-uuidgen" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch deleted file mode 100644 index dbc48a213..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 601e6e56f44b91d957bb643662455f52540f336a Mon Sep 17 00:00:00 2001 -From: Corey Minyard -Date: Tue, 25 Feb 2020 16:08:40 -0600 -Subject: [PATCH] filter: Rename some variables to tr_stdxxx - -stdout and stderr can be macros, don't use the names directly. - -Signed-off-by: Corey Minyard -Upstream-Status: Backport [https://github.com/cminyard/gensio/commit/601e6e56f44b91d957bb643662455f52540f336a] -Signed-off-by: Pierre-Jean Texier ---- - lib/gensio_filter_trace.c | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/lib/gensio_filter_trace.c b/lib/gensio_filter_trace.c -index d39d58b..abe2db6 100644 ---- a/lib/gensio_filter_trace.c -+++ b/lib/gensio_filter_trace.c -@@ -32,8 +32,8 @@ struct trace_filter { - enum trace_dir dir; - bool raw; - char *filename; -- bool stdout; -- bool stderr; -+ bool tr_stdout; -+ bool tr_stderr; - - FILE *tr; - }; -@@ -82,9 +82,9 @@ trace_try_connect(struct gensio_filter *filter, struct timeval *timeout) - { - struct trace_filter *tfilter = filter_to_trace(filter); - -- if (tfilter->stdout) { -+ if (tfilter->tr_stdout) { - tfilter->tr = stdout; -- } else if (tfilter->stderr) { -+ } else if (tfilter->tr_stderr) { - tfilter->tr = stderr; - } else if (tfilter->filename) { - tfilter->tr = fopen(tfilter->filename, "a+"); -@@ -99,7 +99,7 @@ trace_try_disconnect(struct gensio_filter *filter, struct timeval *timeout) - { - struct trace_filter *tfilter = filter_to_trace(filter); - -- if (!tfilter->stdout && !tfilter->stderr && tfilter->tr) -+ if (!tfilter->tr_stdout && !tfilter->tr_stderr && tfilter->tr) - fclose(tfilter->tr); - tfilter->tr = NULL; - return 0; -@@ -331,12 +331,12 @@ static int gensio_trace_filter_func(struct gensio_filter *filter, int op, - - static struct gensio_filter * - gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir, -- bool raw, const char *filename, bool stdout, -- bool stderr) -+ bool raw, const char *filename, bool tr_stdout, -+ bool tr_stderr) - { - struct trace_filter *tfilter; - -- if (!filename && !stdout && !stderr) -+ if (!filename && !tr_stdout && !tr_stderr) - dir = TRACE_NONE; - - tfilter = o->zalloc(o, sizeof(*tfilter)); -@@ -351,8 +351,8 @@ gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir, - if (!tfilter->filename) - goto out_nomem; - } -- tfilter->stdout = stdout; -- tfilter->stderr = stderr; -+ tfilter->tr_stdout = tr_stdout; -+ tfilter->tr_stderr = tr_stderr; - - tfilter->lock = o->alloc_lock(o); - if (!tfilter->lock) -@@ -385,7 +385,7 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o, - { - struct gensio_filter *filter; - int dir = TRACE_NONE; -- bool raw = false, stdout = false, stderr = false; -+ bool raw = false, tr_stdout = false, tr_stderr = false; - const char *filename = NULL; - unsigned int i; - -@@ -396,15 +396,15 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o, - continue; - if (gensio_check_keyvalue(args[i], "file", &filename) > 0) - continue; -- if (gensio_check_keybool(args[i], "stdout", &stdout) > 0) -+ if (gensio_check_keybool(args[i], "stdout", &tr_stdout) > 0) - continue; -- if (gensio_check_keybool(args[i], "stderr", &stderr) > 0) -+ if (gensio_check_keybool(args[i], "stderr", &tr_stderr) > 0) - continue; - return GE_INVAL; - } - - filter = gensio_trace_filter_raw_alloc(o, dir, raw, filename, -- stdout, stderr); -+ tr_stdout, tr_stderr); - if (!filter) - return GE_NOMEM; - --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb deleted file mode 100644 index 8c97662df..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_1.5.3.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "A library to abstract stream I/O like serial port, TCP, telnet, etc" -HOMEPAGE = "https://github.com/cminyard/gensio" -LICENSE = "GPL-2.0 & LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ - file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ - " - -SRCREV = "95ec1ab31ee97411fc37156d12061adcf0331598" -PV = "1.5.3+git${SRCPV}" - -SRC_URI = "git://github.com/cminyard/gensio;protocol=https \ - file://0001-filter-Rename-some-variables-to-tr_stdxxx.patch \ - " - -S = "${WORKDIR}/git" - -inherit autotools - -PACKAGECONFIG ??= "openssl tcp-wrappers" - -PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_HOST}${prefix},--without-openssl, openssl" -PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers, tcp-wrappers" -PACKAGECONFIG[swig] = "--with-swig,--without-swig, swig" - -EXTRA_OECONF = "--without-python" - -RDEPENDS_${PN} += "bash" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.1.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.1.4.bb new file mode 100644 index 000000000..9d73da90d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.1.4.bb @@ -0,0 +1,25 @@ +SUMMARY = "A library to abstract stream I/O like serial port, TCP, telnet, etc" +HOMEPAGE = "https://github.com/cminyard/gensio" +LICENSE = "GPL-2.0 & LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ + file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ + " + +SRCREV = "998a017076a86179696a3ad811e2bae9155e46cb" + +SRC_URI = "git://github.com/cminyard/gensio;protocol=https \ + " + +S = "${WORKDIR}/git" + +inherit autotools + +PACKAGECONFIG ??= "openssl tcp-wrappers" + +PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_HOST}${prefix},--without-openssl, openssl" +PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers, tcp-wrappers" +PACKAGECONFIG[swig] = "--with-swig,--without-swig, swig" + +EXTRA_OECONF = "--without-python" + +RDEPENDS_${PN} += "bash" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/0001-src-interface.h-Make-declarations-as-extern.patch b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/0001-src-interface.h-Make-declarations-as-extern.patch new file mode 100644 index 000000000..77de9e6c5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd/0001-src-interface.h-Make-declarations-as-extern.patch @@ -0,0 +1,31 @@ +From b990146a149e1729c12e4541a67e32ed1dd6e578 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Aug 2020 19:41:08 -0700 +Subject: [PATCH] src/interface.h: Make declarations as extern + +Fixed build with -fno-common + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/interface.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/interface.h b/src/interface.h +index d223b1f..fd4a5f4 100644 +--- a/src/interface.h ++++ b/src/interface.h +@@ -21,8 +21,8 @@ + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + +-int interface_auto_up; +-int interface_do_message; ++extern int interface_auto_up; ++extern int interface_do_message; + + typedef enum { IFSTATUS_UP, IFSTATUS_DOWN, IFSTATUS_ERR } interface_status_t; + +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb index 0b5c5a6ce..7dc83e85f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libdaemon" -SRC_URI = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz" +SRC_URI = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz \ + file://0001-src-interface.h-Make-declarations-as-extern.patch \ + " SRC_URI_append_libc-musl = " file://Fix-build-with-musl.patch" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.7.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.7.bb deleted file mode 100644 index 4911b3d80..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.7.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 = "ef6084dcb4fe2e00327bb9c7b113ece204042c22" -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/iwd/iwd_1.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.8.bb new file mode 100644 index 000000000..b1e6fea2f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.8.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 = "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/libimobiledevice/files/configure-fix-largefile.patch b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/configure-fix-largefile.patch deleted file mode 100644 index 679a8b597..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/configure-fix-largefile.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fix configure error in large file checks on 64-bit architectures - - configure:17888: checking for native large file support - configure:17891: error: in `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/core2-64-oe-linux/libimobiledevice/1.1.4-r0/libimobiledevice-1.1.4': - configure:17893: error: cannot run test program while cross compiling - -configure.ac was using AC_SYS_LARGEFILE macro as is typical, but then -there was an extra runtime check added beyond that: -check if off_t is 8 bytes (64 bits) long. -If that runtime check passed, _FILE_OFFSET_BITS was defined as 64. - -Runtime checks need to go away for cross compiling, and luckily this extra -check was not serving any useful purpose. Note that off_t was *already* -64 bits, *without* setting _FILE_OFFSET_BITS, which makes _FILE_OFFSET_BITS -unneeded for large file support. - -If AC_SYS_LARGEFILE macro sets ac_cv_sys_file_offset_bits=no, -just leave _FILE_OFFSET_BITS undefined! - ---- libimobiledevice-1.1.4/configure.ac.old 2015-07-15 01:38:50.900143927 -0700 -+++ libimobiledevice-1.1.4/configure.ac 2015-07-15 01:39:13.300144430 -0700 -@@ -174,16 +174,6 @@ - if test "$enable_largefile" != no; then - if test "$ac_cv_sys_file_offset_bits" != 'no'; then - LFS_CFLAGS="$LFS_CFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" -- else -- AC_MSG_CHECKING(for native large file support) -- AC_RUN_IFELSE([AC_LANG_SOURCE([#include -- int main (int argc, char **argv) -- { -- exit(!(sizeof(off_t) == 8)); -- }])], -- [ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64) -- AC_MSG_RESULT(yes)], -- [AC_MSG_RESULT(no)]) - fi - if test "$ac_cv_sys_large_files" != 'no'; then - LFS_CFLAGS="$LFS_CFLAGS -D_LARGE_FILES=1" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb new file mode 100644 index 000000000..bcedd6297 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "A protocol library to access an iPhone or iPod Touch in Linux" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ + file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7 \ +" +HOMEPAGE = "http://www.libimobiledevice.org/" + +DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt" + +SRCREV = "15f8652126664e3a4b980e5d1c039b9053ce8566" +SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https" + +S = "${WORKDIR}/git" +inherit autotools pkgconfig + +EXTRA_OECONF = " --without-cython " diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb deleted file mode 100644 index 908b98d8c..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A protocol library to access an iPhone or iPod Touch in Linux" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ - file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7 \ -" - -HOMEPAGE ="http://www.libimobiledevice.org/" - -DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt" - -SRCREV = "fb71aeef10488ed7b0e60a1c8a553193301428c0" -PV = "1.2.0+git${SRCPV}" -SRC_URI = "\ - git://github.com/libimobiledevice/libimobiledevice;protocol=https \ - file://configure-fix-largefile.patch \ -" - -S = "${WORKDIR}/git" -inherit autotools pkgconfig - -EXTRA_OECONF = " --without-cython " diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.22.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.22.0.bb deleted file mode 100644 index 61e314f1f..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.22.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "libmbim is library for talking to WWAN devices by MBIM protocol" -DESCRIPTION = "libmbim is a glib-based library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libmbim/" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -DEPENDS = "glib-2.0 glib-2.0-native libgudev" - -inherit autotools pkgconfig bash-completion - -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" - -SRC_URI[md5sum] = "87060e8957013177e4140edc6f64f5bd" -SRC_URI[sha256sum] = "5c0778eb1cd12c3604523134e55183f5147b0cae71150e875b583768f7aa1f38" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.2.bb new file mode 100644 index 000000000..c7a04b664 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "libmbim is library for talking to WWAN devices by MBIM protocol" +DESCRIPTION = "libmbim is a glib-based library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libmbim/" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +DEPENDS = "glib-2.0 glib-2.0-native libgudev" + +inherit autotools pkgconfig bash-completion gobject-introspection + +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" + +SRC_URI[md5sum] = "6c2b490af87773c8446f37536e7411ac" +SRC_URI[sha256sum] = "32198c099987849c5f442d1cbf4b6e43e645cbdbe9cfdc197b19ddd63c6981e4" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.12.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.12.bb deleted file mode 100644 index 6f8638544..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.24.12.bb +++ /dev/null @@ -1,24 +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 - -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ - " - -SRC_URI[md5sum] = "7e6e49fddb9ae2b6fcde14619d6cfe49" -SRC_URI[sha256sum] = "2d3b91a2b8a882b17b16403c9ef7bdce522db4f0ceaa3e4dff76033885428b69" - -PACKAGECONFIG ??= "udev mbim" -PACKAGECONFIG[udev] = ",--without-udev,libgudev" -PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" - -EXTRA_OECONF_append_toolchain-clang = " --enable-more-warnings=no" 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 new file mode 100644 index 000000000..3a1b70b80 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.26.0.bb @@ -0,0 +1,22 @@ +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/libwebsockets/libwebsockets_4.0.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.0.1.bb deleted file mode 100644 index 0d1f57ab8..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.0.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Canonical libwebsockets.org websocket library" -HOMEPAGE = "https://libwebsockets.org/" -LICENSE = "MIT & Zlib & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c47b078124308a4e1354e8d59f606b7" - -DEPENDS = "zlib" - -S = "${WORKDIR}/git" -SRCREV = "6eb39388f43f6e2a27f0efcbf8cb2391e38824e9" -SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.0-stable" - -UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" - -inherit cmake pkgconfig - -PACKAGECONFIG ?= "libuv client server http2 ssl" -PACKAGECONFIG[client] = "-DLWS_WITHOUT_CLIENT=OFF,-DLWS_WITHOUT_CLIENT=ON," -PACKAGECONFIG[http2] = "-DLWS_WITH_HTTP2=ON,-DLWS_WITH_HTTP2=OFF," -PACKAGECONFIG[ipv6] = "-DLWS_IPV6=ON,-DLWS_IPV6=OFF," -PACKAGECONFIG[libev] = "-DLWS_WITH_LIBEV=ON,-DLWS_WITH_LIBEV=OFF,libev" -PACKAGECONFIG[libuv] = "-DLWS_WITH_LIBUV=ON,-DLWS_WITH_LIBUV=OFF,libuv" -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/*" - -CFLAGS_append = " -Wno-error" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.0.20.bb b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.0.20.bb new file mode 100644 index 000000000..5427daac4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.0.20.bb @@ -0,0 +1,35 @@ +SUMMARY = "Canonical libwebsockets.org websocket library" +HOMEPAGE = "https://libwebsockets.org/" +LICENSE = "MIT & Zlib & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c47b078124308a4e1354e8d59f606b7" + +DEPENDS = "zlib" + +S = "${WORKDIR}/git" +SRCREV = "ec9e8ab892f2dc569ae09336c80c2796fd14a6ff" +SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.0-stable" + +UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + +inherit cmake pkgconfig + +PACKAGECONFIG ?= "libuv client server http2 ssl" +PACKAGECONFIG[client] = "-DLWS_WITHOUT_CLIENT=OFF,-DLWS_WITHOUT_CLIENT=ON," +PACKAGECONFIG[http2] = "-DLWS_WITH_HTTP2=ON,-DLWS_WITH_HTTP2=OFF," +PACKAGECONFIG[ipv6] = "-DLWS_IPV6=ON,-DLWS_IPV6=OFF," +PACKAGECONFIG[libev] = "-DLWS_WITH_LIBEV=ON,-DLWS_WITH_LIBEV=OFF,libev" +PACKAGECONFIG[libuv] = "-DLWS_WITH_LIBUV=ON,-DLWS_WITH_LIBUV=OFF,libuv" +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/*" + +CFLAGS_append = " -Wno-error" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch index b1d96ae5a..55ce4c9a9 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch @@ -22,8 +22,8 @@ index 22e7d0d..809cc8f 100644 +CC ?= $(CROSS_COMPILE)gcc VER = -DVER=$(version) CFLAGS = -Wall $(VER) $(incdefs) $(DEBUG) $(EXTRA_CFLAGS) - LDLIBS = -lm -lrt $(EXTRA_LDFLAGS) -@@ -35,7 +35,7 @@ incdefs := $(shell $(srcdir)/incdefs.sh) + LDLIBS = -lm -lrt -pthread $(EXTRA_LDFLAGS) +@@ -43,7 +43,7 @@ incdefs := $(shell $(srcdir)/incdefs.sh) version := $(shell $(srcdir)/version.sh $(srcdir)) VPATH = $(srcdir) diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch deleted file mode 100644 index af99d2b7f..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/time_t_maybe_long_long.patch +++ /dev/null @@ -1,135 +0,0 @@ -Fix printf if time_t is long long - -On some platforms, time_t has recently switched from "long" to "long -long" [1]. For these platforms it is necessary to use "%lld" as printf -format specifier because the ABI differs between "long" and "long long". - -I found no way for creating something similar to PRId64 for time_t. No -idea how to determine whether it's "long" or "long long". So I cast -everything to "long long" instead. - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=38143339646a4ccce8afe298c34467767c899f51 - -Upstream-Status: Accepted [next version is after 2.0] -Upstream-Patch: https://github.com/richardcochran/linuxptp/commit/7de73fefc378cc42b9ed1115b3afa409d0250a48 - -Signed-off-by: Christian Eggers ---- -diff -Naur linuxptp-2.0.org/phc_ctl.c linuxptp-2.0/phc_ctl.c ---- linuxptp-2.0.org/phc_ctl.c 2018-08-12 23:08:43.000000000 +0200 -+++ linuxptp-2.0/phc_ctl.c 2020-05-29 21:34:26.166519963 +0200 -@@ -230,8 +230,8 @@ - strerror(errno)); - return -1; - } else { -- pr_notice("set clock time to %ld.%09ld or %s", -- ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec)); -+ pr_notice("set clock time to %lld.%09ld or %s", -+ (long long)ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec)); - } - - return args_to_eat; -@@ -248,8 +248,8 @@ - - return -1; - } else { -- pr_notice("clock time is %ld.%09lu or %s", -- ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec)); -+ pr_notice("clock time is %lld.%09lu or %s", -+ (long long)ts.tv_sec, ts.tv_nsec, ctime(&ts.tv_sec)); - } - - /* get operation does not require any arguments */ -diff -Naur linuxptp-2.0.org/print.c linuxptp-2.0/print.c ---- linuxptp-2.0.org/print.c 2018-08-12 23:08:43.000000000 +0200 -+++ linuxptp-2.0/print.c 2020-05-29 21:34:26.166519963 +0200 -@@ -73,16 +73,16 @@ - - if (verbose) { - f = level >= LOG_NOTICE ? stdout : stderr; -- fprintf(f, "%s[%ld.%03ld]: %s%s%s\n", -+ fprintf(f, "%s[%lld.%03ld]: %s%s%s\n", - progname ? progname : "", -- ts.tv_sec, ts.tv_nsec / 1000000, -+ (long long)ts.tv_sec, ts.tv_nsec / 1000000, - message_tag ? message_tag : "", message_tag ? " " : "", - buf); - fflush(f); - } - if (use_syslog) { -- syslog(level, "[%ld.%03ld] %s%s%s", -- ts.tv_sec, ts.tv_nsec / 1000000, -+ syslog(level, "[%lld.%03ld] %s%s%s", -+ (long long)ts.tv_sec, ts.tv_nsec / 1000000, - message_tag ? message_tag : "", message_tag ? " " : "", - buf); - } -diff -Naur linuxptp-2.0.org/unicast_service.c linuxptp-2.0/unicast_service.c ---- linuxptp-2.0.org/unicast_service.c 2018-08-12 23:08:43.000000000 +0200 -+++ linuxptp-2.0/unicast_service.c 2020-05-29 21:36:23.170497415 +0200 -@@ -209,9 +209,9 @@ - tmo = now.tv_sec + req->durationField; - if (tmo > client->grant_tmo) { - client->grant_tmo = tmo; -- pr_debug("%s grant of 0x%x extended to %ld", -+ pr_debug("%s grant of 0x%x extended to %lld", - pid2str(&client->portIdentity), -- client->message_types, tmo); -+ client->message_types, (long long)tmo); - } - } - -@@ -226,8 +226,8 @@ - interval = pqueue_peek(p->unicast_service->queue); - if (interval) { - tmo.it_value = interval->tmo; -- pr_debug("arming timer tmo={%ld,%ld}", -- interval->tmo.tv_sec, interval->tmo.tv_nsec); -+ pr_debug("arming timer tmo={%lld,%ld}", -+ (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec); - } else { - pr_debug("stopping unicast service timer"); - } -@@ -499,8 +499,8 @@ - - while ((interval = pqueue_peek(p->unicast_service->queue)) != NULL) { - -- pr_debug("peek i={2^%d} tmo={%ld,%ld}", interval->log_period, -- interval->tmo.tv_sec, interval->tmo.tv_nsec); -+ pr_debug("peek i={2^%d} tmo={%lld,%ld}", interval->log_period, -+ (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec); - - if (timespec_compare(&now, &interval->tmo) >= 0) { - break; -@@ -519,8 +519,8 @@ - } - - interval_increment(interval); -- pr_debug("next i={2^%d} tmo={%ld,%ld}", interval->log_period, -- interval->tmo.tv_sec, interval->tmo.tv_nsec); -+ pr_debug("next i={2^%d} tmo={%lld,%ld}", interval->log_period, -+ (long long)interval->tmo.tv_sec, interval->tmo.tv_nsec); - pqueue_insert(p->unicast_service->queue, interval); - } - -diff -Naur linuxptp-2.0.org/unicast_client.c linuxptp-2.0/unicast_client.c ---- linuxptp-2.0.org/unicast_client.c 2018-08-12 23:08:43.000000000 +0200 -+++ linuxptp-2.0/unicast_client.c 2020-06-02 11:13:06.922997844 +0200 -@@ -216,7 +216,7 @@ - long duration) - { - struct timespec now; -- long tmo; -+ time_t tmo; - - if (clock_gettime(CLOCK_MONOTONIC, &now)) { - pr_err("clock_gettime failed: %m"); -@@ -226,7 +226,7 @@ - tmo = now.tv_sec + duration; - if (!master->renewal_tmo || tmo < master->renewal_tmo) { - master->renewal_tmo = tmo; -- pr_debug("port %d: renewal timeout at %ld", portnum(p), tmo); -+ pr_debug("port %d: renewal timeout at %lld", portnum(p), (long long)tmo); - } - } - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb deleted file mode 100644 index 930c6673d..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_2.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux" -LICENSE = "GPLv2" -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://time_t_maybe_long_long.patch \ - " - -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}'" - -do_install () { - install -d ${D}/${bindir} - install -p ${S}/ptp4l ${D}/${bindir} - install -p ${S}/pmc ${D}/${bindir} - install -p ${S}/phc2sys ${D}/${bindir} - install -p ${S}/hwstamp_ctl ${D}/${bindir} -} 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 new file mode 100644 index 000000000..69dee1a2f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.0.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux" +LICENSE = "GPLv2" +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 \ + " + +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}'" + +do_install () { + install -d ${D}/${bindir} + install -p ${S}/ptp4l ${D}/${bindir} + install -p ${S}/pmc ${D}/${bindir} + install -p ${S}/phc2sys ${D}/${bindir} + install -p ${S}/hwstamp_ctl ${D}/${bindir} +} diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.2.bb deleted file mode 100644 index 3a1222e89..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.2.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 = "3148fe2d5f4b87e16266dfe559c0764e16ca0546" - -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.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.4.bb new file mode 100644 index 000000000..2d4e39bf9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.4.bb @@ -0,0 +1,35 @@ +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/ser2net/ser2net_4.1.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.8.bb deleted file mode 100644 index 4a91fa4f4..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.1.8.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "A serial to network proxy" -SECTION = "console/network" -HOMEPAGE = "http://sourceforge.net/projects/ser2net/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f" - -DEPENDS = "gensio libyaml" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" - -SRC_URI[sha256sum] = "cffb5147021202b064eb0a9389d0db63d1bb2dcde5a896f7785f97b1b5f51a72" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" - -inherit autotools pkgconfig - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.2.0.bb new file mode 100644 index 000000000..13794ad9d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.2.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "A serial to network proxy" +SECTION = "console/network" +HOMEPAGE = "http://sourceforge.net/projects/ser2net/" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f" + +DEPENDS = "gensio libyaml" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" + +SRC_URI[sha256sum] = "1d895f005896e8c5bcff4fe573e2fec3611bf4feee1247857e476b74323d916c" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/0001-Make-extern-declarations-to-avoid-duplicate-var-defi.patch b/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/0001-Make-extern-declarations-to-avoid-duplicate-var-defi.patch new file mode 100644 index 000000000..c714f7491 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/0001-Make-extern-declarations-to-avoid-duplicate-var-defi.patch @@ -0,0 +1,606 @@ +From 77532d2e99252e3e07afa0f918bb8c9d73798f39 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Aug 2020 16:56:22 -0700 +Subject: [PATCH] Make extern declarations to avoid duplicate var definitions + +gcc-10+ defaults to -fno-common which flags these errors about mulitple +definitions since the variables are defined in header files which are +included from multiple sources, this patch ensures that extern +declaration is added appropriately + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/blacklist.c | 2 +- + src/blacklist.h | 2 +- + src/charset.c | 2 +- + src/charshift.c | 2 +- + src/logging.c | 2 +- + src/logging.h | 4 +- + src/modeminit.c | 6 +- + src/smsd_cfg.c | 2 + + src/smsd_cfg.h | 274 ++++++++++++++++++++++++------------------------ + src/stats.h | 22 ++-- + src/whitelist.c | 2 +- + src/whitelist.h | 2 +- + 12 files changed, 164 insertions(+), 158 deletions(-) + +diff --git a/src/blacklist.c b/src/blacklist.c +index 7440cca..0c00dd9 100755 +--- a/src/blacklist.c ++++ b/src/blacklist.c +@@ -17,11 +17,11 @@ Either version 2 of the License, or (at your option) any later version. + #include + #include + #include ++#include "smsd_cfg.h" + #include "blacklist.h" + #include "extras.h" + #include "logging.h" + #include "alarm.h" +-#include "smsd_cfg.h" + + int inblacklist(char* msisdn) + { +diff --git a/src/blacklist.h b/src/blacklist.h +index 4f99050..61fd294 100755 +--- a/src/blacklist.h ++++ b/src/blacklist.h +@@ -15,7 +15,7 @@ Either version 2 of the License, or (at your option) any later version. + #ifndef BLACK_H + #define BLACK_H + +-char blacklist[256]; // Filename of the black-list ++EXTERN char blacklist[256]; // Filename of the black-list + + int inblacklist(char* msisdn); + +diff --git a/src/charset.c b/src/charset.c +index cd7c997..1716d70 100755 +--- a/src/charset.c ++++ b/src/charset.c +@@ -19,9 +19,9 @@ Either version 2 of the License, or (at your option) any later version. + #include + #include + ++#include "smsd_cfg.h" + #include "charset.h" + #include "logging.h" +-#include "smsd_cfg.h" + #include "pdu.h" + #include "extras.h" + #include "charshift.h" +diff --git a/src/charshift.c b/src/charshift.c +index 48ba340..2d7b26c 100755 +--- a/src/charshift.c ++++ b/src/charshift.c +@@ -25,8 +25,8 @@ Either version 2 of the License, or (at your option) any later version. + #include + #include + +-#include "logging.h" + #include "smsd_cfg.h" ++#include "logging.h" + #include "pdu.h" + #include "charset.h" + #include "extras.h" +diff --git a/src/logging.c b/src/logging.c +index 6ee2c4e..4af341f 100755 +--- a/src/logging.c ++++ b/src/logging.c +@@ -12,6 +12,7 @@ the GNU General Public License as published by the Free Software Foundation. + Either version 2 of the License, or (at your option) any later version. + */ + ++#include "smsd_cfg.h" + #include "logging.h" + #include "extras.h" + #include +@@ -22,7 +23,6 @@ Either version 2 of the License, or (at your option) any later version. + #include + #include + #include +-#include "smsd_cfg.h" + #include "stats.h" + + int Filehandle = -1; +diff --git a/src/logging.h b/src/logging.h +index 4f27906..4550234 100755 +--- a/src/logging.h ++++ b/src/logging.h +@@ -18,7 +18,7 @@ Either version 2 of the License, or (at your option) any later version. + #include + + // 3.1.16beta2: Moved logch() and prch() from charset.c to logging.c: +-char logch_buffer[8192]; ++EXTERN char logch_buffer[8192]; + + #ifdef __GNUC__ + void logch(char* format, ...) __attribute__ ((format(printf, 1, 2))); +@@ -30,7 +30,7 @@ char prch(char ch); + + // 3.1.16beta: changed type: + //int trouble_logging_started; +-time_t trouble_logging_started; ++EXTERN time_t trouble_logging_started; + + int change_loglevel(int new_level); + void restore_loglevel(); +diff --git a/src/modeminit.c b/src/modeminit.c +index 42ff6b4..0d05fe9 100755 +--- a/src/modeminit.c ++++ b/src/modeminit.c +@@ -19,8 +19,6 @@ Either version 2 of the License, or (at your option) any later version. + #include + #include + #include +-#include "logging.h" +-#include "alarm.h" + + #ifdef SOLARIS + #include +@@ -42,9 +40,11 @@ Either version 2 of the License, or (at your option) any later version. + #include + #endif + ++#include "smsd_cfg.h" ++#include "logging.h" ++#include "alarm.h" + #include "extras.h" + #include "modeminit.h" +-#include "smsd_cfg.h" + #include "version.h" + #include "pdu.h" + #include "stats.h" +diff --git a/src/smsd_cfg.c b/src/smsd_cfg.c +index 35c1198..32472b4 100755 +--- a/src/smsd_cfg.c ++++ b/src/smsd_cfg.c +@@ -26,6 +26,8 @@ Either version 2 of the License, or (at your option) any later version. + #include + #include + ++#define EXTERN ++ + #include "extras.h" + #include "cfgfile.h" + #include "smsd_cfg.h" +diff --git a/src/smsd_cfg.h b/src/smsd_cfg.h +index 8ae208d..d6ece37 100755 +--- a/src/smsd_cfg.h ++++ b/src/smsd_cfg.h +@@ -15,6 +15,10 @@ Either version 2 of the License, or (at your option) any later version. + #ifndef SMSD_CFG_H + #define SMSD_CFG_H + ++#ifndef EXTERN ++#define EXTERN extern ++#endif ++ + #include + #include + #include +@@ -126,17 +130,17 @@ Either version 2 of the License, or (at your option) any later version. + #define ALPHABET_UNKNOWN 4 + #define ALPHABET_DEFAULT 0 + +-char process_title[32]; // smsd for main task, NOTIFIER or CHILD, name of a modem for other tasks. +-int process_id; // -1 for main task, all modems have numbers starting with 0. ++EXTERN char process_title[32]; // smsd for main task, NOTIFIER or CHILD, name of a modem for other tasks. ++EXTERN int process_id; // -1 for main task, all modems have numbers starting with 0. + // This is the same as device, can be used like devices[process_id] if IS_MODEM_PROCESS. + +-time_t process_start_time; ++EXTERN time_t process_start_time; + +-int modem_handle; // Handle for modem. ++EXTERN int modem_handle; // Handle for modem. + +-int put_command_timeouts; +-unsigned long long put_command_sent; // 3.1.16beta. +-char tmpdir[PATH_MAX]; // 3.1.16beta. ++EXTERN int put_command_timeouts; ++EXTERN unsigned long long put_command_sent; // 3.1.16beta. ++EXTERN char tmpdir[PATH_MAX]; // 3.1.16beta. + + typedef struct + { +@@ -284,204 +288,204 @@ typedef struct + + // NOTE for regular run intervals: effective value is at least delaytime. + +-char configfile[PATH_MAX]; // Path to config file +-char d_spool[PATH_MAX]; // Spool directory +-char d_failed[PATH_MAX]; // Failed spool directory +-char d_failed_copy[PATH_MAX]; // 3.1.17. +-char d_incoming[PATH_MAX]; // Incoming spool directory +-char d_incoming_copy[PATH_MAX]; // 3.1.16beta2. +-char d_report[PATH_MAX]; // Incoming report spool directory +-char d_report_copy[PATH_MAX]; // 3.1.17. +-char d_phonecalls[PATH_MAX]; // Incoming phonecalls data directory +-char d_saved[PATH_MAX]; // Directory for smsd's internal use, concatenation storage files etc. +-char d_sent[PATH_MAX]; // Sent spool directory +-char d_sent_copy[PATH_MAX]; // 3.1.17. +-char d_checked[PATH_MAX]; // Spool directory for checked messages (only used when no provider queues used) +-char eventhandler[PATH_MAX]; // Global event handler program or script +-char alarmhandler[PATH_MAX]; // Global alarm handler program or script +-char checkhandler[PATH_MAX]; // Handler that checks if the sms file is valid. +-int alarmlevel; // Alarm Level (9=highest). Verbosity of alarm handler. +-char logfile[PATH_MAX]; // Name or Handle of Log File +-int loglevel; // Log Level (9=highest). Verbosity of log file. +-_queue queues[NUMBER_OF_MODEMS]; // Queues +-_device devices[NUMBER_OF_MODEMS]; // Modem devices +-int delaytime; // sleep-time after workless +-int delaytime_mainprocess; // sleep-time after workless, main process. If -1, delaytime is used. +-int blocktime; // sleep-time after multiple errors +-int blockafter; // Block modem after n errors +-int errorsleeptime; // sleep-time after each error +-int autosplit; // Splitting of large text messages 0=no, 1=yes 2=number with text, 3=number with UDH +-int receive_before_send; // if 1 smsd tries to receive one message before sending +-int store_received_pdu; // 0=no, 1=unsupported pdu's only, 2=unsupported and 8bit/unicode, 3=all +-int store_sent_pdu; // 0=no, 1=failed pdu's only, 2=failed and 8bit/unicode, 3=all +-int validity_period; // Validity period for messages. +-int decode_unicode_text; // 1 if unicode text is decoded internally. +-int internal_combine; // 1 if multipart message is combined internally. +-int internal_combine_binary; // 1 if multipart binary message is combined internally. Defaults to internal_combine. +-int keep_filename; // 0 if unique filename is created to each directory when a message file is moved. +-int store_original_filename; // 1 if an original filename is saved to message file when it's moved from ++EXTERN char configfile[PATH_MAX]; // Path to config file ++EXTERN char d_spool[PATH_MAX]; // Spool directory ++EXTERN char d_failed[PATH_MAX]; // Failed spool directory ++EXTERN char d_failed_copy[PATH_MAX]; // 3.1.17. ++EXTERN char d_incoming[PATH_MAX]; // Incoming spool directory ++EXTERN char d_incoming_copy[PATH_MAX]; // 3.1.16beta2. ++EXTERN char d_report[PATH_MAX]; // Incoming report spool directory ++EXTERN char d_report_copy[PATH_MAX]; // 3.1.17. ++EXTERN char d_phonecalls[PATH_MAX]; // Incoming phonecalls data directory ++EXTERN char d_saved[PATH_MAX]; // Directory for smsd's internal use, concatenation storage files etc. ++EXTERN char d_sent[PATH_MAX]; // Sent spool directory ++EXTERN char d_sent_copy[PATH_MAX]; // 3.1.17. ++EXTERN char d_checked[PATH_MAX]; // Spool directory for checked messages (only used when no provider queues used) ++EXTERN char eventhandler[PATH_MAX]; // Global event handler program or script ++EXTERN char alarmhandler[PATH_MAX]; // Global alarm handler program or script ++EXTERN char checkhandler[PATH_MAX]; // Handler that checks if the sms file is valid. ++EXTERN int alarmlevel; // Alarm Level (9=highest). Verbosity of alarm handler. ++EXTERN char logfile[PATH_MAX]; // Name or Handle of Log File ++EXTERN int loglevel; // Log Level (9=highest). Verbosity of log file. ++EXTERN _queue queues[NUMBER_OF_MODEMS]; // Queues ++EXTERN _device devices[NUMBER_OF_MODEMS]; // Modem devices ++EXTERN int delaytime; // sleep-time after workless ++EXTERN int delaytime_mainprocess; // sleep-time after workless, main process. If -1, delaytime is used. ++EXTERN int blocktime; // sleep-time after multiple errors ++EXTERN int blockafter; // Block modem after n errors ++EXTERN int errorsleeptime; // sleep-time after each error ++EXTERN int autosplit; // Splitting of large text messages 0=no, 1=yes 2=number with text, 3=number with UDH ++EXTERN int receive_before_send; // if 1 smsd tries to receive one message before sending ++EXTERN int store_received_pdu; // 0=no, 1=unsupported pdu's only, 2=unsupported and 8bit/unicode, 3=all ++EXTERN int store_sent_pdu; // 0=no, 1=failed pdu's only, 2=failed and 8bit/unicode, 3=all ++EXTERN int validity_period; // Validity period for messages. ++EXTERN int decode_unicode_text; // 1 if unicode text is decoded internally. ++EXTERN int internal_combine; // 1 if multipart message is combined internally. ++EXTERN int internal_combine_binary; // 1 if multipart binary message is combined internally. Defaults to internal_combine. ++EXTERN int keep_filename; // 0 if unique filename is created to each directory when a message file is moved. ++EXTERN int store_original_filename; // 1 if an original filename is saved to message file when it's moved from + // outgoing directory to spooler. Works together with keep_filename. +-int date_filename; // 1 or 2 if YYYYMMDD is included to the filename of incoming message. +-char regular_run[PATH_MAX]; // Script/program which is run regularly. +-int regular_run_interval; // Number of seconds between running a regular_run script/progdam. +-char admin_to[SIZE_TO]; // Destination number for administrative messages. +-int filename_preview; // Number of chars of message text to concatenate to filename. +-int incoming_utf8; // 1 if incoming files are saved using UTF-8 character set. +-int outgoing_utf8; // 1 if outgoing files are automatically converted from UTF-8 to ISO and GSM. +-int log_charconv; // 1 if character set conversion is logged. +-int log_single_lines; // 1 if linefeeds are removed from the modem response to be logged. +-int executable_check; // 0 if eventhandler and other executables are NOT checked during the startup checking. +-int keep_messages; // For testing purposes: messages are not deleted and smsd stops after first run. +-char priviledged_numbers[SIZE_PRIVILEDGED_NUMBERS]; // Priviledged numbers in incoming messages. +-int ic_purge_hours; // If internal_combine is used, concatenation storage is checked every ic_purge_interval minutes +-int ic_purge_minutes; // and if there is message parts older than defined, they are handled or deleted. +-int ic_purge_read; // 1 = message parts are stored as single messages. 0 = parts are just deleted. +-int ic_purge_interval; // +-char shell[PATH_MAX]; // Shell used to run eventhandler, defaults to /bin/sh +-char adminmessage_device[32]; // Name of device used to send administrative messages of mainspooler. +-int smart_logging; // 1 = if loglevel is less than 7, degug log is written is there has been any errors. +-int status_signal_quality; // 1 = signal quality is written to status file. +-int status_include_counters; // 1 = succeeded, failed and received counters are included in the status line. +-int status_include_uptime; // 3.1.16beta: 1 = include started & uptime line in the status file. +-int hangup_incoming_call; // 1 = if detected unexpected input contains RING and we want to end call. +-int max_continuous_sending; // Defines when sending is breaked to do check/do other tasks. Time in minutes. +-int voicecall_hangup_ath; // If ATH is used instead of AT+CHUP. ++EXTERN int date_filename; // 1 or 2 if YYYYMMDD is included to the filename of incoming message. ++EXTERN char regular_run[PATH_MAX]; // Script/program which is run regularly. ++EXTERN int regular_run_interval; // Number of seconds between running a regular_run script/progdam. ++EXTERN char admin_to[SIZE_TO]; // Destination number for administrative messages. ++EXTERN int filename_preview; // Number of chars of message text to concatenate to filename. ++EXTERN int incoming_utf8; // 1 if incoming files are saved using UTF-8 character set. ++EXTERN int outgoing_utf8; // 1 if outgoing files are automatically converted from UTF-8 to ISO and GSM. ++EXTERN int log_charconv; // 1 if character set conversion is logged. ++EXTERN int log_single_lines; // 1 if linefeeds are removed from the modem response to be logged. ++EXTERN int executable_check; // 0 if eventhandler and other executables are NOT checked during the startup checking. ++EXTERN int keep_messages; // For testing purposes: messages are not deleted and smsd stops after first run. ++EXTERN char priviledged_numbers[SIZE_PRIVILEDGED_NUMBERS]; // Priviledged numbers in incoming messages. ++EXTERN int ic_purge_hours; // If internal_combine is used, concatenation storage is checked every ic_purge_interval minutes ++EXTERN int ic_purge_minutes; // and if there is message parts older than defined, they are handled or deleted. ++EXTERN int ic_purge_read; // 1 = message parts are stored as single messages. 0 = parts are just deleted. ++EXTERN int ic_purge_interval; // ++EXTERN char shell[PATH_MAX]; // Shell used to run eventhandler, defaults to /bin/sh ++EXTERN char adminmessage_device[32]; // Name of device used to send administrative messages of mainspooler. ++EXTERN int smart_logging; // 1 = if loglevel is less than 7, degug log is written is there has been any errors. ++EXTERN int status_signal_quality; // 1 = signal quality is written to status file. ++EXTERN int status_include_counters; // 1 = succeeded, failed and received counters are included in the status line. ++EXTERN int status_include_uptime; // 3.1.16beta: 1 = include started & uptime line in the status file. ++EXTERN int hangup_incoming_call; // 1 = if detected unexpected input contains RING and we want to end call. ++EXTERN int max_continuous_sending; // Defines when sending is breaked to do check/do other tasks. Time in minutes. ++EXTERN int voicecall_hangup_ath; // If ATH is used instead of AT+CHUP. + + // 3.1.5: +-int trust_outgoing; // 1 = it's _sure_ that files are created by rename AND permissions are correct. Speeds up spooling. ++EXTERN int trust_outgoing; // 1 = it's _sure_ that files are created by rename AND permissions are correct. Speeds up spooling. + + // 3.1.5: +-int ignore_outgoing_priority; // 1 = Priority: high header is not checked. Speeds up spooling. ++EXTERN int ignore_outgoing_priority; // 1 = Priority: high header is not checked. Speeds up spooling. + + // 3.1.7: +-int ignore_exec_output; // 1 = stdout and stderr of eventhandlers is _not_ checked. ++EXTERN int ignore_exec_output; // 1 = stdout and stderr of eventhandlers is _not_ checked. + + // 3.1.7: +-mode_t conf_umask; // File mode creation mask for smsd and modem processes. ++EXTERN mode_t conf_umask; // File mode creation mask for smsd and modem processes. + + // 3.1.7: +-int trim_text; // 1 = trailing whitespaces are removed from text: ++EXTERN int trim_text; // 1 = trailing whitespaces are removed from text: + + // 3.1.7: +-int use_linux_ps_trick; // 1 = change argv[0] to "smsd: MAINPROCESS", "smsd: GSM1" etc. ++EXTERN int use_linux_ps_trick; // 1 = change argv[0] to "smsd: MAINPROCESS", "smsd: GSM1" etc. + + // 3.1.7: +-int log_unmodified; ++EXTERN int log_unmodified; + + // 3.1.7: +-char suspend_filename[PATH_MAX]; ++EXTERN char suspend_filename[PATH_MAX]; + + // 3.1.9: +-int spool_directory_order; ++EXTERN int spool_directory_order; + + // 3.1.9: 1 if read_from_modem is logged. +-int log_read_from_modem; ++EXTERN int log_read_from_modem; + + // 3.1.16beta2: log_read_timing for performance tuning. +-int log_read_timing; ++EXTERN int log_read_timing; + + // 3.1.16beta: +-int log_response_time; ++EXTERN int log_response_time; + + // 3.1.16beta2: +-int default_alphabet; ++EXTERN int default_alphabet; + + // 3.1.17: Child process for the mainprocess: +-char mainprocess_child[PATH_MAX]; +-char mainprocess_child_args[PATH_MAX]; ++EXTERN char mainprocess_child[PATH_MAX]; ++EXTERN char mainprocess_child_args[PATH_MAX]; + + // 3.1.17: Notifier for the mainprocess: +-int mainprocess_notifier; ++EXTERN int mainprocess_notifier; + + // 3.1.17: If *_copy was made, evenhandler can use it instead of original file: +-int eventhandler_use_copy; ++EXTERN int eventhandler_use_copy; + + // 3.1.17: This defines how long to sleep while looping: +-int sleeptime_mainprocess; ++EXTERN int sleeptime_mainprocess; + + // 3.1.17: Defines how often PID is checked to detect if another smsd is running: +-int check_pid_interval; ++EXTERN int check_pid_interval; + + // 3.1.18: start script/program for mainprocess: +-char mainprocess_start[PATH_MAX]; +-char mainprocess_start_args[PATH_MAX]; ++EXTERN char mainprocess_start[PATH_MAX]; ++EXTERN char mainprocess_start_args[PATH_MAX]; + +-int message_count; // Counter for sent messages. Multipart message is one message. ++EXTERN int message_count; // Counter for sent messages. Multipart message is one message. + +-volatile sig_atomic_t break_workless_delay; // To break the delay when SIGCONT is received. +-volatile sig_atomic_t terminate; // To terminate when SIGTERM is received. ++EXTERN volatile sig_atomic_t break_workless_delay; // To break the delay when SIGCONT is received. ++EXTERN volatile sig_atomic_t terminate; // To terminate when SIGTERM is received. + +-char username[65]; // user and group name which are used to run. +-char groupname[65]; // (max length is just a guess) ++EXTERN char username[65]; // user and group name which are used to run. ++EXTERN char groupname[65]; // (max length is just a guess) + +-char infofile[PATH_MAX]; // Hepler file for stopping the smsd smoothly. +-char pidfile[PATH_MAX]; // File where a process id is stored. ++EXTERN char infofile[PATH_MAX]; // Hepler file for stopping the smsd smoothly. ++EXTERN char pidfile[PATH_MAX]; // File where a process id is stored. + + // Command line arguments: +-char arg_username[65]; +-char arg_groupname[65]; +-char arg_infofile[PATH_MAX]; +-char arg_pidfile[PATH_MAX]; +-char arg_logfile[PATH_MAX]; +-int arg_terminal; ++EXTERN char arg_username[65]; ++EXTERN char arg_groupname[65]; ++EXTERN char arg_infofile[PATH_MAX]; ++EXTERN char arg_pidfile[PATH_MAX]; ++EXTERN char arg_logfile[PATH_MAX]; ++EXTERN int arg_terminal; + // 3.1.7: +-char arg_7bit_packed[512]; +-int do_encode_decode_arg_7bit_packed; ++EXTERN char arg_7bit_packed[512]; ++EXTERN int do_encode_decode_arg_7bit_packed; + +-int terminal; // 1 if smsd is communicating with terminal. +-pid_t device_pids[NUMBER_OF_MODEMS]; // Pid's of modem processes. +-char run_info[PATH_MAX]; // Information about external script/program execution. ++EXTERN int terminal; // 1 if smsd is communicating with terminal. ++EXTERN pid_t device_pids[NUMBER_OF_MODEMS]; // Pid's of modem processes. ++EXTERN char run_info[PATH_MAX]; // Information about external script/program execution. + +-char communicate[32]; // Device name for terminal communication mode. ++EXTERN char communicate[32]; // Device name for terminal communication mode. + +-char international_prefixes[PATH_MAX +1]; +-char national_prefixes[PATH_MAX +1]; ++EXTERN char international_prefixes[PATH_MAX +1]; ++EXTERN char national_prefixes[PATH_MAX +1]; + + // Storage for startup errors: +-char *startup_err_str; +-int startup_err_count; ++EXTERN char *startup_err_str; ++EXTERN int startup_err_count; + + // Storage for PDU's: +-char *incoming_pdu_store; +-char *outgoing_pdu_store; +-char *routed_pdu_store; ++EXTERN char *incoming_pdu_store; ++EXTERN char *outgoing_pdu_store; ++EXTERN char *routed_pdu_store; + + // Storage for getfile errors: +-char *getfile_err_store; ++EXTERN char *getfile_err_store; + + // Text buffer for error messages: +-char tb[SIZE_TB]; ++EXTERN char tb[SIZE_TB]; + + // Buffer for SIM memory checking: +-char *check_memory_buffer; +-size_t check_memory_buffer_size; ++EXTERN char *check_memory_buffer; ++EXTERN size_t check_memory_buffer_size; + +-int os_cygwin; // 1 if we are on Cygwin. ++EXTERN int os_cygwin; // 1 if we are on Cygwin. + +-char language_file[PATH_MAX]; // File name of translated headers. +-char yes_chars[SIZE_HEADER]; // Characters which mean "yes" in the yesno() question. +-char no_chars[SIZE_HEADER]; // See details inside read_translation() function. +-char yes_word[SIZE_HEADER]; // "yes" printed as an output. +-char no_word[SIZE_HEADER]; // "no" +-char datetime_format[SIZE_HEADER]; // strftime format string for time stamps (not inside status reports). +-char logtime_format[SIZE_HEADER]; // 3.1.7: strftime format string for logging time stamps +-char date_filename_format[SIZE_HEADER]; // 3.1.7: strftime format string for date_filename +-int translate_incoming; // 0 if incoming message headers are NOT transtaled. ++EXTERN char language_file[PATH_MAX]; // File name of translated headers. ++EXTERN char yes_chars[SIZE_HEADER]; // Characters which mean "yes" in the yesno() question. ++EXTERN char no_chars[SIZE_HEADER]; // See details inside read_translation() function. ++EXTERN char yes_word[SIZE_HEADER]; // "yes" printed as an output. ++EXTERN char no_word[SIZE_HEADER]; // "no" ++EXTERN char datetime_format[SIZE_HEADER]; // strftime format string for time stamps (not inside status reports). ++EXTERN char logtime_format[SIZE_HEADER]; // 3.1.7: strftime format string for logging time stamps ++EXTERN char date_filename_format[SIZE_HEADER]; // 3.1.7: strftime format string for date_filename ++EXTERN int translate_incoming; // 0 if incoming message headers are NOT transtaled. + + // 3.1.14: +-int logtime_us; +-int logtime_ms; ++EXTERN int logtime_us; ++EXTERN int logtime_ms; + + // 3.1.14: +-int shell_test; ++EXTERN int shell_test; + + // Next two are for debugging purposes: +-int enable_smsd_debug; +-char smsd_debug[SIZE_SMSD_DEBUG]; // Header of an outgoing message file. ++EXTERN int enable_smsd_debug; ++EXTERN char smsd_debug[SIZE_SMSD_DEBUG]; // Header of an outgoing message file. + + // 3.1.20: Alt keys in communication mode: + #define COMMUNICATE_A_KEY_COUNT 10 +-char communicate_a_keys[COMMUNICATE_A_KEY_COUNT][256]; ++EXTERN char communicate_a_keys[COMMUNICATE_A_KEY_COUNT][256]; + + /* initialize all variable with default values */ + +diff --git a/src/stats.h b/src/stats.h +index bd5cdc9..a614af1 100755 +--- a/src/stats.h ++++ b/src/stats.h +@@ -33,17 +33,17 @@ typedef struct + int ber; + } _stats; + +-_stats* statistics[NUMBER_OF_MODEMS]; // Statistic data (shared memory!) +-int rejected_counter; // Statistic counter, rejected SM, number does not fit into any queue +-time_t start_time; // Start time of smsd, allows statistic functions +-int printstatus; // if 1 smsd outputs status on stdout +-time_t last_stats; // time when the last stats file was created +-char d_stats[PATH_MAX]; // path to statistic files +-int stats_interval; // time between statistic files in seconds. +-int stats_no_zeroes; // Suppress files that contain only zeroes +-int status_interval; // time between updating status file in seconds +- +-char *shared_buffer; ++EXTERN _stats* statistics[NUMBER_OF_MODEMS]; // Statistic data (shared memory!) ++EXTERN int rejected_counter; // Statistic counter, rejected SM, number does not fit into any queue ++EXTERN time_t start_time; // Start time of smsd, allows statistic functions ++EXTERN int printstatus; // if 1 smsd outputs status on stdout ++EXTERN time_t last_stats; // time when the last stats file was created ++EXTERN char d_stats[PATH_MAX]; // path to statistic files ++EXTERN int stats_interval; // time between statistic files in seconds. ++EXTERN int stats_no_zeroes; // Suppress files that contain only zeroes ++EXTERN int status_interval; // time between updating status file in seconds ++ ++EXTERN char *shared_buffer; + + /* Creates shared memory variables for statistic data */ + +diff --git a/src/whitelist.c b/src/whitelist.c +index 4ee7a69..3d90bf4 100755 +--- a/src/whitelist.c ++++ b/src/whitelist.c +@@ -17,11 +17,11 @@ Either version 2 of the License, or (at your option) any later version. + #include + #include + #include ++#include "smsd_cfg.h" + #include "whitelist.h" + #include "extras.h" + #include "logging.h" + #include "alarm.h" +-#include "smsd_cfg.h" + + /* Used with >= 3.1x */ + int inwhitelist_q(char* msisdn, char *queuename) +diff --git a/src/whitelist.h b/src/whitelist.h +index 88aea86..3f904f4 100755 +--- a/src/whitelist.h ++++ b/src/whitelist.h +@@ -15,7 +15,7 @@ Either version 2 of the License, or (at your option) any later version. + #ifndef WHITE_H + #define WHITE_H + +-char whitelist[256]; // Filename of the white-list ++EXTERN char whitelist[256]; // Filename of the white-list + + /* Used with >= 3.1x */ + int inwhitelist_q(char* msisdn, char *queuename); +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb b/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb index 6e6413b4b..ca4095753 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb @@ -7,7 +7,9 @@ HOMEPAGE = "http://smstools3.kekekasvi.com" SRC_URI = "http://smstools3.kekekasvi.com/packages/${BP}.tar.gz \ file://sms_binpath.patch \ - file://scripts_no_bash.patch" + file://scripts_no_bash.patch \ + file://0001-Make-extern-declarations-to-avoid-duplicate-var-defi.patch \ + " SRC_URI[md5sum] = "6a9f038fb38a49cc3a4f8f14a88fb8af" SRC_URI[sha256sum] = "a26ba4c02b16f6cf13177bffca6c9230dc5fefaeba8e3030cd4e4905f6a92084" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb new file mode 100644 index 000000000..3860fd8b9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "This daemon is in charge of multiplexing connections over USB to an iPhone or iPod touch." +HOMEPAGE = "https://github.com/libimobiledevice/usbmuxd" +LICENSE = "GPLv3 & GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=ebb5c50ab7cab4baeffba14977030c07 \ + file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "udev libusb1 libplist" + +inherit autotools pkgconfig gitpkgv systemd + +PKGV = "${GITPKGVTAG}" + +SRCREV = "79c8b38d1488a6b07e1e68f39d8caec3f1a45622" +SRC_URI = "git://github.com/libimobiledevice/usbmuxd;protocol=https" + +S = "${WORKDIR}/git" + +EXTRA_OECONF += "--without-preflight" + +FILES_${PN} += "${base_libdir}/udev/rules.d/" + +SYSTEMD_SERVICE_${PN} = "usbmuxd.service" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb deleted file mode 100644 index 728423432..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "This daemon is in charge of multiplexing connections over USB to an iPhone or iPod touch." -LICENSE = "GPLv3 & GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=ebb5c50ab7cab4baeffba14977030c07 \ - file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "udev libusb1 libplist" - -inherit autotools pkgconfig gitpkgv systemd - -PKGV = "${GITPKGVTAG}" - -SRCREV = "ee85938c21043ef5f7cd4dfbc7677f385814d4d8" -SRC_URI = "git://github.com/libimobiledevice/usbmuxd;protocol=https" - -S = "${WORKDIR}/git" - -EXTRA_OECONF += "--without-preflight" - -FILES_${PN} += "${base_libdir}/udev/rules.d/" - -SYSTEMD_SERVICE_${PN} = "usbmuxd.service" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/fno-common.patch b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/fno-common.patch new file mode 100644 index 000000000..fc5e2e99c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/files/fno-common.patch @@ -0,0 +1,29 @@ +Mark extern variables with 'extern' keyword + +This ensures that compilers with -fno-common does not generate multiple definitions + +Upstream-Status: Pending +Signedd-off-by: Khem Raj + +--- a/lib/wfa_cs.c ++++ b/lib/wfa_cs.c +@@ -71,7 +71,7 @@ int wfaExecuteCLI(char *CLI); + + /* Since the two definitions are used all over the CA function */ + char gCmdStr[WFA_CMD_STR_SZ]; +-dutCmdResponse_t gGenericResp; ++extern dutCmdResponse_t gGenericResp; + int wfaTGSetPrio(int sockfd, int tgClass); + void create_apts_msg(int msg, unsigned int txbuf[],int id); + +--- a/lib/wfa_thr.c ++++ b/lib/wfa_thr.c +@@ -41,7 +41,7 @@ + /* + * external global thread sync variables + */ +-tgWMM_t wmm_thr[WFA_THREADS_NUM]; ++extern tgWMM_t wmm_thr[WFA_THREADS_NUM]; + extern int resetsnd; + extern int resetrcv; + extern int newCmdOn; 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 index 99cfb3205..cb39f5a0e 100644 --- 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 @@ -8,12 +8,13 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0542427ed5c315ca34aa09ae7a85ed32" SECTION = "test" S = "${WORKDIR}/git" -SRCREV = "f7a8d7ef7d1a831c1bb47de21fa083536ea2f3a9" +SRCREV = "2da947374c8324f88a0e2155aeba4cf75464b0d8" 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 \ + file://fno-common.patch \ " # to avoid host path QA error diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v67.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v67.bb deleted file mode 100644 index da0c6563a..000000000 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v67.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "libnvdimm utility library" -DESCRIPTION = "Utility library for managing the libnvdimm \ -(non-volatile memory device) sub-system in the Linux kernel. \ -The LIBNVDIMM subsystem provides support for three types of \ -NVDIMMs, namely,PMEM, BLK, and NVDIMM devices that can \ -simultaneously support both PMEM and BLK mode access." -HOMEPAGE = "https://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git/tree/Documentation/nvdimm/nvdimm.txt?h=libnvdimm-for-next" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=e66651809cac5da60c8b80e9e4e79e08" - -inherit autotools-brokensep pkgconfig bash-completion systemd - -SRCREV = "637bb424dc317a044c722a671355ef9df0e0d30f" -SRC_URI = "git://github.com/pmem/ndctl.git" - -DEPENDS = "kmod udev json-c keyutils" - -S = "${WORKDIR}/git" - -EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" -PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd" - -do_configure_prepend() { - ${S}/autogen.sh -} - -SYSTEMD_SERVICE_${PN} = "ndctl-monitor.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" - -FILES_${PN} += "${datadir}/daxctl/daxctl.conf" diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v69.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v69.bb new file mode 100644 index 000000000..396da4bb3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v69.bb @@ -0,0 +1,32 @@ +SUMMARY = "libnvdimm utility library" +DESCRIPTION = "Utility library for managing the libnvdimm \ +(non-volatile memory device) sub-system in the Linux kernel. \ +The LIBNVDIMM subsystem provides support for three types of \ +NVDIMMs, namely,PMEM, BLK, and NVDIMM devices that can \ +simultaneously support both PMEM and BLK mode access." +HOMEPAGE = "https://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git/tree/Documentation/nvdimm/nvdimm.txt?h=libnvdimm-for-next" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=e66651809cac5da60c8b80e9e4e79e08" + +inherit autotools-brokensep pkgconfig bash-completion systemd + +SRCREV = "ea62d6d53bf6f806c4841e97a370201e18446860" +SRC_URI = "git://github.com/pmem/ndctl.git" + +DEPENDS = "kmod udev json-c keyutils" + +S = "${WORKDIR}/git" + +EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd" + +do_configure_prepend() { + ${S}/autogen.sh +} + +SYSTEMD_SERVICE_${PN} = "ndctl-monitor.service" +SYSTEMD_AUTO_ENABLE_${PN} = "disable" + +FILES_${PN} += "${datadir}/daxctl/daxctl.conf" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb index d14ec53e3..937b3500c 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/ocl-icd_git.bb @@ -3,12 +3,12 @@ DESCRIPTION = "Open Source alternative to vendor specific OpenCL ICD loaders." # The LICENSE is BSD 2-Clause "Simplified" License LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=232257bbf7320320725ca9529d3782ab" +LIC_FILES_CHKSUM = "file://COPYING;md5=1238d5bccbb6bda30654e48dcc0a554b" SRC_URI = "git://github.com/OCL-dev/ocl-icd.git;protocol=https" PV = "2.2.12+git${SRCPV}" -SRCREV = "af79aebe4649f30dbd711c1bf6fc661eac6e5f01" +SRCREV = "a9e57b199ff1e8d03fa3e5c53c5544de3dc72fe6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb index dec1bea56..d262dd147 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb @@ -1,11 +1,12 @@ SUMMARY = "OpenCL API Headers" DESCRIPTION = "OpenCL compute API headers from Khronos Group" -LICENSE = "Khronos" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "base" S = "${WORKDIR}/git" -SRCREV = "40c5d226c7c0706f0176884e9b94b3886679c983" +# v2020.06.16 +SRCREV = "b04034a17e214322772c19e7ccd2adf0cd306920" SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git" do_configure[noexec] = "1" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb index 7c49c8d55..ed27b2616 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb @@ -1,24 +1,27 @@ SUMMARY = "OpenCL ICD Loader" DESCRIPTION = "OpenCL compute ICD Loader from Khronos Group" -LICENSE = "Khronos" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ec724732ce73269486574c718ef0c79b" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SECTION = "base" +DEPENDS += "opencl-headers" + inherit pkgconfig cmake S = "${WORKDIR}/git" -SRCREV = "b342ff7b7f70a4b3f2cfc53215af8fa20adc3d86" +PV = "2020.06.16+git${SRCPV}" +SRCREV = "862eebe7ca733c398334a8db8481172a7d3a3c47" SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git" do_install () { install -d ${D}${bindir} - install -m 0755 ${B}/bin/icd_loader_test ${D}${bindir}/ + install -m 0755 ${B}/test/loader_test/icd_loader_test ${D}${bindir}/ chrpath -d ${D}${bindir}/icd_loader_test install -d ${D}${libdir} - install -m 0644 ${B}/lib/libIcdLog.so ${D}${libdir}/ - install -m 0644 ${B}/lib/libOpenCLDriverStub.so ${D}${libdir}/ + install -m 0644 ${B}/test/log/libIcdLog.so ${D}${libdir}/ + install -m 0644 ${B}/test/driver_stub/libOpenCLDriverStub.so ${D}${libdir}/ chrpath -d ${D}${libdir}/libOpenCLDriverStub.so - install -m 0644 ${B}/lib/libOpenCL.so.1.2 ${D}${libdir}/ + install -m 0644 ${B}/libOpenCL.so.1.2 ${D}${libdir}/ cd ${D}${libdir} ln -s libOpenCL.so.1.2 libOpenCL.so.1 ln -s libOpenCL.so.1 libOpenCL.so @@ -41,5 +44,4 @@ FILES_${PN}-dev = " \ FILES_libicdlog = "${libdir}/libIcdLog.so" FILES_libicdlog-dbg = "${libdir}/.debug/libIcdLog.so" -DEPENDS = "opencl-headers" RDEPENDS_${PN} = "libicdlog" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb index c4d63fd27..82860a82f 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_0.8.1.bb @@ -26,7 +26,12 @@ EXTRA_OECMAKE = "-DBUILD_CODE_GEN=ON \ S = "${WORKDIR}/git" -FILES_${PN}_remove = "${sysconfdir}" -FILES_${PN}-ptest += "${sysconfdir}/dbus-1/system.d/" -FILES_${PN}-ptest += "${libdir}/${BPN}/tests" +do_install_append() { + if ! ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then + rm -rf ${D}${sysconfdir}/dbus-1 + fi +} + +PTEST_PATH = "${libdir}/${BPN}/tests" +FILES_${PN}-ptest =+ "${sysconfdir}/dbus-1/system.d/" FILES_${PN}-dev += "${bindir}/sdbus-c++-xml2cpp" diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Use-__builtin_bswap32-on-Clang-if-supported.patch b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Use-__builtin_bswap32-on-Clang-if-supported.patch deleted file mode 100644 index e713665ab..000000000 --- a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Use-__builtin_bswap32-on-Clang-if-supported.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7b5dd67fee58f9f54c8a676abe2131776c0a3c52 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 20 Nov 2019 13:41:39 -0800 -Subject: [PATCH] Use __builtin_bswap32 on Clang if supported - -clang pretends to be gcc 4.2.1 so GCC_VERSION macro will decide that -__builtin_bswap32 is not supported on clang, whereas in reality it might -so its better to add a check for enquiring clang if it supports -__builtin_bswap32 or not - -Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/83] -Signed-off-by: Khem Raj ---- - lib/kcapi-kdf.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/lib/kcapi-kdf.c b/lib/kcapi-kdf.c -index 9e53a0b..f32fbe9 100644 ---- a/lib/kcapi-kdf.c -+++ b/lib/kcapi-kdf.c -@@ -54,10 +54,14 @@ - #include "kcapi.h" - #include "internal.h" - -+#ifndef __has_builtin -+# define __has_builtin(x) 0 -+#endif -+ - #define GCC_VERSION (__GNUC__ * 10000 \ - + __GNUC_MINOR__ * 100 \ - + __GNUC_PATCHLEVEL__) --#if GCC_VERSION >= 40400 -+#if GCC_VERSION >= 40400 || (defined(__clang__) && __has_builtin(__builtin_bswap32)) - # define __HAVE_BUILTIN_BSWAP32__ - #endif - --- -2.24.0 - diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kdf-Move-code-to-fix.patch b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kdf-Move-code-to-fix.patch deleted file mode 100644 index 7ed9caf09..000000000 --- a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kdf-Move-code-to-fix.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 8f961521add49278b48c9721fc53e05ee3543b74 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 16 Nov 2019 23:03:51 -0800 -Subject: [PATCH] kcapi-kdf: Move code to fix - -Fixes clang build -unused function '_bswap32' [-Werror,-Wunused-function] - -Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/83] -Signed-off-by: Khem Raj ---- - lib/kcapi-kdf.c | 37 +++++++++++++++++-------------------- - 1 file changed, 17 insertions(+), 20 deletions(-) - -diff --git a/lib/kcapi-kdf.c b/lib/kcapi-kdf.c -index ea39846..9e53a0b 100644 ---- a/lib/kcapi-kdf.c -+++ b/lib/kcapi-kdf.c -@@ -54,6 +54,20 @@ - #include "kcapi.h" - #include "internal.h" - -+#define GCC_VERSION (__GNUC__ * 10000 \ -+ + __GNUC_MINOR__ * 100 \ -+ + __GNUC_PATCHLEVEL__) -+#if GCC_VERSION >= 40400 -+# define __HAVE_BUILTIN_BSWAP32__ -+#endif -+ -+/* Endian dependent byte swap operations. */ -+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -+# define be_bswap32(x) ((uint32_t)(x)) -+#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -+# ifdef __HAVE_BUILTIN_BSWAP32__ -+# define be_bswap32(x) (uint32_t)__builtin_bswap32((uint32_t)(x)) -+# else - static inline uint32_t rol32(uint32_t x, int n) - { - return ( (x << (n&(32-1))) | (x >> ((32-n)&(32-1))) ); -@@ -68,27 +82,10 @@ static inline uint32_t _bswap32(uint32_t x) - { - return ((rol32(x, 8) & 0x00ff00ffL) | (ror32(x, 8) & 0xff00ff00L)); - } -- --#define GCC_VERSION (__GNUC__ * 10000 \ -- + __GNUC_MINOR__ * 100 \ -- + __GNUC_PATCHLEVEL__) --#if GCC_VERSION >= 40400 --# define __HAVE_BUILTIN_BSWAP32__ --#endif -- --#ifdef __HAVE_BUILTIN_BSWAP32__ --# define _swap32(x) (uint32_t)__builtin_bswap32((uint32_t)(x)) --#else --# define _swap32(x) _bswap32(x) --#endif -- --/* Endian dependent byte swap operations. */ --#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ --# define be_bswap32(x) ((uint32_t)(x)) --#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ --# define be_bswap32(x) _swap32(x) -+# define be_bswap32(x) _bswap32(x) -+# endif - #else --#error "Endianess not defined" -+# error "endianess not defined" - #endif - - DSO_PUBLIC --- -2.24.0 - diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.0.bb b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.0.bb new file mode 100644 index 000000000..b478e4c58 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "Linux Kernel Crypto API User Space Interface Library" +HOMEPAGE = "http://www.chronox.de/libkcapi.html" +LICENSE = "BSD | GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=c78be93ed8d1637f2a3f4a83ff9d5f54" + +DEPENDS = "libtool" + +S = "${WORKDIR}/git" +SRCREV = "8397f0f7c45264a3b9aff5a1f9119df25eeb4c60" +SRC_URI = "git://github.com/smuellerDD/libkcapi.git" + +inherit autotools + +PACKAGECONFIG ??= "" +PACKAGECONFIG[testapp] = "--enable-kcapi-test,,,bash" +PACKAGECONFIG[apps] = "--enable-kcapi-speed --enable-kcapi-hasher --enable-kcapi-rngapp --enable-kcapi-encapp --enable-kcapi-dgstapp,,," + +do_install_append() { + # bindir contains testapp and apps. However it is always created, even + # when no binaries are installed (empty bin_PROGRAMS in Makefile.am), + rmdir --ignore-fail-on-non-empty ${D}${bindir} + + # Remove the generated binary checksum files + rm -f ${D}${bindir}/.*.hmac + rm -f ${D}${libdir}/.*.hmac +} + +CPPFLAGS_append_libc-musl_toolchain-clang = " -Wno-error=sign-compare" diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb deleted file mode 100644 index 4e217a351..000000000 --- a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Linux Kernel Crypto API User Space Interface Library" -HOMEPAGE = "http://www.chronox.de/libkcapi.html" -LICENSE = "BSD | GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=14d5a68b28755c04ebdba226e888b157" - -DEPENDS = "libtool" - -S = "${WORKDIR}/git" -SRCREV = "5649050d201856bf06c8738b5d2aa1710c86ac2f" -PV = "1.1.5" -SRC_URI = " \ - git://github.com/smuellerDD/libkcapi.git \ - file://0001-kcapi-kdf-Move-code-to-fix.patch \ - file://0001-Use-__builtin_bswap32-on-Clang-if-supported.patch \ -" - -inherit autotools - -PACKAGECONFIG ??= "" -PACKAGECONFIG[testapp] = "--enable-kcapi-test,,,bash" -PACKAGECONFIG[apps] = "--enable-kcapi-speed --enable-kcapi-hasher --enable-kcapi-rngapp --enable-kcapi-encapp --enable-kcapi-dgstapp,,," - -do_install_append() { - # bindir contains testapp and apps. However it is always created, even - # when no binaries are installed (empty bin_PROGRAMS in Makefile.am), - rmdir --ignore-fail-on-non-empty ${D}${bindir} - - # Remove the generated binary checksum files - rm -f ${D}${bindir}/.*.hmac - rm -f ${D}${libdir}/.*.hmac -} - -CPPFLAGS_append_libc-musl_toolchain-clang = " -Wno-error=sign-compare" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.4.12.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.4.12.bb deleted file mode 100644 index e1a038dfa..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.4.12.bb +++ /dev/null @@ -1,20 +0,0 @@ -require mariadb.inc -inherit native - -PROVIDES += "mysql5-native" -DEPENDS = "ncurses-native zlib-native bison-native" - -RDEPENDS_${PN} = "" -PACKAGES = "" -EXTRA_OEMAKE = "" - -do_install() { - oe_runmake 'DESTDIR=${D}' install - - install -d ${D}${bindir} - install -m 0755 sql/gen_lex_hash ${D}${bindir}/ - install -m 0755 sql/gen_lex_token ${D}${bindir}/ - install -m 0755 extra/comp_err ${D}${bindir}/ - install -m 0755 scripts/comp_sql ${D}${bindir}/ -} - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb new file mode 100644 index 000000000..73b2a0980 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.4.bb @@ -0,0 +1,20 @@ +require mariadb.inc +inherit native + +PROVIDES += "mysql5-native" +DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native" + +RDEPENDS_${PN} = "" +PACKAGES = "" +EXTRA_OEMAKE = "" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + + install -d ${D}${bindir} + install -m 0755 sql/gen_lex_hash ${D}${bindir}/ + install -m 0755 sql/gen_lex_token ${D}${bindir}/ + install -m 0755 extra/comp_err ${D}${bindir}/ + install -m 0755 scripts/comp_sql ${D}${bindir}/ +} + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 95f5acba1..1aa1f68cd 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -18,11 +18,10 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://c11_atomics.patch \ file://clang_version_header_conflict.patch \ file://fix-arm-atomic.patch \ - file://0001-Fix-build-breakage-from-lock_guard-error-6161.patch \ file://0001-Fix-library-LZ4-lookup.patch \ + file://0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch \ " -SRC_URI[md5sum] = "97d7c0f508c04a31c138fdb24e95dbc4" -SRC_URI[sha256sum] = "fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208" +SRC_URI[sha256sum] = "26db2becc9cec37e99a4e73390bd2eaa74568e21f9cf110359f4f68b37154c72" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -78,6 +77,7 @@ EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \ -DNROFF=FALSE \ -DENABLE_DTRACE=FALSE \ -DWITH_PIC=ON \ + -DWITH_PCRE=system \ -DINSTALL_LAYOUT=RPM \ -DINSTALL_DOCDIR:PATH=${datadir}/doc/${BPN} \ -DINSTALL_LIBDIR:PATH=${baselib} \ @@ -169,8 +169,12 @@ do_install() { mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/ fi if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then - mv ${D}/lib/security ${D}/${libdir} - rmdir --ignore-fail-on-non-empty ${D}/lib + pam_so=$(find ${D} -name pam_user_map.so) + if [ x"${pam_so}" != x ]; then + pam_dir=$(dirname ${pam_so}) + mv ${pam_dir} ${D}/${libdir} + rmdir --ignore-fail-on-non-empty ${pam_dir%security} + fi fi } diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch deleted file mode 100644 index 87c70617a..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch +++ /dev/null @@ -1,32 +0,0 @@ -Subject: [PATCH] Fix build breakage from lock_guard error (#6161) - -Summary: -This change fixes a source issue that caused compile time error which -breaks build for many fbcode services in that setup. The size() member -function of channel is a const member, so member variables accessed -within it are implicitly const as well. This caused error when clang -fails to resolve to a constructor that takes std::mutex because the -suitable constructor got rejected due to loss of constness for its -argument. The fix is to add mutable modifier to the lock_ member of -channel. - -Pull Request resolved: https://github.com/facebook/rocksdb/pull/6161 - -Differential Revision: D18967685 - -Pulled By: maysamyabandeh - -Upstream-Status: Backport - -fbshipit-source-id:698b6a5153c3c92eeacb842c467aa28cc350d432 ---- a/storage/rocksdb/rocksdb/util/channel.h -+++ b/storage/rocksdb/rocksdb/util/channel.h -@@ -60,7 +60,7 @@ class channel { - - private: - std::condition_variable cv_; -- std::mutex lock_; -+ mutable std::mutex lock_; - std::queue buffer_; - bool eof_; - }; diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch new file mode 100644 index 000000000..1856c1af7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-23137-RocksDB-undefined-reference-to-crc32c_arm.patch @@ -0,0 +1,48 @@ +From d88ea260882ca414e940cd6af225617f00503f71 Mon Sep 17 00:00:00 2001 +From: Krunal Bauskar +Date: Mon, 27 Jul 2020 18:38:10 +0800 +Subject: [PATCH] MDEV-23137: RocksDB: undefined reference to crc32c_arm64 + +RocksDB fails to build on arm64: undefined reference to + `crc32c_arm64(unsigned int, unsigned char const*, unsigned int)' + +MariaDB uses storage/rocksdb/build_rocksdb.cmake to compile RocksDB. +Said cmake missed adding crc32c_arm64 compilation target so if +machine native architecture supported crc32 then complier would enable +usage of function defined in crc32c_arm64 causing the listed error. + +Added crc32c_arm64 complition target. + +closes #1642 + +Upstream-Status: Backport + +Signed-off-by: Mingli Yu +--- + storage/rocksdb/build_rocksdb.cmake | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake +index 3f3dca7e990..7d2252c5f77 100644 +--- a/storage/rocksdb/build_rocksdb.cmake ++++ b/storage/rocksdb/build_rocksdb.cmake +@@ -442,6 +442,16 @@ else() + util/crc32c_ppc.c + util/crc32c_ppc_asm.S) + endif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") ++ # aarch ++ if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") ++ CHECK_CXX_COMPILER_FLAG("-march=armv8-a+crc+crypto" HAS_ARMV8_CRC) ++ if(HAS_ARMV8_CRC) ++ message(STATUS " HAS_ARMV8_CRC yes") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crc+crypto -Wno-unused-function") ++ list(APPEND ROCKSDB_SOURCES ++ util/crc32c_arm64.cc) ++ endif(HAS_ARMV8_CRC) ++ endif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64") + endif() + SET(SOURCES) + FOREACH(s ${ROCKSDB_SOURCES}) +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch index 169986130..36217f9aa 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch @@ -1,7 +1,7 @@ -Author: Vicențiu Ciorbaru -Date: Fri Dec 21 19:14:04 2018 +0200 - - Link with libatomic to enable C11 atomics support +From 976468458d53d8bb71acf48ddfc852a60557acb9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= +Date: Thu, 23 Jul 2020 00:02:21 -0700 +Subject: [PATCH] Link with libatomic to enable C11 atomics support Some architectures (mips) require libatomic to support proper atomic operations. Check first if support is available without @@ -9,10 +9,18 @@ Date: Fri Dec 21 19:14:04 2018 +0200 Upstream-Status: Pending Signed-off-by: Khem Raj +Signed-off-by: Mingli Yu +--- + configure.cmake | 20 +++++++++++++++++++- + mysys/CMakeLists.txt | 4 ++++ + sql/CMakeLists.txt | 4 ++++ + 3 files changed, 27 insertions(+), 1 deletion(-) +diff --git a/configure.cmake b/configure.cmake +index a355214..6ee595f 100644 --- a/configure.cmake +++ b/configure.cmake -@@ -926,7 +926,25 @@ int main() +@@ -865,7 +865,25 @@ int main() long long int *ptr= &var; return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); }" @@ -39,10 +47,12 @@ Signed-off-by: Khem Raj IF(WITH_VALGRIND) SET(HAVE_valgrind 1) +diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt +index 3d8a20e..42f1441 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt -@@ -78,6 +78,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings - ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY}) +@@ -129,6 +129,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} + ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO}) DTRACE_INSTRUMENT(mysys) +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) @@ -52,9 +62,11 @@ Signed-off-by: Khem Raj IF(HAVE_BFD_H) TARGET_LINK_LIBRARIES(mysys bfd) ENDIF(HAVE_BFD_H) +diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt +index 616017b..53575f6 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt -@@ -178,6 +178,10 @@ ELSE() +@@ -219,6 +219,10 @@ ELSE() SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) ENDIF() @@ -62,6 +74,9 @@ Signed-off-by: Khem Raj + TARGET_LINK_LIBRARIES(sql atomic) +ENDIF() + - - IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS) - + IF(MSVC) + SET(libs_to_export_symbols sql mysys dbug strings) + # Create shared library of already compiled object +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch index afc1be47b..4cb044339 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch @@ -1,6 +1,6 @@ -From 796464015bffe6e0beca9e1c355b223512803c3e Mon Sep 17 00:00:00 2001 +From cfce1491827e5a581878b5e166bf4d30e6d90e07 Mon Sep 17 00:00:00 2001 From: Mingli Yu -Date: Wed, 27 Feb 2019 23:01:00 -0800 +Date: Thu, 23 Jul 2020 00:08:16 -0700 Subject: [PATCH] sql/CMakeLists.txt: fix gen_lex_hash not found Fix the below do_compile issue in cross-compiling env. @@ -10,18 +10,17 @@ Fix the below do_compile issue in cross-compiling env. Upstream-Status: Inappropriate [oe build specific] Signed-off-by: Mingli Yu - --- sql/CMakeLists.txt | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt -index c6910f46..bf51f4cb 100644 +index 0dc3caa..616017b 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt -@@ -50,11 +50,16 @@ ${WSREP_INCLUDES} - - +@@ -52,11 +52,16 @@ ${CMAKE_BINARY_DIR}/sql + ${CMAKE_SOURCE_DIR}/tpool + ) -ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h @@ -39,9 +38,9 @@ index c6910f46..bf51f4cb 100644 + COMMAND gen_lex_token > lex_token.h) +ENDIF() - ADD_DEFINITIONS(-DMYSQL_SERVER -DHAVE_EVENT_SCHEDULER) - -@@ -370,11 +375,16 @@ IF(NOT CMAKE_CROSSCOMPILING) + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.yy +@@ -345,11 +350,16 @@ IF(NOT CMAKE_CROSSCOMPILING) ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) ENDIF() @@ -61,5 +60,8 @@ index c6910f46..bf51f4cb 100644 + COMMAND gen_lex_hash > lex_hash.h) +ENDIF() - MYSQL_ADD_EXECUTABLE(mysql_tzinfo_to_sql tztime.cc COMPONENT Server) - SET_TARGET_PROPERTIES(mysql_tzinfo_to_sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL") + MYSQL_ADD_EXECUTABLE(mariadb-tzinfo-to-sql tztime.cc COMPONENT Server) + SET_TARGET_PROPERTIES(mariadb-tzinfo-to-sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL") +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.4.12.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.4.12.bb deleted file mode 100644 index c0b53379d..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.4.12.bb +++ /dev/null @@ -1,27 +0,0 @@ -require mariadb.inc - -EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" - -DEPENDS += "mariadb-native bison-native openssl ncurses zlib libaio libedit libevent libxml2" - -PROVIDES += "mysql5 libmysqlclient" - -RPROVIDES_${PN} += "mysql5" -RREPLACES_${PN} += "mysql5" -RCONFLICTS_${PN} += "mysql5" - -RPROVIDES_${PN}-dbg += "mysql5-dbg" -RREPLACES_${PN}-dbg += "mysql5-dbg" -RCONFLICTS_${PN}-dbg += "mysql5-dbg" - -RPROVIDES_${PN}-leftovers += "mysql5-leftovers" -RREPLACES_${PN}-leftovers += "mysql5-leftovers" -RCONFLICTS_${PN}-leftovers += "mysql5-leftovers" - -RPROVIDES_${PN}-client += "mysql5-client" -RREPLACES_${PN}-client += "mysql5-client" -RCONFLICTS_${PN}-client += "mysql5-client" - -RPROVIDES_${PN}-server += "mysql5-server" -RREPLACES_${PN}-server += "mysql5-server" -RCONFLICTS_${PN}-server += "mysql5-server" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb new file mode 100644 index 000000000..e6743fe97 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.4.bb @@ -0,0 +1,27 @@ +require mariadb.inc + +EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" + +DEPENDS += "mariadb-native bison-native libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" + +PROVIDES += "mysql5 libmysqlclient" + +RPROVIDES_${PN} += "mysql5" +RREPLACES_${PN} += "mysql5" +RCONFLICTS_${PN} += "mysql5" + +RPROVIDES_${PN}-dbg += "mysql5-dbg" +RREPLACES_${PN}-dbg += "mysql5-dbg" +RCONFLICTS_${PN}-dbg += "mysql5-dbg" + +RPROVIDES_${PN}-leftovers += "mysql5-leftovers" +RREPLACES_${PN}-leftovers += "mysql5-leftovers" +RCONFLICTS_${PN}-leftovers += "mysql5-leftovers" + +RPROVIDES_${PN}-client += "mysql5-client" +RREPLACES_${PN}-client += "mysql5-client" +RCONFLICTS_${PN}-client += "mysql5-client" + +RPROVIDES_${PN}-server += "mysql5-server" +RREPLACES_${PN}-server += "mysql5-server" +RCONFLICTS_${PN}-server += "mysql5-server" diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb index e874e4a5e..8efa31e95 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -37,22 +37,22 @@ python () { if arch == "aarch64": tunes = d.getVar("TUNE_FEATURES") if not tunes: - raise bb.parse.SkipPackage("%s-%s Needs support for crypto on armv8" % (pkgn, pkgv)) + raise bb.parse.SkipRecipe("%s-%s Needs support for crypto on armv8" % (pkgn, pkgv)) return pkgn = d.getVar("PN") pkgv = d.getVar("PV") if "crypto" not in tunes: - raise bb.parse.SkipPackage("%s-%s Needs support for crypto on armv8" % (pkgn, pkgv)) + raise bb.parse.SkipRecipe("%s-%s Needs support for crypto on armv8" % (pkgn, pkgv)) if arch == "x86_64": tunes = d.getVar("TUNE_FEATURES") if not tunes: - raise bb.parse.SkipPackage("%s-%s Needs support for corei7 on x86_64" % (pkgn, pkgv)) + raise bb.parse.SkipRecipe("%s-%s Needs support for corei7 on x86_64" % (pkgn, pkgv)) return pkgn = d.getVar("PN") pkgv = d.getVar("PV") if "corei7" not in tunes: - raise bb.parse.SkipPackage("%s-%s Needs support for corei7 on x86_64" % (pkgn, pkgv)) + raise bb.parse.SkipRecipe("%s-%s Needs support for corei7 on x86_64" % (pkgn, pkgv)) } diff --git a/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb b/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb new file mode 100644 index 000000000..6d4635b66 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/boost-url/boost-url_git.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Boost.URL is a library for manipulating Uniform Resource Identifiers (URI) and Locators (URL)" +HOMEPAGE = "https://github.com/CPPAlliance/url" +SECTION = "libs" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +SRC_URI = "git://github.com/CPPAlliance/url.git" + +SRCREV = "a56ae0df6d3078319755fbaa67822b4fa7fd352b" + +S = "${WORKDIR}/git" + +inherit cmake + +DEPENDS = "boost" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.7.0.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.7.0.bb deleted file mode 100644 index c6bab5ec2..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.7.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Cap'n Proto serialization/RPC system" -DESCRIPTION = "Cap’n Proto is an insanely fast data interchange format and capability-based RPC system. " -HOMEPAGE = "https://github.com/sandstorm-io/capnproto" -SECTION = "console/tools" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" - -SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV}" -SRCREV = "3f44c6db0f0f6c0cab0633f15f15d0a2acd01d19" - -S = "${WORKDIR}/git/c++" - -inherit cmake - -EXTRA_OECMAKE += "\ - -DBUILD_TESTING=OFF \ -" - -FILES_${PN}-compiler = "${bindir}" - -PACKAGE_BEFORE_PN = "${PN}-compiler" -RDEPENDS_${PN}-dev += "${PN}-compiler" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb new file mode 100644 index 000000000..71f94badf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.8.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Cap'n Proto serialization/RPC system" +DESCRIPTION = "Cap’n Proto is an insanely fast data interchange format and capability-based RPC system. " +HOMEPAGE = "https://github.com/sandstorm-io/capnproto" +SECTION = "console/tools" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" + +SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV}" +SRCREV = "57a4ca5af5a7f55b768a9d9d6655250bffb1257f" + +S = "${WORKDIR}/git/c++" + +inherit cmake + +EXTRA_OECMAKE += "\ + -DBUILD_TESTING=OFF \ +" + +FILES_${PN}-compiler = "${bindir}" + +PACKAGE_BEFORE_PN = "${PN}-compiler" +RDEPENDS_${PN}-dev += "${PN}-compiler" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb new file mode 100644 index 000000000..7f6c34eb3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "JSON schema validator for JSON for Modern C++" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c441d022da1b1663c70181a32225d006" + +SRC_URI = "git://github.com/pboettch/json-schema-validator" +SRCREV = "27fc1d094503623dfe39365ba82581507524545c" + +S = "${WORKDIR}/git" + +DEPENDS += "nlohmann-json" + +inherit cmake +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF" + diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb index 97c6361ad..e41907de4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.3.bb @@ -11,6 +11,8 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b" +PE = "1" + SRCREV = "6aba23f4a8628d599a9ef7fa4811c4ff6e4070e2" SRC_URI = "git://github.com/open-source-parsers/jsoncpp" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-Fix-build-with-libmicrohttpd.patch b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-Fix-build-with-libmicrohttpd.patch new file mode 100644 index 000000000..a4cacb3fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-Fix-build-with-libmicrohttpd.patch @@ -0,0 +1,52 @@ +From d983161415f5f5748fbdbaa5fbd168154ccf8867 Mon Sep 17 00:00:00 2001 +From: Zang Ruochen +Date: Wed, 5 Aug 2020 12:31:24 +0900 +Subject: [PATCH] Fix build with libmicrohttpd 0.9.71 + +--- + src/jsonrpccpp/server/connectors/httpserver.cpp | 2 +- + src/jsonrpccpp/server/connectors/httpserver.h | 8 +++++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/jsonrpccpp/server/connectors/httpserver.cpp b/src/jsonrpccpp/server/connectors/httpserver.cpp +index a849615..dd3b841 100644 +--- a/src/jsonrpccpp/server/connectors/httpserver.cpp ++++ b/src/jsonrpccpp/server/connectors/httpserver.cpp +@@ -151,7 +151,7 @@ void HttpServer::SetUrlHandler(const string &url, + this->SetHandler(NULL); + } + +-int HttpServer::callback(void *cls, MHD_Connection *connection, const char *url, ++mhd_result HttpServer::callback(void *cls, MHD_Connection *connection, const char *url, + const char *method, const char *version, + const char *upload_data, size_t *upload_data_size, + void **con_cls) { +diff --git a/src/jsonrpccpp/server/connectors/httpserver.h b/src/jsonrpccpp/server/connectors/httpserver.h +index 7785edb..0dcf032 100644 +--- a/src/jsonrpccpp/server/connectors/httpserver.h ++++ b/src/jsonrpccpp/server/connectors/httpserver.h +@@ -32,6 +32,12 @@ typedef intptr_t ssize_t; + #include + #include + ++#if MHD_VERSION >= 0x00097002 ++# define mhd_result enum MHD_Result ++#else ++# define mhd_result int ++#endif ++ + namespace jsonrpc { + /** + * This class provides an embedded HTTP Server, based on libmicrohttpd, to +@@ -79,7 +85,7 @@ private: + std::map urlhandler; + struct sockaddr_in loopback_addr; + +- static int callback(void *cls, struct MHD_Connection *connection, ++ static mhd_result callback(void *cls, struct MHD_Connection *connection, + const char *url, const char *method, const char *version, + const char *upload_data, size_t *upload_data_size, + void **con_cls); +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb index ca9675ed6..0ae39765f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.3.0.bb @@ -9,7 +9,10 @@ SECTION = "libs" DEPENDS = "curl jsoncpp libmicrohttpd hiredis" -SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp" +SRC_URI = "git://github.com/cinemast/libjson-rpc-cpp \ + file://0001-Fix-build-with-libmicrohttpd.patch \ +" + SRCREV = "c696f6932113b81cd20cd4a34fdb1808e773f23e" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/lua/lua/CVE-2020-15888.patch b/meta-openembedded/meta-oe/recipes-devtools/lua/lua/CVE-2020-15888.patch new file mode 100644 index 000000000..60a412597 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/lua/lua/CVE-2020-15888.patch @@ -0,0 +1,45 @@ +From 6298903e35217ab69c279056f925fb72900ce0b7 Mon Sep 17 00:00:00 2001 +From: Roberto Ierusalimschy +Date: Mon, 6 Jul 2020 12:11:54 -0300 +Subject: [PATCH] Keep minimum size when shrinking a stack + +When shrinking a stack (during GC), do not make it smaller than the +initial stack size. +--- + ldo.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +==== end of original header ==== + +CVE: CVE-2020-15888 + +Upstream-Status: backport [https://github.com/lua/lua.git] + +Signed-off-by: Joe Slater + +==== +diff --git a/ldo.c b/ldo.c +index c563b1d9..a89ac010 100644 +--- a/src/ldo.c ++++ b/src/ldo.c +@@ -220,7 +220,7 @@ static int stackinuse (lua_State *L) { + + void luaD_shrinkstack (lua_State *L) { + int inuse = stackinuse(L); +- int goodsize = inuse + (inuse / 8) + 2*EXTRA_STACK; ++ int goodsize = inuse + BASIC_STACK_SIZE; + if (goodsize > LUAI_MAXSTACK) + goodsize = LUAI_MAXSTACK; /* respect stack limit */ + if (L->stacksize > LUAI_MAXSTACK) /* had been handling stack overflow? */ +@@ -229,8 +229,7 @@ void luaD_shrinkstack (lua_State *L) { + luaE_shrinkCI(L); /* shrink list */ + /* if thread is currently not handling a stack overflow and its + good size is smaller than current size, shrink its stack */ +- if (inuse <= (LUAI_MAXSTACK - EXTRA_STACK) && +- goodsize < L->stacksize) ++ if (inuse <= (LUAI_MAXSTACK - EXTRA_STACK) && goodsize < L->stacksize) + luaD_reallocstack(L, goodsize); + else /* don't change stack */ + condmovestack(L,{},{}); /* (change only for debugging) */ +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb b/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb index a23a4a5da..d3461b06d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.5.bb @@ -7,6 +7,7 @@ HOMEPAGE = "http://www.lua.org/" SRC_URI = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \ file://lua.pc.in \ file://0001-Allow-building-lua-without-readline-on-Linux.patch \ + file://CVE-2020-15888.patch \ " # if no test suite matches PV release of Lua exactly, download the suite for the closest Lua release. diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json/0001-Templatize-basic_json-ctor-from-json_ref.patch b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json/0001-Templatize-basic_json-ctor-from-json_ref.patch deleted file mode 100644 index aea48b60a..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json/0001-Templatize-basic_json-ctor-from-json_ref.patch +++ /dev/null @@ -1,99 +0,0 @@ -From ec955f08b47ab7cb81f6e4a4c3e7b331ddf50f71 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+git@gmail.com> -Date: Sun, 12 Apr 2020 22:32:39 +0300 -Subject: [PATCH] Templatize basic_json ctor from json_ref - -Upstream-Status: Backport [https://github.com/nlohmann/json/commit/ec955f08b47ab7cb81f6e4a4c3e7b331ddf50f71] -Signed-off-by: Andrew Geissler - ---- - include/nlohmann/detail/meta/type_traits.hpp | 13 ++++++++++++ - include/nlohmann/json.hpp | 8 ++++---- - single_include/nlohmann/json.hpp | 21 ++++++++++++++++---- - 3 files changed, 34 insertions(+), 8 deletions(-) - -diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp -index 280f6953..dd0b3084 100644 ---- a/include/nlohmann/detail/meta/type_traits.hpp -+++ b/include/nlohmann/detail/meta/type_traits.hpp -@@ -41,6 +41,19 @@ template struct is_basic_json : std::false_type {}; - NLOHMANN_BASIC_JSON_TPL_DECLARATION - struct is_basic_json : std::true_type {}; - -+////////////////////// -+// jspn_ref helpers // -+////////////////////// -+ -+template -+class json_ref; -+ -+template -+struct is_json_ref : std::false_type {}; -+ -+template -+struct is_json_ref> : std::true_type {}; -+ - ////////////////////////// - // aliases for detected // - ////////////////////////// -diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp -index 336d69fe..0598efc8 100644 ---- a/include/nlohmann/json.hpp -+++ b/include/nlohmann/json.hpp -@@ -1773,10 +1773,10 @@ class basic_json - // other constructors and destructor // - /////////////////////////////////////// - -- /// @private -- basic_json(const detail::json_ref& ref) -- : basic_json(ref.moved_or_copied()) -- {} -+ template , -+ std::is_same>::value, int> = 0 > -+ basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {} - - /*! - @brief copy constructor -diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp -index 09464f3b..8927180e 100644 ---- a/single_include/nlohmann/json.hpp -+++ b/single_include/nlohmann/json.hpp -@@ -2794,6 +2794,19 @@ template struct is_basic_json : std::false_type {}; - NLOHMANN_BASIC_JSON_TPL_DECLARATION - struct is_basic_json : std::true_type {}; - -+////////////////////// -+// jspn_ref helpers // -+////////////////////// -+ -+template -+class json_ref; -+ -+template -+struct is_json_ref : std::false_type {}; -+ -+template -+struct is_json_ref> : std::true_type {}; -+ - ////////////////////////// - // aliases for detected // - ////////////////////////// -@@ -16632,10 +16645,10 @@ class basic_json - // other constructors and destructor // - /////////////////////////////////////// - -- /// @private -- basic_json(const detail::json_ref& ref) -- : basic_json(ref.moved_or_copied()) -- {} -+ template , -+ std::is_same>::value, int> = 0 > -+ basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {} - - /*! - @brief copy constructor --- -2.21.0 (Apple Git-122) - diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json/0001-typo-fix.patch b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json/0001-typo-fix.patch deleted file mode 100644 index 6af4e9740..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json/0001-typo-fix.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 70be9751cd60e622ce6463f41d47c02fc2d83cbc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Art=C3=B6m=20Bakri=20Al-Sarmini?= <3sz3tt+git@gmail.com> -Date: Sun, 12 Apr 2020 23:42:26 +0300 -Subject: [PATCH] typo fix - -Upstream-Status: Backport [https://github.com/nlohmann/json/commit/70be9751cd60e622ce6463f41d47c02fc2d83cbc] - -Signed-off-by: Andrew Geissler - ---- - include/nlohmann/detail/meta/type_traits.hpp | 2 +- - single_include/nlohmann/json.hpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp -index dd0b3084..13e92cb4 100644 ---- a/include/nlohmann/detail/meta/type_traits.hpp -+++ b/include/nlohmann/detail/meta/type_traits.hpp -@@ -42,7 +42,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION - struct is_basic_json : std::true_type {}; - - ////////////////////// --// jspn_ref helpers // -+// json_ref helpers // - ////////////////////// - - template -diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp -index 8927180e..294e7509 100644 ---- a/single_include/nlohmann/json.hpp -+++ b/single_include/nlohmann/json.hpp -@@ -2795,7 +2795,7 @@ NLOHMANN_BASIC_JSON_TPL_DECLARATION - struct is_basic_json : std::true_type {}; - - ////////////////////// --// jspn_ref helpers // -+// json_ref helpers // - ////////////////////// - - template --- -2.21.0 (Apple Git-122) - diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb deleted file mode 100644 index 5766194d2..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.7.3.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "JSON for modern C++" -HOMEPAGE = "https://nlohmann.github.io/json/" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f5f7c71504da070bcf4f090205ce1080" - -SRC_URI = "git://github.com/nlohmann/json.git;nobranch=1 \ - file://0001-Templatize-basic_json-ctor-from-json_ref.patch \ - file://0001-typo-fix.patch \ - " - -SRCREV = "e7b3b40b5a95bc74b9a7f662830a27c49ffc01b4" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE += "-DJSON_BuildTests=OFF" - -# nlohmann-json is a header only C++ library, so the main package will be empty. - -RDEPENDS_${PN}-dev = "" - -BBCLASSEXTEND = "native nativesdk" - -# other packages commonly reference the file directly as "json.hpp" -# create symlink to allow this usage -do_install_append() { - ln -s nlohmann/json.hpp ${D}${includedir}/json.hpp -} diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.9.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.9.0.bb new file mode 100644 index 000000000..0f5ef7052 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.9.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "JSON for modern C++" +HOMEPAGE = "https://nlohmann.github.io/json/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=dd0607f896f392c8b7d0290a676efc24" + +SRC_URI = "git://github.com/nlohmann/json.git;nobranch=1 \ + " + +SRCREV = "d34771cafc87b358ba421faca28facc7f8080174" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE += "-DJSON_BuildTests=OFF" + +# nlohmann-json is a header only C++ library, so the main package will be empty. + +RDEPENDS_${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" + +# other packages commonly reference the file directly as "json.hpp" +# create symlink to allow this usage +do_install_append() { + ln -s nlohmann/json.hpp ${D}${includedir}/json.hpp +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch deleted file mode 100644 index 13edf229b..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-allow-passing-multiple-libs-to-pkg_config.patch +++ /dev/null @@ -1,41 +0,0 @@ -From fdaa0e3bef93c5c72a7258b5f1e30718e7d81f9b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= -Date: Mon, 2 Mar 2020 12:17:09 +0000 -Subject: [PATCH 1/2] build: allow passing multiple libs to pkg_config -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Sometimes it's necessary to pass multiple library names to pkg-config, -e.g. the brotli shared libraries can be pulled in with - pkg-config libbrotlienc libbrotlidec - -Update the code to handle both, strings (as used so far), and lists -of strings. - -Signed-off-by: André Draszik ---- -Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046] - configure.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.py b/configure.py -index beb08df088..e3f78f2fed 100755 ---- a/configure.py -+++ b/configure.py -@@ -680,7 +680,11 @@ def pkg_config(pkg): - retval = () - for flag in ['--libs-only-l', '--cflags-only-I', - '--libs-only-L', '--modversion']: -- args += [flag, pkg] -+ args += [flag] -+ if isinstance(pkg, list): -+ args += pkg -+ else: -+ args += [pkg] - try: - proc = subprocess.Popen(shlex.split(pkg_config) + args, - stdout=subprocess.PIPE) --- -2.25.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-V8-backport-3f8dc4b2e5ba.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-V8-backport-3f8dc4b2e5ba.patch deleted file mode 100644 index 07dbdfe56..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-deps-V8-backport-3f8dc4b2e5ba.patch +++ /dev/null @@ -1,194 +0,0 @@ -From 836311710ca8d49fdf4d619e3a738a445c413605 Mon Sep 17 00:00:00 2001 -From: Ujjwal Sharma -Date: Wed, 22 Apr 2020 12:20:17 +0530 -Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Original commit message: - - [intl] Remove soon-to-be removed getAllFieldPositions - - Needed to land ICU67.1 soon. - - Bug: v8:10393 - Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618 - Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489 - Reviewed-by: Jakob Kummerow - Commit-Queue: Frank Tang - Cr-Commit-Position: refs/heads/master@{#67027} - -Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463 - -PR-URL: https://github.com/nodejs/node/pull/32993 -Reviewed-By: Michaël Zasso -Reviewed-By: Matheus Marchini -Reviewed-By: Steven R Loomis -Reviewed-By: Richard Lau ---- - common.gypi | 2 +- - deps/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------ - 2 files changed, 38 insertions(+), 36 deletions(-) - -diff --git a/common.gypi b/common.gypi -index b86e5e0..a7b37e6 100644 ---- a/common.gypi -+++ b/common.gypi -@@ -38,7 +38,7 @@ - - # Reset this number to 0 on major V8 upgrades. - # Increment by one for each non-official patch applied to deps/v8. -- 'v8_embedder_string': '-node.16', -+ 'v8_embedder_string': '-node.17', - - ##### V8 defaults for Node.js ##### - -diff --git a/deps/v8/src/objects/js-number-format.cc b/deps/v8/src/objects/js-number-format.cc -index d1e3ef4..757c665 100644 ---- a/deps/v8/src/objects/js-number-format.cc -+++ b/deps/v8/src/objects/js-number-format.cc -@@ -1252,42 +1252,31 @@ MaybeHandle JSNumberFormat::New(Isolate* isolate, - } - - namespace { --Maybe IcuFormatNumber( -+Maybe IcuFormatNumber( - Isolate* isolate, - const icu::number::LocalizedNumberFormatter& number_format, -- Handle numeric_obj, icu::FieldPositionIterator* fp_iter) { -+ Handle numeric_obj, icu::number::FormattedNumber* formatted) { - // If it is BigInt, handle it differently. - UErrorCode status = U_ZERO_ERROR; -- icu::number::FormattedNumber formatted; - if (numeric_obj->IsBigInt()) { - Handle big_int = Handle::cast(numeric_obj); - Handle big_int_string; - ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string, - BigInt::ToString(isolate, big_int), -- Nothing()); -- formatted = number_format.formatDecimal( -+ Nothing()); -+ *formatted = number_format.formatDecimal( - {big_int_string->ToCString().get(), big_int_string->length()}, status); - } else { - double number = numeric_obj->Number(); -- formatted = number_format.formatDouble(number, status); -+ *formatted = number_format.formatDouble(number, status); - } - if (U_FAILURE(status)) { - // This happen because of icu data trimming trim out "unit". - // See https://bugs.chromium.org/p/v8/issues/detail?id=8641 -- THROW_NEW_ERROR_RETURN_VALUE(isolate, -- NewTypeError(MessageTemplate::kIcuError), -- Nothing()); -- } -- if (fp_iter) { -- formatted.getAllFieldPositions(*fp_iter, status); -+ THROW_NEW_ERROR_RETURN_VALUE( -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing()); - } -- icu::UnicodeString result = formatted.toString(status); -- if (U_FAILURE(status)) { -- THROW_NEW_ERROR_RETURN_VALUE(isolate, -- NewTypeError(MessageTemplate::kIcuError), -- Nothing()); -- } -- return Just(result); -+ return Just(true); - } - - } // namespace -@@ -1298,10 +1287,16 @@ MaybeHandle JSNumberFormat::FormatNumeric( - Handle numeric_obj) { - DCHECK(numeric_obj->IsNumeric()); - -- Maybe maybe_format = -- IcuFormatNumber(isolate, number_format, numeric_obj, nullptr); -+ icu::number::FormattedNumber formatted; -+ Maybe maybe_format = -+ IcuFormatNumber(isolate, number_format, numeric_obj, &formatted); - MAYBE_RETURN(maybe_format, Handle()); -- return Intl::ToString(isolate, maybe_format.FromJust()); -+ UErrorCode status = U_ZERO_ERROR; -+ icu::UnicodeString result = formatted.toString(status); -+ if (U_FAILURE(status)) { -+ THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String); -+ } -+ return Intl::ToString(isolate, result); - } - - namespace { -@@ -1414,12 +1409,18 @@ std::vector FlattenRegionsToParts( - } - - namespace { --Maybe ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, -- icu::FieldPositionIterator* fp_iter, -+Maybe ConstructParts(Isolate* isolate, -+ icu::number::FormattedNumber* formatted, - Handle result, int start_index, - Handle numeric_obj, bool style_is_unit) { -+ UErrorCode status = U_ZERO_ERROR; -+ icu::UnicodeString formatted_text = formatted->toString(status); -+ if (U_FAILURE(status)) { -+ THROW_NEW_ERROR_RETURN_VALUE( -+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing()); -+ } - DCHECK(numeric_obj->IsNumeric()); -- int32_t length = formatted.length(); -+ int32_t length = formatted_text.length(); - int index = start_index; - if (length == 0) return Just(index); - -@@ -1428,13 +1429,14 @@ Maybe ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, - // other region covers some part of the formatted string. It's possible - // there's another field with exactly the same begin and end as this backdrop, - // in which case the backdrop's field_id of -1 will give it lower priority. -- regions.push_back(NumberFormatSpan(-1, 0, formatted.length())); -+ regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length())); - - { -- icu::FieldPosition fp; -- while (fp_iter->next(fp)) { -- regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(), -- fp.getEndIndex())); -+ icu::ConstrainedFieldPosition cfp; -+ cfp.constrainCategory(UFIELD_CATEGORY_NUMBER); -+ while (formatted->nextPosition(cfp, status)) { -+ regions.push_back( -+ NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit())); - } - } - -@@ -1456,7 +1458,7 @@ Maybe ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, - Handle substring; - ASSIGN_RETURN_ON_EXCEPTION_VALUE( - isolate, substring, -- Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos), -+ Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos), - Nothing()); - Intl::AddElement(isolate, result, index, field_type_string, substring); - ++index; -@@ -1476,14 +1478,14 @@ MaybeHandle JSNumberFormat::FormatToParts( - number_format->icu_number_formatter().raw(); - CHECK_NOT_NULL(fmt); - -- icu::FieldPositionIterator fp_iter; -- Maybe maybe_format = -- IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter); -+ icu::number::FormattedNumber formatted; -+ Maybe maybe_format = -+ IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted); - MAYBE_RETURN(maybe_format, Handle()); - - Handle result = factory->NewJSArray(0); - Maybe maybe_format_to_parts = ConstructParts( -- isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj, -+ isolate, &formatted, result, 0, numeric_obj, - number_format->style() == JSNumberFormat::Style::UNIT); - MAYBE_RETURN(maybe_format_to_parts, Handle()); - --- -2.26.2 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch deleted file mode 100644 index fc038f3aa..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0002-build-allow-use-of-system-installed-brotli.patch +++ /dev/null @@ -1,66 +0,0 @@ -From f0f927feee8cb1fb173835d5c3f6beb6bf7d5e54 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= -Date: Mon, 2 Mar 2020 12:17:35 +0000 -Subject: [PATCH 2/2] build: allow use of system-installed brotli -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -brotli is available as a shared library since 2016, so it makes sense -to allow its use as a system-installed version. - -Some of the infrastructure was in place already (node.gyp and -node.gypi), but some bits in the configure script here were missing. - -Add them, keeping the default as before, to use the bundled version. - -Refs: https://github.com/google/brotli/pull/421 -Signed-off-by: André Draszik ---- -Upstream-Status: Submitted [https://github.com/nodejs/node/pull/32046] - configure.py | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git a/configure.py b/configure.py -index e3f78f2fed..0190e31b41 100755 ---- a/configure.py -+++ b/configure.py -@@ -301,6 +301,27 @@ shared_optgroup.add_option('--shared-zlib-libpath', - dest='shared_zlib_libpath', - help='a directory to search for the shared zlib DLL') - -+shared_optgroup.add_option('--shared-brotli', -+ action='store_true', -+ dest='shared_brotli', -+ help='link to a shared brotli DLL instead of static linking') -+ -+shared_optgroup.add_option('--shared-brotli-includes', -+ action='store', -+ dest='shared_brotli_includes', -+ help='directory containing brotli header files') -+ -+shared_optgroup.add_option('--shared-brotli-libname', -+ action='store', -+ dest='shared_brotli_libname', -+ default='brotlidec,brotlienc', -+ help='alternative lib name to link to [default: %default]') -+ -+shared_optgroup.add_option('--shared-brotli-libpath', -+ action='store', -+ dest='shared_brotli_libpath', -+ help='a directory to search for the shared brotli DLL') -+ - shared_optgroup.add_option('--shared-cares', - action='store_true', - dest='shared_cares', -@@ -1692,6 +1713,7 @@ configure_napi(output) - configure_library('zlib', output) - configure_library('http_parser', output) - configure_library('libuv', output) -+configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc']) - configure_library('cares', output, pkgname='libcares') - configure_library('nghttp2', output, pkgname='libnghttp2') - configure_v8(output) --- -2.25.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch index 599f742b2..92386fa77 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Install-both-binaries-and-use-libdir.patch @@ -20,11 +20,9 @@ Signed-off-by: Andreas Müller tools/install.py | 31 ++++++++++++++----------------- 2 files changed, 21 insertions(+), 17 deletions(-) -diff --git a/configure.py b/configure.py -index 20cce214db..e2d78a2a51 100755 --- a/configure.py +++ b/configure.py -@@ -559,6 +559,12 @@ parser.add_option('--shared', +@@ -602,6 +602,12 @@ parser.add_option('--shared', help='compile shared library for embedding node in another project. ' + '(This mode is not officially supported for regular applications)') @@ -37,16 +35,14 @@ index 20cce214db..e2d78a2a51 100755 parser.add_option('--without-v8-platform', action='store_true', dest='without_v8_platform', -@@ -1103,6 +1109,7 @@ def configure_node(o): - if o['variables']['want_separate_host_toolset'] == 0: - o['variables']['node_code_cache'] = 'yes' # For testing +@@ -1168,6 +1174,7 @@ def configure_node(o): + o['variables']['node_no_browser_globals'] = b(options.no_browser_globals) + o['variables']['node_shared'] = b(options.shared) + o['variables']['libdir'] = options.libdir node_module_version = getmoduleversion.get_version() - if sys.platform == 'darwin': -diff --git a/tools/install.py b/tools/install.py -index 655802980a..fe4723bf15 100755 + if options.dest_os == 'android': --- a/tools/install.py +++ b/tools/install.py @@ -121,26 +121,23 @@ def subdir_files(path, dest, action): @@ -72,24 +68,20 @@ index 655802980a..fe4723bf15 100755 - # in its source - see the _InstallableTargetInstallPath function. - if sys.platform != 'darwin': - output_prefix += 'lib.target/' -- -- if 'false' == variables.get('node_shared'): -- action([output_prefix + output_file], 'bin/' + output_file) -- else: -- action([output_prefix + output_file], 'lib/' + output_file) + output_bin = 'node' + output_lib = 'libnode.' + variables.get('shlib_suffix') + # GYP will output to lib.target except on OS X, this is hardcoded + # in its source - see the _InstallableTargetInstallPath function. + if sys.platform != 'darwin': + output_libprefix += 'lib.target/' -+ + +- if 'false' == variables.get('node_shared'): +- action([output_prefix + output_file], 'bin/' + output_file) +- else: +- action([output_prefix + output_file], 'lib/' + output_file) + action([output_prefix + output_bin], 'bin/' + output_bin) + if 'true' == variables.get('node_shared'): + action([output_libprefix + output_lib], variables.get('libdir') + '/' + output_lib) if 'true' == variables.get('node_use_dtrace'): action(['out/Release/node.d'], 'lib/dtrace/node.d') --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb deleted file mode 100644 index 9f9f320aa..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.14.1.bb +++ /dev/null @@ -1,164 +0,0 @@ -DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" -HOMEPAGE = "http://nodejs.org" -LICENSE = "MIT & BSD & Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=be4d5107c64dc3d7c57e3797e1a0674b" - -DEPENDS = "openssl" -DEPENDS_append_class-target = " nodejs-native" - -inherit pkgconfig python3native - -COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" -COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" -COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" - -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" - -SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ - file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ - file://0003-Install-both-binaries-and-use-libdir.patch \ - file://0004-v8-don-t-override-ARM-CFLAGS.patch \ - file://big-endian.patch \ - file://0001-build-allow-passing-multiple-libs-to-pkg_config.patch \ - file://0002-build-allow-use-of-system-installed-brotli.patch \ - file://mips-warnings.patch \ - file://0001-deps-V8-backport-3f8dc4b2e5ba.patch \ - " -SRC_URI_append_class-target = " \ - file://0002-Using-native-binaries.patch \ - " - -SRC_URI[md5sum] = "1c78a75f5c95321f533ecccca695e814" -SRC_URI[sha256sum] = "877b4b842318b0e09bc754faf7343f2f097f0fc4f88ab9ae57cf9944e88e7adb" - -S = "${WORKDIR}/node-v${PV}" - -# v8 errors out if you have set CCACHE -CCACHE = "" - -def map_nodejs_arch(a, d): - import re - - if re.match('i.86$', a): return 'ia32' - elif re.match('x86_64$', a): return 'x64' - elif re.match('aarch64$', a): return 'arm64' - elif re.match('(powerpc64|ppc64le)$', a): return 'ppc64' - elif re.match('powerpc$', a): return 'ppc' - return a - -ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \ - ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \ - bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \ - bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \ - '--with-arm-fpu=vfp', d), d), d)}" -GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " -ARCHFLAGS ?= "" - -PACKAGECONFIG ??= "ares brotli icu libuv zlib" -PACKAGECONFIG[ares] = "--shared-cares,,c-ares" -PACKAGECONFIG[brotli] = "--shared-brotli,,brotli" -PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" -PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" -PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" -PACKAGECONFIG[shared] = "--shared" -PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" - -# We don't want to cross-compile during target compile, -# and we need to use the right flags during host compile, -# too. -EXTRA_OEMAKE = "\ - CC.host='${CC}' \ - CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \ - CXX.host='${CXX}' \ - CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \ - LDFLAGS.host='${LDFLAGS}' \ - AR.host='${AR}' \ - \ - builddir_name=./ \ -" - -python do_unpack() { - import shutil - - bb.build.exec_func('base_do_unpack', d) - - shutil.rmtree(d.getVar('S') + '/deps/openssl', True) - if 'ares' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/cares', True) - if 'brotli' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/brotli', True) - if 'libuv' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/uv', True) - if 'nghttp2' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/nghttp2', True) - if 'zlib' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/zlib', True) -} - -# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi -do_configure () { - export LD="${CXX}" - GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES - # $TARGET_ARCH settings don't match --dest-cpu settings - python3 configure.py --prefix=${prefix} --cross-compiling --without-snapshot --shared-openssl \ - --without-dtrace \ - --without-etw \ - --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ - --dest-os=linux \ - --libdir=${D}${libdir} \ - ${ARCHFLAGS} \ - ${PACKAGECONFIG_CONFARGS} -} - -do_compile () { - export LD="${CXX}" - oe_runmake BUILDTYPE=Release -} - -do_install () { - oe_runmake install DESTDIR=${D} - - # wasn't updated since 2009 and is the only thing requiring python2 in runtime - # ERROR: nodejs-12.14.1-r0 do_package_qa: QA Issue: /usr/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples contained in package nodejs-npm requires /usr/bin/python, but no providers found in RDEPENDS_nodejs-npm? [file-rdeps] - rm -f ${D}${exec_prefix}/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples -} - -do_install_append_class-native() { - # use node from PATH instead of absolute path to sysroot - # node-v0.10.25/tools/install.py is using: - # shebang = os.path.join(node_prefix, 'bin/node') - # update_shebang(link_path, shebang) - # and node_prefix can be very long path to bindir in native sysroot and - # when it exceeds 128 character shebang limit it's stripped to incorrect path - # and npm fails to execute like in this case with 133 characters show in log.do_install: - # updating shebang of /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/work/x86_64-linux/nodejs-native/0.10.15-r0/image/home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/npm to /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/node - # /usr/bin/npm is symlink to /usr/lib/node_modules/npm/bin/npm-cli.js - # use sed on npm-cli.js because otherwise symlink is replaced with normal file and - # npm-cli.js continues to use old shebang - sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js - - # Install the native binaries to provide it within sysroot for the target compilation - install -d ${D}${bindir} - install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque - install -m 0755 ${S}/out/Release/bytecode_builtins_list_generator ${D}${bindir}/bytecode_builtins_list_generator - if ${@bb.utils.contains('PACKAGECONFIG','icu','true','false',d)}; then - install -m 0755 ${S}/out/Release/gen-regexp-special-case ${D}${bindir}/gen-regexp-special-case - fi - install -m 0755 ${S}/out/Release/mkcodecache ${D}${bindir}/mkcodecache - install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot -} - -do_install_append_class-target() { - sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js -} - -PACKAGES =+ "${PN}-npm" -FILES_${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx" -RDEPENDS_${PN}-npm = "bash python3-core python3-shell python3-datetime \ - python3-misc python3-multiprocessing" - -PACKAGES =+ "${PN}-systemtap" -FILES_${PN}-systemtap = "${datadir}/systemtap" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb new file mode 100644 index 000000000..8a9f32bce --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_12.18.3.bb @@ -0,0 +1,160 @@ +DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" +HOMEPAGE = "http://nodejs.org" +LICENSE = "MIT & BSD & Artistic-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=30e27bd6830002d9415e4a5da7901f03" + +DEPENDS = "openssl" +DEPENDS_append_class-target = " nodejs-native" + +inherit pkgconfig python3native + +COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" +COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" +COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" + +COMPATIBLE_HOST_riscv64 = "null" +COMPATIBLE_HOST_riscv32 = "null" + +SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ + file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ + file://0003-Install-both-binaries-and-use-libdir.patch \ + file://0004-v8-don-t-override-ARM-CFLAGS.patch \ + file://big-endian.patch \ + file://mips-warnings.patch \ + " +SRC_URI_append_class-target = " \ + file://0002-Using-native-binaries.patch \ + " +SRC_URI[sha256sum] = "71158026579487422fd13cc2553b34cddb76519098aa6030faab52f88c6e0d0e" + +S = "${WORKDIR}/node-v${PV}" + +# v8 errors out if you have set CCACHE +CCACHE = "" + +def map_nodejs_arch(a, d): + import re + + if re.match('i.86$', a): return 'ia32' + elif re.match('x86_64$', a): return 'x64' + elif re.match('aarch64$', a): return 'arm64' + elif re.match('(powerpc64|ppc64le)$', a): return 'ppc64' + elif re.match('powerpc$', a): return 'ppc' + return a + +ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \ + ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \ + bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \ + bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \ + '--with-arm-fpu=vfp', d), d), d)}" +GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " +ARCHFLAGS ?= "" + +PACKAGECONFIG ??= "ares brotli icu zlib" + +PACKAGECONFIG[ares] = "--shared-cares,,c-ares" +PACKAGECONFIG[brotli] = "--shared-brotli,,brotli" +PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" +PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" +PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" +PACKAGECONFIG[shared] = "--shared" +PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" + +# We don't want to cross-compile during target compile, +# and we need to use the right flags during host compile, +# too. +EXTRA_OEMAKE = "\ + CC.host='${CC}' \ + CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \ + CXX.host='${CXX}' \ + CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \ + LDFLAGS.host='${LDFLAGS}' \ + AR.host='${AR}' \ + \ + builddir_name=./ \ +" + +python do_unpack() { + import shutil + + bb.build.exec_func('base_do_unpack', d) + + shutil.rmtree(d.getVar('S') + '/deps/openssl', True) + if 'ares' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/cares', True) + if 'brotli' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/brotli', True) + if 'libuv' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/uv', True) + if 'nghttp2' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/nghttp2', True) + if 'zlib' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/zlib', True) +} + +# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi +do_configure () { + export LD="${CXX}" + GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES + # $TARGET_ARCH settings don't match --dest-cpu settings + python3 configure.py --prefix=${prefix} --cross-compiling --without-snapshot --shared-openssl \ + --without-dtrace \ + --without-etw \ + --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ + --dest-os=linux \ + --libdir=${D}${libdir} \ + ${ARCHFLAGS} \ + ${PACKAGECONFIG_CONFARGS} +} + +do_compile () { + export LD="${CXX}" + oe_runmake BUILDTYPE=Release +} + +do_install () { + oe_runmake install DESTDIR=${D} + + # wasn't updated since 2009 and is the only thing requiring python2 in runtime + # ERROR: nodejs-12.14.1-r0 do_package_qa: QA Issue: /usr/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples contained in package nodejs-npm requires /usr/bin/python, but no providers found in RDEPENDS_nodejs-npm? [file-rdeps] + rm -f ${D}${exec_prefix}/lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples +} + +do_install_append_class-native() { + # use node from PATH instead of absolute path to sysroot + # node-v0.10.25/tools/install.py is using: + # shebang = os.path.join(node_prefix, 'bin/node') + # update_shebang(link_path, shebang) + # and node_prefix can be very long path to bindir in native sysroot and + # when it exceeds 128 character shebang limit it's stripped to incorrect path + # and npm fails to execute like in this case with 133 characters show in log.do_install: + # updating shebang of /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/work/x86_64-linux/nodejs-native/0.10.15-r0/image/home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/npm to /home/jenkins/workspace/build-webos-nightly/device/qemux86/label/open-webos-builder/BUILD-qemux86/sysroots/x86_64-linux/usr/bin/node + # /usr/bin/npm is symlink to /usr/lib/node_modules/npm/bin/npm-cli.js + # use sed on npm-cli.js because otherwise symlink is replaced with normal file and + # npm-cli.js continues to use old shebang + sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js + + # Install the native binaries to provide it within sysroot for the target compilation + install -d ${D}${bindir} + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque + install -m 0755 ${S}/out/Release/bytecode_builtins_list_generator ${D}${bindir}/bytecode_builtins_list_generator + if ${@bb.utils.contains('PACKAGECONFIG','icu','true','false',d)}; then + install -m 0755 ${S}/out/Release/gen-regexp-special-case ${D}${bindir}/gen-regexp-special-case + fi + install -m 0755 ${S}/out/Release/mkcodecache ${D}${bindir}/mkcodecache + install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot +} + +do_install_append_class-target() { + sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js +} + +PACKAGES =+ "${PN}-npm" +FILES_${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx" +RDEPENDS_${PN}-npm = "bash python3-core python3-shell python3-datetime \ + python3-misc python3-multiprocessing" + +PACKAGES =+ "${PN}-systemtap" +FILES_${PN}-systemtap = "${datadir}/systemtap" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-bitbang-Make-bitbang_swd-extern-definition.patch b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-bitbang-Make-bitbang_swd-extern-definition.patch new file mode 100644 index 000000000..d42b628da --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-bitbang-Make-bitbang_swd-extern-definition.patch @@ -0,0 +1,42 @@ +From 428f9f3c4a5be973e4c7fc1325ae9dbe41040df2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Aug 2020 17:47:35 -0700 +Subject: [PATCH] bitbang: Make bitbang_swd extern definition + +Fixes build with gcc10+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/jtag/drivers/bitbang.c | 1 + + src/jtag/drivers/bitbang.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/jtag/drivers/bitbang.c b/src/jtag/drivers/bitbang.c +index b5078c080..f8612aade 100644 +--- a/src/jtag/drivers/bitbang.c ++++ b/src/jtag/drivers/bitbang.c +@@ -43,6 +43,7 @@ static int bitbang_stableclocks(int num_cycles); + static void bitbang_swd_write_reg(uint8_t cmd, uint32_t value, uint32_t ap_delay_clk); + + struct bitbang_interface *bitbang_interface; ++const struct swd_driver bitbang_swd; + + /* DANGER!!!! clock absolutely *MUST* be 0 in idle or reset won't work! + * +diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h +index 577717ebd..0faf5d9ae 100644 +--- a/src/jtag/drivers/bitbang.h ++++ b/src/jtag/drivers/bitbang.h +@@ -57,7 +57,7 @@ struct bitbang_interface { + void (*swdio_drive)(bool on); + }; + +-const struct swd_driver bitbang_swd; ++extern const struct swd_driver bitbang_swd; + + extern bool swd_mode; + +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb index f01b224fa..c7d754fdb 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -10,6 +10,7 @@ SRC_URI = " \ git://repo.or.cz/r/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \ file://0001-Do-not-include-syscrtl.h-with-glibc.patch \ + file://0001-bitbang-Make-bitbang_swd-extern-definition.patch \ " SRCREV_FORMAT = "openocd" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20180523.0.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20180523.0.bb deleted file mode 100644 index c812ae137..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20180523.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "\ -IPC::Run allows you run and interact with child processes \ -using files, pipes, and pseudo-ttys. Both system()-style and scripted \ -usages are supported and may be mixed. Likewise, functional and OO API \ -styles are both supported and may be mixed." -HOMEPAGE = "https://metacpan.org/release/IPC-Run" -SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0ebd37caf53781e8b7223e6b99b63f4e" -DEPENDS = "perl" - -SRC_URI = "git://github.com/toddr/IPC-Run.git" -SRCREV = "0b409702490729eeb97ae65f5b94d949ec083134" - -S = "${WORKDIR}/git" - -inherit cpan - -EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" - -do_compile() { - export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')" - cpan_do_compile -} diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20200505.0.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20200505.0.bb new file mode 100644 index 000000000..27dc358d1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20200505.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "\ +IPC::Run allows you run and interact with child processes \ +using files, pipes, and pseudo-ttys. Both system()-style and scripted \ +usages are supported and may be mixed. Likewise, functional and OO API \ +styles are both supported and may be mixed." +HOMEPAGE = "https://metacpan.org/release/IPC-Run" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0ebd37caf53781e8b7223e6b99b63f4e" +DEPENDS = "perl" + +SRC_URI = "git://github.com/toddr/IPC-Run.git" +SRCREV = "af435a1635ef9e48a84adc3230099e7ecf20c79d" + +S = "${WORKDIR}/git" + +inherit cpan + +EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" + +do_compile() { + export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')" + cpan_do_compile +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_0.3.bb b/meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_0.3.bb new file mode 100644 index 000000000..049cdeffc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_0.3.bb @@ -0,0 +1,36 @@ +SUMMARY = "Header-only C++ library for JSON Schema validation" +HOMEPAGE = "https://github.com/tristanpenman/valijson" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=015106c62262b2383f6c72063f0998f2" + +SRC_URI = "git://github.com/tristanpenman/valijson.git" +SRCREV = "7a52fc88cdffd6678c009ca2fad700151f7363c6" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DINSTALL_HEADERS=1 -DBUILD_TESTS=0" + +DEPENDS = "curlpp" + +# valijson is a header only C++ library, so the main package will be empty. +RDEPENDS_${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" + +do_install() { + install -d ${D}${includedir}/compat + install -d ${D}${includedir}/valijson + install -d ${D}${includedir}/valijson/adapters + install -d ${D}${includedir}/valijson/constraints + install -d ${D}${includedir}/valijson/internal + install -d ${D}${includedir}/valijson/utils + + install -m 0644 ${S}/include/compat/* ${D}${includedir}/compat + install -D -m 0644 ${S}/include/valijson/*.hpp -t ${D}${includedir}/valijson + install -D -m 0644 ${S}/include/valijson/adapters/*.hpp -t ${D}${includedir}/valijson/adapters + install -D -m 0644 ${S}/include/valijson/constraints/*.hpp -t ${D}${includedir}/valijson/constraints + install -D -m 0644 ${S}/include/valijson/internal/*.hpp -t ${D}${includedir}/valijson/internal + install -D -m 0644 ${S}/include/valijson/utils/*.hpp -t ${D}${includedir}/valijson/utils +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_git.bb b/meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_git.bb deleted file mode 100644 index c3254d16e..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Header-only C++ library for JSON Schema validation" -HOMEPAGE = "https://github.com/tristanpenman/valijson" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=015106c62262b2383f6c72063f0998f2" - -SRC_URI = "git://github.com/tristanpenman/valijson.git" -PV = "0.1+git${SRCPV}" - -SRCREV = "c2f22fddf599d04dc33fcd7ed257c698a05345d9" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DINSTALL_HEADERS=1 -DBUILD_TESTS=0" - -# valijson is a header only C++ library, so the main package will be empty. -RDEPENDS_${PN}-dev = "" - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb deleted file mode 100644 index 6c31b6981..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.51.03.bb +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION = "XML-RPC for C/C++ is programming libraries and related tools to help you \ -write an XML-RPC server or client in C or C++." - -HOMEPAGE = "http://xmlrpc-c.sourceforge.net/" -LICENSE = "BSD & MIT" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951" - -SRC_URI = "git://github.com/mirror/xmlrpc-c.git \ - file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \ - file://0002-fix-formatting-issues.patch \ - " -#Release 1.51.03 -SRCREV = "343a3b98e54999d67edb644bcd395aa9784fb16e" - -S = "${WORKDIR}/git/stable" - -DEPENDS = "libxml2" - -inherit autotools-brokensep binconfig pkgconfig - -TARGET_CFLAGS += "-Wno-narrowing" - -EXTRA_OEMAKE += "CC_FOR_BUILD='${BUILD_CC}' \ - LD_FOR_BUILD='${BUILD_LD}' \ - CFLAGS_FOR_BUILD='${BUILD_CFLAGS}' \ - LDFLAGS_FOR_BUILD='${BUILD_LDFLAGS}' \ - " - -EXTRA_OECONF += "--disable-libwww-client --disable-wininet-client" - -PACKAGECONFIG ??= "curl cplusplus" - -PACKAGECONFIG[abyss] = "--enable-abyss-server --enable-abyss-threads --enable-abyss-openssl,--disable-abyss-server --disable-abyss-threads --disable-abyss-openssl,openssl," -PACKAGECONFIG[cplusplus] = "--enable-cplusplus,--disable-cplusplus,," -PACKAGECONFIG[curl] = "--enable-curl-client,--disable-curl-client,curl,curl" - -do_configure() { - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} - autoconf - oe_runconf - # license is incompatible with lib/util/getoptx.* - rm -fv ${S}/tools/turbocharger/mod_gzip.c -} - -BBCLASSEXTEND = "native" - -CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb new file mode 100644 index 000000000..c1f0b78ca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.54.02.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "XML-RPC for C/C++ is programming libraries and related tools to help you \ +write an XML-RPC server or client in C or C++." + +HOMEPAGE = "http://xmlrpc-c.sourceforge.net/" +LICENSE = "BSD & MIT" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=aefbf81ba0750f02176b6f86752ea951" + +SRC_URI = "git://github.com/mirror/xmlrpc-c.git \ + file://0001-test-cpp-server_abyss-Fix-build-with-clang-libc.patch \ + file://0002-fix-formatting-issues.patch \ + " + +#Release 1.54.02 +SRCREV = "86405c7e1bd4f70287204a28d242a1054daab520" + +S = "${WORKDIR}/git/stable" + +DEPENDS = "libxml2" + +inherit autotools-brokensep binconfig pkgconfig + +TARGET_CFLAGS += "-Wno-narrowing" + +EXTRA_OEMAKE += "CC_FOR_BUILD='${BUILD_CC}' \ + LD_FOR_BUILD='${BUILD_LD}' \ + CFLAGS_FOR_BUILD='${BUILD_CFLAGS}' \ + LDFLAGS_FOR_BUILD='${BUILD_LDFLAGS}' \ + " + +EXTRA_OECONF += "--disable-libwww-client --disable-wininet-client" + +PACKAGECONFIG ??= "curl cplusplus" + +PACKAGECONFIG[abyss] = "--enable-abyss-server --enable-abyss-threads --enable-abyss-openssl,--disable-abyss-server --disable-abyss-threads --disable-abyss-openssl,openssl," +PACKAGECONFIG[cplusplus] = "--enable-cplusplus,--disable-cplusplus,," +PACKAGECONFIG[curl] = "--enable-curl-client,--disable-curl-client,curl,curl" + +do_configure() { + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + autoconf + oe_runconf + # license is incompatible with lib/util/getoptx.* + rm -fv ${S}/tools/turbocharger/mod_gzip.c +} + +BBCLASSEXTEND = "native" + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190808.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190808.bb deleted file mode 100644 index a1acfcd00..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20190808.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "display dialog boxes from shell scripts" -DESCRIPTION = "Dialog lets you to present a variety of questions \ -or display messages using dialog boxes from a shell \ -script (or any scripting language)." -HOMEPAGE = "http://invisible-island.net/dialog/" -SECTION = "console/utils" -DEPENDS = "ncurses" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ - " -SRC_URI[md5sum] = "f48b597251a26c522002736652e0300c" -SRC_URI[sha256sum] = "886e12f2cf3df36cde65f32f6ae52bc598eb2599a611b1d8ce5dfdea599e47e2" - -# hardcoded here for use in dialog-static recipe -S = "${WORKDIR}/dialog-${PV}" - -inherit autotools-brokensep pkgconfig - -EXTRA_OECONF = "--with-ncurses \ - --disable-rpath-hack" - -do_configure() { - gnu-configize --force - sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure - sed -i 's,cf_have_ncuconfig=unknown,cf_have_ncuconfig=yes,g' -i configure - oe_runconf -} diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20200327.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20200327.bb new file mode 100644 index 000000000..4c3177c05 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20200327.bb @@ -0,0 +1,33 @@ +SUMMARY = "display dialog boxes from shell scripts" +DESCRIPTION = "Dialog lets you to present a variety of questions \ +or display messages using dialog boxes from a shell \ +script (or any scripting language)." +HOMEPAGE = "http://invisible-island.net/dialog/" +SECTION = "console/utils" +DEPENDS = "ncurses" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" + +SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz \ + " +SRC_URI[md5sum] = "f7a3c240af305b5282af590541e8f4b7" +SRC_URI[sha256sum] = "466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99" + +# hardcoded here for use in dialog-static recipe +S = "${WORKDIR}/dialog-${PV}" + +inherit autotools-brokensep pkgconfig + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" + +PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" + +EXTRA_OECONF = "--with-ncurses \ + --disable-rpath-hack" + +do_configure() { + gnu-configize --force + sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure + sed -i 's,cf_have_ncuconfig=unknown,cf_have_ncuconfig=yes,g' -i configure + oe_runconf +} diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch deleted file mode 100644 index f0fc0bcb2..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/204.patch +++ /dev/null @@ -1,148 +0,0 @@ -Upstream-Status: Submitted [https://github.com/GENIVI/dlt-daemon/pull/204] -From 92830aff6e91041f574753d78da758c62981d9a4 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Sat, 25 Jan 2020 09:08:07 +0100 -Subject: [PATCH 1/3] dlt_user.h: fix build when musl is the libc - implementation, by adding a missing include for pthread_t reference: - -see https://errors.yoctoproject.org/Errors/Details/308000/ for details - -Thanks Khem Raj for the report - -Signed-off-by: Gianfranco Costamagna -Signed-off-by: Gianfranco Costamagna ---- - include/dlt/dlt_user.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h -index 69cb854..766d349 100644 ---- a/include/dlt/dlt_user.h -+++ b/include/dlt/dlt_user.h -@@ -74,6 +74,7 @@ - \{ - */ - # include -+# include - - # if !defined (__WIN32__) - # include - -From 5f67aba02c12b7446e63ccc86285c13bc5c7a432 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Sat, 25 Jan 2020 09:16:14 +0100 -Subject: [PATCH 2/3] dlt-test-init-free: fix build failure with strict - compiler flags, due to uint being undefined. This is actually an "int" type, - looking at the test implementation - -Signed-off-by: Gianfranco Costamagna -Signed-off-by: Gianfranco Costamagna ---- - src/tests/dlt-test-init-free.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/tests/dlt-test-init-free.c b/src/tests/dlt-test-init-free.c -index 96b5245..35b8803 100644 ---- a/src/tests/dlt-test-init-free.c -+++ b/src/tests/dlt-test-init-free.c -@@ -32,7 +32,7 @@ - - void exec(const char *cmd, char *buffer, size_t length); - void printMemoryUsage(); --char *occupyMemory(uint size); -+char *occupyMemory(int size); - void do_example_test(); - void do_dlt_test(); - -@@ -131,7 +131,7 @@ void printMemoryUsage() - printf("%s", result); - } - --char *occupyMemory(uint size) -+char *occupyMemory(int size) - { - char *buf = (char *)malloc(size * sizeof(char)); - - -From c790d61fad382e5d3e648ee99904087eb9bc4a77 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Sat, 25 Jan 2020 09:20:48 +0100 -Subject: [PATCH 3/3] sys/poll.h: deprecate old sys/poll.h include header, now - glibc/musl wants poll.h being included directly. This fixes a build failure - on musl systems with strict c hardening flags - -Signed-off-by: Gianfranco Costamagna -Signed-off-by: Gianfranco Costamagna ---- - src/console/logstorage/dlt-logstorage-ctrl.c | 2 +- - src/daemon/dlt_daemon_event_handler.c | 2 +- - src/daemon/dlt_daemon_event_handler.h | 2 +- - src/daemon/dlt_daemon_event_handler_types.h | 2 +- - src/lib/dlt_user.c | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/console/logstorage/dlt-logstorage-ctrl.c b/src/console/logstorage/dlt-logstorage-ctrl.c -index 525c137..6614f44 100644 ---- a/src/console/logstorage/dlt-logstorage-ctrl.c -+++ b/src/console/logstorage/dlt-logstorage-ctrl.c -@@ -61,7 +61,7 @@ - #include - #include - --#include -+#include - - #if defined(__linux__) - # include "sd-daemon.h" -diff --git a/src/daemon/dlt_daemon_event_handler.c b/src/daemon/dlt_daemon_event_handler.c -index 1611f7b..0d463da 100644 ---- a/src/daemon/dlt_daemon_event_handler.c -+++ b/src/daemon/dlt_daemon_event_handler.c -@@ -30,7 +30,7 @@ - #include - #include - --#include -+#include - #include - - #include "dlt_common.h" -diff --git a/src/daemon/dlt_daemon_event_handler.h b/src/daemon/dlt_daemon_event_handler.h -index eb96101..bd550d3 100644 ---- a/src/daemon/dlt_daemon_event_handler.h -+++ b/src/daemon/dlt_daemon_event_handler.h -@@ -25,7 +25,7 @@ - * \file dlt_daemon_event_handler.h - */ - --#include -+#include - - #include "dlt_daemon_connection_types.h" - #include "dlt_daemon_event_handler_types.h" -diff --git a/src/daemon/dlt_daemon_event_handler_types.h b/src/daemon/dlt_daemon_event_handler_types.h -index 370e503..0b16d08 100644 ---- a/src/daemon/dlt_daemon_event_handler_types.h -+++ b/src/daemon/dlt_daemon_event_handler_types.h -@@ -25,7 +25,7 @@ - * \file dlt_daemon_event_handler_types.h - */ - --#include -+#include - - #include "dlt_daemon_connection_types.h" - -#diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c -#index ffa9b09..511f991 100644 -#--- a/src/lib/dlt_user.c -#+++ b/src/lib/dlt_user.c -#@@ -43,7 +43,7 @@ -# #include -# -# #include /* writev() */ -#-#include -#+#include -# -# #include -# #ifdef linux diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch new file mode 100644 index 000000000..14c44e6ed --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/238.patch @@ -0,0 +1,35 @@ +From 214f8c71552fc096077f0b916dad75b31eefea3d Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Fri, 31 Jul 2020 15:26:35 +0200 +Subject: [PATCH] dlt_offline: fix build failures with gcc-10 + +see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957140 + +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_client.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_common.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_common.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_connection.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_connection.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: multiple definition of `g_logstorage_cache_size'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:118: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_event_handler.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +/usr/bin/ld: CMakeFiles/dlt-daemon.dir/dlt_daemon_offline_logstorage.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: multiple definition of `g_logstorage_cache_max'; CMakeFiles/dlt-daemon.dir/dlt-daemon.c.o:./obj-x86_64-linux-gnu/src/daemon/./src/offlinelogstorage/dlt_offline_logstorage.h:116: first defined here +--- + src/offlinelogstorage/dlt_offline_logstorage.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h b/src/offlinelogstorage/dlt_offline_logstorage.h +index b58da70..8ad84b8 100644 +--- a/src/offlinelogstorage/dlt_offline_logstorage.h ++++ b/src/offlinelogstorage/dlt_offline_logstorage.h +@@ -114,9 +114,9 @@ + #define DLT_OFFLINE_LOGSTORAGE_IS_STRATEGY_SET(S, s) ((S)&(s)) + + /* logstorage max cache */ +-unsigned int g_logstorage_cache_max; ++static unsigned int g_logstorage_cache_max; + /* current logstorage cache size */ +-unsigned int g_logstorage_cache_size; ++static unsigned int g_logstorage_cache_size; + + typedef struct + { diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch new file mode 100644 index 000000000..7d8f22ec7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch @@ -0,0 +1,30 @@ +From b8f9919f000e642fc8970d0a42c1bdadf5a9d720 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Mon, 10 Aug 2020 08:30:34 +0200 +Subject: [PATCH] sd-daemon.c: Fix build with newer glibc and musl libc + +Reported by Khem Raj on meta-oe list + +TOPDIR/build/tmp/work/armv7vet2hf-neon-yoe-linux-musleabi/dlt-daemon/2.18.5-r0/recipe-sysroot/usr/include/sys/fcntl.h:1:2: error: redirecting incorrect #include to [-Werror,-W#warnings] + ^ +1 error generated. + +Signed-off-by: Gianfranco Costamagna +Signed-off-by: Gianfranco Costamagna +--- + systemd/3rdparty/sd-daemon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/3rdparty/sd-daemon.c b/systemd/3rdparty/sd-daemon.c +index 88936d2..de3f985 100644 +--- a/systemd/3rdparty/sd-daemon.c ++++ b/systemd/3rdparty/sd-daemon.c +@@ -35,7 +35,7 @@ + #ifdef __BIONIC__ + #include + #else +-#include ++#include + #endif + #include + #include diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb deleted file mode 100644 index 35c638bc7..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.4.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Diagnostic Log and Trace" -DESCRIPTION = "This component provides a standardised log and trace interface, \ -based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. \ -This component can be used by GENIVI components and other applications as \ -logging facility providing: \ -- the DLT shared library \ -- the DLT daemon, including startup scripts \ -- the DLT daemon adaptors- the DLT client console utilities \ -- the DLT test applications" -HOMEPAGE = "https://www.genivi.org/" -SECTION = "console/utils" -LICENSE = "MPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" - -DEPENDS = "zlib gzip-native" - -SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ - file://0002-Don-t-execute-processes-as-a-specific-user.patch \ - file://0004-Modify-systemd-config-directory.patch \ - file://204.patch \ -" -SRCREV = "14ea971be7e808b9c5099c7f404ed3cf341873c4" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES','systemd', d)}" -# General options -PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF,,dlt-daemon-systemd" - -# Linux options -PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" -PACKAGECONFIG[systemd-watchdog] = "-DWITH_SYSTEMD_WATCHDOG=ON,-DWITH_SYSTEMD_WATCHDOG=OFF,systemd,libsystemd" -PACKAGECONFIG[systemd-journal] = "-DWITH_SYSTEMD_JOURNAL=ON,-DWITH_SYSTEMD_JOURNAL=OFF,systemd,libsystemd" -PACKAGECONFIG[dlt-dbus] = "-DWITH_DLT_DBUS=ON,-DWITH_DLT_DBUS=OFF,dbus,dbus-lib" -PACKAGECONFIG[udp-connection] = "-DWITH_UDP_CONNECTION=ON,-DWITH_UDP_CONNECTION=OFF" - -# Command line options -PACKAGECONFIG[dlt-system] = "-DWITH_DLT_SYSTEM=ON,-DWITH_DLT_SYSTEM=OFF" -PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF,,dlt-daemon-systemd" -PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd" - -inherit autotools gettext cmake systemd - -EXTRA_OECMAKE += "-DSYSTEMD_UNITDIR=${systemd_system_unitdir}" - -PACKAGES += "${PN}-systemd" -SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" -SYSTEMD_SERVICE_${PN} = " ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'dlt.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-system', 'dlt-system.service', '', d)}" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" -SYSTEMD_SERVICE_${PN}-systemd = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-adaptor', 'dlt-adaptor-udp.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples', 'dlt-example-user.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples dlt-console', 'dlt-receive.service', '', d)} \ -" -SYSTEMD_AUTO_ENABLE_${PN}-systemd = "disable" - -FILES_${PN}-doc += "${datadir}/dlt-filetransfer" - -do_install_append() { - rm -f ${D}${bindir}/dlt-test-* -} diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb new file mode 100644 index 000000000..3a2b40515 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb @@ -0,0 +1,68 @@ +SUMMARY = "Diagnostic Log and Trace" +DESCRIPTION = "This component provides a standardised log and trace interface, \ +based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. \ +This component can be used by GENIVI components and other applications as \ +logging facility providing: \ +- the DLT shared library \ +- the DLT daemon, including startup scripts \ +- the DLT daemon adaptors- the DLT client console utilities \ +- the DLT test applications" +HOMEPAGE = "https://www.genivi.org/" +SECTION = "console/utils" +LICENSE = "MPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" + +DEPENDS = "zlib gzip-native" + +SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ + file://0002-Don-t-execute-processes-as-a-specific-user.patch \ + file://0004-Modify-systemd-config-directory.patch \ + file://238.patch \ + file://241.patch \ +" +SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-console ', '', d)} \ + udp-connection dlt-system dlt-filetransfer " +# dlt-dbus + +# General options +PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF,,dlt-daemon-systemd" + +# Linux options +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" +PACKAGECONFIG[systemd-watchdog] = "-DWITH_SYSTEMD_WATCHDOG=ON,-DWITH_SYSTEMD_WATCHDOG=OFF,systemd,libsystemd" +PACKAGECONFIG[systemd-journal] = "-DWITH_SYSTEMD_JOURNAL=ON,-DWITH_SYSTEMD_JOURNAL=OFF,systemd,libsystemd" +PACKAGECONFIG[dlt-dbus] = "-DWITH_DLT_DBUS=ON,-DWITH_DLT_DBUS=OFF,dbus,dbus-lib" +PACKAGECONFIG[udp-connection] = "-DWITH_UDP_CONNECTION=ON,-DWITH_UDP_CONNECTION=OFF" + +# Command line options +PACKAGECONFIG[dlt-system] = "-DWITH_DLT_SYSTEM=ON,-DWITH_DLT_SYSTEM=OFF" +PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF,,dlt-daemon-systemd" +PACKAGECONFIG[dlt-filetransfer] = "-DWITH_DLT_FILETRANSFER=ON,-DWITH_DLT_FILETRANSFER=OFF" +PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd" + +inherit autotools gettext cmake systemd + +EXTRA_OECMAKE += "-DSYSTEMD_UNITDIR=${systemd_system_unitdir}" + +PACKAGES += "${PN}-systemd" +SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" +SYSTEMD_SERVICE_${PN} = " ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'dlt.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-system', 'dlt-system.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-dbus', 'dlt-dbus.service', '', d)}" +SYSTEMD_AUTO_ENABLE_${PN} = "enable" +SYSTEMD_SERVICE_${PN}-systemd = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-adaptor', 'dlt-adaptor-udp.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples', 'dlt-example-user.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples dlt-console', 'dlt-receive.service', '', d)} \ +" +SYSTEMD_AUTO_ENABLE_${PN}-systemd = "disable" + +FILES_${PN}-doc += "${datadir}/dlt-filetransfer" + +do_install_append() { + rm -f ${D}${bindir}/dlt-test-* +} diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb index 21d13ac93..411268815 100644 --- a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb @@ -54,5 +54,7 @@ EXTRA_OECMAKE_append_riscv64 = " -DFLB_DEPS='atomic'" inherit cmake systemd +CFLAGS += "-fcommon" + SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" diff --git a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb new file mode 100644 index 000000000..894ee52f9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb @@ -0,0 +1,37 @@ +SUMMARY = "USB CEC Adaptor communication Library" +HOMEPAGE = "http://libcec.pulse-eight.com/" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b3a719e97f49e4841e90573f9b1a98ac" + +DEPENDS = "p8platform udev ncurses swig-native python3" + +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', '', d)}" +DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" + +SRCREV = "29d82c80bcc62be2878a9ac080de7eb286c4beb9" +SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release \ + file://0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch \ + file://0001-Enhance-reproducibility.patch \ + " + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +# Put client tools into a separate package +PACKAGE_BEFORE_PN += "${PN}-tools" +FILES_${PN}-tools = "${bindir}" +RDEPENDS_${PN}-tools = "python3-${BPN} python3-core" + +# Create the wrapper for python3 +PACKAGES += "python3-${BPN}" +FILES_python3-${BPN} = "${libdir}/python3* ${bindir}/py*" +RDEPENDS_${PN} = "python3-core" + +# cec-client and xbmc need the .so present to work :( +FILES_${PN} += "${libdir}/*.so" +INSANE_SKIP_${PN} = "dev-so" + +# Adapter shows up as a CDC-ACM device +RRECOMMENDS_${PN} = "kernel-module-cdc-acm" diff --git a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb deleted file mode 100644 index 39ceb489e..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "USB CEC Adaptor communication Library" -HOMEPAGE = "http://libcec.pulse-eight.com/" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b3a719e97f49e4841e90573f9b1a98ac" - -DEPENDS = "p8platform udev ncurses swig-native python3" - -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', '', d)}" -DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" - -PV = "5.0.0" - -SRCREV = "43bc27fe7be491149e6f57d14110e02abdac2f24" -SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release \ - file://0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch \ - file://0001-Enhance-reproducibility.patch \ - " - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -# Put client tools into a separate package -PACKAGE_BEFORE_PN += "${PN}-tools" -FILES_${PN}-tools = "${bindir}" -RDEPENDS_${PN}-tools = "python3-${BPN} python3-core" - -# Create the wrapper for python3 -PACKAGES += "python3-${BPN}" -FILES_python3-${BPN} = "${libdir}/python3* ${bindir}/py*" -RDEPENDS_${PN} = "python3-core" - -# cec-client and xbmc need the .so present to work :( -FILES_${PN} += "${libdir}/*.so" -INSANE_SKIP_${PN} = "dev-so" - -# Adapter shows up as a CDC-ACM device -RRECOMMENDS_${PN} = "kernel-module-cdc-acm" diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb deleted file mode 100644 index 36659e752..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.1.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "A library to handle Apple Property List format whereas it's binary or XML" - -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ - file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7" - -DEPENDS = "libxml2 glib-2.0 swig python3" - -inherit autotools pkgconfig python3native - -SRCREV = "3df02d4d0e9008771e8622fdc10de8333b3f0d85" -SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https \ - " - -S = "${WORKDIR}/git" - -do_install_append () { - if [ -e ${D}${libdir}/python*/site-packages/plist/_plist.so ]; then - chrpath -d ${D}${libdir}/python*/site-packages/plist/_plist.so - fi -} - -PACKAGES =+ "${PN}-utils ${PN}++ ${PN}-python" -FILES_${PN} = "${libdir}/libplist${SOLIBS}" -FILES_${PN}++ = "${libdir}/libplist++${SOLIBS}" -FILES_${PN}-utils = "${bindir}/*" -FILES_${PN}-python = "${libdir}/python*/site-packages/*" - - diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb new file mode 100644 index 000000000..408fa8ac0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "A library to handle Apple Property List format whereas it's binary or XML" +HOMEPAGE = "https://github.com/libimobiledevice/libplist" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ + file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7" + +DEPENDS = "libxml2 glib-2.0 swig python3" + +inherit autotools pkgconfig python3native + +SRCREV = "c5a30e9267068436a75b5d00fcbf95cb9c1f4dcd" +SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https" + +S = "${WORKDIR}/git" + +do_install_append () { + if [ -e ${D}${libdir}/python*/site-packages/plist/_plist.so ]; then + chrpath -d ${D}${libdir}/python*/site-packages/plist/_plist.so + fi +} + +PACKAGES =+ "${PN}-utils \ + ${PN}++ \ + ${PN}-python" + +FILES_${PN} = "${libdir}/libplist-2.0${SOLIBS}" +FILES_${PN}++ = "${libdir}/libplist++-2.0${SOLIBS}" +FILES_${PN}-utils = "${bindir}/*" +FILES_${PN}-python = "${libdir}/python*/site-packages/*" diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb new file mode 100644 index 000000000..343d0bc63 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "This daemon is in charge of multiplexing connections over USB to an iPhone or iPod touch." +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7" + +DEPENDS = "udev libusb1 libplist" + +inherit autotools pkgconfig gitpkgv + +PKGV = "${GITPKGVTAG}" + +SRCREV = "ce98c346b7c1dc2a21faea4fd3f32c88e27ca2af" +SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https" + +S = "${WORKDIR}/git" + +FILES_${PN} += "${base_libdir}/udev/rules.d/" diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb deleted file mode 100644 index 36fc5c858..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "This daemon is in charge of multiplexing connections over USB to an iPhone or iPod touch." -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7" - -DEPENDS = "udev libusb1 libplist" - -inherit autotools pkgconfig gitpkgv - -PKGV = "${GITPKGVTAG}" - -SRCREV = "78df9be5fc8222ed53846cb553de9b5d24c85c6c" -SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https" - -S = "${WORKDIR}/git" - -FILES_${PN} += "${base_libdir}/udev/rules.d/" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb deleted file mode 100644 index 1a9cd8f10..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "libzip is a C library for reading, creating, and modifying zip archives." -HOMEPAGE = "https://libzip.org/" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e33bb117aa55f9aad3d28e29256f9919" - -DEPENDS = "zlib bzip2" - -PACKAGECONFIG[ssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" -PACKAGECONFIG[lzma] = "-DENABLE_LZMA=ON,-DENABLE_LZMA=OFF,xz" - -PACKAGECONFIG ?= "ssl lzma" - -inherit cmake - -SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" - -SRC_URI[sha256sum] = "a020dc1b17a79faa748e43a05f8605d65e403813e8e97ad3a300a90ddba097ac" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.3.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.3.bb new file mode 100644 index 000000000..e903de3da --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.3.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "libzip is a C library for reading, creating, and modifying zip archives." +HOMEPAGE = "https://libzip.org/" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=067e9870bba57e1ce20695c4d5672f30" + +DEPENDS = "zlib bzip2" + +PACKAGECONFIG[ssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" +PACKAGECONFIG[lzma] = "-DENABLE_LZMA=ON,-DENABLE_LZMA=OFF,xz" + +PACKAGECONFIG ?= "ssl lzma" + +inherit cmake + +SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" + +SRC_URI[sha256sum] = "a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132" diff --git a/meta-openembedded/meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch b/meta-openembedded/meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch new file mode 100644 index 000000000..574869044 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/lprng/lprng/0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch @@ -0,0 +1,34 @@ +From 6358561d5bad34f0003ebd415142d504fe53045a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Aug 2020 11:42:08 -0700 +Subject: [PATCH] checkpc: Do not define Mail_fd multiple times + +Its also defines in var.c via lp.h this is flagged when -fno-common is +used + +Fixes +TOPDIR/build/tmp/work/core2-32-yoe-linux/lprng/3.8.C-r0/recipe-sysroot-native/usr/bin/i686-yoe-linux/i686-yoe-linux-ld: vars.o:/usr/src/debug/lprng/3.8.C-r0/build/src/../../lprng-3.8.C/src/include/lp.h:72: multiple definition of `Mail_fd'; checkpc.o:/usr/src/debug/lprng/3.8.C-r0/build/src/../../lprng-3.8.C/src/common/checkpc.c:35: first defined here +clang-11: error: linker command failed with exit code 1 (use -v to see invocation) + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/common/checkpc.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/common/checkpc.c b/src/common/checkpc.c +index aa03b08..7334094 100644 +--- a/src/common/checkpc.c ++++ b/src/common/checkpc.c +@@ -32,8 +32,6 @@ static int Remove; + static char *User_specified_printer; + static time_t Current_time; + static int Check_path_list( char *plist, int allow_missing ); +-int Mail_fd; +- + + /* pathnames of the spool directory (sd) and control directory (cd) */ + +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb b/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb index 963c6320f..443234236 100644 --- a/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb +++ b/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb @@ -3,7 +3,9 @@ SECTION = "console/utils" LICENSE = "GPLv2 | Artistic-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=c6570d8d699af1883db9d0e733ac9bfb" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ + file://0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch \ + " SRC_URI[md5sum] = "5901bed95e61d2bea3ba3056056af432" SRC_URI[sha256sum] = "694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10" diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch new file mode 100644 index 000000000..d813b37f9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch @@ -0,0 +1,39 @@ +From 609e1745d26d6f42d426018a4dd8d2342d6fc170 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 18 Aug 2020 08:37:57 -0700 +Subject: [PATCH] Add -lxml2 to linker cmdline of xml is found + +When cross compiling for systems where static libs +for libxml are not available cmake's detection mechanism +resort to linking with libxml.so but doesnt use -lxml2 +liblldbHost.a however requires libxml on linker +cmdline _after_ itself so its use of symbols from libxml2 +can be resolved. Here check for libxml2 being detected and +add it if its found. + +Fixes +minifi-cpp/0.7.0-r0/recipe-sysroot-native/usr/lib/libxml2.so is incompatible with elf32-i386 +| clang-11: error: linker command failed with exit code 1 (use -v to see invocation) + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + thirdparty/libarchive-3.3.2/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/thirdparty/libarchive-3.3.2/CMakeLists.txt b/thirdparty/libarchive-3.3.2/CMakeLists.txt +index 0c1ea6f7..cde0cc51 100644 +--- a/thirdparty/libarchive-3.3.2/CMakeLists.txt ++++ b/thirdparty/libarchive-3.3.2/CMakeLists.txt +@@ -1031,7 +1031,7 @@ ENDIF() + IF(LIBXML2_FOUND) + CMAKE_PUSH_CHECK_STATE() # Save the state of the variables + INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +- LIST(APPEND ADDITIONAL_LIBS ${LIBXML2_LIBRARIES}) ++ LIST(APPEND ADDITIONAL_LIBS xml2) + SET(HAVE_LIBXML2 1) + # libxml2's include files use iconv.h + SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}) +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch new file mode 100644 index 000000000..d0febfd53 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch @@ -0,0 +1,34 @@ +diff -urN -x .git orig/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch patched/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch +--- orig/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch 1970-01-01 09:00:00.000000000 +0900 ++++ patched/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch 2020-08-07 23:14:46.196764271 +0900 +@@ -0,0 +1,30 @@ ++This patch was imported from the libressl potable. ++https://github.com/libressl-portable/portable/commit/a9332ccecfce63bf54924e70c11f420edd3ae312 ++ ++From a9332ccecfce63bf54924e70c11f420edd3ae312 Mon Sep 17 00:00:00 2001 ++From: Brent Cook ++Date: Sun, 17 Jul 2016 18:12:23 -0500 ++Subject: [PATCH] avoid BSWAP assembly for ARM <= v6 ++ ++diff -urN orig/crypto/modes/modes_lcl.h patched/crypto/modes/modes_lcl.h ++--- orig/crypto/modes/modes_lcl.h 2018-11-18 21:27:10.000000000 +0900 +++++ patched/crypto/modes/modes_lcl.h 2020-08-07 23:11:01.960764745 +0900 ++@@ -45,14 +45,16 @@ ++ asm ("bswapl %0" \ ++ : "+r"(ret)); ret; }) ++ # elif (defined(__arm__) || defined(__arm)) && !defined(__STRICT_ALIGNMENT) ++-# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ +++# if (__ARM_ARCH >= 6) +++# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \ ++ asm ("rev %0,%0; rev %1,%1" \ ++ : "+r"(hi),"+r"(lo)); \ ++ (u64)hi<<32|lo; }) ++-# define BSWAP4(x) ({ u32 ret; \ +++# define BSWAP4(x) ({ u32 ret; \ ++ asm ("rev %0,%1" \ ++ : "=r"(ret) : "r"((u32)(x))); \ ++ ret; }) +++# endif ++ # endif ++ #endif ++ #endif diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-compile.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-compile.patch new file mode 100644 index 000000000..84b8c8cb0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-libressl-compile.patch @@ -0,0 +1,43 @@ +diff -urN -x .git orig/cmake/LibreSSL.cmake patched/cmake/LibreSSL.cmake +--- orig/cmake/LibreSSL.cmake 2020-08-07 21:58:34.660773928 +0900 ++++ patched/cmake/LibreSSL.cmake 2020-08-07 22:51:18.620767245 +0900 +@@ -18,6 +18,9 @@ + function(use_libre_ssl SOURCE_DIR BINARY_DIR) + message("Using bundled LibreSSL from release") + ++ find_package(Patch REQUIRED) ++ set(PATCH "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch") ++ + set(BYPRODUCT_PREFIX "lib" CACHE STRING "" FORCE) + set(BYPRODUCT_SUFFIX ".a" CACHE STRING "" FORCE) + +@@ -27,16 +30,29 @@ + set(BYPRODUCT_PREFIX "" CACHE STRING "" FORCE) + set(BUILD_ARGS " -GVisual Studio 15 2017") + endif(WIN32) ++ ++ set(BYPRODUCTS ++ "lib/${BYPRODUCT_PREFIX}crypto${BYPRODUCT_SUFFIX}" ++ "lib/${BYPRODUCT_PREFIX}ssl${BYPRODUCT_SUFFIX}" ++ "lib/${BYPRODUCT_PREFIX}tls${BYPRODUCT_SUFFIX}" ++ ) ++ set(LIBRESSL_INSTALL_DIR "${BINARY_DIR}/thirdparty/libressl-install" CACHE STRING "" FORCE) ++ FOREACH(BYPRODUCT ${BYPRODUCTS}) ++ LIST(APPEND LIBRESSL_LIBRARIES_LIST "${LIBRESSL_INSTALL_DIR}/${BYPRODUCT}") ++ ENDFOREACH(BYPRODUCT) ++ + ExternalProject_Add( + libressl-portable + URL https://cdn.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz https://gentoo.osuosl.org/distfiles/libressl-2.8.3.tar.gz + URL_HASH "SHA256=9b640b13047182761a99ce3e4f000be9687566e0828b4a72709e9e6a3ef98477" + SOURCE_DIR "${BINARY_DIR}/thirdparty/libressl-src" ++ PATCH_COMMAND ${PATCH} + CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS} + "-DCMAKE_INSTALL_PREFIX=${BINARY_DIR}/thirdparty/libressl-install" + "-DLIBRESSL_APPS=OFF" + "-DLIBRESSL_TESTS=OFF" + "${BUILD_ARGS}" ++ BUILD_BYPRODUCTS ${LIBRESSL_LIBRARIES_LIST} + ) + + add_library(crypto STATIC IMPORTED) diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-minifi-compile.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-minifi-compile.patch new file mode 100644 index 000000000..9653ba342 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-minifi-compile.patch @@ -0,0 +1,60 @@ +diff -urN -x .git orig/CMakeLists.txt patched/CMakeLists.txt +--- orig/CMakeLists.txt 2020-08-07 21:58:34.656773928 +0900 ++++ patched/CMakeLists.txt 2020-08-10 15:08:31.800278357 +0900 +@@ -119,13 +119,28 @@ + endif() + endif() + ++include(CheckCXXSourceCompiles) ++CHECK_CXX_SOURCE_COMPILES(" ++ #include ++ int main(int argc, char **argv) { ++ uint8_t m; ++ __atomic_load_8(&m, 0); ++ __atomic_fetch_add_1(&m , 0, 0); ++ return 0; ++ }" ++ HAVE_ATOMIC ++) ++if(NOT HAVE_ATOMIC) ++ set(LIB_ATOMIC atomic) ++endif() ++ + # Use ccache if present +-find_program(CCACHE_FOUND ccache) +-if(CCACHE_FOUND) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) +- message("-- Found ccache: ${CCACHE_FOUND}") +-endif(CCACHE_FOUND) ++#find_program(CCACHE_FOUND ccache) ++#if(CCACHE_FOUND) ++# set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) ++# set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) ++# message("-- Found ccache: ${CCACHE_FOUND}") ++#endif(CCACHE_FOUND) + + if (UNIX AND USE_GOLD_LINKER AND NOT APPLE ) + execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE ld_version) +@@ -303,8 +318,10 @@ + GIT_TAG "f3294d9d86e6a7915a967efff2842089b8b0d071" # Version 7.64.0 + SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-src" + LIST_SEPARATOR % # This is needed for passing semicolon-separated lists ++ TLS_VERIFY OFF + CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS} + "-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-install" ++ "-DCMAKE_INSTALL_LIBDIR=lib${LIBSUFFIX}" + -DCMAKE_POSITION_INDEPENDENT_CODE=ON + -DBUILD_CURL_EXE=OFF + -DBUILD_TESTING=OFF +diff -urN -x .git orig/libminifi/CMakeLists.txt patched/libminifi/CMakeLists.txt +--- orig/libminifi/CMakeLists.txt 2020-08-07 21:58:34.676773928 +0900 ++++ patched/libminifi/CMakeLists.txt 2020-08-10 15:06:17.124278642 +0900 +@@ -108,6 +108,7 @@ + add_library(spdlog STATIC ${SPD_SOURCES}) + add_library(core-minifi STATIC ${SOURCES}) + target_link_libraries(core-minifi ${CMAKE_DL_LIBS} yaml-cpp) ++target_link_libraries(core-minifi ${LIB_ATOMIC}) + + #target_link_libraries(core-minifi PRIVATE bsdiff ) + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-compile.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-compile.patch new file mode 100644 index 000000000..42e1e583c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-compile.patch @@ -0,0 +1,36 @@ +diff -urN -x .git orig/cmake/BundledOSSPUUID.cmake patched/cmake/BundledOSSPUUID.cmake +--- orig/cmake/BundledOSSPUUID.cmake 2020-08-07 21:58:34.660773928 +0900 ++++ patched/cmake/BundledOSSPUUID.cmake 2020-08-07 22:05:57.404772993 +0900 +@@ -22,7 +22,9 @@ + + # Define patch step + find_package(Patch REQUIRED) +- set(PC "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-mac-fix.patch") ++ set(PATCH1 "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-mac-fix.patch") ++ set(PATCH2 "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch") ++ set(PATCH3 "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch") + + # Define byproducts + set(BYPRODUCTS "lib/libuuid.a" +@@ -35,7 +37,9 @@ + ENDFOREACH(BYPRODUCT) + + # Build project +- set(CONFIGURE_COMMAND ./configure "CFLAGS=-fPIC" "CXXFLAGS=-fPIC" --with-cxx --without-perl --without-php --without-pgsql "--prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install") ++ set(CONFIGURE_COMMAND ac_cv_va_copy=C99 ./configure CFLAGS=-fPIC CXXFLAGS=-fPIC --host=${HOST_SYS} ++ --with-cxx --without-perl --without-php --without-pgsql ++ --prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install) + string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type) + if(NOT build_type MATCHES debug) + list(APPEND CONFIGURE_COMMAND --enable-debug=yes) +@@ -52,8 +56,8 @@ + UPDATE_COMMAND "" + INSTALL_COMMAND make install + BUILD_BYPRODUCTS ${OSSPUUID_LIBRARIES_LIST} +- CONFIGURE_COMMAND "" +- PATCH_COMMAND ${PC} && ${CONFIGURE_COMMAND} ++ CONFIGURE_COMMAND ${CONFIGURE_COMMAND} ++ PATCH_COMMAND ${PATCH1} && ${PATCH2} && ${PATCH3} + STEP_TARGETS build + EXCLUDE_FROM_ALL TRUE + ) diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-cross-compile.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-cross-compile.patch new file mode 100644 index 000000000..dc354d9ac --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-cross-compile.patch @@ -0,0 +1,37 @@ +diff -urN -x .git orig/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch patched/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch +--- orig/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch 1970-01-01 09:00:00.000000000 +0900 ++++ patched/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch 2020-08-07 22:28:04.396770190 +0900 +@@ -0,0 +1,33 @@ ++diff -urN orig/config.sub patched/config.sub ++--- orig/config.sub 2008-07-05 06:43:08.000000000 +0900 +++++ patched/config.sub 2020-08-07 22:23:48.412770731 +0900 ++@@ -238,6 +238,8 @@ ++ # Some are omitted here because they have special meanings below. ++ 1750a | 580 \ ++ | a29k \ +++ | aarch64 | aarch64_be \ +++ | riscv32 | riscv64 \ ++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++@@ -314,6 +316,8 @@ ++ # Recognize the basic CPU types with company name. ++ 580-* \ ++ | a29k-* \ +++ | aarch64-* | aarch64_be-* \ +++ | riscv32-* | riscv64-* \ ++ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ++diff -urN orig/shtool patched/shtool ++--- orig/shtool 2008-07-05 06:43:08.000000000 +0900 +++++ patched/shtool 2020-08-07 22:21:23.192771037 +0900 ++@@ -1400,7 +1400,7 @@ ++ if [ ".$opt_t" = .yes ]; then ++ echo "strip $dsttmp" 1>&2 ++ fi ++- strip $dsttmp || shtool_exit $? +++ $STRIP $dsttmp || shtool_exit $? ++ fi ++ if [ ".$opt_o" != . ]; then ++ if [ ".$opt_t" = .yes ]; then diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-musl-compile.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-musl-compile.patch new file mode 100644 index 000000000..7caf848eb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-osspuuid-musl-compile.patch @@ -0,0 +1,25 @@ +diff -urN -x .git orig/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch patched/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch +--- orig/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch 1970-01-01 09:00:00.000000000 +0900 ++++ patched/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch 2020-08-07 11:22:49.344854508 +0900 +@@ -0,0 +1,21 @@ ++diff -urN orig/config.sub patched/config.sub ++--- orig/config.sub 2008-07-05 06:43:08.000000000 +0900 +++++ patched/config.sub 2020-08-07 11:19:25.948854937 +0900 ++@@ -120,7 +120,7 @@ ++ # Here we must recognize all the valid KERNEL-OS combinations. ++ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` ++ case $maybe_os in ++- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ +++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | linux-musl* | \ ++ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) ++ os=-$maybe_os ++@@ -1250,7 +1250,7 @@ ++ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -chorusos* | -chorusrdb* \ ++ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ +++ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* | -linux-musl* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ ++ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-rocksdb-cross-compile.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-rocksdb-cross-compile.patch new file mode 100644 index 000000000..8c5db7c9e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/fix-rocksdb-cross-compile.patch @@ -0,0 +1,12 @@ +diff -urN orig/thirdparty/rocksdb/CMakeLists.txt patched/thirdparty/rocksdb/CMakeLists.txt +--- orig/thirdparty/rocksdb/CMakeLists.txt 2020-07-28 11:39:40.254677515 +0900 ++++ patched/thirdparty/rocksdb/CMakeLists.txt 2020-07-28 11:51:11.898676054 +0900 +@@ -618,6 +618,7 @@ + add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES}) + target_link_libraries(${ROCKSDB_STATIC_LIB} + ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) ++target_link_libraries(${ROCKSDB_STATIC_LIB} ${LIB_ATOMIC}) + + if(WIN32) + # add_library(${ROCKSDB_IMPORT_LIB} SHARED ${SOURCES}) + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service new file mode 100644 index 000000000..5802a7b2f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service @@ -0,0 +1,13 @@ +[Unit] +Description=MiNiFi Service +After=network.target +RequiresMountsFor=/var + +[Service] +Type=simple +WorkingDirectory=@LOCALSTATEDIR@/run/minifi +Environment=MINIFI_HOME=@SYSCONFDIR@/minifi +ExecStart=@BINDIR@/minifi + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch new file mode 100644 index 000000000..2d66576f6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/remove_const_due_to_std_lock_guard.patch @@ -0,0 +1,38 @@ +From bfce136fa9ff1e955928539484ba4dd55f98f05b Mon Sep 17 00:00:00 2001 +From: Willem Jan Withagen +Date: Sun, 16 Aug 2020 23:38:55 +0200 +Subject: [PATCH] Update channel.h + +Compiling this on FreeBSD with CLang fails due to: +```In file included from /usr/ports/net/ceph15/work/ceph-15.2.4/src/rocksdb/utilities/backupable/backupable_db.cc:16: +/usr/ports/net/ceph15/work/ceph-15.2.4/src/rocksdb/util/channel.h:35:33: error: no matching constructor for initialization of 'std::lock_guard' + std::lock_guard lk(lock_); + ^ ~~~~~ +/usr/include/c++/v1/__mutex_base:90:14: note: candidate constructor not viable: 1st argument ('const std::mutex') would lose const qualifier + explicit lock_guard(mutex_type& __m) _LIBCPP_THREAD_SAFETY_ANNOTATION(acquire_capability(__m)) + ^ +/usr/include/c++/v1/__mutex_base:100:5: note: candidate constructor not viable: no known conversion from 'const std::mutex' to 'const std::__1::lock_guard' for 1st argument + lock_guard(lock_guard const&) _LIBCPP_EQUAL_DELETE; + ^ +/usr/include/c++/v1/__mutex_base:94:5: note: candidate constructor not viable: requires 2 arguments, but 1 was provided + lock_guard(mutex_type& __m, adopt_lock_t) _LIBCPP_THREAD_SAFETY_ANNOTATION(requires_capability(__m)) + ^ +1 error generated. +``` +--- + thirdparty/rocksdb/util/channel.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/thirdparty/rocksdb/util/channel.h b/thirdparty/rocksdb/util/channel.h +index 705fa2d28f..993bef5bc0 100644 +--- a/thirdparty/rocksdb/util/channel.h ++++ b/thirdparty/rocksdb/util/channel.h +@@ -31,7 +31,7 @@ class channel { + return buffer_.empty() && eof_; + } + +- size_t size() const { ++ size_t size() { + std::lock_guard lk(lock_); + return buffer_.size(); + } diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf new file mode 100644 index 000000000..c828b49fa --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf @@ -0,0 +1,2 @@ +d @MINIFI_RUN@ 0755 root root - +d @MINIFI_LOG@ 0755 root root - diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf new file mode 100644 index 000000000..2ad14e677 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf @@ -0,0 +1,2 @@ +d root root 0755 @MINIFI_RUN@ none +d root root 0755 @MINIFI_LOG@ none diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb new file mode 100644 index 000000000..37036ebbb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -0,0 +1,120 @@ +SUMMARY = "A subproject of Apache NiFi to collect data where it originates." +DESCRIPTION = "MiNiFi--a subproject of Apache NiFi--is a complementary \ +data collection approach that supplements the core tenets of NiFi in dataflow \ +management, focusing on the collection of data at the source of its creation." +HOMEPAGE = "https://nifi.apache.org/minifi/index.html" +SECTION = "console/network" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9534eb5f4ab800b573a37bffc62f3a7" + +DEPENDS = "virtual/crypt expat flex python3 bison-native libxml2" +RDEPENDS_${PN} = "python3-core" + +SRCREV = "aa42957a2e227df41510047cece3cd606dc1cb6a" +SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ + file://fix-minifi-compile.patch \ + file://fix-libressl-compile.patch \ + file://fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch \ + file://fix-osspuuid-compile.patch \ + file://fix-osspuuid-cross-compile.patch \ + file://fix-osspuuid-musl-compile.patch \ + file://fix-rocksdb-cross-compile.patch \ + file://remove_const_due_to_std_lock_guard.patch \ + file://0001-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch \ + file://minifi.service \ + file://systemd-volatile.conf \ + file://sysvinit-volatile.conf \ + " +S = "${WORKDIR}/git" + +inherit pkgconfig cmake systemd + +SYSTEMD_PACKAGES = "minifi-cpp" +SYSTEMD_SERVICE_${PN} = "minifi.service" +SYSTEMD_AUTO_ENABLE = "disable" + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" + +EXTRA_OECMAKE += " \ + -DHOST_SYS=${HOST_SYS} -DBUILD_SYS=${BUILD_SYS} \ + -DSKIP_TESTS=ON \ + " +EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib" +LDFLAGS_append_toolchain-clang = " -fuse-ld=lld" + +# There are endian issues when communicating with the x86 nifi on the the mips and the ppc machines. +COMPATIBLE_MACHINE_mips = "(!.*mips).*" +COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" +COMPATIBLE_MACHINE_powerpc = "(!.*ppc).*" + +TARGET_CFLAGS_append_riscv32 += "-fpic" +TARGET_CXXFLAGS_append_riscv32 += "-fpic" +TARGET_CFLAGS_append_riscv64 += "-fpic" +TARGET_CXXFLAGS_append_riscv64 += "-fpic" + + +do_install() { + DESTDIR='${B}/minifi-install' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} + + MINIFI_BIN=${base_prefix}${bindir} + MINIFI_HOME=${base_prefix}${sysconfdir}/minifi + MINIFI_RUN=${base_prefix}${localstatedir}/run/minifi + MINIFI_LOG=${base_prefix}${localstatedir}/log/minifi + + install -d ${D}${MINIFI_BIN} + install -d ${D}${MINIFI_HOME}/conf + cp -a ${B}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/ + cp -a ${B}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/ + + sed -i 's|#appender.rolling.directory=.*|appender.rolling.directory='${MINIFI_LOG}'|g' \ + ${D}${MINIFI_HOME}/conf/minifi-log.properties + sed -i 's|nifi.provenance.repository.directory.default=.*|nifi.provenance.repository.directory.default='${MINIFI_RUN}'/provenance_repository|g' \ + ${D}${MINIFI_HOME}/conf/minifi.properties + sed -i 's|nifi.flowfile.repository.directory.default=.*|nifi.flowfile.repository.directory.default='${MINIFI_RUN}'/flowfile_repository|g' \ + ${D}${MINIFI_HOME}/conf/minifi.properties + sed -i 's|nifi.database.content.repository.directory.default=.*|nifi.database.content.repository.directory.default='${MINIFI_RUN}'/content_repository|g' \ + ${D}${MINIFI_HOME}/conf/minifi.properties + sed -i 's|nifi.flow.configuration.file=.*|nifi.flow.configuration.file='${MINIFI_HOME}'/conf/config.yml|g' \ + ${D}${MINIFI_HOME}/conf/minifi.properties + + sed -i 's|export MINIFI_HOME=.*|export MINIFI_HOME='${MINIFI_HOME}'|g' ${D}${MINIFI_BIN}/minifi.sh + sed -i 's|bin_dir=${MINIFI_HOME}/bin|bin_dir='${MINIFI_BIN}'|g' ${D}${MINIFI_BIN}/minifi.sh + sed -i 's|pid_file=${bin_dir}|pid_file='${MINIFI_RUN}'|g' ${D}${MINIFI_BIN}/minifi.sh + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d/ + install -m 0644 ${WORKDIR}/systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ + install -m 0755 -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/minifi.service ${D}${systemd_unitdir}/system/ + + sed -i 's|@LOCALSTATEDIR@|${localstatedir}|g' ${D}${systemd_unitdir}/system/minifi.service + sed -i 's|@SYSCONFDIR@|${sysconfdir}|g' ${D}${systemd_unitdir}/system/minifi.service + sed -i 's|@BINDIR@|${bindir}|g' ${D}${systemd_unitdir}/system/minifi.service + + sed -i 's|@MINIFI_RUN@|'${MINIFI_RUN}'|g' ${D}${sysconfdir}/tmpfiles.d/systemd-volatile.conf + sed -i 's|@MINIFI_LOG@|'${MINIFI_LOG}'|g' ${D}${sysconfdir}/tmpfiles.d/systemd-volatile.conf + + elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/sysvinit-volatile.conf ${D}${sysconfdir}/default/volatiles/99_minifi + + sed -i 's|@MINIFI_RUN@|'${MINIFI_RUN}'|g' ${D}${sysconfdir}/default/volatiles/99_minifi + sed -i 's|@MINIFI_LOG@|'${MINIFI_LOG}'|g' ${D}${sysconfdir}/default/volatiles/99_minifi + fi +} + +pkg_postinst_${PN}() { + if [ -z "$D" ]; then + if type systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create + elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi + fi +} + +FILES_${PN} = " \ + ${bindir} \ + ${sysconfdir} \ + ${systemd_unitdir} \ + " diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.3.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.3.bb deleted file mode 100644 index 43021c534..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.3.bb +++ /dev/null @@ -1,189 +0,0 @@ -SUMMARY = "Versioned Operating System Repository." -DESCRIPTION = "libostree is both a shared library and suite of command line \ -tools that combines a \"git-like\" model for committing and downloading \ -bootable filesystem trees, along with a layer for deploying them and managing \ -the bootloader configuration." -HOMEPAGE = "https://ostree.readthedocs.io" -LICENSE = "LGPLv2.1" - -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -DEPENDS = " \ - glib-2.0 \ - e2fsprogs \ - libcap \ - zlib \ - xz \ - bison-native \ -" - -# The Yocto mirror has an old export of ostree: -# http://downloads.yoctoproject.org/mirror/sources/git2_github.com.ostreedev.ostree.tar.gz -PREMIRRORS = "" - -SRC_URI = " \ - gitsm://github.com/ostreedev/ostree \ - file://run-ptest \ -" -SRCREV = "6ed48234ba579ff73eb128af237212b0a00f2057" - -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+)" - -S = "${WORKDIR}/git" - -inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconfig ptest-gnome systemd - -# Package configuration - match ostree defaults, but without rofiles-fuse -# otherwise we introduce a dependendency on meta-filesystems -PACKAGECONFIG ??= " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ - glib \ - gpgme \ - soup \ -" - -# We include soup because ostree can't (currently) be built without -# soup or curl - https://github.com/ostreedev/ostree/issues/1897 -PACKAGECONFIG_class-native ??= " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ - builtin-grub2-mkconfig \ - gpgme \ - soup \ -" - -PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" -PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" -PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" -PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" -PACKAGECONFIG[glib] = "--with-crypto=glib" -PACKAGECONFIG[gjs] = "ac_cv_path_GJS=${bindir}/gjs" -PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls" -PACKAGECONFIG[gpgme] = "--with-gpgme, --without-gpgme, gpgme" -PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive" -PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux" -PACKAGECONFIG[manpages] = "--enable-man, --disable-man, libxslt-native docbook-xsl-stylesheets-native" -PACKAGECONFIG[mkinitcpio] = "--with-mkinitcpio, --without-mkinitcpio" -PACKAGECONFIG[no-http2] = "--disable-http2, --enable-http2" -PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl" -PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse" -PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux" -PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" -PACKAGECONFIG[soup] = "--with-soup, --without-soup --disable-glibtest, libsoup-2.4" -PACKAGECONFIG[static] = "" -PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_unitdir}/system, --without-libsystemd, systemd" -PACKAGECONFIG[trivial-httpd-cmdline] = "--enable-trivial-httpd-cmdline, --disable-trivial-httpd-cmdline" - -EXTRA_OECONF = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \ -" - -# Makefile-libostree.am overrides this to avoid a build problem with clang, -# but that fix breaks cross compilation and we don't need it -EXTRA_OEMAKE = " \ - INTROSPECTION_SCANNER_ENV= \ -" - -EXTRA_OECONF_class-native = " \ - --enable-wrpseudo-compat \ - --disable-otmpfile \ -" - -# Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the -# do_configure stage so we do depend on it -SYSROOT_DIR = "${STAGING_DIR_TARGET}" -SYSROOT_DIR_class-native = "${STAGING_DIR_NATIVE}" -do_configure[vardeps] += "SYSROOT_DIR" - -do_configure_prepend() { - # this reflects what autogen.sh does, but the OE wrappers for autoreconf - # allow it to work without the other gyrations which exist there - cp ${S}/libglnx/Makefile-libglnx.am ${S}/libglnx/Makefile-libglnx.am.inc - cp ${S}/bsdiff/Makefile-bsdiff.am ${S}/bsdiff/Makefile-bsdiff.am.inc -} - -do_install_append_class-native() { - create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" -} - -PACKAGE_BEFORE_PN = " \ - ${PN}-dracut \ - ${PN}-grub \ - ${PN}-mkinitcpio \ - ${PN}-switchroot \ - ${PN}-trivial-httpd \ -" - -FILES_${PN} += " \ - ${nonarch_libdir}/${BPN} \ - ${nonarch_libdir}/tmpfiles.d \ - ${systemd_unitdir}/system \ - ${systemd_unitdir}/system-generators \ -" -FILES_${PN}-dracut = " \ - ${sysconfdir}/dracut.conf.d \ - ${libdir}/dracut \ -" -FILES_${PN}-grub = " \ - ${sysconfdir}/grub.d \ - ${libexecdir}/libostree/grub2-15_ostree \ -" -FILES_${PN}-mkinitcpio = " \ - ${sysconfdir}/ostree-mkinitcpio.conf \ - ${libdir}/initcpio \ -" -FILES_${PN}-switchroot = " \ - ${nonarch_libdir}/${BPN}/ostree-prepare-root \ - ${systemd_unitdir}/system/ostree-prepare-root.service \ -" -FILES_${PN}-trivial-httpd = " \ - ${libexecdir}/libostree/ostree-trivial-httpd \ -" - -RDEPENDS_${PN} = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'trivial-httpd-cmdline', '${PN}-trivial-httpd', '', d)} \ -" -RDEPENDS_${PN}-dracut = "bash" -RDEPENDS_${PN}-mkinitcpio = "bash" -RDEPENDS_${PN}_class-target = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'gpgme', 'gnupg', '', d)} \ - ${PN}-switchroot \ -" - -# -# Note that to get ptest to pass you also need: -# -# xattr in DISTRO_FEATURES -# static ostree-prepare-root (PACKAGECONFIG_append_pn-ostree = " static") -# meta-python in your layers -# overlayfs in your kernel (KERNEL_EXTRA_FEATURES += "features/overlayfs/overlayfs.scc") -# busybox built statically -# /var/tmp as a real filesystem (not a tmpfs) -# Sufficient disk space (IMAGE_ROOTFS_SIZE = "524288") and RAM (QB_MEM = "-m 1024") -# -RDEPENDS_${PN}-ptest += " \ - attr \ - bash \ - coreutils \ - cpio \ - diffutils \ - findutils \ - grep \ - python3-core \ - python3-multiprocessing \ - strace \ - tar \ - util-linux \ - xz \ - ${PN}-trivial-httpd \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'python3-pyyaml', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \ -" -RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us" - -RRECOMMENDS_${PN} += "kernel-module-overlay" - -SYSTEMD_SERVICE_${PN} = "ostree-remount.service ostree-finalize-staged.path" -SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.5.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.5.bb new file mode 100644 index 000000000..7527298c2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.5.bb @@ -0,0 +1,189 @@ +SUMMARY = "Versioned Operating System Repository." +DESCRIPTION = "libostree is both a shared library and suite of command line \ +tools that combines a \"git-like\" model for committing and downloading \ +bootable filesystem trees, along with a layer for deploying them and managing \ +the bootloader configuration." +HOMEPAGE = "https://ostree.readthedocs.io" +LICENSE = "LGPLv2.1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +DEPENDS = " \ + glib-2.0 \ + e2fsprogs \ + libcap \ + zlib \ + xz \ + bison-native \ +" + +# The Yocto mirror has an old export of ostree: +# http://downloads.yoctoproject.org/mirror/sources/git2_github.com.ostreedev.ostree.tar.gz +PREMIRRORS = "" + +SRC_URI = " \ + gitsm://github.com/ostreedev/ostree \ + file://run-ptest \ +" +SRCREV = "63797cb750b4b2a05c5143613d89de9df99df9df" + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+)" + +S = "${WORKDIR}/git" + +inherit autotools bash-completion gobject-introspection gtk-doc manpages pkgconfig ptest-gnome systemd + +# Package configuration - match ostree defaults, but without rofiles-fuse +# otherwise we introduce a dependendency on meta-filesystems +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ + glib \ + gpgme \ + soup \ +" + +# We include soup because ostree can't (currently) be built without +# soup or curl - https://github.com/ostreedev/ostree/issues/1897 +PACKAGECONFIG_class-native ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ + builtin-grub2-mkconfig \ + gpgme \ + soup \ +" + +PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" +PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" +PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" +PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" +PACKAGECONFIG[glib] = "--with-crypto=glib" +PACKAGECONFIG[gjs] = "ac_cv_path_GJS=${bindir}/gjs" +PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls" +PACKAGECONFIG[gpgme] = "--with-gpgme, --without-gpgme, gpgme" +PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive" +PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux" +PACKAGECONFIG[manpages] = "--enable-man, --disable-man, libxslt-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[mkinitcpio] = "--with-mkinitcpio, --without-mkinitcpio" +PACKAGECONFIG[no-http2] = "--disable-http2, --enable-http2" +PACKAGECONFIG[openssl] = "--with-crypto=openssl, , openssl" +PACKAGECONFIG[rofiles-fuse] = "--enable-rofiles-fuse, --disable-rofiles-fuse, fuse" +PACKAGECONFIG[selinux] = "--with-selinux, --without-selinux, libselinux" +PACKAGECONFIG[smack] = "--with-smack, --without-smack, smack" +PACKAGECONFIG[soup] = "--with-soup, --without-soup --disable-glibtest, libsoup-2.4" +PACKAGECONFIG[static] = "" +PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_unitdir}/system, --without-libsystemd, systemd" +PACKAGECONFIG[trivial-httpd-cmdline] = "--enable-trivial-httpd-cmdline, --disable-trivial-httpd-cmdline" + +EXTRA_OECONF = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \ +" + +# Makefile-libostree.am overrides this to avoid a build problem with clang, +# but that fix breaks cross compilation and we don't need it +EXTRA_OEMAKE = " \ + INTROSPECTION_SCANNER_ENV= \ +" + +EXTRA_OECONF_class-native = " \ + --enable-wrpseudo-compat \ + --disable-otmpfile \ +" + +# Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the +# do_configure stage so we do depend on it +SYSROOT_DIR = "${STAGING_DIR_TARGET}" +SYSROOT_DIR_class-native = "${STAGING_DIR_NATIVE}" +do_configure[vardeps] += "SYSROOT_DIR" + +do_configure_prepend() { + # this reflects what autogen.sh does, but the OE wrappers for autoreconf + # allow it to work without the other gyrations which exist there + cp ${S}/libglnx/Makefile-libglnx.am ${S}/libglnx/Makefile-libglnx.am.inc + cp ${S}/bsdiff/Makefile-bsdiff.am ${S}/bsdiff/Makefile-bsdiff.am.inc +} + +do_install_append_class-native() { + create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" +} + +PACKAGE_BEFORE_PN = " \ + ${PN}-dracut \ + ${PN}-grub \ + ${PN}-mkinitcpio \ + ${PN}-switchroot \ + ${PN}-trivial-httpd \ +" + +FILES_${PN} += " \ + ${nonarch_libdir}/${BPN} \ + ${nonarch_libdir}/tmpfiles.d \ + ${systemd_unitdir}/system \ + ${systemd_unitdir}/system-generators \ +" +FILES_${PN}-dracut = " \ + ${sysconfdir}/dracut.conf.d \ + ${libdir}/dracut \ +" +FILES_${PN}-grub = " \ + ${sysconfdir}/grub.d \ + ${libexecdir}/libostree/grub2-15_ostree \ +" +FILES_${PN}-mkinitcpio = " \ + ${sysconfdir}/ostree-mkinitcpio.conf \ + ${libdir}/initcpio \ +" +FILES_${PN}-switchroot = " \ + ${nonarch_libdir}/${BPN}/ostree-prepare-root \ + ${systemd_unitdir}/system/ostree-prepare-root.service \ +" +FILES_${PN}-trivial-httpd = " \ + ${libexecdir}/libostree/ostree-trivial-httpd \ +" + +RDEPENDS_${PN} = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'trivial-httpd-cmdline', '${PN}-trivial-httpd', '', d)} \ +" +RDEPENDS_${PN}-dracut = "bash" +RDEPENDS_${PN}-mkinitcpio = "bash" +RDEPENDS_${PN}_class-target = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'gpgme', 'gnupg', '', d)} \ + ${PN}-switchroot \ +" + +# +# Note that to get ptest to pass you also need: +# +# xattr in DISTRO_FEATURES +# static ostree-prepare-root (PACKAGECONFIG_append_pn-ostree = " static") +# meta-python in your layers +# overlayfs in your kernel (KERNEL_EXTRA_FEATURES += "features/overlayfs/overlayfs.scc") +# busybox built statically +# /var/tmp as a real filesystem (not a tmpfs) +# Sufficient disk space (IMAGE_ROOTFS_SIZE = "524288") and RAM (QB_MEM = "-m 1024") +# +RDEPENDS_${PN}-ptest += " \ + attr \ + bash \ + coreutils \ + cpio \ + diffutils \ + findutils \ + grep \ + python3-core \ + python3-multiprocessing \ + strace \ + tar \ + util-linux \ + xz \ + ${PN}-trivial-httpd \ + ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'python3-pyyaml', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \ +" +RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us" + +RRECOMMENDS_${PN} += "kernel-module-overlay" + +SYSTEMD_SERVICE_${PN} = "ostree-remount.service ostree-finalize-staged.path" +SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.3.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.3.bb index 92741d817..01233699a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_2.8.3.bb @@ -10,3 +10,5 @@ SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=2.x \ inherit cmake S = "${WORKDIR}/git" + +CXXFLAGS += " -Wno-error=type-limits" diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch deleted file mode 100644 index 8e2b3c7cb..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 721a48e5397bd4ab454482041e55671eae7b189f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 11 May 2020 18:01:11 -0700 -Subject: [PATCH] examples: Initialize child_idx - -Assign UINT_MAX and assert it - -Fixes warning -rtree_map.c:358:12: error: 'child_idx' may be used uninitialized -in this function [-Werror=maybe-uninitialized] - -Upstream-Status: Submitted [https://github.com/pmem/pmdk/pull/4802] -Signed-off-by: Khem Raj ---- - src/examples/libpmemobj/tree_map/rtree_map.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/examples/libpmemobj/tree_map/rtree_map.c b/src/examples/libpmemobj/tree_map/rtree_map.c -index 995e22bb9..6b3ead65c 100644 ---- a/src/examples/libpmemobj/tree_map/rtree_map.c -+++ b/src/examples/libpmemobj/tree_map/rtree_map.c -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -320,12 +321,13 @@ has_only_one_child(TOID(struct tree_map_node) node, unsigned *child_idx) - static void - remove_extra_node(TOID(struct tree_map_node) *node) - { -- unsigned child_idx; -+ unsigned child_idx = UINT_MAX; - TOID(struct tree_map_node) tmp, tmp_child; - - /* Our node has child with only one child. */ - tmp = *node; - has_only_one_child(tmp, &child_idx); -+ assert(child_idx != UINT_MAX); - tmp_child = D_RO(tmp)->slots[child_idx]; - - /* --- -2.26.2 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch b/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch deleted file mode 100644 index 82b96cf95..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3863d8bd71d6a5638cf984f8d8f9cccac0c7f2a4 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Mon, 23 Jul 2018 11:31:17 -0700 -Subject: [PATCH] Makefile: Don't install the docs - -Signed-off-by: Alistair Francis -Upstream-Status: Inappropriate [disable feature] ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 47a447f12..7c0f9848f 100644 ---- a/Makefile -+++ b/Makefile -@@ -148,7 +148,6 @@ rpm dpkg: pkg-clean - - install uninstall: - $(MAKE) -C src $@ -- $(MAKE) -C doc $@ - - .PHONY: all clean clobber test check cstyle check-license install uninstall\ - source rpm dpkg pkg-clean pcheck check-remote format doc require-rpmem\ --- -2.14.4 - diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.8.bb b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.8.bb deleted file mode 100644 index fe7b760e2..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.8.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Persistent Memory Development Kit" -DESCRIPTION = "Persistent Memory Development Kit" -HOMEPAGE = "http://pmem.io" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1b8430f251523f1bff0c9fb95da7e0ca" -DEPENDS = "ndctl" - -# Required to have the fts.h header for musl -DEPENDS_append_libc-musl = " fts" - -S = "${WORKDIR}/git" - -SRC_URI = "git://github.com/pmem/pmdk.git \ - file://0001-examples-Initialize-child_idx.patch \ - file://0002-Makefile-Don-t-install-the-docs.patch \ - " - -SRCREV = "0245d75eaf0f6106c86a7926a45fdf2149e37eaa" - -inherit autotools-brokensep pkgconfig - -# Fix jemalloc error: -# | configure: error: cannot run C compiled programs. -# | If you meant to cross compile, use `--host'. -# -# Also fix #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] -EXTRA_OEMAKE = "BUILD_EXAMPLES='n' HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}' LIB_PREFIX=${baselib}" - -# Fix the missing fts libs when using musl -EXTRA_OEMAKE_append_libc-musl = " EXTRA_LIBS='-lfts'" - -do_configure_prepend() { - touch .skip-doc -} - -do_install() { - oe_runmake prefix=${prefix} DESTDIR=${D} install - - # Remove uneeded files - rm -rf ${D}/usr/${baselib}/pmdk_debug -} - -# Include these by default otherwise the SDK is not very useful -FILES_${PN} += "${bindir}/pmempool ${bindir}/daxio" -FILES_${PN} += "${libdir}/*so*" -FILES_${PN} += "${libdir}/pkgconfig/*.pc" -FILES_${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/* /usr/*/include/" -FILES_${PN} += "/usr/etc" -FILES_${PN} += "/usr/share" - -COMPATIBLE_HOST='(x86_64).*' diff --git a/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb new file mode 100644 index 000000000..8bb89f418 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb @@ -0,0 +1,49 @@ +SUMMARY = "Persistent Memory Development Kit" +DESCRIPTION = "Persistent Memory Development Kit" +HOMEPAGE = "http://pmem.io" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b44ee63f162f9cdb18fff1224877aafd" +DEPENDS = "ndctl" + +# Required to have the fts.h header for musl +DEPENDS_append_libc-musl = " fts" + +S = "${WORKDIR}/git" + +SRC_URI = "git://github.com/pmem/pmdk.git" + +SRCREV = "1926ffb8f3f5f0617b3b3ed32029d437c272f187" + +inherit autotools-brokensep pkgconfig + +# Fix jemalloc error: +# | configure: error: cannot run C compiled programs. +# | If you meant to cross compile, use `--host'. +# +# Also fix #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] +EXTRA_OEMAKE = "BUILD_EXAMPLES='n' DOC='n' HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}' LIB_PREFIX=${baselib}" + +# Fix the missing fts libs when using musl +EXTRA_OEMAKE_append_libc-musl = " EXTRA_LIBS='-lfts'" + +do_configure_prepend() { + touch .skip-doc +} + +do_install() { + oe_runmake prefix=${prefix} DESTDIR=${D} install + + # Remove uneeded files + rm -rf ${D}/usr/${baselib}/pmdk_debug +} + +# Include these by default otherwise the SDK is not very useful +FILES_${PN} += "${bindir}/pmempool ${bindir}/daxio" +FILES_${PN} += "${libdir}/*so*" +FILES_${PN} += "${libdir}/pkgconfig/*.pc" +FILES_${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/* /usr/*/include/" +FILES_${PN} += "/usr/etc" +FILES_${PN} += "/usr/share" + +COMPATIBLE_HOST='(x86_64).*' diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.5.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.5.bb deleted file mode 100644 index 893f323d3..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.5.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "Redis key-value store" -DESCRIPTION = "Redis is an open source, advanced key-value store." -HOMEPAGE = "http://redis.io" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=3c01b49fed4df1a79843688fa3f7b9d6" -DEPENDS = "readline lua ncurses" - -SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ - file://redis.conf \ - file://init-redis-server \ - file://redis.service \ - file://hiredis-use-default-CC-if-it-is-set.patch \ - file://lua-update-Makefile-to-use-environment-build-setting.patch \ - file://oe-use-libc-malloc.patch \ - file://0001-src-Do-not-reset-FINAL_LIBS.patch \ - file://GNU_SOURCE.patch \ - " - -SRC_URI[md5sum] = "617d680fc0944c217e2350a365686eb0" -SRC_URI[sha256sum] = "42cf86a114d2a451b898fcda96acd4d01062a7dbaaad2801d9164a36f898f596" - -inherit autotools-brokensep update-rc.d systemd useradd - -FINAL_LIBS_x86_toolchain-clang = "-latomic" -FINAL_LIBS_mips = "-latomic" -FINAL_LIBS_arm = "-latomic" -FINAL_LIBS_powerpc = "-latomic" - -export FINAL_LIBS - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" -GROUPADD_PARAM_${PN} = "--system redis" - -REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" - -do_compile_prepend() { - (cd deps && oe_runmake hiredis lua linenoise) -} - -do_install() { - export PREFIX=${D}/${prefix} - oe_runmake install - install -d ${D}/${sysconfdir}/redis - install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server - install -d ${D}/var/lib/redis/ - chown redis.redis ${D}/var/lib/redis/ - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service - - if [ "${REDIS_ON_SYSTEMD}" = true ]; then - sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf - fi -} - -CONFFILES_${PN} = "${sysconfdir}/redis/redis.conf" - -INITSCRIPT_NAME = "redis-server" -INITSCRIPT_PARAMS = "defaults 87" - -SYSTEMD_SERVICE_${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.6.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.6.bb new file mode 100644 index 000000000..c9846c5c7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.6.bb @@ -0,0 +1,66 @@ +SUMMARY = "Redis key-value store" +DESCRIPTION = "Redis is an open source, advanced key-value store." +HOMEPAGE = "http://redis.io" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" +DEPENDS = "readline lua ncurses" + +SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ + file://redis.conf \ + file://init-redis-server \ + file://redis.service \ + file://hiredis-use-default-CC-if-it-is-set.patch \ + file://lua-update-Makefile-to-use-environment-build-setting.patch \ + file://oe-use-libc-malloc.patch \ + file://0001-src-Do-not-reset-FINAL_LIBS.patch \ + file://GNU_SOURCE.patch \ + " + +SRC_URI[md5sum] = "2f65e1f5610d98dd48e10eef49c79b02" +SRC_URI[sha256sum] = "12ad49b163af5ef39466e8d2f7d212a58172116e5b441eebecb4e6ca22363d94" + +inherit autotools-brokensep update-rc.d systemd useradd + +FINAL_LIBS_x86_toolchain-clang = "-latomic" +FINAL_LIBS_mips = "-latomic" +FINAL_LIBS_arm = "-latomic" +FINAL_LIBS_powerpc = "-latomic" + +export FINAL_LIBS + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" +GROUPADD_PARAM_${PN} = "--system redis" + +REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" + +do_compile_prepend() { + (cd deps && oe_runmake hiredis lua linenoise) +} + +do_install() { + export PREFIX=${D}/${prefix} + oe_runmake install + install -d ${D}/${sysconfdir}/redis + install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server + install -d ${D}/var/lib/redis/ + chown redis.redis ${D}/var/lib/redis/ + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service + + if [ "${REDIS_ON_SYSTEMD}" = true ]; then + sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf + fi +} + +CONFFILES_${PN} = "${sysconfdir}/redis/redis.conf" + +INITSCRIPT_NAME = "redis-server" +INITSCRIPT_PARAMS = "defaults 87" + +SYSTEMD_SERVICE_${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service deleted file mode 100644 index 5adf63c8a..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Small Footprint CIM Broker Service -After=syslog.target - -[Service] -Type=oneshot -ExecStart=/usr/sbin/sfcbd -d -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-Replace-need-for-error.h-when-it-does-not-exist.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-Replace-need-for-error.h-when-it-does-not-exist.patch deleted file mode 100644 index e72305023..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-Replace-need-for-error.h-when-it-does-not-exist.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 394bf0f1ed07419d40f6024363cc1ffc7ef61bc6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 31 Aug 2017 21:56:25 -0700 -Subject: [PATCH] Replace need for error.h when it does not exist - -helps fixing build on musl - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - brokerUpc.c | 5 ++++- - configure.ac | 2 +- - httpAdapter.c | 4 +++- - support.c | 14 +++++++++++++- - trace.c | 4 +++- - 5 files changed, 24 insertions(+), 5 deletions(-) - -diff --git a/brokerUpc.c b/brokerUpc.c -index 17cbd9b..fe2b347 100644 ---- a/brokerUpc.c -+++ b/brokerUpc.c -@@ -20,8 +20,11 @@ - - #include - #include -+#ifdef HAVE_ERROR_H - #include -- -+#else -+#include -+#endif - #include "support.h" - #include "native.h" - #include -diff --git a/configure.ac b/configure.ac -index ab2964e..d4915a1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -517,7 +517,7 @@ fi - # Checks for header files. - AC_HEADER_STDC - AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS([fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h zlib.h]) -+AC_CHECK_HEADERS([error.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h zlib.h]) - AC_CHECK_HEADERS([cmpi/cmpimacs.h cmpi/cmpift.h cmpi/cmpidt.h],[],[AC_MSG_ERROR([Could not find required CPMI header.])]) - - # Checks for typedefs, structures, and compiler characteristics. -diff --git a/httpAdapter.c b/httpAdapter.c -index 2719e6c..e768972 100644 ---- a/httpAdapter.c -+++ b/httpAdapter.c -@@ -71,7 +71,9 @@ - #ifdef HAVE_UDS - #include - #endif -- -+#ifndef __SOCKADDR_ARG -+# define __SOCKADDR_ARG struct sockaddr *__restrict -+#endif - /* should probably go into cimRequest.h */ - #define CIM_PROTOCOL_ANY 0 - #define CIM_PROTOCOL_CIM_XML 1 -diff --git a/support.c b/support.c -index c7bba8b..5b3eef1 100644 ---- a/support.c -+++ b/support.c -@@ -32,7 +32,11 @@ - #include "support.h" - #include - #include -+#ifdef HAVE_ERROR_H - #include -+#else -+#include -+#endif - #include - #include "native.h" - #include "trace.h" -@@ -331,17 +335,25 @@ loadQualifierDeclMI(const char *provider, - _SFCB_RETURN(NULL); - }; - -+ - /****************************************************************************/ - - /** Exits the program with a memory allocation error message in case the given - * condition holds. - */ -+#if HAVE_ERROR_H - #define __ALLOC_ERROR(cond) \ - if ( cond ) { \ - error_at_line ( -1, errno, __FILE__, __LINE__, \ - "unable to allocate requested memory." ); \ - } -- -+#else -+#define __ALLOC_ERROR(cond) \ -+ if ( cond ) { \ -+ err(1, "%s:%d: %s", __FILE__, __LINE__, \ -+ "unable to allocate requested memory." ); \ -+ } -+#endif - /** - * flag to ensure MM is initialized only once - */ -diff --git a/trace.c b/trace.c -index d7f30db..438af46 100644 ---- a/trace.c -+++ b/trace.c -@@ -279,7 +279,9 @@ _sfcb_trap(int tn) - } - #endif - } -- -+#ifndef SA_INTERRUPT -+# define SA_INTERRUPT 0x20000000 /* from GLIBC's */ -+#endif - sigHandler * - setSignal(int sn, sigHandler * sh, int flags) - { --- -2.14.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-include-stdint.h-system-header-for-UINT16_MAX.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-include-stdint.h-system-header-for-UINT16_MAX.patch deleted file mode 100644 index c2111a2c1..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-include-stdint.h-system-header-for-UINT16_MAX.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 446fb15f79499f52ce01ca759dbdcfe635519a82 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 27 Jun 2017 07:09:33 -0700 -Subject: [PATCH] include stdint.h system header for UINT16_MAX - -Fixes build error - -error: 'UINT16_MAX' undeclared (first use in this function) - -Signed-off-by: Khem Raj ---- - interopServerProvider.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/interopServerProvider.c b/interopServerProvider.c -index 23ae182..532febe 100644 ---- a/interopServerProvider.c -+++ b/interopServerProvider.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.13.2 - diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.15-fix-provider-debugging.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.15-fix-provider-debugging.patch deleted file mode 100644 index 4fbecaa63..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.15-fix-provider-debugging.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up sblim-sfcb-1.4.5/providerDrv.c.orig sblim-sfcb-1.4.5/providerDrv.c ---- sblim-sfcb-1.4.5/providerDrv.c.orig 2013-09-04 12:59:22.140813239 +0200 -+++ sblim-sfcb-1.4.5/providerDrv.c 2013-09-04 12:59:40.511870274 +0200 -@@ -3585,7 +3585,7 @@ processProviderInvocationRequests(char * - rc = spRecvReq(&providerSockets.receive, &parms->requestor, - (void **) &parms->req, &rl, &mqg); - if (mqg.rdone) { -- int debug_break = 0; -+ volatile int debug_break = 0; - if (rc != 0) { - mlogf(M_ERROR,M_SHOW, "spRecvReq returned error %d. Skipping message.\n", rc); - free(parms); diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-maxMsgLen.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-maxMsgLen.patch deleted file mode 100644 index a0dd81653..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-maxMsgLen.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up sblim-sfcb-1.3.16/sfcb.cfg.pre.in.old sblim-sfcb-1.3.16/sfcb.cfg.pre.in ---- sblim-sfcb-1.3.16/sfcb.cfg.pre.in.old 2012-06-13 23:21:09.000000000 +0200 -+++ sblim-sfcb-1.3.16/sfcb.cfg.pre.in 2013-06-24 15:34:38.881992781 +0200 -@@ -113,8 +113,8 @@ provProcs: 32 - - ## Max message length, in bytes. This is a limit on the size of messages - ## written across sockets, for instance, between providers and SFCB. --## Default is 10000000 --maxMsgLen: 10000000 -+## Default is 100000000 -+maxMsgLen: 100000000 - - ## Location of the registration directory, where providerRegister can be found - ## Default is @localstatedir@/lib/sfcb/registration diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-multilib-man-cfg.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-multilib-man-cfg.patch deleted file mode 100644 index c8cece2c2..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-multilib-man-cfg.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up sblim-sfcb-1.3.16/man/sfcbd.1.pre.in.orig sblim-sfcb-1.3.16/man/sfcbd.1.pre.in ---- sblim-sfcb-1.3.16/man/sfcbd.1.pre.in.orig 2014-02-26 14:05:32.213091734 +0100 -+++ sblim-sfcb-1.3.16/man/sfcbd.1.pre.in 2014-02-26 15:10:54.476196379 +0100 -@@ -151,7 +151,7 @@ Default=\fI@localstatedir@/lib/sfcb/regi - .TP - .B providerDirs - A space separated list of directories where sfcb is looking for provider --libraries. Default=\fI@libdir@\ @libdir@/cmpi\fR -+libraries. Default=\fI/usr/lib\ /usr/lib/cmpi /usr/lib64\ /usr/lib64/cmpi\fR - .TP - .B providerSampleInterval - The interval in seconds at which the provider manager is checking for -@@ -275,11 +275,11 @@ SSL private key file for sfcb. - SSL client certificate / trust store for sfcb. - .SH LIBRARIES - .TP --.I @libdir@/libsfc* -+.I /usr/lib/libsfc* /usr/lib64/libsfc* - Binaries for sfcb runtime libraries. - .TP --.I @libdir@/cmpi/* --Binaries for providers -+.I /usr/lib/cmpi/* /usr/lib64/cmpi/* -+Binaries for providers. - .SH AUTHOR - Adrian Schuur - .SH CONRIBUTORS -diff -up sblim-sfcb-1.3.16/sfcb.cfg.pre.in.orig sblim-sfcb-1.3.16/sfcb.cfg.pre.in ---- sblim-sfcb-1.3.16/sfcb.cfg.pre.in.orig 2014-02-26 15:35:43.133869718 +0100 -+++ sblim-sfcb-1.3.16/sfcb.cfg.pre.in 2014-02-26 15:38:12.794240532 +0100 -@@ -121,8 +121,8 @@ maxMsgLen: 100000000 - registrationDir: @localstatedir@/lib/sfcb/registration - - ## Locations to look for provider libraries. Delimit paths with a space. --## Default is @libdir@/sfcb @libdir@ @libdir@/cmpi --providerDirs: @libdir@/sfcb @libdir@ @libdir@/cmpi -+## Default is /usr/lib/sfcb /usr/lib64/sfcb /usr/lib /usr/lib64 /usr/lib/cmpi /usr/lib64/cmpi -+providerDirs: /usr/lib/sfcb /usr/lib64/sfcb /usr/lib /usr/lib64 /usr/lib/cmpi /usr/lib64/cmpi - - ## Enable the root/interop namespace (affects indications) - ## Default: true diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch deleted file mode 100644 index 7f95a9da3..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in.orig sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in ---- sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in.orig 2009-10-13 21:54:13.000000000 +0200 -+++ sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in 2010-09-06 14:01:57.294564062 +0200 -@@ -26,7 +26,7 @@ Supported command line options are: - .TP - \fB\-c\fR \fIschemadir\fR - Path to obtain the CIM Schema classes. --Default is \fI@datadir@/sfcb\fR -+Default is \fI@datadir@/mof/cim-current\fR - .TP - \fB\-s\fR \fIstagingdir\fR - Path to sfcb staging area containing class MOFs and registration files -@@ -58,7 +58,7 @@ Alias of \fB-b\fR - Display usage information and exit. - .SH FILES - .TP --\fI@datadir@/sfcb/CIM/CIM_Schema.mof\fR -+\fI@datadir@/mof/cim-current/CIM_Schema.mof\fR - CIM Schema - .TP - \fI@localstatedir@/lib/sfcb/registration/providerRegister\fR -diff -up sblim-sfcb-1.3.9/sfcbrepos.sh.in.orig sblim-sfcb-1.3.9/sfcbrepos.sh.in ---- sblim-sfcb-1.3.9/sfcbrepos.sh.in.orig 2009-12-22 01:18:29.000000000 +0100 -+++ sblim-sfcb-1.3.9/sfcbrepos.sh.in 2010-09-06 13:45:28.671491648 +0200 -@@ -59,7 +59,7 @@ then - echo -e "\t-X create repository in non-native format as specifed by argument" - echo -e "\t-s specify staging directory [@localstatedir@/lib/sfcb/stage]" - echo -e "\t-r specify repository directory [@localstatedir@/lib/sfcb/registration]" -- echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/sfcb/CIM]" -+ echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/mof/cim-current]" - echo -e "\t-t create tiny class repository by omitting inheritance information" - echo -e "\t-z compress repository with gzip" - echo -@@ -99,7 +99,7 @@ fi - - if [ -z "$cimschemadir" ] - then -- cimschemadir=${DESTDIR}@datadir@/sfcb/CIM -+ cimschemadir=${DESTDIR}@datadir@/mof/cim-current - fi - - if [ -d $stagingdir ] && [ -f $stagingdir/default.reg ] && diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.5-service.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.5-service.patch deleted file mode 100644 index eaccfa594..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.5-service.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up sblim-sfcb-1.4.6/Makefile.in.orig sblim-sfcb-1.4.6/Makefile.in ---- sblim-sfcb-1.4.6/Makefile.in.orig 2013-10-07 10:43:34.783228137 +0200 -+++ sblim-sfcb-1.4.6/Makefile.in 2013-10-07 10:44:30.178533289 +0200 -@@ -627,7 +627,6 @@ initdir = $(sysconfdir)/init.d - pamdir = $(sysconfdir)/pam.d - sfcblibdir = $(libdir)/sfcb - cmpilibdir = $(libdir)/cmpi --systemddir = $(DESTDIR)@SYSTEMDDIR@ - MANFILES = man/genSslCert.1 man/getSchema.1 man/sfcbd.1 man/sfcbmof.1 \ - man/sfcbrepos.1 man/sfcbstage.1 man/sfcbunstage.1 man/sfcbuuid.1 \ - man/wbemcat.1 man/xmltest.1 -@@ -2366,7 +2365,6 @@ unittest: - cd test && sh check_all.sh - - install-data-local: -- if test -d $(systemddir); then cp $(srcdir)/sblim-sfcb.service $(systemddir); fi; - test -d $(DESTDIR)$(sfcbstatedir)/registration/repository || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/registration/repository - test -d $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop - test -d $(DESTDIR)$(sfcbstatedir)/stage/regs || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/stage/regs -@@ -2384,7 +2382,6 @@ install-data-local: - uninstall-local: - rm -f $(DESTDIR)$(sfcbstatedir)/stage/default.reg - rm -f $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop/10_interop.mof -- rm -f $(systemddir)/sblim-sfcb.service - @INDICATIONS_TRUE@ rm -f $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop/20_indication.mof - @INDICATIONS_TRUE@ rm -f $(DESTDIR)$(sfcbstatedir)/stage/mofs/indication.mof - @DOCS_TRUE@ rm -rf $(DESTDIR)$(sfcbdocdir)/html diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch deleted file mode 100644 index 3268d49f4..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up sblim-sfcb-1.4.8/control.c.orig sblim-sfcb-1.4.8/control.c ---- sblim-sfcb-1.4.8/control.c.orig 2014-03-27 00:46:28.000000000 +0100 -+++ sblim-sfcb-1.4.8/control.c 2014-05-15 12:31:38.304169409 +0200 -@@ -170,7 +170,7 @@ static Control init[] = { - {"sslCertList", CTL_STRING, SFCB_CONFDIR "/clist.pem", {0}}, - {"sslCiphers", CTL_STRING, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH", {0}}, - {"sslDhParamsFilePath", CTL_STRING, NULL, {0}}, -- {"sslEcDhCurveName", CTL_STRING, "secp224r1", {0}}, -+ {"sslEcDhCurveName", CTL_STRING, "secp384r1", {0}}, - {"enableSslCipherServerPref", CTL_BOOL, NULL, {.b=0}}, - - {"registrationDir", CTL_STRING, SFCB_STATEDIR "/registration", {0}}, -diff -up sblim-sfcb-1.4.8/sfcb.cfg.pre.in.orig sblim-sfcb-1.4.8/sfcb.cfg.pre.in ---- sblim-sfcb-1.4.8/sfcb.cfg.pre.in.orig 2014-05-15 12:31:59.188244865 +0200 -+++ sblim-sfcb-1.4.8/sfcb.cfg.pre.in 2014-05-15 12:32:45.554408412 +0200 -@@ -293,8 +293,8 @@ sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STR - ## environment. If this value is not set, the indicated default is in effect. - ## If the value is set but the curve name is not recognized by the underlying - ## openssl implementation, SFCB will abort. --## Default is secp224r1 --#sslEcDhCurveName: secp224r1 -+## Default is secp384r1 -+#sslEcDhCurveName: secp384r1 - - ## When set to true, sets the SSL_OP_CIPHER_SERVER_PREFERENCE flag for the ssl - ## context, to enforce server's preference instead of the client preference for diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-ftbfs.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-ftbfs.patch deleted file mode 100644 index 9548b3c06..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-ftbfs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up sblim-sfcb-1.4.9/control.c.orig sblim-sfcb-1.4.9/control.c ---- sblim-sfcb-1.4.9/control.c.orig 2015-07-13 15:06:21.331660336 +0200 -+++ sblim-sfcb-1.4.9/control.c 2015-07-13 15:08:38.031308917 +0200 -@@ -83,7 +83,7 @@ long httpReqHandlerTimeout; - * Kindly null terminate, always, even if might overwrite - * the last char of the truncated string. - */ --inline char *strncpy_kind(char *to, char *from, size_t size) { -+char *strncpy_kind(char *to, char *from, size_t size) { - strncpy(to, from, size); - *(to + size - 1) = '\0'; - return to; diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch deleted file mode 100644 index 7279d84a5..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ad6ca4f392bf549239b1ed3b2b372070eb127e7f Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Wed, 11 Jul 2018 11:06:04 +0800 -Subject: [PATCH] Makefile.am: fix sfcbinst2mof_DEPENDENCIES - -Fixed build with automake 1.16.1: -/path/to/i586-poky-linux/8.1.0/ld: cannot find -lsfcBrokerCore -collect2: error: ld returned 1 exit status - -Upstream-Status: Pending - -Signed-off-by: Robert Yang ---- - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.am b/Makefile.am -index 34ac319..47deed7 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -360,6 +360,7 @@ sfcbproc_SOURCES=sfcbproc.c - - sfcbinst2mof_SOURCES=sfcbinst2mof.c - sfcbinst2mof_LDADD = -lsfcFileRepository -lsfcBrokerCore -+sfcbinst2mof_DEPENDENCIES = libsfcBrokerCore.la libsfcFileRepository.la - - sfcbtrace_SOURCES=sfcbtrace.c - sfcbtrace_LDADD = -lsfcBrokerCore --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Avoid-variable-definition-in-header-files.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Avoid-variable-definition-in-header-files.patch new file mode 100644 index 000000000..b0b43f357 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Avoid-variable-definition-in-header-files.patch @@ -0,0 +1,100 @@ +From fccbb85beb89b9ca35cac87fb553ef124a6c516b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Aug 2020 17:26:14 -0700 +Subject: [PATCH] Avoid variable definition in header files + +This can cause multiple definitions to be emitted into objects and link +fail as a result with gcc-10+ since it defaults to -fno-common, patch +moves the definitions to source files + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + control.h | 2 +- + providerMgr.c | 1 + + providerMgr.h | 2 +- + sfcBroker.c | 2 +- + trace.c | 1 + + trace.h | 2 +- + 6 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/control.h b/control.h +index e41e4b9..5e15363 100644 +--- a/control.h ++++ b/control.h +@@ -28,7 +28,7 @@ int getControlUNum(char *id, unsigned int *val); + int getControlULong(char *id, unsigned long *val); + int getControlNum(char *id, long *val); + int getControlBool(char *id, int *val); +-const char * sfcBrokerStart; ++extern const char * sfcBrokerStart; + + #endif + /* MODELINES */ +diff --git a/providerMgr.c b/providerMgr.c +index c38a7d3..ff6d38d 100644 +--- a/providerMgr.c ++++ b/providerMgr.c +@@ -53,6 +53,7 @@ + #define SFCB_ASM(x) + #endif + ++sigset_t mask, old_mask; + static pthread_mutex_t resultsocketMutex = PTHREAD_MUTEX_INITIALIZER; + + extern CMPIBroker *Broker; +diff --git a/providerMgr.h b/providerMgr.h +index 3cc7745..fbbfecd 100644 +--- a/providerMgr.h ++++ b/providerMgr.h +@@ -398,7 +398,7 @@ BinResponseHdr **invokeProviders(BinRequestContext * binCtx, int *err, + BinResponseHdr *invokeProvider(BinRequestContext * ctx); + void freeResponseHeaders(BinResponseHdr ** resp, + BinRequestContext * ctx); +-sigset_t mask, old_mask; ++extern sigset_t mask, old_mask; + + #endif + /* MODELINES */ +diff --git a/sfcBroker.c b/sfcBroker.c +index ca043c9..85581f5 100644 +--- a/sfcBroker.c ++++ b/sfcBroker.c +@@ -53,7 +53,7 @@ + #endif + + int sfcBrokerPid = 0; +- ++const char *sfcBrokerStart; + extern int sfcbUseSyslog; + + extern void setExFlag(unsigned long f); +diff --git a/trace.c b/trace.c +index 438af46..23597e1 100644 +--- a/trace.c ++++ b/trace.c +@@ -52,6 +52,7 @@ char *processName = NULL; + int providerProcess = 0; + int idleThreadId = 0; + int terminating = 0; ++int colorTrace; + + int _sfcb_debug = 0; + unsigned long _sfcb_trace_mask = 0; +diff --git a/trace.h b/trace.h +index 2c6d8be..ea39850 100644 +--- a/trace.h ++++ b/trace.h +@@ -130,7 +130,7 @@ typedef struct traceId { + #define CYAN 6 + #define WHITE 7 + void changeTextColor(int reset); +-int colorTrace; ++extern int colorTrace; + + #define MAX_MSG_SIZE 1024 /* max length of trace message */ + +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Replace-need-for-error.h-when-it-does-not-exist.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Replace-need-for-error.h-when-it-does-not-exist.patch new file mode 100644 index 000000000..e72305023 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-Replace-need-for-error.h-when-it-does-not-exist.patch @@ -0,0 +1,124 @@ +From 394bf0f1ed07419d40f6024363cc1ffc7ef61bc6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 31 Aug 2017 21:56:25 -0700 +Subject: [PATCH] Replace need for error.h when it does not exist + +helps fixing build on musl + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + brokerUpc.c | 5 ++++- + configure.ac | 2 +- + httpAdapter.c | 4 +++- + support.c | 14 +++++++++++++- + trace.c | 4 +++- + 5 files changed, 24 insertions(+), 5 deletions(-) + +diff --git a/brokerUpc.c b/brokerUpc.c +index 17cbd9b..fe2b347 100644 +--- a/brokerUpc.c ++++ b/brokerUpc.c +@@ -20,8 +20,11 @@ + + #include + #include ++#ifdef HAVE_ERROR_H + #include +- ++#else ++#include ++#endif + #include "support.h" + #include "native.h" + #include +diff --git a/configure.ac b/configure.ac +index ab2964e..d4915a1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -517,7 +517,7 @@ fi + # Checks for header files. + AC_HEADER_STDC + AC_HEADER_SYS_WAIT +-AC_CHECK_HEADERS([fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h zlib.h]) ++AC_CHECK_HEADERS([error.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h zlib.h]) + AC_CHECK_HEADERS([cmpi/cmpimacs.h cmpi/cmpift.h cmpi/cmpidt.h],[],[AC_MSG_ERROR([Could not find required CPMI header.])]) + + # Checks for typedefs, structures, and compiler characteristics. +diff --git a/httpAdapter.c b/httpAdapter.c +index 2719e6c..e768972 100644 +--- a/httpAdapter.c ++++ b/httpAdapter.c +@@ -71,7 +71,9 @@ + #ifdef HAVE_UDS + #include + #endif +- ++#ifndef __SOCKADDR_ARG ++# define __SOCKADDR_ARG struct sockaddr *__restrict ++#endif + /* should probably go into cimRequest.h */ + #define CIM_PROTOCOL_ANY 0 + #define CIM_PROTOCOL_CIM_XML 1 +diff --git a/support.c b/support.c +index c7bba8b..5b3eef1 100644 +--- a/support.c ++++ b/support.c +@@ -32,7 +32,11 @@ + #include "support.h" + #include + #include ++#ifdef HAVE_ERROR_H + #include ++#else ++#include ++#endif + #include + #include "native.h" + #include "trace.h" +@@ -331,17 +335,25 @@ loadQualifierDeclMI(const char *provider, + _SFCB_RETURN(NULL); + }; + ++ + /****************************************************************************/ + + /** Exits the program with a memory allocation error message in case the given + * condition holds. + */ ++#if HAVE_ERROR_H + #define __ALLOC_ERROR(cond) \ + if ( cond ) { \ + error_at_line ( -1, errno, __FILE__, __LINE__, \ + "unable to allocate requested memory." ); \ + } +- ++#else ++#define __ALLOC_ERROR(cond) \ ++ if ( cond ) { \ ++ err(1, "%s:%d: %s", __FILE__, __LINE__, \ ++ "unable to allocate requested memory." ); \ ++ } ++#endif + /** + * flag to ensure MM is initialized only once + */ +diff --git a/trace.c b/trace.c +index d7f30db..438af46 100644 +--- a/trace.c ++++ b/trace.c +@@ -279,7 +279,9 @@ _sfcb_trap(int tn) + } + #endif + } +- ++#ifndef SA_INTERRUPT ++# define SA_INTERRUPT 0x20000000 /* from GLIBC's */ ++#endif + sigHandler * + setSignal(int sn, sigHandler * sh, int flags) + { +-- +2.14.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-stdint.h-system-header-for-UINT16_MAX.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-stdint.h-system-header-for-UINT16_MAX.patch new file mode 100644 index 000000000..c2111a2c1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-stdint.h-system-header-for-UINT16_MAX.patch @@ -0,0 +1,29 @@ +From 446fb15f79499f52ce01ca759dbdcfe635519a82 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 27 Jun 2017 07:09:33 -0700 +Subject: [PATCH] include stdint.h system header for UINT16_MAX + +Fixes build error + +error: 'UINT16_MAX' undeclared (first use in this function) + +Signed-off-by: Khem Raj +--- + interopServerProvider.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/interopServerProvider.c b/interopServerProvider.c +index 23ae182..532febe 100644 +--- a/interopServerProvider.c ++++ b/interopServerProvider.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.13.2 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.15-fix-provider-debugging.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.15-fix-provider-debugging.patch new file mode 100644 index 000000000..4fbecaa63 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.15-fix-provider-debugging.patch @@ -0,0 +1,12 @@ +diff -up sblim-sfcb-1.4.5/providerDrv.c.orig sblim-sfcb-1.4.5/providerDrv.c +--- sblim-sfcb-1.4.5/providerDrv.c.orig 2013-09-04 12:59:22.140813239 +0200 ++++ sblim-sfcb-1.4.5/providerDrv.c 2013-09-04 12:59:40.511870274 +0200 +@@ -3585,7 +3585,7 @@ processProviderInvocationRequests(char * + rc = spRecvReq(&providerSockets.receive, &parms->requestor, + (void **) &parms->req, &rl, &mqg); + if (mqg.rdone) { +- int debug_break = 0; ++ volatile int debug_break = 0; + if (rc != 0) { + mlogf(M_ERROR,M_SHOW, "spRecvReq returned error %d. Skipping message.\n", rc); + free(parms); diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-maxMsgLen.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-maxMsgLen.patch new file mode 100644 index 000000000..a0dd81653 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-maxMsgLen.patch @@ -0,0 +1,14 @@ +diff -up sblim-sfcb-1.3.16/sfcb.cfg.pre.in.old sblim-sfcb-1.3.16/sfcb.cfg.pre.in +--- sblim-sfcb-1.3.16/sfcb.cfg.pre.in.old 2012-06-13 23:21:09.000000000 +0200 ++++ sblim-sfcb-1.3.16/sfcb.cfg.pre.in 2013-06-24 15:34:38.881992781 +0200 +@@ -113,8 +113,8 @@ provProcs: 32 + + ## Max message length, in bytes. This is a limit on the size of messages + ## written across sockets, for instance, between providers and SFCB. +-## Default is 10000000 +-maxMsgLen: 10000000 ++## Default is 100000000 ++maxMsgLen: 100000000 + + ## Location of the registration directory, where providerRegister can be found + ## Default is @localstatedir@/lib/sfcb/registration diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-multilib-man-cfg.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-multilib-man-cfg.patch new file mode 100644 index 000000000..c8cece2c2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.16-multilib-man-cfg.patch @@ -0,0 +1,41 @@ +diff -up sblim-sfcb-1.3.16/man/sfcbd.1.pre.in.orig sblim-sfcb-1.3.16/man/sfcbd.1.pre.in +--- sblim-sfcb-1.3.16/man/sfcbd.1.pre.in.orig 2014-02-26 14:05:32.213091734 +0100 ++++ sblim-sfcb-1.3.16/man/sfcbd.1.pre.in 2014-02-26 15:10:54.476196379 +0100 +@@ -151,7 +151,7 @@ Default=\fI@localstatedir@/lib/sfcb/regi + .TP + .B providerDirs + A space separated list of directories where sfcb is looking for provider +-libraries. Default=\fI@libdir@\ @libdir@/cmpi\fR ++libraries. Default=\fI/usr/lib\ /usr/lib/cmpi /usr/lib64\ /usr/lib64/cmpi\fR + .TP + .B providerSampleInterval + The interval in seconds at which the provider manager is checking for +@@ -275,11 +275,11 @@ SSL private key file for sfcb. + SSL client certificate / trust store for sfcb. + .SH LIBRARIES + .TP +-.I @libdir@/libsfc* ++.I /usr/lib/libsfc* /usr/lib64/libsfc* + Binaries for sfcb runtime libraries. + .TP +-.I @libdir@/cmpi/* +-Binaries for providers ++.I /usr/lib/cmpi/* /usr/lib64/cmpi/* ++Binaries for providers. + .SH AUTHOR + Adrian Schuur + .SH CONRIBUTORS +diff -up sblim-sfcb-1.3.16/sfcb.cfg.pre.in.orig sblim-sfcb-1.3.16/sfcb.cfg.pre.in +--- sblim-sfcb-1.3.16/sfcb.cfg.pre.in.orig 2014-02-26 15:35:43.133869718 +0100 ++++ sblim-sfcb-1.3.16/sfcb.cfg.pre.in 2014-02-26 15:38:12.794240532 +0100 +@@ -121,8 +121,8 @@ maxMsgLen: 100000000 + registrationDir: @localstatedir@/lib/sfcb/registration + + ## Locations to look for provider libraries. Delimit paths with a space. +-## Default is @libdir@/sfcb @libdir@ @libdir@/cmpi +-providerDirs: @libdir@/sfcb @libdir@ @libdir@/cmpi ++## Default is /usr/lib/sfcb /usr/lib64/sfcb /usr/lib /usr/lib64 /usr/lib/cmpi /usr/lib64/cmpi ++providerDirs: /usr/lib/sfcb /usr/lib64/sfcb /usr/lib /usr/lib64 /usr/lib/cmpi /usr/lib64/cmpi + + ## Enable the root/interop namespace (affects indications) + ## Default: true diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch new file mode 100644 index 000000000..7f95a9da3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch @@ -0,0 +1,42 @@ +diff -up sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in.orig sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in +--- sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in.orig 2009-10-13 21:54:13.000000000 +0200 ++++ sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in 2010-09-06 14:01:57.294564062 +0200 +@@ -26,7 +26,7 @@ Supported command line options are: + .TP + \fB\-c\fR \fIschemadir\fR + Path to obtain the CIM Schema classes. +-Default is \fI@datadir@/sfcb\fR ++Default is \fI@datadir@/mof/cim-current\fR + .TP + \fB\-s\fR \fIstagingdir\fR + Path to sfcb staging area containing class MOFs and registration files +@@ -58,7 +58,7 @@ Alias of \fB-b\fR + Display usage information and exit. + .SH FILES + .TP +-\fI@datadir@/sfcb/CIM/CIM_Schema.mof\fR ++\fI@datadir@/mof/cim-current/CIM_Schema.mof\fR + CIM Schema + .TP + \fI@localstatedir@/lib/sfcb/registration/providerRegister\fR +diff -up sblim-sfcb-1.3.9/sfcbrepos.sh.in.orig sblim-sfcb-1.3.9/sfcbrepos.sh.in +--- sblim-sfcb-1.3.9/sfcbrepos.sh.in.orig 2009-12-22 01:18:29.000000000 +0100 ++++ sblim-sfcb-1.3.9/sfcbrepos.sh.in 2010-09-06 13:45:28.671491648 +0200 +@@ -59,7 +59,7 @@ then + echo -e "\t-X create repository in non-native format as specifed by argument" + echo -e "\t-s specify staging directory [@localstatedir@/lib/sfcb/stage]" + echo -e "\t-r specify repository directory [@localstatedir@/lib/sfcb/registration]" +- echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/sfcb/CIM]" ++ echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/mof/cim-current]" + echo -e "\t-t create tiny class repository by omitting inheritance information" + echo -e "\t-z compress repository with gzip" + echo +@@ -99,7 +99,7 @@ fi + + if [ -z "$cimschemadir" ] + then +- cimschemadir=${DESTDIR}@datadir@/sfcb/CIM ++ cimschemadir=${DESTDIR}@datadir@/mof/cim-current + fi + + if [ -d $stagingdir ] && [ -f $stagingdir/default.reg ] && diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.5-service.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.5-service.patch new file mode 100644 index 000000000..eaccfa594 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.5-service.patch @@ -0,0 +1,27 @@ +diff -up sblim-sfcb-1.4.6/Makefile.in.orig sblim-sfcb-1.4.6/Makefile.in +--- sblim-sfcb-1.4.6/Makefile.in.orig 2013-10-07 10:43:34.783228137 +0200 ++++ sblim-sfcb-1.4.6/Makefile.in 2013-10-07 10:44:30.178533289 +0200 +@@ -627,7 +627,6 @@ initdir = $(sysconfdir)/init.d + pamdir = $(sysconfdir)/pam.d + sfcblibdir = $(libdir)/sfcb + cmpilibdir = $(libdir)/cmpi +-systemddir = $(DESTDIR)@SYSTEMDDIR@ + MANFILES = man/genSslCert.1 man/getSchema.1 man/sfcbd.1 man/sfcbmof.1 \ + man/sfcbrepos.1 man/sfcbstage.1 man/sfcbunstage.1 man/sfcbuuid.1 \ + man/wbemcat.1 man/xmltest.1 +@@ -2366,7 +2365,6 @@ unittest: + cd test && sh check_all.sh + + install-data-local: +- if test -d $(systemddir); then cp $(srcdir)/sblim-sfcb.service $(systemddir); fi; + test -d $(DESTDIR)$(sfcbstatedir)/registration/repository || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/registration/repository + test -d $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop + test -d $(DESTDIR)$(sfcbstatedir)/stage/regs || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/stage/regs +@@ -2384,7 +2382,6 @@ install-data-local: + uninstall-local: + rm -f $(DESTDIR)$(sfcbstatedir)/stage/default.reg + rm -f $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop/10_interop.mof +- rm -f $(systemddir)/sblim-sfcb.service + @INDICATIONS_TRUE@ rm -f $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop/20_indication.mof + @INDICATIONS_TRUE@ rm -f $(DESTDIR)$(sfcbstatedir)/stage/mofs/indication.mof + @DOCS_TRUE@ rm -rf $(DESTDIR)$(sfcbdocdir)/html diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch new file mode 100644 index 000000000..3268d49f4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch @@ -0,0 +1,26 @@ +diff -up sblim-sfcb-1.4.8/control.c.orig sblim-sfcb-1.4.8/control.c +--- sblim-sfcb-1.4.8/control.c.orig 2014-03-27 00:46:28.000000000 +0100 ++++ sblim-sfcb-1.4.8/control.c 2014-05-15 12:31:38.304169409 +0200 +@@ -170,7 +170,7 @@ static Control init[] = { + {"sslCertList", CTL_STRING, SFCB_CONFDIR "/clist.pem", {0}}, + {"sslCiphers", CTL_STRING, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH", {0}}, + {"sslDhParamsFilePath", CTL_STRING, NULL, {0}}, +- {"sslEcDhCurveName", CTL_STRING, "secp224r1", {0}}, ++ {"sslEcDhCurveName", CTL_STRING, "secp384r1", {0}}, + {"enableSslCipherServerPref", CTL_BOOL, NULL, {.b=0}}, + + {"registrationDir", CTL_STRING, SFCB_STATEDIR "/registration", {0}}, +diff -up sblim-sfcb-1.4.8/sfcb.cfg.pre.in.orig sblim-sfcb-1.4.8/sfcb.cfg.pre.in +--- sblim-sfcb-1.4.8/sfcb.cfg.pre.in.orig 2014-05-15 12:31:59.188244865 +0200 ++++ sblim-sfcb-1.4.8/sfcb.cfg.pre.in 2014-05-15 12:32:45.554408412 +0200 +@@ -293,8 +293,8 @@ sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STR + ## environment. If this value is not set, the indicated default is in effect. + ## If the value is set but the curve name is not recognized by the underlying + ## openssl implementation, SFCB will abort. +-## Default is secp224r1 +-#sslEcDhCurveName: secp224r1 ++## Default is secp384r1 ++#sslEcDhCurveName: secp384r1 + + ## When set to true, sets the SSL_OP_CIPHER_SERVER_PREFERENCE flag for the ssl + ## context, to enforce server's preference instead of the client preference for diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-ftbfs.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-ftbfs.patch new file mode 100644 index 000000000..9548b3c06 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-ftbfs.patch @@ -0,0 +1,12 @@ +diff -up sblim-sfcb-1.4.9/control.c.orig sblim-sfcb-1.4.9/control.c +--- sblim-sfcb-1.4.9/control.c.orig 2015-07-13 15:06:21.331660336 +0200 ++++ sblim-sfcb-1.4.9/control.c 2015-07-13 15:08:38.031308917 +0200 +@@ -83,7 +83,7 @@ long httpReqHandlerTimeout; + * Kindly null terminate, always, even if might overwrite + * the last char of the truncated string. + */ +-inline char *strncpy_kind(char *to, char *from, size_t size) { ++char *strncpy_kind(char *to, char *from, size_t size) { + strncpy(to, from, size); + *(to + size - 1) = '\0'; + return to; diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch new file mode 100644 index 000000000..7279d84a5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch @@ -0,0 +1,31 @@ +From ad6ca4f392bf549239b1ed3b2b372070eb127e7f Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Wed, 11 Jul 2018 11:06:04 +0800 +Subject: [PATCH] Makefile.am: fix sfcbinst2mof_DEPENDENCIES + +Fixed build with automake 1.16.1: +/path/to/i586-poky-linux/8.1.0/ld: cannot find -lsfcBrokerCore +collect2: error: ld returned 1 exit status + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index 34ac319..47deed7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -360,6 +360,7 @@ sfcbproc_SOURCES=sfcbproc.c + + sfcbinst2mof_SOURCES=sfcbinst2mof.c + sfcbinst2mof_LDADD = -lsfcFileRepository -lsfcBrokerCore ++sfcbinst2mof_DEPENDENCIES = libsfcBrokerCore.la libsfcFileRepository.la + + sfcbtrace_SOURCES=sfcbtrace.c + sfcbtrace_LDADD = -lsfcBrokerCore +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sfcb.service b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sfcb.service new file mode 100644 index 000000000..5adf63c8a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/sfcb.service @@ -0,0 +1,11 @@ +[Unit] +Description=Small Footprint CIM Broker Service +After=syslog.target + +[Service] +Type=oneshot +ExecStart=/usr/sbin/sfcbd -d +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index a527f773a..3e4ed7c03 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb @@ -26,6 +26,7 @@ SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ file://0001-include-stdint.h-system-header-for-UINT16_MAX.patch \ file://0001-Replace-need-for-error.h-when-it-does-not-exist.patch \ file://sblim-sfcb-1.4.9-fix-sfcbinst2mof.patch \ + file://0001-Avoid-variable-definition-in-header-files.patch \ " SRC_URI[md5sum] = "28021cdabc73690a94f4f9d57254ce30" diff --git a/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-DtaAnnotatedDump-Add-typedef-name-to-the-union.patch b/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-DtaAnnotatedDump-Add-typedef-name-to-the-union.patch new file mode 100644 index 000000000..4be3353c6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-DtaAnnotatedDump-Add-typedef-name-to-the-union.patch @@ -0,0 +1,34 @@ +From 9db49b94336f65453e06fb6a6bc4e6edf9403fea Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 17 Aug 2020 17:22:09 -0700 +Subject: [PATCH] DtaAnnotatedDump: Add typedef name to the union + +This is found with clang +error: anonymous non-C-compatible type given name for linkage purposes by +typedef declaration; add a tag name here [-Werror,-Wnon-c-typedef-for-linkage] +| typedef union +| ^ +| CAtomHeader + +Upstream-Status: Submitted [https://github.com/Drive-Trust-Alliance/sedutil/pull/332] +Signed-off-by: Khem Raj +--- + Common/DtaAnnotatedDump.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Common/DtaAnnotatedDump.h b/Common/DtaAnnotatedDump.h +index 2749365..734c8eb 100644 +--- a/Common/DtaAnnotatedDump.h ++++ b/Common/DtaAnnotatedDump.h +@@ -20,7 +20,7 @@ along with sedutil. If not, see . + + #pragma pack(push,1) + +-typedef union ++typedef union CAtomHeader_t + { + // four bytes in big endian (network) byte order + uint8_t all[4]; +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb index 765618433..1e7a39319 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb @@ -12,6 +12,7 @@ PV = "${BASEPV}+git${SRCPV}" SRCREV = "358cc758948be788284d5faba46ccf4cc1813796" SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git \ file://0001-Fix-build-on-big-endian-architectures.patch \ + file://0001-DtaAnnotatedDump-Add-typedef-name-to-the-union.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.6.bb b/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.6.bb deleted file mode 100644 index 17c2fbab2..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.6.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Terminal multiplexer" -HOMEPAGE = "http://tmux.sourceforge.net" -SECTION = "console/utils" - -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf19144bdaca107" - -DEPENDS = "ncurses libevent" - -SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz" -SRC_URI[md5sum] = "d541ff392249f94c4f3635793556f827" -SRC_URI[sha256sum] = "b17cd170a94d7b58c0698752e1f4f263ab6dc47425230df7e53a6435cc7cd7e8" - -UPSTREAM_CHECK_URI = "https://github.com/tmux/tmux/releases" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "" -PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter," - -do_configure_prepend() { - # The 'compat' directory is needed for output during the build but it's - # not automatically created when building outside the source directory. - mkdir ${B}/compat -} diff --git a/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1b.bb b/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1b.bb new file mode 100644 index 000000000..fde0ed4ac --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.1b.bb @@ -0,0 +1,25 @@ +SUMMARY = "Terminal multiplexer" +HOMEPAGE = "http://tmux.sourceforge.net" +SECTION = "console/utils" + +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf19144bdaca107" + +DEPENDS = "ncurses libevent" + +SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz" +SRC_URI[md5sum] = "2cdacbf06ac4980d3f5312ad23b37f9b" +SRC_URI[sha256sum] = "d93f351d50af05a75fe6681085670c786d9504a5da2608e481c47cf5e1486db9" + +UPSTREAM_CHECK_URI = "https://github.com/tmux/tmux/releases" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "" +PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter," + +do_configure_prepend() { + # The 'compat' directory is needed for output during the build but it's + # not automatically created when building outside the source directory. + mkdir ${B}/compat +} diff --git a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.14.bb b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.14.bb deleted file mode 100644 index b94664c33..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.14.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Zlog is a pure C logging library" -HOMEPAGE = "https://github.com/HardySimpson/zlog" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRCREV = "8fc78c3c65cb705953a2f3f9a813c3ef3c8b2270" -SRC_URI = "git://github.com/HardySimpson/zlog" - -S = "${WORKDIR}/git" - -inherit pkgconfig - -EXTRA_OEMAKE = "CC='${CC}' LD='${LD}' LIBRARY_PATH=${baselib}" - -do_install() { - oe_runmake install PREFIX=${D}${exec_prefix} INSTALL=install -} diff --git a/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb new file mode 100644 index 000000000..7dde4182f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.15.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Zlog is a pure C logging library" +HOMEPAGE = "https://github.com/HardySimpson/zlog" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRCREV = "876099f3c66033f3de11d79f63814766b1021dbe" +SRC_URI = "git://github.com/HardySimpson/zlog" + +S = "${WORKDIR}/git" + +inherit pkgconfig + +EXTRA_OEMAKE = "CC='${CC}' LD='${LD}' LIBRARY_PATH=${baselib}" + +do_install() { + oe_runmake install PREFIX=${D}${exec_prefix} INSTALL=install +} diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb deleted file mode 100644 index 10f5a800b..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.2.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Library for reading and writing Jcat files" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" - -DEPENDS = "\ - glib-2.0 \ - json-glib \ -" - -SRC_URI = "\ - git://github.com/hughsie/libjcat.git \ - file://run-ptest \ -" -SRCREV = "1a509ac60b7446254c3bd1f45ea53e6cffba30ac" -S = "${WORKDIR}/git" - -inherit gobject-introspection gtk-doc meson ptest-gnome vala - -PACKAGECONFIG ??= "\ - gpg \ - pkcs7 \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ -" -PACKAGECONFIG[gpg] = "-Dgpg=true,-Dgpg=false,gpgme" -PACKAGECONFIG[pkcs7] = "-Dpkcs7=true,-Dpkcs7=false,gnutls gnutls-native" -PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" - -# manpage generation is broken because help2man needs to run the target binary on the host... -EXTRA_OEMESON = "-Dman=false" -GTKDOC_MESON_OPTION = "gtkdoc" - -RDEPENDS_${PN}_class-target = "\ - ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \ -" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.3.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.3.bb new file mode 100644 index 000000000..7ef2e5305 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.3.bb @@ -0,0 +1,34 @@ +SUMMARY = "Library for reading and writing Jcat files" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" + +DEPENDS = "\ + glib-2.0 \ + json-glib \ +" + +SRC_URI = "\ + git://github.com/hughsie/libjcat.git \ + file://run-ptest \ +" +SRCREV = "3c120a9132a36b100366cfe3d658ae31e6f4b7e9" +S = "${WORKDIR}/git" + +inherit gobject-introspection gtk-doc meson ptest-gnome vala + +PACKAGECONFIG ??= "\ + gpg \ + pkcs7 \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ +" +PACKAGECONFIG[gpg] = "-Dgpg=true,-Dgpg=false,gpgme" +PACKAGECONFIG[pkcs7] = "-Dpkcs7=true,-Dpkcs7=false,gnutls gnutls-native" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" + +# manpage generation is broken because help2man needs to run the target binary on the host... +EXTRA_OEMESON = "-Dman=false" +GTKDOC_MESON_OPTION = "gtkdoc" + +RDEPENDS_${PN}_class-target = "\ + ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \ +" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch new file mode 100644 index 000000000..86586fe71 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch @@ -0,0 +1,36 @@ +From 53a4f19887d9ae4e77f32dd6d71c8a7b516b4d5d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 10 Aug 2020 21:53:33 +0200 +Subject: [PATCH] Do not build tests when introspection is disabled/missing +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: +| ../libpeas-1.26.0/tests/libpeas/introspection/meson.build:47:0: ERROR: Unknown variable "libpeas_gir". + +Upstrem-Status: Submitted[https://gitlab.gnome.org/GNOME/libpeas/-/merge_requests/28] + +Signed-off-by: Andreas Müller +--- + meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 8322fea..43fb062 100644 +--- a/meson.build ++++ b/meson.build +@@ -254,7 +254,9 @@ subdir('loaders') + if build_demos == true + subdir('peas-demo') + endif +-subdir('tests') ++if generate_gir == true ++ subdir('tests') ++endif + + summary = [ + '', +-- +2.26.2 + diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch new file mode 100644 index 000000000..664693128 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas/add_missing_locale_include.patch @@ -0,0 +1,21 @@ +From 3cc69f1eaa86163c3816265fa64cb660f4def364 Mon Sep 17 00:00:00 2001 +From: Christian Hergert +Date: Fri, 13 Mar 2020 10:32:21 -0700 +Subject: [PATCH] demo: add missing locale.h include + +Fixes #39 + +Upstream-Status: backport + +diff --git a/peas-demo/peas-demo.c b/peas-demo/peas-demo.c +index 47ac005..466a392 100644 +--- a/peas-demo/peas-demo.c ++++ b/peas-demo/peas-demo.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.25.3.bb b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.25.3.bb deleted file mode 100644 index 57419a427..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.25.3.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "libpeas is a gobject-based plugins engine" -HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d" - -DEPENDS = "gtk+3" - -GNOMEBASEBUILDCLASS = "meson" -GTKDOC_MESON_OPTION = "gtk_doc" - -inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache - -SRC_URI[archive.md5sum] = "08bfff8f9688cf630dcb0f950617661f" -SRC_URI[archive.sha256sum] = "1c9bbb29740c29cd6e1dd0c9964722ff08cd5e6f68f1b5c135bc391a6ce97639" - -PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" - -PACKAGES =+ "${PN}-demo ${PN}-python3" -FILES_${PN}-demo = " \ - ${bindir}/peas-demo \ - ${libdir}/peas-demo \ -" - -RDEPENDS_${PN}-python3 = "python3-pygobject" -FILES_${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb new file mode 100644 index 000000000..fd4ce7de5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.26.0.bb @@ -0,0 +1,32 @@ +SUMMARY = "libpeas is a gobject-based plugins engine" +HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d" + +DEPENDS = "gtk+3" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI += " \ + file://add_missing_locale_include.patch \ + file://0001-Do-not-build-tests-when-introspection-is-disabled-mi.patch \ +" + +SRC_URI[archive.md5sum] = "f7723bf8433b7984121157e1e9a629b5" +SRC_URI[archive.sha256sum] = "a976d77e20496479a8e955e6a38fb0e5c5de89cf64d9f44e75c2213ee14f7376" + +PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" + +PACKAGES =+ "${PN}-demo ${PN}-python3" +FILES_${PN}-demo = " \ + ${bindir}/peas-demo \ + ${libdir}/peas-demo \ +" + +RDEPENDS_${PN}-python3 = "python3-pygobject" +FILES_${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so" diff --git a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc index 65fd89e6f..f7dc66843 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc @@ -28,6 +28,8 @@ S = "${WORKDIR}/DirectFB-${PV}" LDFLAGS_append = " -lm" +CXXFLAGS_append_toolchain-clang = " -Wno-error=dtor-typedef" + # Workaround for linking issues seen with armv7a + gold LDFLAGS_append_arm = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.10.bb b/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.10.bb deleted file mode 100644 index 0bf48ace6..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.10.bb +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY = "Framebuffer image and doc viewer tools" -DESCRIPTION = "The fbida project contains a few applications for viewing and editing images, \ - with the main focus being photos." -HOMEPAGE = "http://linux.bytesex.org/fbida/" -AUTHOR = "Gerd Hoffmann" -SECTION = "utils" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" - -DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif" - -SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz \ - file://0001-Avoid-using-host-path.patch \ - file://fix-preprocessor.patch \ - file://support-jpeg-turbo.patch \ - file://use-jpeg-turbo.patch \ - " -SRC_URI[md5sum] = "09460b964b58c2e39b665498eca29018" -SRC_URI[sha256sum] = "7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6" - -B = "${WORKDIR}/build" - -inherit pkgconfig - -EXTRA_OEMAKE = "STRIP= 'srcdir=${S}' -f ${S}/GNUmakefile" - -PACKAGECONFIG ??= "gif png curl" -PACKAGECONFIG[curl] = ",,curl" -PACKAGECONFIG[gif] = ",,giflib" -PACKAGECONFIG[png] = ",,libpng" -PACKAGECONFIG[tiff] = ",,tiff" -PACKAGECONFIG[motif] = ",,libx11 libxext libxpm libxt openmotif" -PACKAGECONFIG[webp] = ",,libwebp" -PACKAGECONFIG[lirc] = ",,lirc" - -do_compile() { - sed -i -e 's# fbgs# \$(srcdir)/fbgs#; s#-Ijpeg#-I\$(srcdir)/jpeg#; s# jpeg/# \$(srcdir)/jpeg/#' ${S}/GNUmakefile - sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk - sed -i -e 's: cpp: ${CPP}:' ${S}/GNUmakefile - - # Be sure to respect preferences (force to "no") - # Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH} - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'curl', d)}" ]; then - sed -i -e '/^HAVE_LIBCURL/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'gif', d)}" ]; then - sed -i -e '/^HAVE_LIBGIF/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'png', d)}" ]; then - sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'tiff', d)}" ]; then - sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'motif', d)}" ]; then - sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'webp', d)}" ]; then - sed -i -e '/^HAVE_LIBWEBP/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'lirc', d)}" ]; then - sed -i -e '/^HAVE_LIBLIRC/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - - oe_runmake -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -RDEPENDS_${PN} = "ttf-dejavu-sans-mono bash" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.14.bb b/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.14.bb new file mode 100644 index 000000000..29d0f64ac --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.14.bb @@ -0,0 +1,75 @@ +SUMMARY = "Framebuffer image and doc viewer tools" +DESCRIPTION = "The fbida project contains a few applications for viewing and editing images, \ + with the main focus being photos." +HOMEPAGE = "http://linux.bytesex.org/fbida/" +AUTHOR = "Gerd Hoffmann" +SECTION = "utils" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=e8feb78a32950a909621bbb51f634b39" + +DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif libdrm pixman poppler libepoxy cairo" + +SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz \ + file://0001-Avoid-using-host-path.patch \ + file://fix-preprocessor.patch \ + file://support-jpeg-turbo.patch \ + file://cairo-weak-detect.patch \ + file://fbida-gcc10.patch \ + " +SRC_URI[sha256sum] = "95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438" + +inherit pkgconfig + +EXTRA_OEMAKE = "STRIP= 'srcdir=${S}' -f ${S}/GNUmakefile" + +PACKAGECONFIG ??= "gif png curl" +PACKAGECONFIG[curl] = ",,curl" +PACKAGECONFIG[gif] = ",,giflib" +PACKAGECONFIG[png] = ",,libpng" +PACKAGECONFIG[tiff] = ",,tiff" +PACKAGECONFIG[motif] = ",,libx11 libxext libxpm libxt openmotif" +PACKAGECONFIG[webp] = ",,libwebp" +PACKAGECONFIG[lirc] = ",,lirc" +# This can only be enabled when cairo has egl enabled in its packageconfig support too +PACKAGECONFIG[egl] = ",," + +EXTRA_OEMAKE += ""${@bb.utils.contains('PACKAGECONFIG', 'egl', 'HAVE_CAIRO_GL=yes', 'HAVE_CAIRO_GL=no', d)}"" + +do_compile() { + sed -i -e 's# fbgs# \$(srcdir)/fbgs#; s#-Ijpeg#-I\$(srcdir)/jpeg#; s# jpeg/# \$(srcdir)/jpeg/#' ${S}/GNUmakefile + sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk + sed -i -e 's: cpp: ${CPP}:' ${S}/GNUmakefile + + # Be sure to respect preferences (force to "no") + # Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH} + if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'curl', d)}" ]; then + sed -i -e '/^HAVE_LIBCURL/s/:=.*$/:= no/' ${S}/GNUmakefile + fi + if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'gif', d)}" ]; then + sed -i -e '/^HAVE_LIBGIF/s/:=.*$/:= no/' ${S}/GNUmakefile + fi + if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'png', d)}" ]; then + sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile + fi + if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'tiff', d)}" ]; then + sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile + fi + if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'motif', d)}" ]; then + sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile + fi + if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'webp', d)}" ]; then + sed -i -e '/^HAVE_LIBWEBP/s/:=.*$/:= no/' ${S}/GNUmakefile + fi + if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'lirc', d)}" ]; then + sed -i -e '/^HAVE_LIBLIRC/s/:=.*$/:= no/' ${S}/GNUmakefile + fi + + oe_runmake +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +RDEPENDS_${PN} = "ttf-dejavu-sans-mono bash" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch new file mode 100644 index 000000000..c7c579cc4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch @@ -0,0 +1,17 @@ +OE configures cairo to disable EGL support, however fbida expects cairo with egl support +this patch therefore makes it possible to set HAVE_CAIRO_GL via recipe + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj + +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -67,7 +67,7 @@ define make-config + LIB := $(LIB) + RESDIR := $(call ac_resdir) + HAVE_LINUX_FB_H := $(call ac_header,linux/fb.h) +-HAVE_CAIRO_GL := $(call ac_pkg_config,cairo-gl) ++HAVE_CAIRO_GL ?= $(call ac_pkg_config,cairo-gl) + HAVE_LIBPCD := $(call ac_lib,pcd_open,pcd) + HAVE_LIBGIF := $(call ac_lib,DGifOpenFileName,gif) + HAVE_LIBWEBP := $(call ac_pkg_config,libwebp) diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fbida-gcc10.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fbida-gcc10.patch new file mode 100644 index 000000000..1104289f3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fbida-gcc10.patch @@ -0,0 +1,61 @@ +Fix build with gcc10 + +Patch from https://src.fedoraproject.org/rpms/fbida/raw/master/f/fbida.gcc10.patch + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- fbida-2.14/fbi.c.org 2020-03-15 17:02:17.944189632 +0100 ++++ fbida-2.14/fbi.c 2020-03-15 17:02:21.880223224 +0100 +@@ -100,7 +100,6 @@ + + /* graphics interface */ + gfxstate *gfx; +-int debug; + + /* framebuffer */ + char *fbdev = NULL; +--- fbida-2.14/filter.c 2020-03-15 16:44:17.159855150 +0100 ++++ fbida-2.14/filter.c 2020-03-15 16:44:27.017941447 +0100 +@@ -6,8 +6,6 @@ + #include "readers.h" + #include "filter.h" + +-int debug = 0; +- + /* ----------------------------------------------------------------------- */ + + static void +--- fbida-2.14/readers.c.org 2020-03-15 17:01:18.692683597 +0100 ++++ fbida-2.14/readers.c 2020-03-15 16:57:19.141632384 +0100 +@@ -6,6 +6,8 @@ + + #include "readers.h" + ++int debug=0; ++ + /* ----------------------------------------------------------------------- */ + + void load_bits_lsb(unsigned char *dst, unsigned char *src, int width, + +--- fbida-2.14/viewer.c.org 2020-03-15 17:05:02.991595832 +0100 ++++ fbida-2.14/viewer.c 2020-03-15 17:04:55.424531467 +0100 +@@ -40,7 +40,6 @@ + #define PROCESS_LINES 16 + +-int debug; + Cursor ptrs[POINTER_COUNT]; + + /* ----------------------------------------------------------------------- */ + +--- fbida-2.14/idaconfig.h.org 2020-03-15 17:07:09.239668196 +0100 ++++ fbida-2.14/idaconfig.h 2020-03-15 17:07:21.248770061 +0100 +@@ -17,7 +17,7 @@ + + /* -------------------------------------------------------------------------- */ + +-char *ida_lists; ++extern char *ida_lists; + + void ida_init_config(void); + void ida_read_config(void); diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch index 909a0a6c0..cdeac996a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch @@ -1,14 +1,6 @@ -Index: fbida-2.13/GNUmakefile -=================================================================== ---- fbida-2.13.orig/GNUmakefile -+++ fbida-2.13/GNUmakefile -@@ -53,8 +53,7 @@ include $(srcdir)/mk/Autoconf.mk - - ac_jpeg_ver = $(shell \ - $(call ac_init,for libjpeg version);\ -- $(call ac_s_cmd,echo JPEG_LIB_VERSION \ -- | cpp -include jpeglib.h | tail -n 1);\ -+ $(call ac_s_cmd,cpp -include jpeglib.h -dM -E -x c /dev/null | grep 'define JPEG_LIB_VERSION' | cut -f 3 -d' ');\ - $(call ac_fini)) - - define make-config +--- a/scripts/jpeg-version.sh ++++ b/scripts/jpeg-version.sh +@@ -1,2 +1,2 @@ + #!/bin/sh +-echo JPEG_LIB_VERSION | cpp $CFLAGS -include jpeglib.h | tail -1 ++${CPP} -include jpeglib.h -dM -E -x c /dev/null | grep 'define JPEG_LIB_VERSION' | cut -f 3 -d' ' diff --git a/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb b/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb index 851641c08..6ef9f74c7 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb @@ -12,6 +12,9 @@ inherit cmake features_check # depends on virtual/libx11, virtual/libgl REQUIRED_DISTRO_FEATURES = "x11 opengl" +# Do not use -fno-common, check back when upgrading to new version it might not be needed +CFLAGS += "-fcommon" + PROVIDES += "mesa-glut" DEPENDS = "virtual/libx11 libxmu libxi virtual/libgl libglu libxrandr" diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.16.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.16.bb deleted file mode 100644 index 1d5a29438..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.16.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Jpeg 2000 implementation" -HOMEPAGE = "https://github.com/mdadams/jasper" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" - -SRC_URI = "git://github.com/mdadams/jasper.git;protocol=https" -SRCREV = "9aef6d91a82a8a6aecb575cbee57f74470603cc2" - -S = "${WORKDIR}/git" - -inherit cmake - -PACKAGECONFIG ??= "" -PACKAGECONFIG[jpeg] = "-DJAS_ENABLE_LIBJPEG=true, -DJAS_ENABLE_LIBJPEG=false, jpeg" -PACKAGECONFIG[opengl] = "-DJAS_ENABLE_OPENGL=true, -DJAS_ENABLE_OPENGL=false, freeglut" - -EXTRA_OECMAKE_append = " -DJAS_ENABLE_SHARED=true" - -do_install_append() { - chrpath -d ${D}${bindir}/jasper - chrpath -d ${D}${bindir}/imginfo - chrpath -d ${D}${bindir}/imgcmp - chrpath -d ${D}${libdir}/libjasper.so.* -} diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.19.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.19.bb new file mode 100644 index 000000000..e121ae946 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.19.bb @@ -0,0 +1,24 @@ +SUMMARY = "Jpeg 2000 implementation" +HOMEPAGE = "https://github.com/mdadams/jasper" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" + +SRC_URI = "git://github.com/mdadams/jasper.git;protocol=https" +SRCREV = "7d8cfd8ac16d1af9b51e5ccd781e898f0fbf57cc" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGECONFIG ??= "" +PACKAGECONFIG[jpeg] = "-DJAS_ENABLE_LIBJPEG=true, -DJAS_ENABLE_LIBJPEG=false, jpeg" +PACKAGECONFIG[opengl] = "-DJAS_ENABLE_OPENGL=true, -DJAS_ENABLE_OPENGL=false, freeglut" + +EXTRA_OECMAKE_append = " -DJAS_ENABLE_SHARED=true" + +do_install_append() { + chrpath -d ${D}${bindir}/jasper + chrpath -d ${D}${bindir}/imginfo + chrpath -d ${D}${bindir}/imgcmp + chrpath -d ${D}${libdir}/libjasper.so.* +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb b/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb deleted file mode 100644 index 249e96f16..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "A pedagogically-oriented open source site containing software that is broadly useful for image processing and image analysis applications" -DEPENDS = "jpeg tiff libpng zlib" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://leptonica-license.txt;md5=34aa579294e8284b7b848c8d5d361e8f" - -SRC_URI = "http://www.leptonica.org/source/leptonica-${PV}.tar.gz" -SRC_URI[md5sum] = "4f32be9bd2e2c142ba018037ab5d746f" -SRC_URI[sha256sum] = "29c35426a416bf454413c6fec24c24a0b633e26144a17e98351b6dffaa4a833b" - -EXTRA_OECONF += " \ - --without-libwebp \ -" - -PACKAGECONFIG ??= "giflib" -PACKAGECONFIG[openjpeg] = "--with-libopenjpeg,--without-libopenjpeg,openjpeg" -PACKAGECONFIG[giflib] = "--with-giflib,--without-giflib,giflib" - -inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.79.0.bb b/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.79.0.bb new file mode 100644 index 000000000..a6de1f795 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.79.0.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "A pedagogically-oriented open source site containing software that is broadly useful for image processing and image analysis applications" +DEPENDS = "jpeg tiff libpng zlib" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://leptonica-license.txt;md5=34aa579294e8284b7b848c8d5d361e8f" + +UPSTREAM_CHECK_URI = "https://github.com/DanBloomberg/leptonica/releases" + +SRC_URI = "http://www.leptonica.org/source/leptonica-${PV}.tar.gz" +SRC_URI[md5sum] = "a545654b1dae7d29e2ea346b29095f84" +SRC_URI[sha256sum] = "045966c9c5d60ebded314a9931007a56d9d2f7a6ac39cb5cc077c816f62300d8" + +EXTRA_OECONF += " \ + --without-libwebp \ +" + +PACKAGECONFIG ??= "giflib" +PACKAGECONFIG[openjpeg] = "--with-libopenjpeg,--without-libopenjpeg,openjpeg" +PACKAGECONFIG[giflib] = "--with-giflib,--without-giflib,giflib" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch b/meta-openembedded/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch new file mode 100644 index 000000000..619bad6d0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch @@ -0,0 +1,46 @@ +From a57c498f6c25aa297e49533c242525f2b9da7048 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Aug 2020 18:20:42 -0700 +Subject: [PATCH] Make extern declarations in header file + +curobj is a static object in other places as well. +Fixes build with gcc10/-fno-common + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + fdesign/sp_spinner.c | 2 +- + lib/flinternal.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/fdesign/sp_spinner.c b/fdesign/sp_spinner.c +index 04f2c19..6206daa 100644 +--- a/fdesign/sp_spinner.c ++++ b/fdesign/sp_spinner.c +@@ -29,7 +29,7 @@ + #include "spec/spinner_spec.h" + + static FD_spinnerattrib * spn_attrib; +-FL_OBJECT *curobj; ++static FL_OBJECT *curobj; + + + /*************************************** +diff --git a/lib/flinternal.h b/lib/flinternal.h +index 06d847e..577bd10 100644 +--- a/lib/flinternal.h ++++ b/lib/flinternal.h +@@ -138,8 +138,8 @@ enum { + + /* events.c or event related */ + +-FL_OBJECT * fli_handled_obj; +-FL_OBJECT * fli_handled_parent; ++extern FL_OBJECT * fli_handled_obj; ++extern FL_OBJECT * fli_handled_parent; + + void fli_obj_queue_delete( void ); + +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb b/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb index 999d53d4a..35029f517 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb @@ -9,6 +9,7 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/xforms/xforms-${PV}.tar. file://fix-link-to-xforms-man.patch \ file://add-absolute-path-for-include-dir.patch \ file://fix-path-fdesign_LDADD.patch \ + file://0001-Make-extern-declarations-in-header-file.patch \ " SRC_URI[md5sum] = "235720a758a8b8d9e6e452dc67190e9b" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb b/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb deleted file mode 100644 index dfdf82458..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.12.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "library for easy implementation of a RDP/VNC server" -HOMEPAGE = "https://libvnc.github.io" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f" - -PACKAGECONFIG ??= " \ - 24bpp \ - filetransfer \ - ${@bb.utils.contains('LICENSE_FLAGS_WHITELIST','commercial','ffmpeg','',d)} \ - gcrypt \ - gnutls \ - jpeg \ - lzo \ - png \ - pthread \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '',d)} \ - sdl \ - websockets \ - zlib \ -" - -PACKAGECONFIG[24bpp] = "-DWITH_24BPP=ON,-DWITH_24BPP=OFF," -PACKAGECONFIG[filetransfer] = "-DWITH_TIGHTVNC_FILETRANSFER=ON,-DWITH_TIGHTVNC_FILETRANSFER=OFF," -PACKAGECONFIG[ffmpeg] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,ffmpeg,ffmpeg" -PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=ON,-DWITH_GCRYPT=OFF,libgcrypt,libgcrypt" -PACKAGECONFIG[gnutls] = "-DWITH_GNUTLS=ON,-DWITH_GNUTLS=OFF,gnutls" -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg" -PACKAGECONFIG[ipv6] = "-DWITH_IPv6=ON,-DWITH_IPv6=OFF," -PACKAGECONFIG[lzo] = "-DWITH_LZO=ON,-DWITH_LZO=OFF,lzo" -PACKAGECONFIG[openssl] = "-DWITH_OPENSSL=ON,-DWITH_OPENSSL=OFF,openssl" -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,libpng" -PACKAGECONFIG[pthread] = "-DWITH_THREADS=ON,-DWITH_THREADS=OFF," -PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" -PACKAGECONFIG[sasl] = "-DWITH_SASL=ON,-DWITH_SASL=OFF,cyrus-sasl" -PACKAGECONFIG[sdl] = "-DWITH_SDL=ON,-DWITH_SDL=OFF,libsdl2" -PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF," -PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib" - -PACKAGE_BEFORE_PN = "libvncclient" -FILES_libvncclient = "${libdir}/libvncclient.*" - -inherit cmake - -SRC_URI = "git://github.com/LibVNC/libvncserver" -SRCREV = "1354f7f1bb6962dab209eddb9d6aac1f03408110" -PV .= "+git${SRCPV}" - -S = "${WORKDIR}/git" - -EXTRA_OECMAKE = "-DMAKE_INSTALL_LIBDIR=${libdir}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb b/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb new file mode 100644 index 000000000..11bba430e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "library for easy implementation of a RDP/VNC server" +HOMEPAGE = "https://libvnc.github.io" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f" + +PACKAGECONFIG ??= " \ + 24bpp \ + filetransfer \ + ${@bb.utils.contains('LICENSE_FLAGS_WHITELIST','commercial','ffmpeg','',d)} \ + gcrypt \ + gnutls \ + jpeg \ + lzo \ + png \ + pthread \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '',d)} \ + sdl \ + websockets \ + zlib \ +" + +PACKAGECONFIG[24bpp] = "-DWITH_24BPP=ON,-DWITH_24BPP=OFF," +PACKAGECONFIG[filetransfer] = "-DWITH_TIGHTVNC_FILETRANSFER=ON,-DWITH_TIGHTVNC_FILETRANSFER=OFF," +PACKAGECONFIG[ffmpeg] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,ffmpeg,ffmpeg" +PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=ON,-DWITH_GCRYPT=OFF,libgcrypt,libgcrypt" +PACKAGECONFIG[gnutls] = "-DWITH_GNUTLS=ON,-DWITH_GNUTLS=OFF,gnutls" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg" +PACKAGECONFIG[ipv6] = "-DWITH_IPv6=ON,-DWITH_IPv6=OFF," +PACKAGECONFIG[lzo] = "-DWITH_LZO=ON,-DWITH_LZO=OFF,lzo" +PACKAGECONFIG[openssl] = "-DWITH_OPENSSL=ON,-DWITH_OPENSSL=OFF,openssl" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,libpng" +PACKAGECONFIG[pthread] = "-DWITH_THREADS=ON,-DWITH_THREADS=OFF," +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" +PACKAGECONFIG[sasl] = "-DWITH_SASL=ON,-DWITH_SASL=OFF,cyrus-sasl" +PACKAGECONFIG[sdl] = "-DWITH_SDL=ON,-DWITH_SDL=OFF,libsdl2" +PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF," +PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib" + +PACKAGE_BEFORE_PN = "libvncclient" +FILES_libvncclient = "${libdir}/libvncclient.*" + +inherit cmake + +SRC_URI = "git://github.com/LibVNC/libvncserver" +SRCREV = "2aa20dad4c23c18948d3f63b33f9dfec1f837729" + +S = "${WORKDIR}/git" + +EXTRA_OECMAKE = "-DMAKE_INSTALL_LIBDIR=${libdir}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb deleted file mode 100644 index 1a376a469..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.52.0.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Character Based User Interface for libyui" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ -" - -SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ - file://0003-Simplify-ncurses-finding-module.patch \ - " - -SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" - -SRCREV = "d5b64b6291b6f292871ad5c6df25c4f6896f7d50" - -S = "${WORKDIR}/git" - -inherit cmake gettext pkgconfig - -DEPENDS += "boost libyui ncurses" - -BBCLASSEXTEND = "nativesdk" - -do_configure_prepend () { - cd ${S} - git checkout bootstrap.sh - sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" bootstrap.sh - ./bootstrap.sh - if [ -e ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so ]; then - mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ - cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ - fi - cd - - sed -i -e "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt - sed -i -e "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake -} - -do_install_append () { - if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then - mv ${D}/usr/lib64 ${D}/usr/lib - fi -} - -do_install_append_class-nativesdk () { - mkdir -p ${D}/${base_prefix} - mv ${D}/usr ${D}/${base_prefix} -} - -FILES_${PN} += "${datadir}/*" - -FILES_${PN}-dev += "${libdir}/*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb new file mode 100644 index 000000000..ba94a838a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_2.55.0.bb @@ -0,0 +1,53 @@ +SUMMARY = "Character Based User Interface for libyui" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ +" + +SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ + file://0003-Simplify-ncurses-finding-module.patch \ + " + +SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" + +SRCREV = "e89fcc53c27c3a3bf559d43190289c3ce4f335b1" + +S = "${WORKDIR}/git" + +inherit cmake gettext pkgconfig + +DEPENDS += "boost libyui ncurses" + +BBCLASSEXTEND = "nativesdk" + +EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" +EXTRA_OECMAKE_append_toolchain-clang = "-DENABLE_WERROR=OFF" + +do_configure_prepend () { + cd ${S} + git checkout bootstrap.sh + sed -i "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" bootstrap.sh + ./bootstrap.sh + if [ -e ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so ]; then + mkdir -p ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ + cp ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib/libyui.so* ${PKG_CONFIG_SYSROOT_DIR}${base_prefix}/usr/lib64/ + fi + cd - + sed -i -e "s#\${YPREFIX}#\${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${S}/CMakeLists.txt + sed -i -e "s#/usr#${PKG_CONFIG_SYSROOT_DIR}${base_prefix}&#" ${PKG_CONFIG_SYSROOT_DIR}${libdir}/cmake/libyui/LibyuiLibraryDepends-release.cmake +} + +do_install_append () { + if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then + mv ${D}/usr/lib64 ${D}/usr/lib + fi +} + +do_install_append_class-nativesdk () { + mkdir -p ${D}/${base_prefix} + mv ${D}/usr ${D}/${base_prefix} +} + +FILES_${PN} += "${datadir}/*" + +FILES_${PN}-dev += "${libdir}/*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.10.0.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.10.0.bb new file mode 100644 index 000000000..d7f529e31 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.10.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "Libyui is a widget abstraction library providing Qt, GTK and ncurses frontends." +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + " + +SRC_URI = "git://github.com/libyui/libyui.git \ + file://0001-Fix-build-with-clang.patch \ + file://0001-Use-relative-install-paths-for-CMake.patch \ + " + +SRCREV = "de9134007d2d029fe5809ce48f57fe218e6ffe16" +SRCREV_FORMAT = "default" +S = "${WORKDIR}/git" + +inherit cmake gettext pkgconfig + +DEPENDS += "boost" + +EXTRA_OECMAKE += "-DENABLE_WERROR=OFF" + +BBCLASSEXTEND = "native nativesdk" + +do_configure_prepend () { + (cd ${S} && + ./bootstrap.sh && + cd -) +} + +do_install_append () { + if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then + mv ${D}/usr/lib64 ${D}/usr/lib + fi +} + +do_install_append_class-nativesdk () { + mkdir -p ${D}/${base_prefix} + mv ${D}/usr ${D}/${base_prefix} +} + +FILES_${PN}-dev = "${libdir}/* ${includedir}/yui*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb deleted file mode 100644 index 7c6f4c13d..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_3.6.0.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Libyui is a widget abstraction library providing Qt, GTK and ncurses frontends." -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING.gpl-3;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ - file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - " - -SRC_URI = "git://github.com/libyui/libyui.git \ - file://0001-Fix-build-with-clang.patch \ - file://0001-Use-relative-install-paths-for-CMake.patch \ - " - -SRCREV = "8459235919f592b1bc099ecf9a947cb6344b6fa5" -SRCREV_FORMAT = "default" -S = "${WORKDIR}/git" - -inherit cmake gettext pkgconfig - -DEPENDS += "boost" - -EXTRA_OECMAKE += "-DENABLE_WERROR=OFF" - -BBCLASSEXTEND = "native nativesdk" - -do_configure_prepend () { - (cd ${S} && - ./bootstrap.sh && - cd -) -} - -do_install_append () { - if [ "${libdir}" = "${base_prefix}/usr/lib" ] && [ -d ${D}/usr/lib64 ]; then - mv ${D}/usr/lib64 ${D}/usr/lib - fi -} - -do_install_append_class-nativesdk () { - mkdir -p ${D}/${base_prefix} - mv ${D}/usr ${D}/${base_prefix} -} - -FILES_${PN}-dev = "${libdir}/* ${includedir}/yui*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb b/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb deleted file mode 100644 index c460fc35c..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Terminus fonts packages (console and X11)" -DESCRIPTION = "Terminus Font is a clean, fixed width bitmap font, designed for \ - long (8 and more hours per day) work with computers." -HOMEPAGE = "http://terminus-font.sourceforge.net/" -AUTHOR = "Dimitar Zhekov" -SECTION = "fonts" - -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://OFL.TXT;md5=9cadb26f4c5c005618c5ae74f041ec54" - -DEPENDS = "hostperl-runtime-native gzip-native bdftopcf-native" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "a8e792fe6e84c86ed2b6ed3e2a12ba66" -SRC_URI[sha256sum] = "f6f4876a4dabe6a37c270c20bb9e141e38fb50e0bba200e1b9d0470e5eed97b7" - -inherit allarch fontcache - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "" - -# Don't use font cache mecanism for console packages -FONT_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '${PN}-pcf', '', d)}" - -# Hand made configure script. Don't need oe_runconf -do_configure() { - chmod +x ${S}/configure - ${S}/configure --prefix=${prefix} \ - --psfdir=${datadir}/consolefonts \ - --acmdir=${datadir}/consoletrans \ - --x11dir=${datadir}/fonts/terminus -} - -do_compile() { - oe_runmake DESTDIR=${D} psf txt ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'pcf', '', d)} -} - -do_install() { - oe_runmake DESTDIR=${D} install-psf install-acm ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'install-pcf', '', d)} -} - -PACKAGES += "${PN}-consolefonts ${PN}-consoletrans ${PN}-pcf" -FILES_${PN}-consolefonts = "${datadir}/consolefonts" -FILES_${PN}-consoletrans = "${datadir}/consoletrans" -FILES_${PN}-pcf = "${datadir}/fonts/terminus" diff --git a/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb b/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb new file mode 100644 index 000000000..dc263fda4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.48.bb @@ -0,0 +1,45 @@ +SUMMARY = "Terminus fonts packages (console and X11)" +DESCRIPTION = "Terminus Font is a clean, fixed width bitmap font, designed for \ + long (8 and more hours per day) work with computers." +HOMEPAGE = "http://terminus-font.sourceforge.net/" +AUTHOR = "Dimitar Zhekov" +SECTION = "fonts" + +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://OFL.TXT;md5=9b226721636fde0db38ea656c2aae4bf" + +DEPENDS = "hostperl-runtime-native gzip-native bdftopcf-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "a2cb88f6cf174f3d07de93b91e115a8d" +SRC_URI[sha256sum] = "34799c8dd5cec7db8016b4a615820dfb43b395575afbb24fc17ee19c869c94af" + +inherit allarch fontcache + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = "" + +# Don't use font cache mecanism for console packages +FONT_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '${PN}-pcf', '', d)}" + +# Hand made configure script. Don't need oe_runconf +do_configure() { + chmod +x ${S}/configure + ${S}/configure --prefix=${prefix} \ + --psfdir=${datadir}/consolefonts \ + --acmdir=${datadir}/consoletrans \ + --x11dir=${datadir}/fonts/terminus +} + +do_compile() { + oe_runmake DESTDIR=${D} psf ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'pcf', '', d)} +} + +do_install() { + oe_runmake DESTDIR=${D} install-psf ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'install-pcf', '', d)} +} + +PACKAGES += "${PN}-consolefonts ${PN}-consoletrans ${PN}-pcf" +FILES_${PN}-consolefonts = "${datadir}/consolefonts" +FILES_${PN}-consoletrans = "${datadir}/consoletrans" +FILES_${PN}-pcf = "${datadir}/fonts/terminus" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb deleted file mode 100644 index 240949f55..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Video Decode and Presentation API for UNIX" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=83af8811a28727a13f04132cc33b7f58" - -DEPENDS = "virtual/libx11 libxext xorgproto" - -SRCREV = "f57a9904c43ef5d726320c77baa91d0c38361ed4" -SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau" - -S = "${WORKDIR}/git" - -inherit features_check meson - -REQUIRED_DISTRO_FEATURES = "x11" - -do_install_append() { - rm -f ${D}${libdir}/*/*.la -} - -FILES_${PN}-dbg += "${libdir}/vdpau/.debug" -FILES_${PN}-dev += "${libdir}/vdpau/lib*${SOLIBSDEV}" -FILES_${PN} += "${libdir}/vdpau/lib*${SOLIBS}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb new file mode 100644 index 000000000..b6790a085 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb @@ -0,0 +1,23 @@ +SUMMARY = "Video Decode and Presentation API for UNIX" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=83af8811a28727a13f04132cc33b7f58" + +DEPENDS = "virtual/libx11 libxext xorgproto" + +SRCREV = "c3d1a9dbafdfe6144ff474d0d523dc01b068750f" +SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau" + +S = "${WORKDIR}/git" + +inherit features_check meson + +REQUIRED_DISTRO_FEATURES = "x11" + +do_install_append() { + rm -f ${D}${libdir}/*/*.la +} + +FILES_${PN}-dbg += "${libdir}/vdpau/.debug" +FILES_${PN}-dev += "${libdir}/vdpau/lib*${SOLIBSDEV}" +FILES_${PN} += "${libdir}/vdpau/lib*${SOLIBS}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index bd75cdb1f..4a297c313 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -16,7 +16,9 @@ SRCREV_FORMAT = "vk-gl-cts" S = "${WORKDIR}/git" -inherit pkgconfig cmake +inherit pkgconfig cmake features_check + +REQUIRED_DISTRO_FEATURES += "opengl" DEPENDS += "libpng zlib virtual/libgles2 virtual/egl" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb index 3e336e45c..0e50fd947 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.6.1.bb @@ -13,7 +13,16 @@ S = "${WORKDIR}/git" do_install() { install -d ${D}/${CTSDIR} cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR} + + install -m 0755 ${B}/modules/egl/deqp-egl ${D}/${CTSDIR} + install -m 0755 ${B}/modules/gles2/deqp-gles2 ${D}/${CTSDIR} + install -m 0755 ${B}/modules/gles3/deqp-gles3 ${D}/${CTSDIR} + install -m 0755 ${B}/modules/gles31/deqp-gles31 ${D}/${CTSDIR} + install -m 0755 ${B}/modules/internal/de-internal-tests ${D}/${CTSDIR} + rm -r ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles rm -r ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles rm -r ${D}/${CTSDIR}/common/subgroups/*.a ${D}/${CTSDIR}/common/subgroups/cmake_install.cmake ${D}/${CTSDIR}/common/subgroups/CMakeFiles } + +SECURITY_CFLAGS_riscv64 = "${SECURITY_NOPIE_CFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch deleted file mode 100644 index d44445fa9..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 8ab672ccc67b64058cffac2cd19a0d3b75d5aa25 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 30 Nov 2019 11:43:32 -0800 -Subject: [PATCH] Fix build on 32bit arches with 64bit time_t - -time element is deprecated on new input_event structure in kernel's -input.h [1] - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f - -Upstream-Status: Submitted [https://github.com/LibVNC/x11vnc/pull/117] -Signed-off-by: Khem Raj ---- - src/uinput.c | 28 ++++++++++++++++++++++++---- - 1 file changed, 24 insertions(+), 4 deletions(-) - -diff --git a/src/uinput.c b/src/uinput.c -index 28fbad3..343b7c5 100644 ---- a/src/uinput.c -+++ b/src/uinput.c -@@ -54,6 +54,11 @@ so, delete this exception statement from your version. - #include - #include - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - #if !defined(EV_SYN) || !defined(SYN_REPORT) - #undef UINPUT_OK - #endif -@@ -710,6 +715,7 @@ void parse_uinput_str(char *in) { - static void ptr_move(int dx, int dy) { - #ifdef UINPUT_OK - struct input_event ev; -+ struct timeval tval; - int d = direct_rel_fd < 0 ? fd : direct_rel_fd; - - if (injectable && strchr(injectable, 'M') == NULL) { -@@ -720,7 +726,9 @@ static void ptr_move(int dx, int dy) { - - if (db) fprintf(stderr, "ptr_move(%d, %d) fd=%d\n", dx, dy, d); - -- gettimeofday(&ev.time, NULL); -+ gettimeofday(&tval, NULL); -+ ev.input_event_sec = tval.tv_sec; -+ ev.input_event_usec = tval.tv_usec; - ev.type = EV_REL; - ev.code = REL_Y; - ev.value = dy; -@@ -755,6 +763,7 @@ static void apply_tslib(int *x, int *y) { - static void ptr_abs(int x, int y, int p) { - #ifdef UINPUT_OK - struct input_event ev; -+ struct timeval tval; - int x0, y0; - int d = direct_abs_fd < 0 ? fd : direct_abs_fd; - -@@ -773,7 +782,9 @@ static void ptr_abs(int x, int y, int p) { - - if (db) fprintf(stderr, "ptr_abs(%d, %d => %d %d, p=%d) fd=%d\n", x0, y0, x, y, p, d); - -- gettimeofday(&ev.time, NULL); -+ gettimeofday(&tval, NULL); -+ ev.input_event_sec = tval.tv_sec; -+ ev.input_event_usec = tval.tv_usec; - ev.type = EV_ABS; - ev.code = ABS_Y; - ev.value = y; -@@ -950,6 +961,7 @@ if (0) {usleep(100*1000) ;} - static void button_click(int down, int btn) { - #ifdef UINPUT_OK - struct input_event ev; -+ struct timeval tval; - int d = direct_btn_fd < 0 ? fd : direct_btn_fd; - - if (injectable && strchr(injectable, 'B') == NULL) { -@@ -959,7 +971,12 @@ static void button_click(int down, int btn) { - if (db) fprintf(stderr, "button_click: btn %d %s fd=%d\n", btn, down ? "down" : "up", d); - - memset(&ev, 0, sizeof(ev)); -- gettimeofday(&ev.time, NULL); -+ gettimeofday(&tval, NULL); -+ gettimeofday(&tval, NULL); -+ ev.input_event_sec = tval.tv_sec; -+ ev.input_event_usec = tval.tv_usec; -+ ev.input_event_sec = tval.tv_sec; -+ ev.input_event_usec = tval.tv_usec; - ev.type = EV_KEY; - ev.value = down; - -@@ -1230,6 +1247,7 @@ void uinput_pointer_command(int mask, int x, int y, rfbClientPtr client) { - void uinput_key_command(int down, int keysym, rfbClientPtr client) { - #ifdef UINPUT_OK - struct input_event ev; -+ struct timeval tval; - int scancode; - allowed_input_t input; - int d = direct_key_fd < 0 ? fd : direct_key_fd; -@@ -1253,7 +1271,9 @@ void uinput_key_command(int down, int keysym, rfbClientPtr client) { - if (db) fprintf(stderr, "uinput_key_command: %d -> %d %s fd=%d\n", keysym, scancode, down ? "down" : "up", d); - - memset(&ev, 0, sizeof(ev)); -- gettimeofday(&ev.time, NULL); -+ gettimeofday(&tval, NULL); -+ ev.input_event_sec = tval.tv_sec; -+ ev.input_event_usec = tval.tv_usec; - ev.type = EV_KEY; - ev.code = (unsigned char) scancode; - ev.value = down; diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch deleted file mode 100644 index a15f3fe5b..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 686491573827b98ba031adaa5da373366079d3d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dagenais?= -Date: Mon, 11 Feb 2019 11:42:59 -0500 -Subject: [PATCH] misc/Makefile.am: don't install Xdummy when configured - --without-x - -Upstream-status: submitted https://github.com/jeff-dagenais/x11vnc/pull/1 - -Signed-off-by: Jean-Francois Dagenais ---- - misc/Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/misc/Makefile.am b/misc/Makefile.am -index c0b98c8..e4a22c1 100644 ---- a/misc/Makefile.am -+++ b/misc/Makefile.am -@@ -18,7 +18,10 @@ EXTRA_DIST = \ - uinput.pl \ - ultravnc_repeater.pl \ - vcinject.pl \ -- x11vnc_loop \ -+ x11vnc_loop -+ -+if HAVE_X11 -+EXTRA_DIST += \ - Xdummy.c \ - Xdummy.in - -@@ -32,3 +35,4 @@ do_dummy_c_subst = $(SED) \ - Xdummy: $(srcdir)/Xdummy.in $(srcdir)/Xdummy.c - $(do_dummy_c_subst) < $< > $@.tmp - mv -f $@.tmp $@ -+endif --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch deleted file mode 100644 index 8e894bd8e..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 7be055c13c7d0d640941830a3291af3b404928c1 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 27 Jun 2016 04:44:14 -0400 -Subject: [PATCH] configure.ac: remove redundant RPATH - -It caused oe QA issue: -... -|ERROR: QA Issue: x11vnc: work/i586-poky-linux/x11vnc/0.9.13-r0/packages-split/ -x11vnc/usr/bin/x11vnc contains probably-redundant RPATH /usr/lib [useless-rpaths] -... - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia ---- - configure.ac | 21 +++++---------------- - 1 file changed, 5 insertions(+), 16 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6f664d0..f986686 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -330,10 +330,8 @@ if test "x$with_crypto" != "xno" -a "x$with_ssl" != "xno"; then - saved_LDFLAGS="$LDFLAGS" - CPPFLAGS="$CPPFLAGS -I$with_ssl/include" - LDFLAGS="$LDFLAGS -L$with_ssl/lib" -- if test "x$ld_minus_R" = "xno"; then -+ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then - : -- elif test "x$GCC" = "xyes"; then -- LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib" - else - LDFLAGS="$LDFLAGS -R$with_ssl/lib" - fi -@@ -447,10 +445,8 @@ if test ! -z "$with_system_libvncserver" -a "x$with_system_libvncserver" != "xno - fi - if test "x$with_system_libvncserver" != "xyes"; then - rflag="" -- if test "x$ld_minus_R" = "xno"; then -+ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then - : -- elif test "x$GCC" = "xyes"; then -- rflag="-Xlinker -R$with_system_libvncserver/lib" - else - rflag="-R$with_system_libvncserver/lib" - fi -@@ -484,10 +480,8 @@ new enough. - elif libvncserver-config --version 1>/dev/null 2>&1; then - rflag="" - rprefix=`libvncserver-config --prefix` -- if test "x$ld_minus_R" = "xno"; then -+ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then - : -- elif test "x$GCC" = "xyes"; then -- rflag=" -Xlinker -R$rprefix/lib " - else - rflag=" -R$rprefix/lib " - fi -@@ -541,11 +535,8 @@ if test "x$with_jpeg" != "xno"; then - saved_LDFLAGS="$LDFLAGS" - CPPFLAGS="$CPPFLAGS -I$with_jpeg/include" - LDFLAGS="$LDFLAGS -L$with_jpeg/lib" -- if test "x$ld_minus_R" = "xno"; then -+ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then - : -- elif test "x$GCC" = "xyes"; then -- # this is not complete... in general a rat's nest. -- LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib" - else - LDFLAGS="$LDFLAGS -R$with_jpeg/lib" - fi -@@ -590,10 +581,8 @@ if test "x$with_zlib" != "xno" -a "x$with_libz" != "xno"; then - saved_LDFLAGS="$LDFLAGS" - CPPFLAGS="$CPPFLAGS -I$with_zlib/include" - LDFLAGS="$LDFLAGS -L$with_zlib/lib" -- if test "x$ld_minus_R" = "xno"; then -+ if test "x$ld_minus_R" = "xno" -o "x$GCC" = "xyes"; then - : -- elif test "x$GCC" = "xyes"; then -- LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib" - else - LDFLAGS="$LDFLAGS -R$with_zlib/lib" - fi --- -2.8.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch deleted file mode 100644 index a571ba283..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/src-cursor-fix-xfc-NULL-pointer-dereference.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 95a10ab64c2dbbec2c8dad91a5ffb73a0d68474b Mon Sep 17 00:00:00 2001 -From: Jonathan Liu -Date: Mon, 16 Mar 2020 20:04:06 +1100 -Subject: [PATCH] src/cursor: fix xfc NULL pointer dereference - -xfc->width and xfc->height for the XFixes cursor image returned from -XFixesGetCursorImage(dpy) are accessed without first checking that xfc -is not NULL. This can result in the server sometimes crashing when -moving a Google Chrome window. - -Fixes: 37c946191a0f ("Broken cursor bugfix for 64 bit systems (#49)") -Upstream-Status: Accepted -Signed-off-by: Jonathan Liu ---- - src/cursor.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cursor.c b/src/cursor.c -index 39e73a6..74a08c6 100644 ---- a/src/cursor.c -+++ b/src/cursor.c -@@ -1311,7 +1311,7 @@ static int get_exact_cursor(int init) { - - /* retrieve the cursor info + pixels from server: */ - xfc = XFixesGetCursorImage(dpy); -- { -+ if (xfc) { - /* 2017-07-09, Stephan Fuhrmann: This fixes an implementation flaw for 64 bit systems. - * The XFixesCursorImage structure says xfc->pixels is (unsigned long*) in the structure, but - * the protocol spec says it's 32 bit per pixel diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb index e3a1914fe..50ce9a59e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb @@ -7,12 +7,11 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://src/x11vnc.h;endline=31;md5=e871a2ad004776794b616822dcab6314" -SRCREV = "4ca006fed80410bd9b061a1519bd5d9366bb0bc8" +SRCREV = "87cd0530f438372dda3c70bb491a6fd19f09acc2" +PV .= "+git${SRCPV}" + SRC_URI = "git://github.com/LibVNC/x11vnc \ file://starting-fix.patch \ - file://0001-misc-Makefile.am-don-t-install-Xdummy-when-configure.patch \ - file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ - file://src-cursor-fix-xfc-NULL-pointer-dereference.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch new file mode 100644 index 000000000..7dfa23342 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch @@ -0,0 +1,34 @@ +From cebbeaa9d0bdc18377faef27ea9ffd38e509d180 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 4 Feb 2020 16:38:06 -0500 +Subject: [PATCH] Fix link failure with gcc 10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without the 'extern' this looks like a definition not just a +declaration, in every file that includes the header. gcc 10 is stricter +about this kind of multiple definition. + +Upstream-Status: Backport [https://cgit.freedesktop.org/xorg/driver/xf86-video-ati/commit/?id=f223035f4ffcff2a9296d1e907a5193f8e8845a3] +Reviewed-by: Michel Dänzer +--- + src/drmmode_display.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/drmmode_display.h b/src/drmmode_display.h +index 96eaef0..8cd8a0a 100644 +--- a/src/drmmode_display.h ++++ b/src/drmmode_display.h +@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type, + uint64_t *ust, uint32_t *result_seq); + + +-miPointerSpriteFuncRec drmmode_sprite_funcs; ++extern miPointerSpriteFuncRec drmmode_sprite_funcs; + + + #endif +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb index 4042150b1..d3395496a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb @@ -12,6 +12,8 @@ DEPENDS += "virtual/libx11 libxvmc drm \ inherit features_check REQUIRED_DISTRO_FEATURES += "opengl" +SRC_URI += "file://0001-Fix-link-failure-with-gcc-10.patch" + SRC_URI[md5sum] = "47eccf71823206ade9629cba69de7ef6" SRC_URI[sha256sum] = "5cb6015d8664546ad1311bc9c363d7bc41ebf60e7046ceb44dd38e5b707961b0" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch new file mode 100644 index 000000000..32a24b4be --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch @@ -0,0 +1,36 @@ +From 95ed4b743f197e20f1884a326d5a7128187a7ba6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Aug 2020 17:56:30 -0700 +Subject: [PATCH] lbx_zlib: Mark declration with extern + +Fixes build with gcc10/-fno-common + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/lbx_zlib/lbx_zlib.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/lbx_zlib/lbx_zlib.h b/src/lbx_zlib/lbx_zlib.h +index 8ae8956..bec3b96 100644 +--- a/src/lbx_zlib/lbx_zlib.h ++++ b/src/lbx_zlib/lbx_zlib.h +@@ -136,9 +136,9 @@ extern void Xfree(pointer /*ptr*/); + #endif + + /* lbx_zlib.c */ +-unsigned long stream_out_compressed; +-unsigned long stream_out_uncompressed; +-unsigned long stream_out_plain; +-unsigned long stream_in_compressed; +-unsigned long stream_in_uncompressed; +-unsigned long stream_in_plain; ++extern unsigned long stream_out_compressed; ++extern unsigned long stream_out_uncompressed; ++extern unsigned long stream_out_plain; ++extern unsigned long stream_in_compressed; ++extern unsigned long stream_in_uncompressed; ++extern unsigned long stream_in_plain; +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb index 3e5c31a05..58b4f31b1 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb @@ -7,7 +7,9 @@ DEPENDS += " xorgproto zlib" PE = "1" PR = "r11" -SRC_URI += "file://mkg3states-1.1.patch" +SRC_URI += "file://mkg3states-1.1.patch \ + file://0001-lbx_zlib-Mark-declration-with-extern.patch \ + " SRC_URI[md5sum] = "273329a78c2e9ea189ac416c7fde94a1" SRC_URI[sha256sum] = "c6b6ff7858ec619cafa8205debca6bf78c5610a2844a782ed643c7fd017cf8ae" diff --git a/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb b/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb new file mode 100644 index 000000000..e861ddb72 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb @@ -0,0 +1,76 @@ +# Copyright (C) 2018 Krzysztof Kozlowski +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Broadcom Bluetooth firmware files" +DESCRIPTION = "Firmware for Broadcom Bluetooth devices. Note that in case of BT+WiFi devices, separate WiFi firmware might be needed." +HOMEPAGE = "https://github.com/winterheart/broadcom-bt-firmware" + +LICENSE = "Firmware-Broadcom-WIDCOMM" +NO_GENERIC_LICENSE[Firmware-Broadcom-WIDCOMM] = "LICENSE.broadcom_bcm20702" + +LIC_FILES_CHKSUM = "file://LICENSE.broadcom_bcm20702;md5=c0d5ea0502b00df74173d0f8a48b619d" +SRC_URI = "git://github.com/winterheart/broadcom-bt-firmware.git" +SRCREV = "1af1116f73782951bd7bbe2139928e497c3a634b" + +PE = "1" + +S = "${WORKDIR}/git" + +inherit allarch + +CLEANBROKEN = "1" + +do_compile() { + : +} + +do_install() { + install -d ${D}${nonarch_base_libdir}/firmware/brcm/ + cp brcm/*.hcd ${D}${nonarch_base_libdir}/firmware/brcm/ + + # For license package: + install -m 0644 LICENSE.broadcom_bcm20702 ${D}${nonarch_base_libdir}/firmware/brcm/ + + # For main package: + install -m 0644 DEVICES.md ${D}${nonarch_base_libdir}/firmware/brcm/ +} + +PACKAGES =+ " \ + ${PN}-bcm20702a1 \ + ${PN}-bcm20702b0 \ + ${PN}-bcm20703a1 \ + ${PN}-bcm43142a0 \ + ${PN}-bcm4335c0 \ + ${PN}-bcm4350c5 \ + ${PN}-bcm4356a2 \ + ${PN}-bcm4371c2 \ + ${PN}-license \ +" + +RDEPENDS_${PN}-bcm20702a1 = "${PN}-license" +RDEPENDS_${PN}-bcm20702b0 = "${PN}-license" +RDEPENDS_${PN}-bcm20703a1 = "${PN}-license" +RDEPENDS_${PN}-bcm43142a0 = "${PN}-license" +RDEPENDS_${PN}-bcm4335c0 = "${PN}-license" +RDEPENDS_${PN}-bcm4350c5 = "${PN}-license" +RDEPENDS_${PN}-bcm4356a2 = "${PN}-license" +RDEPENDS_${PN}-bcm4371c2 = "${PN}-license" + +FILES_${PN}-bcm20702a1 = "${nonarch_base_libdir}/firmware/brcm/BCM20702A1*hcd" +FILES_${PN}-bcm20702b0 = "${nonarch_base_libdir}/firmware/brcm/BCM20702B0*hcd" +FILES_${PN}-bcm20703a1 = "${nonarch_base_libdir}/firmware/brcm/BCM20703A1*hcd" +FILES_${PN}-bcm43142a0 = "${nonarch_base_libdir}/firmware/brcm/BCM43142A0*hcd" +FILES_${PN}-bcm4335c0 = "${nonarch_base_libdir}/firmware/brcm/BCM4335C0*hcd" +FILES_${PN}-bcm4350c5 = "${nonarch_base_libdir}/firmware/brcm/BCM4350C5*hcd" +FILES_${PN}-bcm4356a2 = "${nonarch_base_libdir}/firmware/brcm/BCM4356A2*hcd" +FILES_${PN}-bcm4371c2 = "${nonarch_base_libdir}/firmware/brcm/BCM4371C2*hcd" +FILES_${PN}-license += "${nonarch_base_libdir}/firmware/brcm/LICENSE.broadcom_bcm20702" + +FILES_${PN} += "${nonarch_base_libdir}/firmware/brcm/*" +RDEPENDS_${PN} += "${PN}-license" + +# Make broadcom-bt-firmware depend on all of the split-out packages. +python populate_packages_prepend () { + firmware_pkgs = oe.utils.packages_filter_out_system(d) + d.appendVar('RDEPENDS_broadcom-bt-firmware', ' ' + ' '.join(firmware_pkgs)) +} diff --git a/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_git.bb b/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_git.bb deleted file mode 100644 index 8c474ecdc..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_git.bb +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright (C) 2018 Krzysztof Kozlowski -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Broadcom Bluetooth firmware files" -DESCRIPTION = "Firmware for Broadcom Bluetooth devices. Note that in case of BT+WiFi devices, separate WiFi firmware might be needed." -HOMEPAGE = "https://github.com/winterheart/broadcom-bt-firmware" - -LICENSE = "Firmware-Broadcom-WIDCOMM" -NO_GENERIC_LICENSE[Firmware-Broadcom-WIDCOMM] = "LICENSE.broadcom_bcm20702" - -LIC_FILES_CHKSUM = "file://LICENSE.broadcom_bcm20702;md5=c0d5ea0502b00df74173d0f8a48b619d" -SRC_URI = "git://github.com/winterheart/broadcom-bt-firmware.git" -SRCREV = "c0bd928b8ae5754b6077c99afe6ef5c949a58f32" -PE = "1" -PV = "0.0+git${SRCPV}" - -S = "${WORKDIR}/git" - -inherit allarch - -CLEANBROKEN = "1" - -do_compile() { - : -} - -do_install() { - install -d ${D}${nonarch_base_libdir}/firmware/brcm/ - cp brcm/*.hcd ${D}${nonarch_base_libdir}/firmware/brcm/ - - # For license package: - install -m 0644 LICENSE.broadcom_bcm20702 ${D}${nonarch_base_libdir}/firmware/brcm/ - - # For main package: - install -m 0644 DEVICES.md ${D}${nonarch_base_libdir}/firmware/brcm/ -} - -PACKAGES =+ " \ - ${PN}-bcm20702a1 \ - ${PN}-bcm20702b0 \ - ${PN}-bcm20703a1 \ - ${PN}-bcm43142a0 \ - ${PN}-bcm4335c0 \ - ${PN}-bcm4350c5 \ - ${PN}-bcm4356a2 \ - ${PN}-bcm4371c2 \ - ${PN}-license \ -" - -RDEPENDS_${PN}-bcm20702a1 = "${PN}-license" -RDEPENDS_${PN}-bcm20702b0 = "${PN}-license" -RDEPENDS_${PN}-bcm20703a1 = "${PN}-license" -RDEPENDS_${PN}-bcm43142a0 = "${PN}-license" -RDEPENDS_${PN}-bcm4335c0 = "${PN}-license" -RDEPENDS_${PN}-bcm4350c5 = "${PN}-license" -RDEPENDS_${PN}-bcm4356a2 = "${PN}-license" -RDEPENDS_${PN}-bcm4371c2 = "${PN}-license" - -FILES_${PN}-bcm20702a1 = "${nonarch_base_libdir}/firmware/brcm/BCM20702A1*hcd" -FILES_${PN}-bcm20702b0 = "${nonarch_base_libdir}/firmware/brcm/BCM20702B0*hcd" -FILES_${PN}-bcm20703a1 = "${nonarch_base_libdir}/firmware/brcm/BCM20703A1*hcd" -FILES_${PN}-bcm43142a0 = "${nonarch_base_libdir}/firmware/brcm/BCM43142A0*hcd" -FILES_${PN}-bcm4335c0 = "${nonarch_base_libdir}/firmware/brcm/BCM4335C0*hcd" -FILES_${PN}-bcm4350c5 = "${nonarch_base_libdir}/firmware/brcm/BCM4350C5*hcd" -FILES_${PN}-bcm4356a2 = "${nonarch_base_libdir}/firmware/brcm/BCM4356A2*hcd" -FILES_${PN}-bcm4371c2 = "${nonarch_base_libdir}/firmware/brcm/BCM4371C2*hcd" -FILES_${PN}-license += "${nonarch_base_libdir}/firmware/brcm/LICENSE.broadcom_bcm20702" - -FILES_${PN} += "${nonarch_base_libdir}/firmware/brcm/*" -RDEPENDS_${PN} += "${PN}-license" - -# Make broadcom-bt-firmware depend on all of the split-out packages. -python populate_packages_prepend () { - firmware_pkgs = oe.utils.packages_filter_out_system(d) - d.appendVar('RDEPENDS_broadcom-bt-firmware', ' ' + ' '.join(firmware_pkgs)) -} diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-an-ARM64-gcc-10-compilation-error.-Without-t.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-an-ARM64-gcc-10-compilation-error.-Without-t.patch new file mode 100644 index 000000000..c94644438 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-Fix-for-an-ARM64-gcc-10-compilation-error.-Without-t.patch @@ -0,0 +1,54 @@ +From 0dddb4e1158705345b7f4f71635d42c89e1b0c8f Mon Sep 17 00:00:00 2001 +From: Dave Anderson +Date: Fri, 31 Jan 2020 17:11:46 -0500 +Subject: [PATCH] Fix for an ARM64 gcc-10 compilation error. Without the + patch, the build of the embedded gdb module fails with an error message that + indicates "multiple definition of 'tdesc_aarch64'". (anderson@redhat.com) + +Upstream-Status: Backport [https://github.com/crash-utility/crash/commit/e770735200c02ac2414c394ea6ec5f7f033efe64] +Signed-off-by: Khem Raj +--- + gdb-7.6.patch | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + +diff --git a/gdb-7.6.patch b/gdb-7.6.patch +index f6c311d..f64b55f 100644 +--- a/gdb-7.6.patch ++++ b/gdb-7.6.patch +@@ -2471,3 +2471,33 @@ diff -up gdb-7.6/opcodes/configure.orig gdb-7.6/opcodes/configure + #else + # error "!__i386__ && !__x86_64__" + #endif ++--- gdb-7.6/gdb/features/aarch64.c.orig +++++ gdb-7.6/gdb/features/aarch64.c ++@@ -5,7 +5,6 @@ ++ #include "osabi.h" ++ #include "target-descriptions.h" ++ ++-struct target_desc *tdesc_aarch64; ++ static void ++ initialize_tdesc_aarch64 (void) ++ { ++--- gdb-7.6/gdb/aarch64-linux-nat.c.orig +++++ gdb-7.6/gdb/aarch64-linux-nat.c ++@@ -37,6 +37,7 @@ ++ ++ #include "gregset.h" ++ +++extern struct target_desc *tdesc_aarch64; ++ #include "features/aarch64.c" ++ ++ /* Defines ps_err_e, struct ps_prochandle. */ ++--- gdb-7.6/gdb/aarch64-tdep.c.orig +++++ gdb-7.6/gdb/aarch64-tdep.c ++@@ -52,6 +52,7 @@ ++ #include "gdb_assert.h" ++ #include "vec.h" ++ +++struct target_desc *tdesc_aarch64; ++ #include "features/aarch64.c" ++ #include "features/aarch64-without-fpu.c" ++ +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.8.bb b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.8.bb index 834c92cc4..6e2533635 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.8.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.8.bb @@ -25,6 +25,7 @@ SRC_URI = "git://github.com/crash-utility/${BPN}.git \ file://remove-unrecognized-gcc-option-m32-for-mips.patch \ file://0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch \ file://0003-crash-detect-the-sysroot-s-glibc-header-file.patch \ + file://0001-Fix-for-an-ARM64-gcc-10-compilation-error.-Without-t.patch \ " SRCREV = "24f4801f8c8871a2e3e660fe9fa8fdd86bb29876" diff --git a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-hpmfwupg-move-variable-definition-to-.c-file.patch b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-hpmfwupg-move-variable-definition-to-.c-file.patch new file mode 100644 index 000000000..a765c3ab2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool/0001-hpmfwupg-move-variable-definition-to-.c-file.patch @@ -0,0 +1,41 @@ +From 3f7bb7218181745ca7762c1b4832cbb1c9e692f5 Mon Sep 17 00:00:00 2001 +From: Vaclav Dolezal +Date: Thu, 23 Jan 2020 11:26:32 +0100 +Subject: [PATCH] hpmfwupg: move variable definition to .c file + +Upstream-Status: Pending +Signed-off-by: Vaclav Dolezal +--- + include/ipmitool/ipmi_hpmfwupg.h | 2 +- + lib/ipmi_hpmfwupg.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h +index de65292..07f597b 100644 +--- a/include/ipmitool/ipmi_hpmfwupg.h ++++ b/include/ipmitool/ipmi_hpmfwupg.h +@@ -800,7 +800,7 @@ typedef struct _VERSIONINFO { + char descString[HPMFWUPG_DESC_STRING_LENGTH + 1]; + }VERSIONINFO, *PVERSIONINFO; + +-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; ++extern VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; + + #define TARGET_VER (0x01) + #define ROLLBACK_VER (0x02) +diff --git a/lib/ipmi_hpmfwupg.c b/lib/ipmi_hpmfwupg.c +index bbcffc0..d7cdcd6 100644 +--- a/lib/ipmi_hpmfwupg.c ++++ b/lib/ipmi_hpmfwupg.c +@@ -58,6 +58,8 @@ ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf); + + extern int verbose; + ++VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; ++ + int HpmfwupgUpgrade(struct ipmi_intf *intf, char *imageFilename, + int activate, int, int); + int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx *pFwupgCtx); +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb index 3de9a92a7..e3c74a516 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb @@ -30,6 +30,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ipmitool/ipmitool-${PV}.tar.bz2 \ file://0003-channel-Fix-buffer-overflow.patch \ file://0004-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch \ file://0005-fru-sdr-Fix-id_string-buffer-overflows.patch \ + file://0001-hpmfwupg-move-variable-definition-to-.c-file.patch \ " SRC_URI[md5sum] = "bab7ea104c7b85529c3ef65c54427aa3" SRC_URI[sha256sum] = "0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01" diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch new file mode 100644 index 000000000..49777bcee --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch @@ -0,0 +1,104 @@ +From 399f2c9a3acd5bd913e50a4dde52dee6527b297e Mon Sep 17 00:00:00 2001 +From: Kairui Song +Date: Wed, 29 Jan 2020 13:37:13 +0800 +Subject: [PATCH] [PATCH] Remove duplicated variable definitions + +When building on Fedora 32 (with GCC 10), following error is observed: + +/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2010: multiple definition of + `crash_reserved_mem_nr'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2010: first defined here +/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2009: multiple definition of + `crash_reserved_mem'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2009: first defined here +/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1278: multiple definition of + `parallel_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1278: first defined here +/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1265: multiple definition of + `splitting_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1265: first defined here +... +collect2: error: ld returned 1 exit status +make: *** [Makefile:97: makedumpfile] Error 1 + +These variables are wrongly defined multiple times. So remove the +duplicated definitions. + +Upstream-Status: Backport [https://github.com/kraj/makedumpfile/commit/399f2c9a3acd5bd913e50a4dde52dee6527b297e] +Signed-off-by: Kairui Song +Signed-off-by: Kazuhito Hagio +--- + makedumpfile.c | 8 ++++---- + makedumpfile.h | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/makedumpfile.c b/makedumpfile.c +index e290fbd..ae7336a 100644 +--- a/makedumpfile.c ++++ b/makedumpfile.c +@@ -10954,7 +10954,7 @@ check_param_for_reassembling_dumpfile(int argc, char *argv[]) + return FALSE; + + if ((info->splitting_info +- = malloc(sizeof(splitting_info_t) * info->num_dumpfile)) ++ = malloc(sizeof(struct splitting_info) * info->num_dumpfile)) + == NULL) { + MSG("Can't allocate memory for splitting_info.\n"); + return FALSE; +@@ -11042,7 +11042,7 @@ check_param_for_creating_dumpfile(int argc, char *argv[]) + return FALSE; + } + if ((info->splitting_info +- = malloc(sizeof(splitting_info_t) * info->num_dumpfile)) ++ = malloc(sizeof(struct splitting_info) * info->num_dumpfile)) + == NULL) { + MSG("Can't allocate memory for splitting_info.\n"); + return FALSE; +@@ -11077,13 +11077,13 @@ check_param_for_creating_dumpfile(int argc, char *argv[]) + + if (info->num_threads) { + if ((info->parallel_info = +- malloc(sizeof(parallel_info_t) * info->num_threads)) ++ malloc(sizeof(struct parallel_info) * info->num_threads)) + == NULL) { + MSG("Can't allocate memory for parallel_info.\n"); + return FALSE; + } + +- memset(info->parallel_info, 0, sizeof(parallel_info_t) ++ memset(info->parallel_info, 0, sizeof(struct parallel_info) + * info->num_threads); + } + +diff --git a/makedumpfile.h b/makedumpfile.h +index 68d9691..7217407 100644 +--- a/makedumpfile.h ++++ b/makedumpfile.h +@@ -1262,7 +1262,7 @@ struct splitting_info { + mdf_pfn_t end_pfn; + off_t offset_eraseinfo; + unsigned long size_eraseinfo; +-} splitting_info_t; ++}; + + struct parallel_info { + int fd_memory; +@@ -1275,7 +1275,7 @@ struct parallel_info { + #ifdef USELZO + lzo_bytep wrkmem; + #endif +-} parallel_info_t; ++}; + + struct ppc64_vmemmap { + unsigned long phys; +@@ -2006,8 +2006,8 @@ struct memory_range { + }; + + #define CRASH_RESERVED_MEM_NR 8 +-struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; +-int crash_reserved_mem_nr; ++extern struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; ++extern int crash_reserved_mem_nr; + + unsigned long read_vmcoreinfo_symbol(char *str_symbol); + int readmem(int type_addr, unsigned long long addr, void *bufptr, size_t size); +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb index 8d1676a4c..165e192cb 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb @@ -24,6 +24,7 @@ SRC_URI = "\ ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ + file://0001-PATCH-Remove-duplicated-variable-definitions.patch \ " SRC_URI[md5sum] = "808ef840ca49ca6bfde77c097cf429f5" SRC_URI[sha256sum] = "e702fbdf62b4cd829a76e46f3e24eb3fc7501918b85ebdcd8baef4f53d6ee2c8" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index 3b10e978e..ebb95cf78 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb @@ -10,6 +10,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://0001-genisoimage-Fix-fprintf-format-errors.patch \ file://0001-define-__THROW-to-avoid-build-issue-with-musl.patch \ file://0002-Do-not-use-rcmd-on-build-with-musl.patch \ + file://0001-genisoimage-Add-missing-extern-definition.patch \ " SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9" SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-missing-extern-definition.patch b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-missing-extern-definition.patch new file mode 100644 index 000000000..809d3afd7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-missing-extern-definition.patch @@ -0,0 +1,29 @@ +From fd5251cc8b82ce7a5f907c5129969097d75609fe Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Aug 2020 17:38:59 -0700 +Subject: [PATCH] genisoimage: Add missing extern definition + +Fixed build with gcc10 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + genisoimage/genisoimage.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/genisoimage/genisoimage.h b/genisoimage/genisoimage.h +index bbedfb0..82c859b 100644 +--- a/genisoimage/genisoimage.h ++++ b/genisoimage/genisoimage.h +@@ -376,7 +376,7 @@ extern int use_fileversion; + extern int split_SL_component; + extern int split_SL_field; + extern char *trans_tbl; +-char *outfile; ++extern char *outfile; + + #define JMAX 64 /* maximum Joliet file name length (spec) */ + #define JLONGMAX 103 /* out of spec Joliet file name length */ +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb new file mode 100644 index 000000000..596c5fe86 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "Opus Audio Codec" +DESCRIPTION = "The libopusenc libraries provide a high-level API for encoding \ + .opus files. libopusenc depends only on libopus." +HOMEPAGE = "http://www.opus-codec.org/" +SECTION = "libs/multimedia" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=174b92049c2c697eb73112801662a07c" + +DEPENDS = "libopus" + +UPSTREAM_CHECK_URI = "https://github.com/xiph/libopusenc/releases" + +SRC_URI = "https://ftp.osuosl.org/pub/xiph/releases/opus/libopusenc-${PV}.tar.gz" +SRC_URI[md5sum] = "f038ea0f4168d184c76b42d293697c57" +SRC_URI[sha256sum] = "8298db61a8d3d63e41c1a80705baa8ce9ff3f50452ea7ec1c19a564fe106cbb9" + +S = "${WORKDIR}/libopusenc-${PV}" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/files/config.linux-cross b/meta-openembedded/meta-oe/recipes-multimedia/live555/files/config.linux-cross deleted file mode 100644 index d1277da8d..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/files/config.linux-cross +++ /dev/null @@ -1,17 +0,0 @@ -COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_STRSTREAM=1 -D_LARGEFILE_SOURCE=1 -C = c -C_COMPILER = $(CC) -C_FLAGS = $(COMPILE_OPTS) -CPP = cpp -CPLUSPLUS_COMPILER = $(CXX) -CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 -OBJ = o -LINK = $(CXX) -o -LINK_OPTS = -L. -CONSOLE_LINK_OPTS = $(LINK_OPTS) -LIBRARY_LINK = $(LD) -o -LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic -LIB_SUFFIX = a -LIBS_FOR_CONSOLE_APPLICATION = -LIBS_FOR_GUI_APPLICATION = -EXE = diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc deleted file mode 100644 index e08d11b0c..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc +++ /dev/null @@ -1,56 +0,0 @@ -# live555 OE build file -# Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION = "LIVE555 Streaming Media libraries" -HOMEPAGE = "http://live.com/" -LICENSE = "LGPLv3" -SECTION = "devel" - -URLV = "${@d.getVar('PV')[0:4]}.${@d.getVar('PV')[4:6]}.${@d.getVar('PV')[6:8]}" -SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz \ - file://config.linux-cross" -# only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older -MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" - -S = "${WORKDIR}/live" -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure() { - cp ${WORKDIR}/config.linux-cross . - echo "COMPILE_OPTS+=" -fPIC -DXLOCALE_NOT_USED"" >> config.linux-cross - ./genMakefiles linux-cross -} - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${includedir}/BasicUsageEnvironment - install -d ${D}${includedir}/groupsock - install -d ${D}${includedir}/liveMedia - install -d ${D}${includedir}/UsageEnvironment - install -d ${D}${libdir} - cp -R --no-dereference --preserve=mode,links -v ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/ - cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/ - cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/ - cp -R --no-dereference --preserve=mode,links -v ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/ - cp -R --no-dereference --preserve=mode,links -v ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/ - # Find all the headers - for i in $(find . -name "*.hh") $(find . -name "*.h") ; do - install ${i} ${D}${includedir} - done - cp ${S}/*/*.a ${D}${libdir} - install -d ${D}${bindir} - for i in MPEG2TransportStreamIndexer openRTSP playSIP sapWatch testMPEG1or2ProgramToTransportStream testMPEG1or2Splitter testMPEG1or2VideoReceiver testMPEG2TransportStreamTrickPlay testOnDemandRTSPServer testRelay testAMRAudioStreamer testDVVideoStreamer testMP3Receiver testMP3Streamer testMPEG1or2AudioVideoStreamer testMPEG1or2VideoStreamer testMPEG2TransportStreamer testMPEG4VideoStreamer testWAVAudioStreamer vobStreamer; do - install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/ - done - install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/ -} - -PACKAGES =+ "live555-openrtsp live555-playsip live555-mediaserver live555-examples" -FILES_live555-openrtsp = "${bindir}/openRTSP" -FILES_live555-playsip = "${bindir}/playSIP" -FILES_live555-mediaserver = "${bindir}/live555MediaServer" -FILES_live555-examples = "${bindir}/*" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555/config.linux-cross b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555/config.linux-cross new file mode 100644 index 000000000..fe6a28604 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555/config.linux-cross @@ -0,0 +1,17 @@ +COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_STRSTREAM=1 -D_LARGEFILE_SOURCE=1 +C = c +C_COMPILER = $(CC) +C_FLAGS = $(COMPILE_OPTS) +CPP = cpp +CPLUSPLUS_COMPILER = $(CXX) +CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 +OBJ = o +LINK = $(CXX) -o +LINK_OPTS = -L. +CONSOLE_LINK_OPTS = $(LINK_OPTS) +LIBRARY_LINK = $(LD) -o +LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic +LIB_SUFFIX = a +LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto +LIBS_FOR_GUI_APPLICATION = +EXE = diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190828.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190828.bb deleted file mode 100644 index 1da61c0cf..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190828.bb +++ /dev/null @@ -1,11 +0,0 @@ -require live555.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - " -# SRC_URI[md5sum] = "a84ca3946d899f5592c7d31012ed2fe3" -# SRC_URI[sha256sum] = "0bd0c26d980425d9a419d835193e292a08a968f175da1902da4b495f126d5abd" - -SRC_URI[md5sum] = "a593f915664793b3ba41299b17b8bedc" -SRC_URI[sha256sum] = "a3dcd157865186cf883c3a80b4bb09637e91fff96b234b2c780a7f7dcc7a35dc" - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200721.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200721.bb new file mode 100644 index 000000000..df85cd484 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200721.bb @@ -0,0 +1,62 @@ +# live555 OE build file +# Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION = "LIVE555 Streaming Media libraries" +HOMEPAGE = "http://live.com/" +LICENSE = "LGPLv3" +SECTION = "devel" + +DEPENDS = "openssl" + +URLV = "${@d.getVar('PV')[0:4]}.${@d.getVar('PV')[4:6]}.${@d.getVar('PV')[6:8]}" +SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz \ + file://config.linux-cross" + +# only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older +MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" + +SRC_URI[sha256sum] = "89b2d99589de2ce9b4007ea6625dfce28317421604cf5131f4e1bf5bf7040b63" + +S = "${WORKDIR}/live" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + " + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_configure() { + cp ${WORKDIR}/config.linux-cross . + echo "COMPILE_OPTS+=" -fPIC -DXLOCALE_NOT_USED"" >> config.linux-cross + ./genMakefiles linux-cross +} + +do_install() { + install -d ${D}${includedir}/BasicUsageEnvironment + install -d ${D}${includedir}/groupsock + install -d ${D}${includedir}/liveMedia + install -d ${D}${includedir}/UsageEnvironment + install -d ${D}${libdir} + cp -R --no-dereference --preserve=mode,links -v ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/ + cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/ + cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/ + cp -R --no-dereference --preserve=mode,links -v ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/ + cp -R --no-dereference --preserve=mode,links -v ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/ + # Find all the headers + for i in $(find . -name "*.hh") $(find . -name "*.h") ; do + install ${i} ${D}${includedir} + done + cp ${S}/*/*.a ${D}${libdir} + install -d ${D}${bindir} + for i in MPEG2TransportStreamIndexer openRTSP playSIP sapWatch testMPEG1or2ProgramToTransportStream testMPEG1or2Splitter testMPEG1or2VideoReceiver testMPEG2TransportStreamTrickPlay testOnDemandRTSPServer testRelay testAMRAudioStreamer testDVVideoStreamer testMP3Receiver testMP3Streamer testMPEG1or2AudioVideoStreamer testMPEG1or2VideoStreamer testMPEG2TransportStreamer testMPEG4VideoStreamer testWAVAudioStreamer vobStreamer; do + install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/ + done + install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/ +} + +PACKAGES =+ "live555-openrtsp live555-playsip live555-mediaserver live555-examples" +FILES_live555-openrtsp = "${bindir}/openRTSP" +FILES_live555-playsip = "${bindir}/playSIP" +FILES_live555-mediaserver = "${bindir}/live555MediaServer" +FILES_live555-examples = "${bindir}/*" diff --git a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.3.bb b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.3.bb deleted file mode 100644 index e57e7a720..000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.3.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "The Geolocation Service" -DESCRIPTION = "Geoclue is a D-Bus service that provides location information. \ -The primary goal of the Geoclue project is to make creating location-aware applications \ -as simple as possible, while the secondary goal is to ensure that no application \ -can access location information without explicit permission from user." -LICENSE = "GPLv2.0+" -SECTION = "console/network" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6" - -DEPENDS = "glib-2.0 dbus json-glib libsoup-2.4 intltool-native" - -inherit meson pkgconfig gtk-doc gobject-introspection vala - -SRC_URI = " \ - https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/${PV}/geoclue-${PV}.tar \ -" - -SRC_URI[md5sum] = "6228301ed62b587ebaa0438b97ce66e4" -SRC_URI[sha256sum] = "3caa5e10190a34c17a9b3a9d1d8a19797ed197f07f36f6e35ce533a379efe155" - -export BUILD_SYS -export HOST_SYS -export STAGING_INCDIR -export STAGING_LIBDIR - -# Without this line, package is declared a library and named libgeoclue* -AUTO_LIBNAME_PKGS = "" - -PACKAGECONFIG ??= "3g modem-gps cdma nmea lib" -PACKAGECONFIG[3g] = "-D3g-source=true,-D3g-source=false,modemmanager" -PACKAGECONFIG[modem-gps] = "-Dmodem-gps-source=true,-Dmodem-gps-source=false,modemmanager" -PACKAGECONFIG[cdma] = "-Dcdma-source=true,-Dcdma-source=false,modemmanager" -PACKAGECONFIG[nmea] = "-Dnmea-source=true,-Dnmea-source=false,avahi,avahi-daemon" -PACKAGECONFIG[lib] = "-Dlibgeoclue=true,-Dlibgeoclue=false,gobject-introspection" - -GTKDOC_MESON_OPTION = "gtk-doc" - -EXTRA_OEMESON += " \ - -Ddbus-sys-dir=${sysconfdir}/dbus-1/system.d \ - -Ddemo-agent=false \ -" - -FILES_${PN} += " \ - ${datadir}/dbus-1/system-services \ - ${libdir} \ - ${systemd_unitdir} \ - ${prefix}/libexec \ -" - -FILES_${PN}-dev += " \ - ${datadir}/dbus-1/interfaces \ - ${datadir}/gir-1.0 \ -" diff --git a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb new file mode 100644 index 000000000..03a10ce62 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.5.6.bb @@ -0,0 +1,46 @@ +SUMMARY = "The Geolocation Service" +DESCRIPTION = "Geoclue is a D-Bus service that provides location information. \ +The primary goal of the Geoclue project is to make creating location-aware applications \ +as simple as possible, while the secondary goal is to ensure that no application \ +can access location information without explicit permission from user." +LICENSE = "GPLv2.0+" +SECTION = "console/network" + +LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6" + +DEPENDS = "glib-2.0 dbus json-glib libsoup-2.4 intltool-native" + +inherit meson pkgconfig gtk-doc gobject-introspection vala + +SRC_URI = "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/${PV}/geoclue-${PV}.tar" + +SRC_URI[sha256sum] = "76494f1262fd90faea05116aface7f580b9b50f7c525bc86ccf33409cea95e8d" + +# Without this line, package is declared a library and named libgeoclue* +AUTO_LIBNAME_PKGS = "" + +PACKAGECONFIG ??= "3g modem-gps cdma nmea lib" +PACKAGECONFIG[3g] = "-D3g-source=true,-D3g-source=false,modemmanager" +PACKAGECONFIG[modem-gps] = "-Dmodem-gps-source=true,-Dmodem-gps-source=false,modemmanager" +PACKAGECONFIG[cdma] = "-Dcdma-source=true,-Dcdma-source=false,modemmanager" +PACKAGECONFIG[nmea] = "-Dnmea-source=true,-Dnmea-source=false,avahi,avahi-daemon" +PACKAGECONFIG[lib] = "-Dlibgeoclue=true,-Dlibgeoclue=false,gobject-introspection" + +GTKDOC_MESON_OPTION = "gtk-doc" + +EXTRA_OEMESON += " \ + -Ddbus-sys-dir=${sysconfdir}/dbus-1/system.d \ + -Ddemo-agent=false \ +" + +FILES_${PN} += " \ + ${datadir}/dbus-1/system-services \ + ${libdir} \ + ${systemd_unitdir} \ + ${prefix}/libexec \ +" + +FILES_${PN}-dev += " \ + ${datadir}/dbus-1/interfaces \ + ${datadir}/gir-1.0 \ +" diff --git a/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.1.bb b/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.1.bb new file mode 100644 index 000000000..c6914007d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.1.bb @@ -0,0 +1,27 @@ +SUMMARY = "Small and fast POSIX-compliant shell" +HOMEPAGE = "http://gondor.apana.org.au/~herbert/dash/" +SECTION = "System Environment/Shells" + +LICENSE = "BSD & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b5262b4a1a1bff72b48e935531976d2e" + +inherit autotools update-alternatives + +SRC_URI = "http://gondor.apana.org.au/~herbert/${BPN}/files/${BP}.tar.gz" +SRC_URI[md5sum] = "df978fd0324f60a6ff45f686fe269fdc" +SRC_URI[sha256sum] = "73c881f146e329ac54962766760fd62cb8bdff376cd6c2f5772eecc1570e1611" + +EXTRA_OECONF += "--bindir=${base_bindir}" + +ALTERNATIVE_${PN} = "sh" +ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" +ALTERNATIVE_TARGET[sh] = "${base_bindir}/dash" +ALTERNATIVE_PRIORITY = "10" + +pkg_postinst_${PN} () { + grep -q "^${base_bindir}/dash$" $D${sysconfdir}/shells || echo ${base_bindir}/dash >> $D${sysconfdir}/shells +} + +pkg_postrm_${PN} () { + printf "$(grep -v "^${base_bindir}/dash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells +} diff --git a/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.bb b/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.bb deleted file mode 100644 index b3a36651f..000000000 --- a/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.11.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Small and fast POSIX-compliant shell" -HOMEPAGE = "http://gondor.apana.org.au/~herbert/dash/" -SECTION = "System Environment/Shells" - -LICENSE = "BSD & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b5262b4a1a1bff72b48e935531976d2e" - -inherit autotools update-alternatives - -SRC_URI = "http://gondor.apana.org.au/~herbert/${BPN}/files/${BP}.tar.gz" -SRC_URI[md5sum] = "027236e48b9202607b1418fee42c473e" -SRC_URI[sha256sum] = "4dd9a6ed5fe7546095157918fe5d784bb0b7887ae13de50e1e2d11e1b5a391cb" - -EXTRA_OECONF += "--bindir=${base_bindir}" - -ALTERNATIVE_${PN} = "sh" -ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" -ALTERNATIVE_TARGET[sh] = "${base_bindir}/dash" -ALTERNATIVE_PRIORITY = "10" - -pkg_postinst_${PN} () { - grep -q "^${base_bindir}/dash$" $D${sysconfdir}/shells || echo ${base_bindir}/dash >> $D${sysconfdir}/shells -} - -pkg_postrm_${PN} () { - printf "$(grep -v "^${base_bindir}/dash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells -} diff --git a/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0001-Remove-defining-handle_interrupt-twice.patch b/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0001-Remove-defining-handle_interrupt-twice.patch new file mode 100644 index 000000000..d6d6ae06d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0001-Remove-defining-handle_interrupt-twice.patch @@ -0,0 +1,28 @@ +From 2c77b61506aa867a873e3691214983b3eb7f652d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Aug 2020 19:49:35 -0700 +Subject: [PATCH] Remove defining handle_interrupt twice + +Fixes build with -fno-common + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + tc.sig.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tc.sig.c b/tc.sig.c +index 77659ca..576605a 100644 +--- a/tc.sig.c ++++ b/tc.sig.c +@@ -56,7 +56,6 @@ int alrmcatch_disabled; /* = 0; */ + int phup_disabled; /* = 0; */ + int pchild_disabled; /* = 0; */ + int pintr_disabled; /* = 0; */ +-int handle_interrupt; /* = 0; */ + + int + handle_pending_signals(void) +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb b/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb index b30c3434e..541f5505f 100644 --- a/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb +++ b/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.22.02.bb @@ -12,6 +12,7 @@ SRC_URI = " \ https://astron.com/pub/${BPN}/${BP}.tar.gz \ file://0001-Enable-system-malloc-on-all-linux.patch \ file://0002-Add-debian-csh-scripts.patch \ + file://0001-Remove-defining-handle_interrupt-twice.patch \ " SRC_URI[md5sum] = "f34909eab33733aecc05d27adc82277b" SRC_URI[sha256sum] = "ed287158ca1b00ba477e8ea57bac53609838ebcfd05fcb05ca95021b7ebe885b" diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.0.bb b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.0.bb deleted file mode 100644 index e235b9b95..000000000 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (c) 2012-2014 LG Electronics, Inc. -SUMMARY = "c-ares is a C library that resolves names asynchronously." -HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" - -PV = "1.16.0+gitr${SRCPV}" - -SRC_URI = "\ - git://github.com/c-ares/c-ares.git \ - file://cmake-install-libcares.pc.patch \ - file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ -" -SRCREV = "077a587dccbe2f0d8a1987fbd3525333705c2249" - -UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P\d+_(\d_?)+)" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -PACKAGES =+ "${PN}-utils" - -FILES_${PN}-utils = "${bindir}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb new file mode 100644 index 000000000..67dd70180 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb @@ -0,0 +1,27 @@ +# Copyright (c) 2012-2014 LG Electronics, Inc. +SUMMARY = "c-ares is a C library that resolves names asynchronously." +HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" + +PV = "1.16.0+gitr${SRCPV}" + +SRC_URI = "\ + git://github.com/c-ares/c-ares.git \ + file://cmake-install-libcares.pc.patch \ + file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ +" +SRCREV = "74a1426ba60e2cd7977e53a22ef839c87415066e" + +UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P\d+_(\d_?)+)" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +PACKAGES =+ "${PN}-utils" + +FILES_${PN}-utils = "${bindir}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.0.bb deleted file mode 100644 index 151653b22..000000000 --- a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "C++11 command line parser" -DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface." -HOMEPAGE = "https://github.com/CLIUtils/CLI11" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b73927b18d5c6cd8d2ed28a6ad539733" -SRCREV = "13becaddb657eacd090537719a669d66d393b8b2" -PV .= "+git${SRCPV}" - -SRC_URI += "gitsm://github.com/CLIUtils/CLI11" - -S = "${WORKDIR}/git" - -inherit cmake -inherit ptest - -# cli11 is a header only C++ library, so the main package will be empty. -RDEPENDS_${PN}-dev = "" diff --git a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.1.bb b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.1.bb new file mode 100644 index 000000000..5f022d78a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.1.bb @@ -0,0 +1,17 @@ +SUMMARY = "C++11 command line parser" +DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface." +HOMEPAGE = "https://github.com/CLIUtils/CLI11" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b73927b18d5c6cd8d2ed28a6ad539733" +SRCREV = "5cb3efabce007c3a0230e4cc2e27da491c646b6c" +PV .= "+git${SRCPV}" + +SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=v1" + +S = "${WORKDIR}/git" + +inherit cmake +inherit ptest + +# cli11 is a header only C++ library, so the main package will be empty. +RDEPENDS_${PN}-dev = "" diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch new file mode 100644 index 000000000..96146a195 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch @@ -0,0 +1,40 @@ +From 04d5f4805a86302a0e135a28d58a6c1ff6a68d52 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 30 Jul 2020 23:03:51 +0200 +Subject: [PATCH] Use compiler -fcf-protection only if compiler/arch supports + it +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There have been some PRs they were either rejected or some general suggestion +for more flags suggested. So + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + cmake/compilerFlags.cmake | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake +index 12caf42..455525e 100644 +--- a/cmake/compilerFlags.cmake ++++ b/cmake/compilerFlags.cmake +@@ -26,7 +26,12 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN + # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0 + if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) ) + if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) +- add_compile_options(-fstack-clash-protection -fcf-protection) ++ # Gcc does support -fcf-protection on few arches only ++ CHECK_CXX_COMPILER_FLAG(-fcf-protection COMPILER_SUPPORTS_FCF_PROTECTION) ++ if (COMPILER_SUPPORTS_FCF_PROTECTION) ++ add_compile_options(-fcf-protection) ++ endif() ++ add_compile_options(-fstack-clash-protection) + endif() + + if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8 +-- +2.21.3 + diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb deleted file mode 100644 index 97116ee2d..000000000 --- a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" - -DEPENDS = "zlib expat" - -SRC_URI = "https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz" -SRC_URI[md5sum] = "56d064517ae5903dd963b84514a121c1" -SRC_URI[sha256sum] = "f125286980fd1bcb28e188c02a93946951c61e10784720be2301b661a65b3081" - -S = "${WORKDIR}/${BPN}-${PV}-Source" - -inherit cmake gettext diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb new file mode 100644 index 000000000..ed1e8de5c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb @@ -0,0 +1,16 @@ +SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +DEPENDS = "zlib expat" + +SRC_URI = "https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz" +SRC_URI[sha256sum] = "a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994e3e778" + +# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either +inherit dos2unix +SRC_URI += "file://0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch" + +S = "${WORKDIR}/${BPN}-${PV}-Source" + +inherit cmake gettext diff --git a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_6.2.0.bb b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_6.2.0.bb deleted file mode 100644 index 05dc94a99..000000000 --- a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_6.2.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "open-source formatting library for C++" -DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." -HOMEPAGE = "https://fmt.dev" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=af88d758f75f3c5c48a967501f24384b" - -SRC_URI += "git://github.com/fmtlib/fmt" -SRCREV = "9bdd1596cef1b57b9556f8bef32dc4a32322ef3e" - -S = "${WORKDIR}/git" - -inherit cmake -inherit ptest - -EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" diff --git a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb new file mode 100644 index 000000000..ed3de0b50 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb @@ -0,0 +1,15 @@ +SUMMARY = "open-source formatting library for C++" +DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." +HOMEPAGE = "https://fmt.dev" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=af88d758f75f3c5c48a967501f24384b" + +SRC_URI += "git://github.com/fmtlib/fmt" +SRCREV = "cd4af11efc9c622896a3e4cb599fa28668ca3d05" + +S = "${WORKDIR}/git" + +inherit cmake +inherit ptest + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb new file mode 100644 index 000000000..6a97c24c2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb @@ -0,0 +1,85 @@ +# Copyright (C) 2010-2012 O.S. Systems Software Ltda. All Rights Reserved +# Released under the MIT license + +DESCRIPTION = "FreeRDP RDP client & server library" +HOMEPAGE = "http://www.freerdp.com" +DEPENDS = "openssl alsa-lib pcsc-lite" +SECTION = "net" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +inherit pkgconfig cmake gitpkgv + +PE = "1" +PKGV = "${GITPKGVTAG}" + +SRCREV = "d2ba84a6885f57674098fe8e76c5f99d880e580d" +SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0 \ + file://winpr-makecert-Build-with-install-RPATH.patch \ +" + +S = "${WORKDIR}/git" + +EXTRA_OECMAKE += " \ + -DWITH_ALSA=ON \ + -DWITH_PCSC=ON \ + -DWITH_FFMPEG=OFF \ + -DWITH_CUNIT=OFF \ + -DWITH_NEON=OFF \ + -DBUILD_STATIC_LIBS=OFF \ + -DCMAKE_POSITION_INDEPENDANT_CODE=ON \ + -DWITH_MANPAGES=OFF \ +" + +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'directfb pam pulseaudio wayland x11', d)}\ + gstreamer cups \ +" + +X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" +PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XFIXES=ON -DWITH_XDAMAGE=ON -DWITH_XRANDR=ON -DWITH_XKBFILE=ON,-DWITH_X11=OFF,${X11_DEPS}" +PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland wayland-native" +PACKAGECONFIG[directfb] = "-DWITH_DIRECTFB=ON,-DWITH_DIRECTFB=OFF,directfb" +PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam" +PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio" +PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" + +PACKAGES =+ "libfreerdp" + +LEAD_SONAME = "libfreerdp.so" +FILES_libfreerdp = "${libdir}/lib*${SOLIBS}" + +PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" + +# we will need winpr-makecert to generate TLS certificates +do_install_append () { + install -d ${D}${bindir} + install -m755 winpr/tools/makecert-cli/winpr-makecert ${D}${bindir} + rm -rf ${D}${libdir}/cmake + rm -rf ${D}${libdir}/freerdp +} + +python populate_packages_prepend () { + freerdp_root = d.expand('${libdir}/freerdp') + + do_split_packages(d, freerdp_root, '^(audin_.*)\.so$', + output_pattern='libfreerdp-plugin-%s', + description='FreeRDP plugin %s', + prepend=True, extra_depends='libfreerdp-plugin-audin') + + do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$', + output_pattern='libfreerdp-plugin-%s', + description='FreeRDP plugin %s', + prepend=True, extra_depends='libfreerdp-plugin-rdpsnd') + + do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$', + output_pattern='libfreerdp-plugin-%s', + description='FreeRDP plugin %s', + prepend=True, extra_depends='libfreerdp-plugin-tsmf') + + do_split_packages(d, freerdp_root, '^([^-]*)\.so$', + output_pattern='libfreerdp-plugin-%s', + description='FreeRDP plugin %s', + prepend=True, extra_depends='') +} diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb deleted file mode 100644 index 7cafbb799..000000000 --- a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright (C) 2010-2012 O.S. Systems Software Ltda. All Rights Reserved -# Released under the MIT license - -DESCRIPTION = "FreeRDP RDP client & server library" -HOMEPAGE = "http://www.freerdp.com" -DEPENDS = "openssl alsa-lib pcsc-lite" -SECTION = "net" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -inherit pkgconfig cmake gitpkgv - -PE = "1" -PV = "2.0.0+gitr${SRCPV}" -PKGV = "${GITPKGVTAG}" - -# 2.0.0 release -SRCREV = "5ab2bed8749747b8e4b2ed431fd102bc726be684" -SRC_URI = "git://github.com/FreeRDP/FreeRDP.git \ - file://winpr-makecert-Build-with-install-RPATH.patch \ -" - -S = "${WORKDIR}/git" - -EXTRA_OECMAKE += " \ - -DWITH_ALSA=ON \ - -DWITH_PCSC=ON \ - -DWITH_FFMPEG=OFF \ - -DWITH_CUNIT=OFF \ - -DWITH_NEON=OFF \ - -DBUILD_STATIC_LIBS=OFF \ - -DCMAKE_POSITION_INDEPENDANT_CODE=ON \ - -DWITH_MANPAGES=OFF \ -" - -PACKAGECONFIG ??= " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'directfb pam pulseaudio wayland x11', d)}\ - gstreamer cups \ -" - -X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" -PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XFIXES=ON -DWITH_XDAMAGE=ON -DWITH_XRANDR=ON -DWITH_XKBFILE=ON,-DWITH_X11=OFF,${X11_DEPS}" -PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland wayland-native" -PACKAGECONFIG[directfb] = "-DWITH_DIRECTFB=ON,-DWITH_DIRECTFB=OFF,directfb" -PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam" -PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio" -PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base" -PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" - -PACKAGES =+ "libfreerdp" - -LEAD_SONAME = "libfreerdp.so" -FILES_libfreerdp = "${libdir}/lib*${SOLIBS}" - -PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" - -# we will need winpr-makecert to generate TLS certificates -do_install_append () { - install -d ${D}${bindir} - install -m755 winpr/tools/makecert-cli/winpr-makecert ${D}${bindir} - rm -rf ${D}${libdir}/cmake - rm -rf ${D}${libdir}/freerdp -} - -python populate_packages_prepend () { - freerdp_root = d.expand('${libdir}/freerdp') - - do_split_packages(d, freerdp_root, '^(audin_.*)\.so$', - output_pattern='libfreerdp-plugin-%s', - description='FreeRDP plugin %s', - prepend=True, extra_depends='libfreerdp-plugin-audin') - - do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$', - output_pattern='libfreerdp-plugin-%s', - description='FreeRDP plugin %s', - prepend=True, extra_depends='libfreerdp-plugin-rdpsnd') - - do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$', - output_pattern='libfreerdp-plugin-%s', - description='FreeRDP plugin %s', - prepend=True, extra_depends='libfreerdp-plugin-tsmf') - - do_split_packages(d, freerdp_root, '^([^-]*)\.so$', - output_pattern='libfreerdp-plugin-%s', - description='FreeRDP plugin %s', - prepend=True, extra_depends='') -} diff --git a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.0.0.bb b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.0.0.bb deleted file mode 100644 index 556a25aa1..000000000 --- a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.0.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Improved drop-in replacement for std::function" -DESCRIPTION = "Provides improved implementations of std::function." -HOMEPAGE = "https://naios.github.io/function2" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRCREV = "d2acdb6c3c7612a6133cd03464ef941161258f4e" -PV .= "+git${SRCPV}" - -SRC_URI += "gitsm://github.com/Naios/function2" - -S = "${WORKDIR}/git" - -inherit cmake -inherit ptest - -# Installs some data to incorrect top-level /usr directory -do_install_append() { - mkdir -p ${D}/${datadir}/function2 - mv ${D}/${prefix}/Readme.md ${D}/${datadir}/function2/ - mv ${D}/${prefix}/LICENSE.txt ${D}/${datadir}/function2/ -} diff --git a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.1.0.bb b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.1.0.bb new file mode 100644 index 000000000..56dc30acd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.1.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "Improved drop-in replacement for std::function" +DESCRIPTION = "Provides improved implementations of std::function." +HOMEPAGE = "https://naios.github.io/function2" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" +SRCREV = "3a0746bf5f601dfed05330aefcb6854354fce07d" +PV .= "+git${SRCPV}" + +SRC_URI += "gitsm://github.com/Naios/function2" + +S = "${WORKDIR}/git" + +inherit cmake +inherit ptest + +# Installs some data to incorrect top-level /usr directory +do_install_append() { + mkdir -p ${D}/${datadir}/function2 + mv ${D}/${prefix}/Readme.md ${D}/${datadir}/function2/ + mv ${D}/${prefix}/LICENSE.txt ${D}/${datadir}/function2/ +} diff --git a/meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch b/meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch deleted file mode 100644 index a9198166a..000000000 --- a/meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 52e6cf052b1f938fcca1bc24d578fe0bfd972988 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 25 Jun 2017 07:25:33 -0700 -Subject: [PATCH] Use sigemptyset API instead of __sigemptyset - -__sigemptyset has been removed from glibc public -API headers in upcoming (2.26) release onwards - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - src/prog/gpm-root.y | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y -index 5126c65..76c896c 100644 ---- a/src/prog/gpm-root.y -+++ b/src/prog/gpm-root.y -@@ -1196,11 +1196,7 @@ int main(int argc, char **argv) - LOG_DAEMON : LOG_USER); - /* reap your zombies */ - childaction.sa_handler=reap_children; --#if defined(__GLIBC__) -- __sigemptyset(&childaction.sa_mask); --#else /* __GLIBC__ */ - sigemptyset(&childaction.sa_mask); --#endif /* __GLIBC__ */ - childaction.sa_flags=0; - sigaction(SIGCHLD,&childaction,NULL); - --- -2.13.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb index 3800d147f..600b25df8 100644 --- a/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb @@ -9,14 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" PV = "1.99.7+git${SRCREV}" PR = "r2" -SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77" +SRCREV = "e82d1a653ca94aa4ed12441424da6ce780b1e530" DEPENDS = "ncurses bison-native" SRC_URI = "git://github.com/telmich/gpm;protocol=git \ file://init \ file://gpm.service.in \ - file://0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb deleted file mode 100644 index 8543c6f48..000000000 --- a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.103.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "The gSOAP toolkit provides a unique SOAP-to-C/C++ language binding \ -for the development of SOAP Web Services and clients." -SECTION = "devel" -LICENSE = "GPL-2.0-with-OpenSSL-exception" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ - file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \ - " -SRC_URI[md5sum] = "3207ece9fc8ceb787091de93838f5952" -SRC_URI[sha256sum] = "afe2ba08d2fa56adc3c774b6741587203a72140a255346e9947b8d2ee6c7d4b6" - -inherit autotools - -BBCLASSEXTEND = "native" - -S = "${WORKDIR}/${BPN}-2.8" - -PARALLEL_MAKE = "" - -EXTRA_OEMAKE_class-target = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2" - -DEPENDS = "openssl zlib flex bison bison-native" -DEPENDS_append_class-target = " gsoap-native" - -do_install_append() { - install -d ${D}${libdir} - for lib in libgsoapssl libgsoapssl++ libgsoap libgsoapck++ libgsoap++ libgsoapck - do - oe_libinstall -C gsoap $lib ${D}${libdir} - done -} - -do_install_class-native() { - oe_runmake DESTDIR=${D} BINDIR=${D}${bindir} install -} - -FILES_${PN} = "${bindir}/wsdl2h ${bindir}/soapcpp2" -FILES_${PN} += "${datadir}" -FILES_${PN}-staticdev = "${libdir}" -FILES_${PN}-dev = "${includedir}" -RRECOMMENDS_${PN}-dev = "${PN}-staticdev" diff --git a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.105.bb b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.105.bb new file mode 100644 index 000000000..70807de2a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.105.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "The gSOAP toolkit provides a unique SOAP-to-C/C++ language binding \ +for the development of SOAP Web Services and clients." +SECTION = "devel" +LICENSE = "GPL-2.0-with-OpenSSL-exception" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ + file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \ + " +SRC_URI[md5sum] = "ce91e46d3abc1d720566b13298fbc367" +SRC_URI[sha256sum] = "aa20c535cf08f1576bebad97cc6159ca57c68bc43acfc9a296e4e9faf041097e" + +inherit autotools + +BBCLASSEXTEND = "native" + +S = "${WORKDIR}/${BPN}-2.8" + +PARALLEL_MAKE = "" + +EXTRA_OEMAKE_class-target = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2" + +DEPENDS = "openssl zlib flex bison bison-native" +DEPENDS_append_class-target = " gsoap-native" + +do_install_append() { + install -d ${D}${libdir} + for lib in libgsoapssl libgsoapssl++ libgsoap libgsoapck++ libgsoap++ libgsoapck + do + oe_libinstall -C gsoap $lib ${D}${libdir} + done +} + +do_install_class-native() { + oe_runmake DESTDIR=${D} BINDIR=${D}${bindir} install +} + +FILES_${PN} = "${bindir}/wsdl2h ${bindir}/soapcpp2" +FILES_${PN} += "${datadir}" +FILES_${PN}-staticdev = "${libdir}" +FILES_${PN}-dev = "${includedir}" +RRECOMMENDS_${PN}-dev = "${PN}-staticdev" diff --git a/meta-openembedded/meta-oe/recipes-support/htop/files/htop-gcc10.patch b/meta-openembedded/meta-oe/recipes-support/htop/files/htop-gcc10.patch new file mode 100644 index 000000000..5be06277d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/htop/files/htop-gcc10.patch @@ -0,0 +1,31 @@ +Fix build with -fno-common + +Upstream-Staus: Pending +Signed-off-by: Khem Raj +--- a/CRT.h ++++ b/CRT.h +@@ -140,7 +140,7 @@ extern const char **CRT_treeStr; + + extern int CRT_delay; + +-int* CRT_colors; ++extern int* CRT_colors; + + extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT]; + +@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount; + + extern int CRT_scrollWheelVAmount; + +-char* CRT_termType; ++extern char* CRT_termType; + + // TODO move color scheme to Settings, perhaps? + + extern int CRT_colorScheme; + +-void *backtraceArray[128]; ++extern void *backtraceArray[128]; + + #if HAVE_SETUID_ENABLED + diff --git a/meta-openembedded/meta-oe/recipes-support/htop/htop_2.2.0.bb b/meta-openembedded/meta-oe/recipes-support/htop/htop_2.2.0.bb index 64eb0c571..c608077de 100644 --- a/meta-openembedded/meta-oe/recipes-support/htop/htop_2.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/htop/htop_2.2.0.bb @@ -9,6 +9,7 @@ DEPENDS = "ncurses" SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \ file://0001-Use-pkg-config.patch \ file://0001-Ask-for-python3-specifically.patch \ + file://htop-gcc10.patch \ " SRC_URI[md5sum] = "0d816b6beed31edc75babcfbf863ffa8" SRC_URI[sha256sum] = "d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57" diff --git a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb new file mode 100644 index 000000000..804faf02e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -0,0 +1,87 @@ +SUMMARY = "ImageMagick is an image conversion toolkit" +SECTION = "console/utils" +HOMEPAGE = "https://www.imagemagick.org/" +DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \ +editing raster and vector image files. It can read and write over 200 image file formats." +LICENSE = "ImageMagick" +LIC_FILES_CHKSUM = "file://LICENSE;md5=41b4fa9af60c88e61484b02c0561181a" +# FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. +DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" + +BASE_PV := "${PV}" +PV .= "_25" +SRC_URI = "git://github.com/ImageMagick/ImageMagick.git " +SRCREV = "8b4e00829eb84d4e7b4da11acf1f98f1e8166e5b" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig update-alternatives + +# xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2 +# if someone needs xml support then fix it first +EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --disable-openmp --without-xml --disable-opencl" + +CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[graphviz] = "--with-gvc,--without-gvc,graphviz" +PACKAGECONFIG[jp2] = "--with-jp2,,jasper" +PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz" +PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg" +PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo" +PACKAGECONFIG[rsvg] = "--with-rsvg,--without-rsvg,librsvg" +PACKAGECONFIG[tcmalloc] = "--with-tcmalloc=yes,--with-tcmalloc=no,gperftools" +PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" +PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf" +PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt" + +FILES_${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \ + ${datadir}/ImageMagick-7" + +FILES_${PN}-dev += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/*.a" + +FILES_${PN}-dbg += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/.debug/*" + +BBCLASSEXTEND = "native" + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN} = "animate compare composite conjure convert display \ + identify import mogrify montage stream" + +ALTERNATIVE_TARGET[animate] = "${bindir}/animate.im7" +ALTERNATIVE_TARGET[compare] = "${bindir}/compare.im7" +ALTERNATIVE_TARGET[composite] = "${bindir}/composite.im7" +ALTERNATIVE_TARGET[conjure] = "${bindir}/conjure.im7" +ALTERNATIVE_TARGET[convert] = "${bindir}/convert.im7" +ALTERNATIVE_TARGET[display] = "${bindir}/display.im7" +ALTERNATIVE_TARGET[identify] = "${bindir}/identify.im7" +ALTERNATIVE_TARGET[import] = "${bindir}/import.im7" +ALTERNATIVE_TARGET[mogrify] = "${bindir}/mogrify.im7" +ALTERNATIVE_TARGET[montage] = "${bindir}/montage.im7" +ALTERNATIVE_TARGET[stream] = "${bindir}/stream.im7" + +ALTERNATIVE_${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \ + convert.1 display.1 identify.1 import.1 mogrify.1 montage.1 stream.1" + +ALTERNATIVE_LINK_NAME[animate.1] = "${mandir}/man1/animate.1" +ALTERNATIVE_TARGET[animate.1] = "${mandir}/man1/animate.im7.1" +ALTERNATIVE_LINK_NAME[compare.1] = "${mandir}/man1/compare.1" +ALTERNATIVE_TARGET[compare.1] = "${mandir}/man1/compare.im7.1" +ALTERNATIVE_LINK_NAME[composite.1] = "${mandir}/man1/composite.1" +ALTERNATIVE_TARGET[composite.1] = "${mandir}/man1/composite.im7.1" +ALTERNATIVE_LINK_NAME[conjure.1] = "${mandir}/man1/conjure.1" +ALTERNATIVE_TARGET[conjure.1] = "${mandir}/man1/conjure.im7.1" +ALTERNATIVE_LINK_NAME[convert.1] = "${mandir}/man1/convert.1" +ALTERNATIVE_TARGET[convert.1] = "${mandir}/man1/convert.im7.1" +ALTERNATIVE_LINK_NAME[display.1] = "${mandir}/man1/display.1" +ALTERNATIVE_TARGET[display.1] = "${mandir}/man1/display.im7.1" +ALTERNATIVE_LINK_NAME[identify.1] = "${mandir}/man1/identify.1" +ALTERNATIVE_TARGET[identify.1] = "${mandir}/man1/identify.im7.1" +ALTERNATIVE_LINK_NAME[import.1] = "${mandir}/man1/import.1" +ALTERNATIVE_TARGET[import.1] = "${mandir}/man1/import.im7.1" +ALTERNATIVE_LINK_NAME[mogrify.1] = "${mandir}/man1/mogrify.1" +ALTERNATIVE_TARGET[mogrify.1] = "${mandir}/man1/mogrify.im7.1" +ALTERNATIVE_LINK_NAME[montage.1] = "${mandir}/man1/montage.1" +ALTERNATIVE_TARGET[montage.1] = "${mandir}/man1/montage.im7.1" +ALTERNATIVE_LINK_NAME[stream.1] = "${mandir}/man1/stream.1" +ALTERNATIVE_TARGET[stream.1] = "${mandir}/man1/stream.im7.1" diff --git a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.9.bb b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.9.bb deleted file mode 100644 index 3f7d06e26..000000000 --- a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.9.bb +++ /dev/null @@ -1,87 +0,0 @@ -SUMMARY = "ImageMagick is an image conversion toolkit" -SECTION = "console/utils" -HOMEPAGE = "https://www.imagemagick.org/" -DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \ -editing raster and vector image files. It can read and write over 200 image file formats." -LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=41b4fa9af60c88e61484b02c0561181a" -# FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. -DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" - -BASE_PV := "${PV}" -PV .= "_13" -SRC_URI = "git://github.com/ImageMagick/ImageMagick.git " -SRCREV = "15b935d64f613b5a0fc9d3fead5c6ec1b0e3908f" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig update-alternatives - -# xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2 -# if someone needs xml support then fix it first -EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --disable-openmp --without-xml --disable-opencl" - -CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[graphviz] = "--with-gvc,--without-gvc,graphviz" -PACKAGECONFIG[jp2] = "--with-jp2,,jasper" -PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz" -PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg" -PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo" -PACKAGECONFIG[rsvg] = "--with-rsvg,--without-rsvg,librsvg" -PACKAGECONFIG[tcmalloc] = "--with-tcmalloc=yes,--with-tcmalloc=no,gperftools" -PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" -PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf" -PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt" - -FILES_${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \ - ${datadir}/ImageMagick-7" - -FILES_${PN}-dev += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/*.a" - -FILES_${PN}-dbg += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/.debug/*" - -BBCLASSEXTEND = "native" - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE_${PN} = "animate compare composite conjure convert display \ - identify import mogrify montage stream" - -ALTERNATIVE_TARGET[animate] = "${bindir}/animate.im7" -ALTERNATIVE_TARGET[compare] = "${bindir}/compare.im7" -ALTERNATIVE_TARGET[composite] = "${bindir}/composite.im7" -ALTERNATIVE_TARGET[conjure] = "${bindir}/conjure.im7" -ALTERNATIVE_TARGET[convert] = "${bindir}/convert.im7" -ALTERNATIVE_TARGET[display] = "${bindir}/display.im7" -ALTERNATIVE_TARGET[identify] = "${bindir}/identify.im7" -ALTERNATIVE_TARGET[import] = "${bindir}/import.im7" -ALTERNATIVE_TARGET[mogrify] = "${bindir}/mogrify.im7" -ALTERNATIVE_TARGET[montage] = "${bindir}/montage.im7" -ALTERNATIVE_TARGET[stream] = "${bindir}/stream.im7" - -ALTERNATIVE_${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \ - convert.1 display.1 identify.1 import.1 mogrify.1 montage.1 stream.1" - -ALTERNATIVE_LINK_NAME[animate.1] = "${mandir}/man1/animate.1" -ALTERNATIVE_TARGET[animate.1] = "${mandir}/man1/animate.im7.1" -ALTERNATIVE_LINK_NAME[compare.1] = "${mandir}/man1/compare.1" -ALTERNATIVE_TARGET[compare.1] = "${mandir}/man1/compare.im7.1" -ALTERNATIVE_LINK_NAME[composite.1] = "${mandir}/man1/composite.1" -ALTERNATIVE_TARGET[composite.1] = "${mandir}/man1/composite.im7.1" -ALTERNATIVE_LINK_NAME[conjure.1] = "${mandir}/man1/conjure.1" -ALTERNATIVE_TARGET[conjure.1] = "${mandir}/man1/conjure.im7.1" -ALTERNATIVE_LINK_NAME[convert.1] = "${mandir}/man1/convert.1" -ALTERNATIVE_TARGET[convert.1] = "${mandir}/man1/convert.im7.1" -ALTERNATIVE_LINK_NAME[display.1] = "${mandir}/man1/display.1" -ALTERNATIVE_TARGET[display.1] = "${mandir}/man1/display.im7.1" -ALTERNATIVE_LINK_NAME[identify.1] = "${mandir}/man1/identify.1" -ALTERNATIVE_TARGET[identify.1] = "${mandir}/man1/identify.im7.1" -ALTERNATIVE_LINK_NAME[import.1] = "${mandir}/man1/import.1" -ALTERNATIVE_TARGET[import.1] = "${mandir}/man1/import.im7.1" -ALTERNATIVE_LINK_NAME[mogrify.1] = "${mandir}/man1/mogrify.1" -ALTERNATIVE_TARGET[mogrify.1] = "${mandir}/man1/mogrify.im7.1" -ALTERNATIVE_LINK_NAME[montage.1] = "${mandir}/man1/montage.1" -ALTERNATIVE_TARGET[montage.1] = "${mandir}/man1/montage.im7.1" -ALTERNATIVE_LINK_NAME[stream.1] = "${mandir}/man1/stream.1" -ALTERNATIVE_TARGET[stream.1] = "${mandir}/man1/stream.im7.1" diff --git a/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb b/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb index 14718184b..0cc8b31b3 100755 --- a/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb @@ -9,8 +9,6 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" RDEPENDS_${PN} += " \ - gcov \ - gcov-symlinks \ libjson-perl \ libperlio-gzip-perl \ perl \ @@ -46,6 +44,11 @@ RDEPENDS_${PN} += " \ perl-module-tie-hash \ " +RDEPENDS_${PN}_append_class-target = " \ + gcov \ + gcov-symlinks \ +" + SRC_URI = " \ http://downloads.sourceforge.net/ltp/${BP}.tar.gz \ file://0001-geninfo-Add-intermediate-text-format-support.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.2.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.2.bb deleted file mode 100644 index a954499c6..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.2.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "The goal of this project is to provide a tiny library that would \ -facilitate the common operations with sizes in bytes." -HOMEPAGE = "https://github.com/rhinstaller/libbytesize" -LICENSE = "LGPLv2+" -SECTION = "devel/lib" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" - -S = "${WORKDIR}/git" -B = "${S}" - -SRCREV = "e64e752a28a4a41b0a43cba3bedf9571c22af807" -SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master" - -inherit gettext autotools python3native - -DEPENDS += " \ - libpcre2 \ - gmp \ - mpfr \ - gettext-native \ -" - -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" - -PACKAGECONFIG ??= "python3" -PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3-core" - -EXTRA_OECONF = "--without-gtk-doc" -EXTRA_OEMAKE = "py3libdir=${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb new file mode 100644 index 000000000..0aaf188b6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "The goal of this project is to provide a tiny library that would \ +facilitate the common operations with sizes in bytes." +HOMEPAGE = "https://github.com/rhinstaller/libbytesize" +LICENSE = "LGPLv2+" +SECTION = "devel/lib" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" + +S = "${WORKDIR}/git" +B = "${S}" + +SRCREV = "732ee8d28492e4bc9b52c29bcb81a5c19388d002" +SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master" + +inherit gettext autotools python3native + +DEPENDS += " \ + libpcre2 \ + gmp \ + mpfr \ + gettext-native \ +" + +FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" + +PACKAGECONFIG ??= "python3" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3-core" + +EXTRA_OECONF = "--without-gtk-doc" +EXTRA_OEMAKE = "py3libdir=${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.70.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.70.bb deleted file mode 100644 index 94976d2e9..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.70.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" -HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=57d09285feac8a64efa878e692b14f36" -SECTION = "net" - -DEPENDS = "file" - -SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ -" -SRC_URI[md5sum] = "dcd6045ecb4ea18c120afedccbd1da74" -SRC_URI[sha256sum] = "90d0a3d396f96f9bc41eb0f7e8187796049285fabef82604acd4879590977307" - -inherit autotools lib_package pkgconfig gettext - -CFLAGS += "-pthread -D_REENTRANT" - -EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" - -PACKAGECONFIG ?= "curl https" -PACKAGECONFIG_append_class-target = "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ -" -PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," -PACKAGECONFIG[https] = "--enable-https,--disable-https,libgcrypt gnutls," - -do_compile_append() { - sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc -} diff --git a/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb new file mode 100644 index 000000000..2bd8148e3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" +HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=57d09285feac8a64efa878e692b14f36" +SECTION = "net" + +DEPENDS = "file" + +SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ +" +SRC_URI[md5sum] = "c7e230e9b899282b43d9a9faa41e893d" +SRC_URI[sha256sum] = "e8f445e85faf727b89e9f9590daea4473ae00ead38b237cf1eda55172b89b182" + +inherit autotools lib_package pkgconfig gettext + +CFLAGS += "-pthread -D_REENTRANT" + +EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" + +PACKAGECONFIG ?= "curl https" +PACKAGECONFIG_append_class-target = "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ +" +PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," +PACKAGECONFIG[https] = "--enable-https,--disable-https,libgcrypt gnutls," + +do_compile_append() { + sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc +} diff --git a/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.30.bb b/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.30.bb deleted file mode 100644 index 9cd02b0c0..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.30.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "Library for controlling team network device" -HOMEPAGE = "http://www.libteam.org/" -SECTION = "libs/network" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "libnl libdaemon jansson" - -SRC_URI = "git://github.com/jpirko/libteam \ - file://0001-include-sys-select.h-for-fd_set-definition.patch \ - file://0002-teamd-Re-adjust-include-header-order.patch \ - file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \ - file://0001-team_basic_test.py-use-python3-interpreter.patch \ - file://run-ptest \ - " -SRCREV = "471fb50d206e5a3f2eef9e4247329b51edc5c493" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig ptest - -FILES_${PN} = "${libdir}/libteam${SOLIBS} \ -" - -PACKAGES += "${PN}-dctl ${PN}-utils" -FILES_${PN}-dctl = "${libdir}/libteamdctl${SOLIBS} \ -" -FILES_${PN}-utils = "${bindir}/bond2team \ - ${bindir}/teamd \ - ${bindir}/teamdctl \ - ${bindir}/teamnl \ -" - -RDEPENDS_${PN}-utils = "bash" -RDEPENDS_${PN}-ptest = "python3-core" - -do_install_ptest() { - install ${S}/scripts/team_basic_test.py ${D}${PTEST_PATH}/ -} diff --git a/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.31.bb b/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.31.bb new file mode 100644 index 000000000..149cfb8d2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.31.bb @@ -0,0 +1,40 @@ +SUMMARY = "Library for controlling team network device" +HOMEPAGE = "http://www.libteam.org/" +SECTION = "libs/network" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "libnl libdaemon jansson" + +SRC_URI = "git://github.com/jpirko/libteam \ + file://0001-include-sys-select.h-for-fd_set-definition.patch \ + file://0002-teamd-Re-adjust-include-header-order.patch \ + file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \ + file://0001-team_basic_test.py-use-python3-interpreter.patch \ + file://run-ptest \ + " +SRCREV = "3ee12c6d569977cf1cd30d0da77807a07aa77158" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig ptest + +FILES_${PN} = "${libdir}/libteam${SOLIBS} \ +" + +PACKAGES += "${PN}-dctl ${PN}-utils" +FILES_${PN}-dctl = "${libdir}/libteamdctl${SOLIBS} \ +" +FILES_${PN}-utils = "${bindir}/bond2team \ + ${bindir}/teamd \ + ${bindir}/teamdctl \ + ${bindir}/teamnl \ +" + +RDEPENDS_${PN}-utils = "bash" +RDEPENDS_${PN}-ptest = "python3-core" + +do_install_ptest() { + install ${S}/scripts/team_basic_test.py ${D}${PTEST_PATH}/ +} diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/reproducible-build.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/reproducible-build.patch index db598a88c..3f53db9e5 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/reproducible-build.patch +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/reproducible-build.patch @@ -1,23 +1,27 @@ configure.ac: override CONFIGURE_LINE For reproducible binaries, we need to report a constant CONFIGURE_LINE. -This patched is only applied for such builds. -Upstream-Status: Inappropriate [oe specific] +Upstream-Status: Pending Signed-off-by: Joe Slater --- git.orig/configure.ac +++ git/configure.ac -@@ -15,7 +15,10 @@ AC_PREREQ(2.69) +@@ -15,7 +15,15 @@ AC_PREREQ(2.69) ################################################################################ dnl -- Process this file with autoconf to produce a configure script. AC_INIT -CONFIGURE_LINE="$0 $@" -+dnl The default CONFIGURE_LINE has been overridden for reproducible binaries -+dnl CONFIGURE_LINE="$0 $@" -+CONFIGURE_LINE="configure parameters are not available for reproducible builds" ++ ++dnl per reproducible-builds.org check SOURCE_DATE_EPOCH ++dnl ++if test -z "${SOURCE_DATE_EPOCH+set}" ; then ++ CONFIGURE_LINE="$0 $@" ++else ++ CONFIGURE_LINE="configure options are not available for reproducible builds" ++fi + AC_CONFIG_SRCDIR([lib/device/dev-cache.h]) AC_CONFIG_HEADERS([include/configure.h]) diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index ab618b436..3c6c7edfc 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -15,7 +15,7 @@ SRC_URI = "git://sourceware.org/git/lvm2.git \ file://0001-Avoid-bashisms-in-init-scripts.patch \ file://0005-do-not-build-manual.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ - ${@bb.utils.contains('BUILD_REPRODUCIBLE_BINARIES','1','file://reproducible-build.patch','', d)} \ + file://reproducible-build.patch \ " SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02" diff --git a/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch b/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch index 130267931..9c154a173 100644 --- a/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch +++ b/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch @@ -9,31 +9,24 @@ Signed-off-by: Khem Raj Makefile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -diff --git a/GNUmakefile b/GNUmakefile -index 7bf7dca..0e10030 100644 --- a/GNUmakefile +++ b/GNUmakefile -@@ -41,7 +41,6 @@ endif +@@ -45,7 +45,6 @@ endif CC?= gcc CFLAGS?= -O2 -pipe CFLAGS+= -g -Wall -CPPFLAGS= -DREGEX CPPFLAGS+= -D_GNU_SOURCE - CPPFLAGS+= $(BSD_CPPFLAGS) -D__dead=__dead2 + CPPFLAGS+= $(BSD_CPPFLAGS) LIBS= $(CURSES_LIBS) $(BSD_LIBS) -diff --git a/Makefile b/Makefile -index 94ce340..d516bbc 100644 --- a/Makefile +++ b/Makefile -@@ -10,7 +10,7 @@ DPADD+= ${LIBCURSES} ${LIBUTIL} - # REGEX -- create regular expression functions. +@@ -11,7 +11,7 @@ DPADD+= ${LIBUTIL} # STARTUPFILE -- look for and handle initialization file. + # MGLOG -- debug mg internals to a log file. # --CFLAGS+=-Wall -DREGEX -+CFLAGS+=-Wall +-CFLAGS+=-Wall -DREGEX `pkg-config --cflags-only-I ncurses` ++CFLAGS+=-Wall `pkg-config --cflags-only-I ncurses` SRCS= autoexec.c basic.c bell.c buffer.c cinfo.c dir.c display.c \ echo.c extend.c file.c fileio.c funmap.c help.c kbd.c keymap.c \ --- -2.12.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch b/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch index 551f1df16..8e8c2b902 100644 --- a/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch +++ b/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch @@ -8,8 +8,6 @@ Signed-off-by: Khem Raj fileio.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/fileio.c b/fileio.c -index 48a67a2..9b69665 100644 --- a/fileio.c +++ b/fileio.c @@ -12,6 +12,7 @@ @@ -20,6 +18,3 @@ index 48a67a2..9b69665 100644 #include #include #include --- -2.12.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch b/meta-openembedded/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch index 907d67064..bdd7632be 100644 --- a/meta-openembedded/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch +++ b/meta-openembedded/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch @@ -8,13 +8,11 @@ Signed-off-by: Khem Raj fileio.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/fileio.c b/fileio.c -index 9b69665..a852fd2 100644 --- a/fileio.c +++ b/fileio.c -@@ -28,6 +28,10 @@ - #include "kbd.h" - #include "pathnames.h" +@@ -36,6 +36,10 @@ + #define DEFFILEMODE 0666 + #endif +#if !defined(DEFFILEMODE) +# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ @@ -23,6 +21,3 @@ index 9b69665..a852fd2 100644 static char *bkuplocation(const char *); static int bkupleavetmp(const char *); --- -2.12.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/mg/mg_20170401.bb b/meta-openembedded/meta-oe/recipes-support/mg/mg_20170401.bb deleted file mode 100644 index dad1d008b..000000000 --- a/meta-openembedded/meta-oe/recipes-support/mg/mg_20170401.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "A portable version of the mg maintained by the OpenBSD team" -HOMEPAGE = "http://homepage.boetes.org/software/mg/" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://version.c;md5=1895eb37bf6bd79cdc5c89d8166fabfb" -DEPENDS = "ncurses libbsd" -SECTION = "console/editors" - -SRC_URI = "http://homepage.boetes.org/software/mg/mg-${PV}.tar.gz \ - file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ - file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ - " -SRC_URI_append_libc-musl = "\ - file://0001-Undefine-REGEX-for-musl-based-systems.patch \ - " -SRC_URI[md5sum] = "884388589fb38c2109ad9fed328be20a" -SRC_URI[sha256sum] = "0a3608b17c153960cb1d954ca3b62445a77c0c1a18aa5c8c58aba9f6b8d62aab" - -# CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?= -EXTRA_OEMAKE = "\ - 'CC=${CC}' \ - 'LDFLAGS=${LDFLAGS}' \ - \ - 'prefix=${prefix}' \ - 'bindir=${bindir}' \ - 'libdir=${libdir}' \ - 'includedir=${includedir}' \ - 'mandir=${mandir}' \ - 'PKG_CONFIG=pkg-config' \ -" - -CFLAGS += "-I${STAGING_INCDIR}/bsd" - -do_install () { - oe_runmake install DESTDIR=${D} -} - -inherit pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/mg/mg_20200723.bb b/meta-openembedded/meta-oe/recipes-support/mg/mg_20200723.bb new file mode 100644 index 000000000..b73f93756 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/mg/mg_20200723.bb @@ -0,0 +1,38 @@ +SUMMARY = "A portable version of the mg maintained by the OpenBSD team" +HOMEPAGE = "http://homepage.boetes.org/software/mg/" +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://version.c;md5=1895eb37bf6bd79cdc5c89d8166fabfb" +DEPENDS = "ncurses libbsd" +SECTION = "console/editors" + +SRCREV = "60fa3582f5f735b9d43825f5bdcc4ea5f0740f91" +SRC_URI = "git://github.com/hboetes/mg \ + file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ + file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ + " +SRC_URI_append_libc-musl = "\ + file://0001-Undefine-REGEX-for-musl-based-systems.patch \ + " + +S = "${WORKDIR}/git" + +# CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?= +EXTRA_OEMAKE = "\ + 'CC=${CC}' \ + 'LDFLAGS=${LDFLAGS}' \ + \ + 'prefix=${prefix}' \ + 'bindir=${bindir}' \ + 'libdir=${libdir}' \ + 'includedir=${includedir}' \ + 'mandir=${mandir}' \ + 'PKG_CONFIG=pkg-config' \ +" + +CFLAGS += "-I${STAGING_INCDIR}/bsd" + +do_install () { + oe_runmake install DESTDIR=${D} +} + +inherit pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/monit/monit/monitrc b/meta-openembedded/meta-oe/recipes-support/monit/monit/monitrc index f8d6a4388..af7bd2be5 100644 --- a/meta-openembedded/meta-oe/recipes-support/monit/monit/monitrc +++ b/meta-openembedded/meta-oe/recipes-support/monit/monit/monitrc @@ -21,6 +21,12 @@ set daemon 30 # check services at 30 seconds intervals # # default Monit check immediately after Monit start) # # + +# set monit files in temporary locations +set pidfile /var/run/.monit.pid +set statefile /var/run/.monit.state +set idfile /var/run/.monit.id + ## Set syslog logging. If you want to log to a standalone log file instead, ## specify the full path to the log file # diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.3.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.3.bb deleted file mode 100644 index 645b07b4c..000000000 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_4.9.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ -Not ANOther editor) is an enhanced clone of the \ -Pico text editor." -HOMEPAGE = "http://www.nano-editor.org/" -SECTION = "console/utils" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" - -DEPENDS = "ncurses file" -RDEPENDS_${PN} = "ncurses-terminfo-base" - -PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" - -SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[md5sum] = "52137a960ae8b3ca6d7dab6767fe6e5f" -SRC_URI[sha256sum] = "6e3438f033a0ed07d3d74c30d0803cbda3d2366ba1601b7bbf9b16ac371f51b4" - -UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" - -inherit autotools gettext pkgconfig - -PACKAGECONFIG[tiny] = "--enable-tiny," diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.0.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.0.bb new file mode 100644 index 000000000..e97c01f14 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.0.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ +Not ANOther editor) is an enhanced clone of the \ +Pico text editor." +HOMEPAGE = "http://www.nano-editor.org/" +SECTION = "console/utils" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" + +DEPENDS = "ncurses file" +RDEPENDS_${PN} = "ncurses-terminfo-base" + +PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" + +SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" +SRC_URI[sha256sum] = "7c0d94be69cd066f20df2868a2da02f7b1d416ce8d47c0850a8bd270897caa36" + +UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" + +inherit autotools gettext pkgconfig + +PACKAGECONFIG[tiny] = "--enable-tiny," diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch new file mode 100644 index 000000000..c5a64387f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch @@ -0,0 +1,31 @@ +From 59fafe6e39759e193b5764b36b4c5a93da352123 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 18 Aug 2020 00:36:49 -0700 +Subject: [PATCH] Use -Os to compile tinyxml2.cpp + +This workarounds issue [1] seen on riscv with gcc + +[1] https://github.com/riscv/riscv-gnu-toolchain/issues/624 + +Upstream-Status: Inappropriate [ OE-Specific ] +Signed-off-by: Khem Raj +--- + modules/datasets/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/datasets/CMakeLists.txt b/modules/datasets/CMakeLists.txt +index 56ca9e310..99b7a33f6 100644 +--- a/modules/datasets/CMakeLists.txt ++++ b/modules/datasets/CMakeLists.txt +@@ -2,7 +2,7 @@ set(the_description "datasets framework") + + set(filter_srcs "${CMAKE_CURRENT_LIST_DIR}/src/tinyxml2/tinyxml2.cpp") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override") # GCC ++ ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override -Os") # GCC + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-inconsistent-missing-override") # Clang + endif() +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb deleted file mode 100644 index 7927ce25f..000000000 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb +++ /dev/null @@ -1,206 +0,0 @@ -SUMMARY = "Opencv : The Open Computer Vision Library" -HOMEPAGE = "http://opencv.org/" -SECTION = "libs" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=19598330421859a6dd353a4318091ac7" - -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" - -SRCREV_opencv = "01b2c5a77ca6dbef3baef24ebc0a5984579231d9" -SRCREV_contrib = "e6f32c6a69043456a806a4e802ee3ce7b7059c93" -SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" -SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" -SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" -SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" - -def ipp_filename(d): - import re - arch = d.getVar('TARGET_ARCH') - if re.match("i.86$", arch): - return "ippicv_2020_lnx_ia32_20191018_general.tgz" - else: - return "ippicv_2020_lnx_intel64_20191018_general.tgz" - -def ipp_md5sum(d): - import re - arch = d.getVar('TARGET_ARCH') - if re.match("i.86$", arch): - return "ad189a940fb60eb71f291321322fe3e8" - else: - return "7421de0095c7a39162ae13a6098782f9" - -IPP_FILENAME = "${@ipp_filename(d)}" -IPP_MD5 = "${@ipp_md5sum(d)}" - -SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" -SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ - git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ - file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ - file://0003-To-fix-errors-as-following.patch \ - file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ - file://0001-Dont-use-isystem.patch \ - file://download.patch \ - file://0001-Make-ts-module-external.patch \ - " -PV = "4.3.0" - -S = "${WORKDIR}/git" - -# OpenCV wants to download more files during configure. We download these in -# do_fetch and construct a source cache in the format it expects -OPENCV_DLDIR = "${WORKDIR}/downloads" - -do_unpack_extra() { - tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} - - md5() { - # Return the MD5 of $1 - echo $(md5sum $1 | cut -d' ' -f1) - } - cache() { - TAG=$1 - shift - mkdir --parents ${OPENCV_DLDIR}/$TAG - for F in $*; do - DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F) - test -e $DEST || ln -s $F $DEST - done - } - cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i - cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i - cache data ${WORKDIR}/face/*.dat -} -addtask unpack_extra after do_unpack before do_patch - -EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ - -DWITH_1394=OFF \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DOPENCV_ICV_HASH=${IPP_MD5} \ - -DIPPROOT=${WORKDIR}/ippicv_lnx \ - -DOPENCV_GENERATE_PKGCONFIG=ON \ - -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ - -DOPENCV_ALLOW_DOWNLOADS=OFF \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ -" -EXTRA_OECMAKE_append_x86 = " -DX86=ON" - -PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" - -PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" -PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," -PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," -PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," -PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," -PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," -PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," -PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," -PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," -PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," -PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," -PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," -PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," -PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," -PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," -PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," -PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," -PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," -PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," -PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," -PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," - -inherit pkgconfig cmake - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} - -export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" -export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" -export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" -export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" -export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" - -TARGET_CC_ARCH += "-I${S}/include " - -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ - ${PN}-apps" - -python populate_packages_prepend () { - cv_libdir = d.expand('${libdir}') - do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) - - pn = d.getVar('PN') - metapkg = pn + '-dev' - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - blacklist = [ metapkg ] - metapkg_rdepends = [ ] - packages = d.getVar('PACKAGES').split() - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): - metapkg_rdepends.append(pkg) - d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) - - metapkg = pn - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - blacklist = [ metapkg, "libopencv-ts" ] - metapkg_rdepends = [ ] - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): - metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) -} - -PACKAGES_DYNAMIC += "^libopencv-.*" - -FILES_${PN} = "" -FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/cmake/opencv4/*.cmake" -FILES_${PN}-staticdev += "${libdir}/opencv4/3rdparty/*.a" -FILES_${PN}-apps = "${bindir}/* ${datadir}/opencv4 ${datadir}/licenses" -FILES_${PN}-java = "${datadir}/OpenCV/java" -FILES_${PN}-samples = "${datadir}/opencv4/samples/" - -INSANE_SKIP_${PN}-java = "libdir" -INSANE_SKIP_${PN}-dbg = "libdir" - -ALLOW_EMPTY_${PN} = "1" - -SUMMARY_python-opencv = "Python bindings to opencv" -FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python-opencv = "python-core python-numpy" - -SUMMARY_python3-opencv = "Python bindings to opencv" -FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python3-opencv = "python3-core python3-numpy" - -RDEPENDS_${PN}-apps = "bash" - -do_install_append() { - # Move Python files into correct library folder (for multilib build) - if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then - mv ${D}/usr/lib/* ${D}/${libdir}/ - rm -rf ${D}/usr/lib - fi -} diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.4.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.4.0.bb new file mode 100644 index 000000000..372e15cd0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.4.0.bb @@ -0,0 +1,210 @@ +SUMMARY = "Opencv : The Open Computer Vision Library" +HOMEPAGE = "http://opencv.org/" +SECTION = "libs" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=19598330421859a6dd353a4318091ac7" + +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" + +DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" + +SRCREV_opencv = "c3bb57afeaf030f10939204d48d7c2a3842f4293" +SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b" +SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" +SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" +SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" +SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" + +def ipp_filename(d): + import re + arch = d.getVar('TARGET_ARCH') + if re.match("i.86$", arch): + return "ippicv_2020_lnx_ia32_20191018_general.tgz" + else: + return "ippicv_2020_lnx_intel64_20191018_general.tgz" + +def ipp_md5sum(d): + import re + arch = d.getVar('TARGET_ARCH') + if re.match("i.86$", arch): + return "ad189a940fb60eb71f291321322fe3e8" + else: + return "7421de0095c7a39162ae13a6098782f9" + +IPP_FILENAME = "${@ipp_filename(d)}" +IPP_MD5 = "${@ipp_md5sum(d)}" + +SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" +SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ + git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ + git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ + file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ + file://0003-To-fix-errors-as-following.patch \ + file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ + file://0001-Dont-use-isystem.patch \ + file://download.patch \ + file://0001-Make-ts-module-external.patch \ + " +SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" + +S = "${WORKDIR}/git" + +# OpenCV wants to download more files during configure. We download these in +# do_fetch and construct a source cache in the format it expects +OPENCV_DLDIR = "${WORKDIR}/downloads" + +do_unpack_extra() { + tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} + + md5() { + # Return the MD5 of $1 + echo $(md5sum $1 | cut -d' ' -f1) + } + cache() { + TAG=$1 + shift + mkdir --parents ${OPENCV_DLDIR}/$TAG + for F in $*; do + DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F) + test -e $DEST || ln -s $F $DEST + done + } + cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i + cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i + cache data ${WORKDIR}/face/*.dat +} +addtask unpack_extra after do_unpack before do_patch + +CMAKE_VERBOSE = "VERBOSE=1" + +EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ + -DWITH_1394=OFF \ + -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DOPENCV_ICV_HASH=${IPP_MD5} \ + -DIPPROOT=${WORKDIR}/ippicv_lnx \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ + -DOPENCV_ALLOW_DOWNLOADS=OFF \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ +" +EXTRA_OECMAKE_append_x86 = " -DX86=ON" + +PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" + +PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" +PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," +PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," +PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," +PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," +PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," +PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," +PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," +PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," +PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," +PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," +PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," +PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," +PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," +PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," +PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," +PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," +PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," +PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," +PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," +PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," + +inherit pkgconfig cmake + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} + +export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" +export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" +export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" +export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" +export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" + +TARGET_CC_ARCH += "-I${S}/include " + +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ + ${PN}-apps" + +python populate_packages_prepend () { + cv_libdir = d.expand('${libdir}') + do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) + + pn = d.getVar('PN') + metapkg = pn + '-dev' + d.setVar('ALLOW_EMPTY_' + metapkg, "1") + blacklist = [ metapkg ] + metapkg_rdepends = [ ] + packages = d.getVar('PACKAGES').split() + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): + metapkg_rdepends.append(pkg) + d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) + + metapkg = pn + d.setVar('ALLOW_EMPTY_' + metapkg, "1") + blacklist = [ metapkg, "libopencv-ts" ] + metapkg_rdepends = [ ] + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): + metapkg_rdepends.append(pkg) + d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) +} + +PACKAGES_DYNAMIC += "^libopencv-.*" + +FILES_${PN} = "" +FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" +FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/cmake/opencv4/*.cmake" +FILES_${PN}-staticdev += "${libdir}/opencv4/3rdparty/*.a" +FILES_${PN}-apps = "${bindir}/* ${datadir}/opencv4 ${datadir}/licenses" +FILES_${PN}-java = "${datadir}/OpenCV/java" +FILES_${PN}-samples = "${datadir}/opencv4/samples/" + +INSANE_SKIP_${PN}-java = "libdir" +INSANE_SKIP_${PN}-dbg = "libdir" + +ALLOW_EMPTY_${PN} = "1" + +SUMMARY_python-opencv = "Python bindings to opencv" +FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS_python-opencv = "python-core python-numpy" + +SUMMARY_python3-opencv = "Python bindings to opencv" +FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS_python3-opencv = "python3-core python3-numpy" + +RDEPENDS_${PN}-apps = "bash" + +do_install_append() { + # Move Python files into correct library folder (for multilib build) + if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then + mv ${D}/usr/lib/* ${D}/${libdir}/ + rm -rf ${D}/usr/lib + fi +} + +TOOLCHAIN = "gcc" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb index 092e6059b..eacd4abc0 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb @@ -8,10 +8,10 @@ DEPENDS = "pidgin json-glib glib-2.0 zlib" inherit pkgconfig SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=git" -SRCREV = "14f1b69b6292bbdc98cca484b050ec8359394c4e" +SRCREV = "77f94b55bfb8b0dbc7fafa7461057d33b6802236" S = "${WORKDIR}/git" -PV = "1.5+git${SRCPV}" +PV = "1.6+git${SRCPV}" do_compile() { oe_runmake -C skypeweb; diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/basename-include.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/basename-include.patch index 3d6d7a8f1..4a18ba350 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/basename-include.patch +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/basename-include.patch @@ -5,6 +5,9 @@ Subject: [PATCH 3/3] Minic GNU basename() API for non-glibc library e.g. musl Upstream-Status: Pending +Rework for poppler 0.90.1 +Signed-off-by: Andreas Müller + Signed-off-by: Khem Raj Signed-off-by: Randy MacLeod --- @@ -12,7 +15,7 @@ Signed-off-by: Randy MacLeod 1 file changed, 4 insertions(+) diff --git a/goo/gbasename.cc b/goo/gbasename.cc -index 830c1c80..e93eb368 100644 +index 69236d8..3858415 100644 --- a/goo/gbasename.cc +++ b/goo/gbasename.cc @@ -46,6 +46,10 @@ @@ -23,9 +26,9 @@ index 830c1c80..e93eb368 100644 +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) +#endif + - std::string gbasename(const char* filename) + std::string gbasename(const char *filename) { #ifdef _MSC_VER -- -2.17.0 +2.21.3 diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.89.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.89.0.bb deleted file mode 100644 index f8b7c075a..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.89.0.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE = "https://poppler.freedesktop.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ - file://0001-Do-not-overwrite-all-our-build-flags.patch \ - file://basename-include.patch \ - " -SRC_URI[md5sum] = "92ac57f60ae8c3a1f8bfe01c9530b7b5" -SRC_URI[sha256sum] = "fba230364537782cc5d43b08d693ef69c36586286349683c7b127156a8ef9b5c" - -DEPENDS = "fontconfig zlib cairo lcms glib-2.0" - -inherit cmake pkgconfig gobject-introspection - -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" -PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" -PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" -PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" -PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON,-DENABLE_SPLASH=OFF,boost" - -# surprise - did not expect this to work :) -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -EXTRA_OECMAKE += " \ - -DENABLE_CMS=lcms2 \ - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ - -DBUILD_GTK_TESTS=OFF \ - -DENABLE_ZLIB=ON \ - -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ -" - -do_configure_append() { - # poppler macro uses pkg-config to check for g-ir runtimes. Something - # makes them point to /usr/bin. Align them to sysroot - that's where the - # gir-wrappers are: - sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja -} - -PACKAGES =+ "libpoppler libpoppler-glib" -FILES_libpoppler = "${libdir}/libpoppler.so.*" -FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" - -RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.08.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.08.0.bb new file mode 100644 index 000000000..c3f9716ef --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.08.0.bb @@ -0,0 +1,51 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE = "https://poppler.freedesktop.org/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ + file://0001-Do-not-overwrite-all-our-build-flags.patch \ + file://basename-include.patch \ + " +SRC_URI[sha256sum] = "ae65fef04bbf63259a6352e7b620719115d4fb97f5079b0b8b00a8eb0c86eca5" + +DEPENDS = "fontconfig zlib cairo lcms glib-2.0" + +inherit cmake pkgconfig gobject-introspection + +PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" +PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" +PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" +PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" +PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON,-DENABLE_SPLASH=OFF,boost" + +# surprise - did not expect this to work :) +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +EXTRA_OECMAKE += " \ + -DENABLE_CMS=lcms2 \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -DBUILD_GTK_TESTS=OFF \ + -DENABLE_ZLIB=ON \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ +" + +do_configure_append() { + # poppler macro uses pkg-config to check for g-ir runtimes. Something + # makes them point to /usr/bin. Align them to sysroot - that's where the + # gir-wrappers are: + sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja +} + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES_libpoppler = "${libdir}/libpoppler.so.*" +FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + +RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch b/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch new file mode 100644 index 000000000..5147f17c3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid/0001-get-edid-define-quiet-once.patch @@ -0,0 +1,44 @@ +From 9da8eb6663d0ba046bc0570172c549d421de043a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 12 Aug 2020 23:39:32 -0700 +Subject: [PATCH] get-edid: define quiet once + +Fixes build with gcc 10 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + get-edid/classic.c | 2 +- + get-edid/i2c.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/get-edid/classic.c b/get-edid/classic.c +index 9cc8ee3..b13f5f0 100644 +--- a/get-edid/classic.c ++++ b/get-edid/classic.c +@@ -26,7 +26,7 @@ typedef byte* real_ptr; + #define dosmemput(buffer,length,offset) memcpy(offset,buffer,length) + + #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } +-int quiet; ++extern int quiet; + + real_ptr far_ptr_to_real_ptr( uint32 farptr ) + { +diff --git a/get-edid/i2c.c b/get-edid/i2c.c +index 625d7cb..0929e98 100644 +--- a/get-edid/i2c.c ++++ b/get-edid/i2c.c +@@ -15,7 +15,7 @@ + + //Ideas (but not too much actual code) taken from i2c-tools. Thanks guys. + +-int quiet; ++extern int quiet; + + #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } + +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb b/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb index e4c2cadc2..1aa492c31 100644 --- a/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb @@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=292c42e2aedc4af636636bf7af0e2b26" SRC_URI = "http://polypux.org/projects/read-edid/read-edid-${PV}.tar.gz \ file://0001-Do-not-install-license-file.patch \ + file://0001-get-edid-define-quiet-once.patch \ " SRC_URI[md5sum] = "016546e438bf6c98739ff74061df9854" SRC_URI[sha256sum] = "c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f" diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.28.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.28.bb deleted file mode 100644 index fbf018d7f..000000000 --- a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.28.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "Satyr is a collection of low-level algorithms for program \ -failure processing, analysis, and reporting supporting kernel space, user \ -space, Python, and Java programs" - -HOMEPAGE = "https://github.com/abrt/satyr" -LICENSE = "GPLv2" - -inherit autotools-brokensep python3native pkgconfig - -SRC_URI = "git://github.com/abrt/satyr.git \ - file://0002-fix-compile-failure-against-musl-C-library.patch \ -" -SRCREV = "8b5547b89b712b39a59f1d8b366e7de0f5f46108" -S = "${WORKDIR}/git" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS += " \ - gdb \ -" - -PACKAGES += "python3-${BPN}" -FILES_python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" - -PACKAGECONFIG ??= "python3 rpm" -PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" -PACKAGECONFIG[rpm] = "--with-rpm, --without-rpm, rpm" - -do_configure_prepend() { - ${S}/gen-version -} diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.30.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.30.bb new file mode 100644 index 000000000..7831dd956 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.30.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Satyr is a collection of low-level algorithms for program \ +failure processing, analysis, and reporting supporting kernel space, user \ +space, Python, and Java programs" + +HOMEPAGE = "https://github.com/abrt/satyr" +LICENSE = "GPLv2" + +inherit autotools-brokensep python3native pkgconfig + +SRC_URI = "git://github.com/abrt/satyr.git \ + file://0002-fix-compile-failure-against-musl-C-library.patch \ +" +SRCREV = "871a07001c64cfce15dffd7e93a5c3d55af6d5e8" +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS += " \ + gdb \ + gperf-native \ + json-c \ + nettle \ +" + +PACKAGES += "python3-${BPN}" +FILES_python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" + +PACKAGECONFIG ??= "python3 rpm" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" +PACKAGECONFIG[rpm] = "--with-rpm, --without-rpm, rpm" + +do_configure_prepend() { + ${S}/gen-version +} diff --git a/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch new file mode 100644 index 000000000..9e2ebe756 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch @@ -0,0 +1,98 @@ +From b7dd97708b9d0ed09d8d7ac435f8b25eadbf6487 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=83=C2=ADsa=C3=85=E2=84=A2?= +Date: Thu, 13 Aug 2020 11:20:38 -0700 +Subject: [PATCH 1/2] Fix building with GCC 10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC 10 defaults to -fno-common that results into errors on multiple +global variable definitions: + +/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: +shar-opts.o:(.data.rel.ro.local+0x0): multiple definition of +`program_name'; shar.o:(.rodata+0x10): first defined here + +This patch fixes it by changing the definitions in header files into extern +declarations. + + + +Signed-off-by: Petr PísaÅ™ +Signed-off-by: Khem Raj +--- + src/shar-opts.h | 2 +- + src/shar-std.def | 2 +- + src/unshar-opts.h | 2 +- + src/uudecode-opts.h | 2 +- + src/uuencode-opts.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/shar-opts.h b/src/shar-opts.h +index 172676f..f6e4e79 100644 +--- a/src/shar-opts.h ++++ b/src/shar-opts.h +@@ -352,7 +352,7 @@ extern "C" { + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + extern bool initialization_done; + extern int optidx; +diff --git a/src/shar-std.def b/src/shar-std.def +index ed06b77..a28f61c 100644 +--- a/src/shar-std.def ++++ b/src/shar-std.def +@@ -41,7 +41,7 @@ no-misuse-usage; + usage-message; + die-code; + +-export = '#include "local.h"'"\nchar const * const program_name;"; ++export = '#include "local.h"'"\nextern char const * const program_name;"; + + #shell + echo "include = 'char const * const program_name = \"${progname}\";';" +diff --git a/src/unshar-opts.h b/src/unshar-opts.h +index 568ffca..aa85833 100644 +--- a/src/unshar-opts.h ++++ b/src/unshar-opts.h +@@ -192,7 +192,7 @@ extern "C" { + extern size_t separator_str_len; + + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * +diff --git a/src/uudecode-opts.h b/src/uudecode-opts.h +index 5b74419..289a366 100644 +--- a/src/uudecode-opts.h ++++ b/src/uudecode-opts.h +@@ -170,7 +170,7 @@ extern "C" { + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * +diff --git a/src/uuencode-opts.h b/src/uuencode-opts.h +index 1a5b7bc..f2df0a8 100644 +--- a/src/uuencode-opts.h ++++ b/src/uuencode-opts.h +@@ -166,7 +166,7 @@ extern "C" { + * global exported definitions + */ + #include "local.h" +-char const * const program_name; ++extern char const * const program_name; + + + /* * * * * * +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch new file mode 100644 index 000000000..d4a8d6fba --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch @@ -0,0 +1,40 @@ +From ab981e1a973e83edb6ea19e6e84102f43ded0dcb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Aug 2020 11:22:40 -0700 +Subject: [PATCH 2/2] Do not include lib/md5.c into src/shar.c +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +ib/md5.o is part of libgnu.a that is linked to shar. There is no +point in linking md5.o twice into shar executable. Moreover SuSE +reports that this triggers a linking error with GCC 10: + +/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: +../lib/libgnu.a(md5.o): in function `md5_stream': +[ 30s] md5.c:(.text+0x15d): multiple definition of `md5_stream'; +shar.o:shar.c:(.text+0x28): first defined here + + + +Signed-off-by: Petr PísaÅ™ +Signed-off-by: Khem Raj +--- + src/shar.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/shar.c b/src/shar.c +index 11cbada..6d7ed1d 100644 +--- a/src/shar.c ++++ b/src/shar.c +@@ -53,7 +53,6 @@ static const char cright_years_z[] = + + #include "inttostr.h" + #include "liballoca.h" +-#include "md5.c" + #include "md5.h" + #include "quotearg.h" + #include "xalloc.h" +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb index 930922ed4..48eb26893 100644 --- a/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb @@ -10,6 +10,8 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-Fix-build-with-clang.patch \ file://CVE-2018-1000097.patch \ file://0001-Fix-build-with-recent-gettext.patch \ + file://0001-Fix-building-with-GCC-10.patch \ + file://0002-Do-not-include-lib-md5.c-into-src-shar.c.patch \ " SRC_URI[md5sum] = "32a51b23e25ad5e6af4b89f228be1800" SRC_URI[sha256sum] = "ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637" diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb deleted file mode 100644 index 39629cce0..000000000 --- a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Very fast, header only, C++ logging library." -HOMEPAGE = "https://github.com/gabime/spdlog/wiki" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRCREV = "cf6f1dd01e660d5865d68bf5fa78f6376b89470a" -SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;" - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native" -# no need to build example&text&benchmarks on pure yocto -EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off" - -inherit cmake - -# Header-only library -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.7.0.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.7.0.bb new file mode 100644 index 000000000..ce491da0d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.7.0.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Very fast, header only, C++ logging library." +HOMEPAGE = "https://github.com/gabime/spdlog/wiki" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRCREV = "616caa5d30172b65cc3a06800894c575d70cb8e6" +SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;" + +DEPENDS += "fmt" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" +# no need to build example&text&benchmarks on pure yocto +EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on" + +inherit cmake + +# Header-only library +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb index ecaf01e71..196198c52 100644 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb @@ -3,14 +3,15 @@ LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" DEPENDS = " \ + glib-2.0-native \ + libxslt-native \ acl \ libatasmart \ polkit \ libgudev \ - dbus-glib \ glib-2.0 \ + dbus-glib \ libblockdev \ - libxslt-native \ " DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" @@ -19,13 +20,13 @@ RDEPENDS_${PN} = "acl" SRC_URI = " \ git://github.com/storaged-project/udisks.git;branch=master \ " -PV = "2.8.4+git${SRCREV}" -SRCREV = "db5f487345da2eaa87976450ea51c2c465d9b82e" +PV = "2.9.1" +SRCREV = "95444ab6bf2b8d8c205b540dded4029fcb15f91b" S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" -inherit autotools systemd gtk-doc gobject-introspection gettext features_check +inherit autotools-brokensep systemd gtk-doc gobject-introspection gettext features_check REQUIRED_DISTRO_FEATURES = "polkit" diff --git a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.1.0.bb b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.1.0.bb deleted file mode 100644 index b294d77ba..000000000 --- a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.1.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "USB hub per-port power control" -HOMEPAGE = "https://github.com/mvp/uhubctl" -BUGTRACKER = "https://github.com/mvp/uhubctl/issues" -DEPENDS = "libusb1" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRCREV = "c9fa3c68a1b2c9790c731602b8bae2b513e80605" -SRC_URI = "git://github.com/mvp/${BPN}" -S = "${WORKDIR}/git" - -# uhubctl gets its program version from "git describe". As we use the source -# archive do reduce download size replace the call with our hardcoded version. -do_configure_append() { - sed -i "s/^\(GIT_VERSION :=\).*$/\1 ${PV}/g" ${S}/Makefile -} - -do_install () { - oe_runmake install DESTDIR=${D} -} diff --git a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.2.0.bb b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.2.0.bb new file mode 100644 index 000000000..fb60446cb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.2.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "USB hub per-port power control" +HOMEPAGE = "https://github.com/mvp/uhubctl" +BUGTRACKER = "https://github.com/mvp/uhubctl/issues" +DEPENDS = "libusb1" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRCREV = "5ee8260c71647f687b5e71af11f45244814835d7" +SRC_URI = "git://github.com/mvp/${BPN}" +S = "${WORKDIR}/git" + +# uhubctl gets its program version from "git describe". As we use the source +# archive do reduce download size replace the call with our hardcoded version. +do_configure_append() { + sed -i "s/^\(GIT_VERSION :=\).*$/\1 ${PV}/g" ${S}/Makefile +} + +do_install () { + oe_runmake install DESTDIR=${D} +} diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fixes_for_mm_struct.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fixes_for_mm_struct.patch new file mode 100644 index 000000000..1ad5ce51b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fixes_for_mm_struct.patch @@ -0,0 +1,176 @@ +From 98070c936931879d2b8e22939724b5a0689721d0 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Tue, 18 Aug 2020 17:48:29 +0800 +Subject: [PATCH 1/3] fixes_for_mm_struct + +Upstream-Status: Backport [https://www.virtualbox.org/ticket/19644] + +Signed-off-by: Hongxu Jia +--- + .../Runtime/r0drv/linux/memobj-r0drv-linux.c | 74 +++++++++++++++++-- + 1 file changed, 67 insertions(+), 7 deletions(-) + +diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +index 37389bcc..cdc7e8e6 100644 +--- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c ++++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +@@ -222,9 +222,17 @@ static void *rtR0MemObjLinuxDoMmap(RTR3PTR R3PtrFixed, size_t cb, size_t uAlignm + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) + ulAddr = vm_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0); + #else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + down_write(&pTask->mm->mmap_sem); ++#else ++ down_write(&pTask->mm->mmap_lock); ++#endif + ulAddr = do_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + up_write(&pTask->mm->mmap_sem); ++#else ++ up_write(&pTask->mm->mmap_lock); ++#endif + #endif + } + else +@@ -232,9 +240,17 @@ static void *rtR0MemObjLinuxDoMmap(RTR3PTR R3PtrFixed, size_t cb, size_t uAlignm + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) + ulAddr = vm_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0); + #else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + down_write(&pTask->mm->mmap_sem); ++#else ++ down_write(&pTask->mm->mmap_lock); ++#endif + ulAddr = do_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + up_write(&pTask->mm->mmap_sem); ++#else ++ up_write(&pTask->mm->mmap_lock); ++#endif + #endif + if ( !(ulAddr & ~PAGE_MASK) + && (ulAddr & (uAlignment - 1))) +@@ -269,13 +285,29 @@ static void rtR0MemObjLinuxDoMunmap(void *pv, size_t cb, struct task_struct *pTa + Assert(pTask == current); RT_NOREF_PV(pTask); + vm_munmap((unsigned long)pv, cb); + #elif defined(USE_RHEL4_MUNMAP) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + down_write(&pTask->mm->mmap_sem); ++#else ++ down_write(&pTask->mm->mmap_lock); ++#endif + do_munmap(pTask->mm, (unsigned long)pv, cb, 0); /* should it be 1 or 0? */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + up_write(&pTask->mm->mmap_sem); + #else ++ up_write(&pTask->mm->mmap_lock); ++#endif ++#else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + down_write(&pTask->mm->mmap_sem); ++#else ++ down_write(&pTask->mm->mmap_lock); ++#endif + do_munmap(pTask->mm, (unsigned long)pv, cb); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + up_write(&pTask->mm->mmap_sem); ++#else ++ up_write(&pTask->mm->mmap_lock); ++#endif + #endif + } + +@@ -593,7 +625,11 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem) + size_t iPage; + Assert(pTask); + if (pTask && pTask->mm) +- down_read(&pTask->mm->mmap_sem); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) ++ down_read(&pTask->mm->mmap_sem); ++#else ++ down_read(&pTask->mm->mmap_lock); ++#endif + + iPage = pMemLnx->cPages; + while (iPage-- > 0) +@@ -608,7 +644,11 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem) + } + + if (pTask && pTask->mm) +- up_read(&pTask->mm->mmap_sem); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) ++ up_read(&pTask->mm->mmap_sem); ++#else ++ up_read(&pTask->mm->mmap_lock); ++#endif + } + /* else: kernel memory - nothing to do here. */ + break; +@@ -1076,7 +1116,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P + papVMAs = (struct vm_area_struct **)RTMemAlloc(sizeof(*papVMAs) * cPages); + if (papVMAs) + { +- down_read(&pTask->mm->mmap_sem); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) ++ down_read(&pTask->mm->mmap_sem); ++#else ++ down_read(&pTask->mm->mmap_lock); ++#endif + + /* + * Get user pages. +@@ -1162,7 +1206,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P + papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED; + } + +- up_read(&pTask->mm->mmap_sem); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) ++ up_read(&pTask->mm->mmap_sem); ++#else ++ up_read(&pTask->mm->mmap_lock); ++#endif + + RTMemFree(papVMAs); + +@@ -1189,7 +1237,11 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P + #endif + } + +- up_read(&pTask->mm->mmap_sem); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) ++ up_read(&pTask->mm->mmap_sem); ++#else ++ up_read(&pTask->mm->mmap_lock); ++#endif + + RTMemFree(papVMAs); + rc = VERR_LOCK_FAILED; +@@ -1604,7 +1656,11 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ p + const size_t cPages = (offSub + cbSub) >> PAGE_SHIFT; + size_t iPage; + +- down_write(&pTask->mm->mmap_sem); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) ++ down_write(&pTask->mm->mmap_sem); ++#else ++ down_write(&pTask->mm->mmap_lock); ++#endif + + rc = VINF_SUCCESS; + if (pMemLnxToMap->cPages) +@@ -1721,7 +1777,11 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ p + } + #endif /* CONFIG_NUMA_BALANCING */ + +- up_write(&pTask->mm->mmap_sem); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) ++ up_write(&pTask->mm->mmap_sem); ++#else ++ up_write(&pTask->mm->mmap_lock); ++#endif + + if (RT_SUCCESS(rc)) + { +-- +2.18.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0002-fixes_for_module_memory.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0002-fixes_for_module_memory.patch new file mode 100644 index 000000000..a3cfc3b37 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0002-fixes_for_module_memory.patch @@ -0,0 +1,65 @@ +From bb580f7b601e5395a2f8fcb2485387035273320f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Tue, 18 Aug 2020 17:49:34 +0800 +Subject: [PATCH 2/3] fixes_for_module_memory + +Upstream-Status: Backport [https://www.virtualbox.org/ticket/19644] + +Signed-off-by: Hongxu Jia +--- + .../Runtime/r0drv/linux/alloc-r0drv-linux.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +index bbb8acc6..45cd34c7 100644 +--- a/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c ++++ b/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +@@ -153,6 +153,8 @@ RT_EXPORT_SYMBOL(RTR0MemExecDonate); + + + #ifdef RTMEMALLOC_EXEC_VM_AREA ++ ++ + /** + * Allocate executable kernel memory in the module range. + * +@@ -168,7 +170,12 @@ static PRTMEMHDR rtR0MemAllocExecVmArea(size_t cb) + struct vm_struct *pVmArea; + size_t iPage; + ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) ++ pVmArea = __get_vm_area_caller(cbAlloc, VM_ALLOC, MODULES_VADDR, MODULES_END, ++ __builtin_return_address(0)); ++#else + pVmArea = __get_vm_area(cbAlloc, VM_ALLOC, MODULES_VADDR, MODULES_END); ++#endif + if (!pVmArea) + return NULL; + pVmArea->nr_pages = 0; /* paranoia? */ +@@ -201,14 +208,21 @@ static PRTMEMHDR rtR0MemAllocExecVmArea(size_t cb) + # endif + pVmArea->nr_pages = cPages; + pVmArea->pages = papPages; +- if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) ++ unsigned long start = (unsigned long)pVmArea->addr; ++ unsigned long size = get_vm_area_size(pVmArea); ++ ++ if (!map_kernel_range(start, size, PAGE_KERNEL_EXEC, papPages)) ++#else ++ if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, + # if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) + &papPagesIterator + # else + papPages + # endif + )) +- { ++#endif ++ { + PRTMEMLNXHDREX pHdrEx = (PRTMEMLNXHDREX)pVmArea->addr; + pHdrEx->pVmArea = pVmArea; + pHdrEx->pvDummy = NULL; +-- +2.18.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0003-fixes_for_changes_in_cpu_tlbstate.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0003-fixes_for_changes_in_cpu_tlbstate.patch new file mode 100644 index 000000000..6a3e63f63 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0003-fixes_for_changes_in_cpu_tlbstate.patch @@ -0,0 +1,39 @@ +From 6089974a81b1b44e1d2dfa5af1fdc110dfee40c1 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Tue, 18 Aug 2020 17:51:24 +0800 +Subject: [PATCH 3/3] fixes_for_changes_in_cpu_tlbstate + +Upstream-Status: Backport [https://www.virtualbox.org/ticket/19644] + +Signed-off-by: Hongxu Jia +--- + src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +index c7d0d99a..2e7aa6e1 100644 +--- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c ++++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +@@ -757,12 +757,19 @@ EXPORT_SYMBOL(SUPDrvLinuxIDC); + RTCCUINTREG VBOXCALL supdrvOSChangeCR4(RTCCUINTREG fOrMask, RTCCUINTREG fAndMask) + { + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + RTCCUINTREG uOld = this_cpu_read(cpu_tlbstate.cr4); ++#else ++ RTCCUINTREG uOld = __read_cr4(); ++#endif + RTCCUINTREG uNew = (uOld & fAndMask) | fOrMask; + if (uNew != uOld) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + this_cpu_write(cpu_tlbstate.cr4, uNew); + __write_cr4(uNew); ++#endif ++ ASMSetCR4(uNew); + } + #else + RTCCUINTREG uOld = ASMGetCR4(); +-- +2.18.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.8-4.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.8-4.patch new file mode 100644 index 000000000..cb4148fc7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.8-4.patch @@ -0,0 +1,19 @@ +Description: Fix kernel 5.8 forbidding use of vermagic.h header file +Author: Gianfranco Costamagna +Origin: https://www.virtualbox.org/ticket/19644 +Bug-Ubuntu: https://launchpad.net/bugs/1884652 +Last-Update: 2020-08-10 + +--- virtualbox-6.1.12-dfsg.orig/src/VBox/Additions/linux/sharedfolders/vfsmod.c ++++ virtualbox-6.1.12-dfsg/src/VBox/Additions/linux/sharedfolders/vfsmod.c +@@ -53,7 +53,9 @@ + #include + #include + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 62) +-# include ++# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) ++# include ++# endif + #endif + #include + #include diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb new file mode 100644 index 000000000..e57df58d6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb @@ -0,0 +1,86 @@ +SUMMARY = "VirtualBox Linux Guest Drivers" +SECTION = "core" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" + +DEPENDS = "virtual/kernel" + +inherit module kernel-module-split + +COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" + +VBOX_NAME = "VirtualBox-${PV}" + +SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ + file://0001-fixes_for_mm_struct.patch \ + file://0002-fixes_for_module_memory.patch \ + file://0003-fixes_for_changes_in_cpu_tlbstate.patch \ + file://kernel-5.8-4.patch \ + file://Makefile.utils \ +" +SRC_URI[md5sum] = "3c351f7fd6376e0bb3c8489505a9450c" +SRC_URI[sha256sum] = "05eff0321daa72f6d00fb121a6b4211f39964778823806fa0b7b751667dec362" + +S ?= "${WORKDIR}/vbox_module" +S_task-patch = "${WORKDIR}/${VBOX_NAME}" + +export BUILD_TARGET_ARCH="${ARCH}" +export BUILD_TARGET_ARCH_x86-64="amd64" + +EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1" + +# otherwise 5.2.22 builds just vboxguest +MAKE_TARGETS = "all" + +addtask export_sources after do_patch before do_configure + +do_export_sources() { + mkdir -p "${S}" + ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz + tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz + + # add a mount utility to use shared folder from VBox Addition Source Code + mkdir -p "${S}/utils" + install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils + install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils + install ${S}/../Makefile.utils ${S}/utils/Makefile + +} + +do_configure_prepend() { + # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. + # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in /build, or the variable KERN_VER must be set. Stop. + mkdir -p ${WORKDIR}/${KERNEL_VERSION} + ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build +} + +# compile and install mount utility +do_compile() { + oe_runmake all + oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils + if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then + echo "ERROR: One of vbox*.ko modules wasn't built" + exit 1 + fi +} + +module_do_install() { + MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc + install -d $MODULE_DIR + install -m 644 vboxguest.ko $MODULE_DIR + install -m 644 vboxsf.ko $MODULE_DIR + install -m 644 vboxvideo.ko $MODULE_DIR +} + +do_install_append() { + install -d ${D}${base_sbindir} + install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} +} + +PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" +RRECOMMENDS_${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" + +FILES_${PN} = "${base_sbindir}" + +# autoload if installed +KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.6.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.6.bb deleted file mode 100644 index 89b1ee11e..000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.6.bb +++ /dev/null @@ -1,81 +0,0 @@ -SUMMARY = "VirtualBox Linux Guest Drivers" -SECTION = "core" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" - -DEPENDS = "virtual/kernel" - -inherit module kernel-module-split - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" - -VBOX_NAME = "VirtualBox-${PV}" - -SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ - file://Makefile.utils \ -" -SRC_URI[md5sum] = "fe6328d22dfb20ea372daa4b58b12374" -SRC_URI[sha256sum] = "b031c30d770f28c5f884071ad933e8c1f83e65b93aaba03a4012077c1d90a54f" - -S = "${WORKDIR}/vbox_module" - -export BUILD_TARGET_ARCH="${ARCH}" -export BUILD_TARGET_ARCH_x86-64="amd64" - -EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1" - -# otherwise 5.2.22 builds just vboxguest -MAKE_TARGETS = "all" - -addtask export_sources after do_patch before do_configure - -do_export_sources() { - mkdir -p "${S}" - ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz - tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz - - # add a mount utility to use shared folder from VBox Addition Source Code - mkdir -p "${S}/utils" - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils - install ${S}/../Makefile.utils ${S}/utils/Makefile - -} - -do_configure_prepend() { - # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. - # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in /build, or the variable KERN_VER must be set. Stop. - mkdir -p ${WORKDIR}/${KERNEL_VERSION} - ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build -} - -# compile and install mount utility -do_compile() { - oe_runmake all - oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils - if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then - echo "ERROR: One of vbox*.ko modules wasn't built" - exit 1 - fi -} - -module_do_install() { - MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc - install -d $MODULE_DIR - install -m 644 vboxguest.ko $MODULE_DIR - install -m 644 vboxsf.ko $MODULE_DIR - install -m 644 vboxvideo.ko $MODULE_DIR -} - -do_install_append() { - install -d ${D}${base_sbindir} - install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} -} - -PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" -RRECOMMENDS_${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" - -FILES_${PN} = "${base_sbindir}" - -# autoload if installed -KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" diff --git a/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.4.bb b/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.4.bb deleted file mode 100644 index 6e74e49bf..000000000 --- a/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.7.4.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Extremely fast non-cryptographic hash algorithm" -DESCRIPTION = "xxHash is an extremely fast non-cryptographic hash algorithm, \ -working at speeds close to RAM limits." -HOMEPAGE = "http://www.xxhash.com/" -LICENSE = "BSD-2-Clause & GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b335320506abb0505437e39295e799cb" - -SRC_URI = "git://github.com/Cyan4973/xxHash.git" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" - -SRCREV = "173e50be0509c6fb6c1bb74d95049ef61d7fdced" - -S = "${WORKDIR}/git" - -do_compile () { - oe_runmake all -} - -do_install () { - oe_runmake DESTDIR=${D} install -} diff --git a/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.8.0.bb b/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.8.0.bb new file mode 100644 index 000000000..e437d4d15 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/xxhash/xxhash_0.8.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "Extremely fast non-cryptographic hash algorithm" +DESCRIPTION = "xxHash is an extremely fast non-cryptographic hash algorithm, \ +working at speeds close to RAM limits." +HOMEPAGE = "http://www.xxhash.com/" +LICENSE = "BSD-2-Clause & GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b335320506abb0505437e39295e799cb" + +SRC_URI = "git://github.com/Cyan4973/xxHash.git;branch=release;protocol=git" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + +SRCREV = "94e5f23e736f2bb67ebdf90727353e65344f9fc0" + +S = "${WORKDIR}/git" + +do_compile () { + oe_runmake all +} + +do_install () { + oe_runmake DESTDIR=${D} install +} diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch index 6795ba849..93a42213b 100644 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch @@ -11,8 +11,6 @@ Upstream-Status: Pending src/utilities/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/src/Makefile.am b/src/Makefile.am -index 62c9ba8..435ec23 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,7 @@ AM_CPPFLAGS = \ @@ -20,15 +18,13 @@ index 62c9ba8..435ec23 100644 `pkg-config --silence-errors --cflags json-c` \ -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ - -Wall -Werror -Wextra \ -+ -Wall -Wextra \ - -Wno-address-of-packed-member - - bin_PROGRAMS = fwts -diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am -index 6bcf9f8..de89bf1 100644 ++ -Wall -Wextra \ + -Wno-address-of-packed-member \ + -Wfloat-equal -Wmissing-declarations \ + -Wno-long-long -Wredundant-decls -Wshadow \ --- a/src/lib/src/Makefile.am +++ b/src/lib/src/Makefile.am -@@ -24,7 +24,7 @@ AM_CPPFLAGS = \ +@@ -25,7 +25,7 @@ AM_CPPFLAGS = \ `pkg-config --silence-errors --cflags json-c` \ `pkg-config --cflags glib-2.0 gio-2.0` \ -DDATAROOTDIR=\"$(datarootdir)\" \ @@ -37,8 +33,6 @@ index 6bcf9f8..de89bf1 100644 -Wno-address-of-packed-member pkglib_LTLIBRARIES = libfwts.la -diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am -index 21f969e..82009a0 100644 --- a/src/utilities/Makefile.am +++ b/src/utilities/Makefile.am @@ -16,7 +16,7 @@ diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts_19.06.00.bb b/meta-openembedded/meta-oe/recipes-test/fwts/fwts_19.06.00.bb deleted file mode 100644 index 88a89fb0b..000000000 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts_19.06.00.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Firmware testsuite" -DESCRIPTION = "The tool fwts comprises of over fifty tests that are designed to exercise and test different aspects of a machine's firmware. Many of these tests need super user access to read BIOS data and ACPI tables, so the tool requires running with super user privileges (e.g. with sudo)." -HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519" - -SRCREV = "b0ec7aa2ef743d113fd8c5e57c0ca3d5edd86f0e" -SRC_URI = "http://fwts.ubuntu.com/release/fwts-V19.06.00.tar.gz;subdir=${BPN}-${PV} \ - file://0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch \ - file://0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch \ - file://0003-Undefine-PAGE_SIZE.patch \ - file://0001-Add-correct-printf-qualifier-for-off_t.patch \ - file://0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch \ - file://0001-Remove-Werror-from-build.patch \ - " -SRC_URI[md5sum] = "012f933329510cc5a71817ede681eee2" -SRC_URI[sha256sum] = "13aa991f12c69f48df368aae5e5d0fbc9136413b4bfe115421bc3216d919f8a2" - -COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux" - -DEPENDS = "libpcre json-c glib-2.0 dtc bison-native libbsd" -DEPENDS_append_libc-musl = " libexecinfo" - -inherit autotools bash-completion pkgconfig - -CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=unknown-pragmas" -LDFLAGS_append_libc-musl = " -lexecinfo" - -FILES_${PN} += "${libdir}/fwts/lib*${SOLIBS}" -FILES_${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la" -FILES_${PN}-staticdev += "${libdir}/fwts/lib*a" -FILES_${PN}-dbg += "${libdir}/fwts/.debug" - -TOOLCHAIN = "gcc" - diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts_20.07.00.bb b/meta-openembedded/meta-oe/recipes-test/fwts/fwts_20.07.00.bb new file mode 100644 index 000000000..28565eb8c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts_20.07.00.bb @@ -0,0 +1,32 @@ +SUMMARY = "Firmware testsuite" +DESCRIPTION = "The tool fwts comprises of over fifty tests that are designed to exercise and test different aspects of a machine's firmware. Many of these tests need super user access to read BIOS data and ACPI tables, so the tool requires running with super user privileges (e.g. with sudo)." +HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519" + +SRC_URI = "http://fwts.ubuntu.com/release/fwts-V${PV}.tar.gz;subdir=${BP} \ + file://0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch \ + file://0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch \ + file://0003-Undefine-PAGE_SIZE.patch \ + file://0001-Add-correct-printf-qualifier-for-off_t.patch \ + file://0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch \ + file://0001-Remove-Werror-from-build.patch \ + " +SRC_URI[sha256sum] = "4a8e0211b388efbcfcb6530297e9a924d0afa2d6db58e9db2f031129eda6d66f" + +COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux" + +DEPENDS = "libpcre json-c glib-2.0 dtc bison-native libbsd" +DEPENDS_append_libc-musl = " libexecinfo" + +inherit autotools-brokensep bash-completion pkgconfig + +CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=unknown-pragmas" +LDFLAGS_append_libc-musl = " -lexecinfo" + +FILES_${PN} += "${libdir}/fwts/lib*${SOLIBS}" +FILES_${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la" +FILES_${PN}-staticdev += "${libdir}/fwts/lib*a" +FILES_${PN}-dbg += "${libdir}/fwts/.debug" + diff --git a/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.48.bb b/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.48.bb deleted file mode 100644 index 1ae470ee6..000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.48.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "CGI.pm is a stable, complete and mature solution for processing and preparing \ -HTTP requests and responses. Major features including processing form \ -submissions, file uploads, reading and writing cookies, query string generation \ -and manipulation, and processing and preparing HTTP headers." -HOMEPAGE = "http://search.cpan.org/~leejo/CGI-4.28/lib/CGI.pod" -SECTION = "libs" -LICENSE = "Artistic-2.0 | GPL-2.0" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=415fc49abed2728f9480cd32c8d67beb" - -SRC_URI = "http://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/CGI-${PV}.tar.gz" - -SRC_URI[md5sum] = "0e81952bb42e00361abc4d33696b08f5" -SRC_URI[sha256sum] = "102cd7562983b85e8354ebcbb3be94a35f7f6706b2b49fdb790135da4d1d55d2" - -S = "${WORKDIR}/CGI-${PV}" - -inherit cpan ptest-perl - -RDEPENDS_${PN} += "\ - libhtml-parser-perl \ - perl-module-base \ - perl-module-deprecate \ - perl-module-if \ -" - -do_install_prepend() { - # requires "-T" (taint) command line option - rm -rf ${B}/t/push.t - rm -rf ${B}/t/utf8.t - # tests building of docs - rm -rf ${B}/t/compiles_pod.t -} - -RDEPENDS_${PN}-ptest += " \ - libtest-deep-perl \ - libtest-warn-perl \ - perl-module-bytes \ - perl-module-file-find \ - perl-module-filehandle \ - perl-module-findbin \ - perl-module-lib \ - perl-module-perlio \ - perl-module-perlio-scalar \ - perl-module-test-more \ - perl-module-utf8 \ -" - -RPROVIDES_${PN} += "perl-module-cgi" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.50.bb b/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.50.bb new file mode 100644 index 000000000..61ed78b6f --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.50.bb @@ -0,0 +1,51 @@ +DESCRIPTION = "CGI.pm is a stable, complete and mature solution for processing and preparing \ +HTTP requests and responses. Major features including processing form \ +submissions, file uploads, reading and writing cookies, query string generation \ +and manipulation, and processing and preparing HTTP headers." +HOMEPAGE = "http://search.cpan.org/~leejo/CGI-4.28/lib/CGI.pod" +SECTION = "libs" +LICENSE = "Artistic-2.0 | GPL-2.0" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=415fc49abed2728f9480cd32c8d67beb" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/CGI-${PV}.tar.gz" + +SRC_URI[md5sum] = "6c7c9d0c272849f3c3c1859cb78962fe" +SRC_URI[sha256sum] = "d8c7a2143352842a9b4962c314ee7e0385273c8b9d8314dcbd04a09c008eef46" + +S = "${WORKDIR}/CGI-${PV}" + +inherit cpan ptest-perl + +RDEPENDS_${PN} += "\ + libhtml-parser-perl \ + perl-module-base \ + perl-module-deprecate \ + perl-module-if \ +" + +do_install_prepend() { + # requires "-T" (taint) command line option + rm -rf ${B}/t/push.t + rm -rf ${B}/t/utf8.t + # tests building of docs + rm -rf ${B}/t/compiles_pod.t +} + +RDEPENDS_${PN}-ptest += " \ + libtest-deep-perl \ + libtest-warn-perl \ + perl-module-bytes \ + perl-module-file-find \ + perl-module-filehandle \ + perl-module-findbin \ + perl-module-lib \ + perl-module-perlio \ + perl-module-perlio-scalar \ + perl-module-test-more \ + perl-module-utf8 \ +" + +RPROVIDES_${PN} += "perl-module-cgi" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-djangorestframework.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-djangorestframework.inc deleted file mode 100644 index 8551a8341..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-djangorestframework.inc +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "djangorestframework" -DESCRIPTION = "pip3 install djangorestframework" -HOMEPAGE = "https://pypi.python.org/pypi/djangorestframework" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7879a5a716147a784f7e524c9cf103c1" - -SRC_URI[md5sum] = "0d481bf8dbb87bb927b46798edc1a9bd" -SRC_URI[sha256sum] = "607865b0bb1598b153793892101d881466bd5a991de12bd6229abb18b1c86136" -PYPI_PACKAGE = "djangorestframework" - -inherit pypi - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-django \ -" \ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-login.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-login.inc deleted file mode 100644 index 59eb64f77..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-login.inc +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "User session management for Flask" -DESCRIPTION = "Flask-Login provides user session management for Flask. \ -It handles the common tasks of logging in, logging out, and remembering \ -your users’ sessions over extended periods of time." -HOMEPAGE = " https://github.com/maxcountryman/flask-login" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8aa87a1cd9fa41d969ad32cfdac2c596" - -SRC_URI[md5sum] = "25b34c74bd509792f291c16e184225df" -SRC_URI[sha256sum] = "c815c1ac7b3e35e2081685e389a665f2c74d7e077cb93cecabaea352da4752ec" - -PYPI_PACKAGE = "Flask-Login" - -RDEPENDS_${PN}_class-target = "${PYTHON_PN}-flask" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyalsaaudio.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyalsaaudio.inc deleted file mode 100644 index d150409a2..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyalsaaudio.inc +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Support for the Linux 2.6.x ALSA Sound System" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1a3b161aa0fcec32a0c8907a2219ad9d" - -SRC_URI[md5sum] = "b46f69561bc85fc52e698b2440ca251e" -SRC_URI[sha256sum] = "84e8f8da544d7f4bd96479ce4a237600077984d9be1d7f16c1d9a492ecf50085" - -DEPENDS += "alsa-lib" - -RDEPENDS_${PN} += "libasound" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-xlsxwriter.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-xlsxwriter.inc deleted file mode 100644 index f5d56db00..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-xlsxwriter.inc +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Python 2 and 3 compatibility library" -HOMEPAGE = "https://xlsxwriter.readthedocs.io" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0960d52d61b0801760f39463288c2672" - -inherit pypi - -PYPI_PACKAGE = "XlsxWriter" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.3.bb deleted file mode 100644 index 16d2a881f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Advanced Enumerations library" -HOMEPAGE = "https://pypi.org/project/aenum/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://aenum/LICENSE;md5=c6a85477543f8b8591b9c1f82abebbe9" - -SRC_URI[md5sum] = "026786dbb37c15c2c8dc91fbf5828e97" -SRC_URI[sha256sum] = "a4334cabf47c167d44ab5a6198837b80deec5d5bad1b5cf70c966c3a330260e8" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.4.bb new file mode 100644 index 000000000..da77a5c75 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_2.2.4.bb @@ -0,0 +1,11 @@ +SUMMARY = "Advanced Enumerations library" +HOMEPAGE = "https://pypi.org/project/aenum/" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://aenum/LICENSE;md5=c6a85477543f8b8591b9c1f82abebbe9" + +SRC_URI[md5sum] = "8983562361efe5be865617341dadbb9b" +SRC_URI[sha256sum] = "81828d1fbe20b6b188d75b21a0fa936d7d929d839ef843ef385d9c2a97082864" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argexec_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argexec_1.0.2.bb deleted file mode 100644 index 179e07127..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-argexec_1.0.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Expose your Python functions to the command line with one easy step!" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ea70b07c354e36056bd35e17c9c3face" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "9fac09884c54db79e57ab80f0c423794" -SRC_URI[sha256sum] = "e271286b280f930aeaae7496454573f8029c3f48ef1dc47c780155dd4a7b9e7f" - -DEPENDS += "python3-setuptools-scm-native" -RDEPENDS_${PN} += "\ - python3-typing \ - python3-dynamic-dispatch \ - python3-typeguard \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argexec_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argexec_1.0.3.bb new file mode 100644 index 000000000..a26835b60 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-argexec_1.0.3.bb @@ -0,0 +1,17 @@ +SUMMARY = "Expose your Python functions to the command line with one easy step!" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ea70b07c354e36056bd35e17c9c3face" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "448635948823309312ea9f70b30b6c2d" +SRC_URI[sha256sum] = "61f9ae9322e38ae64996848421afbdb018239a99c4e796fe064f172d6c98c3bf" + +DEPENDS += "python3-setuptools-scm-native" +RDEPENDS_${PN} += "\ + python3-typing \ + python3-dynamic-dispatch \ + python3-typeguard \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.3.0.bb deleted file mode 100644 index 0d38da989..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.3.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "A fast, pure Python library for parsing and serializing ASN.1 structures" -HOMEPAGE = "https://github.com/wbond/asn1crypto" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7439e38f5e04ff62fae436184786b7ca" - -PYPI_PACKAGE = "asn1crypto" - -SRC_URI[md5sum] = "daad112940181917e3ff169b47b9bd9a" -SRC_URI[sha256sum] = "5a215cb8dc12f892244e3a113fe05397ee23c5c4ca7a69cd6e69811755efc42d" - -inherit pypi setuptools3 - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.4.0.bb new file mode 100644 index 000000000..bb1271e33 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.4.0.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "A fast, pure Python library for parsing and serializing ASN.1 structures" +HOMEPAGE = "https://github.com/wbond/asn1crypto" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7439e38f5e04ff62fae436184786b7ca" + +PYPI_PACKAGE = "asn1crypto" + +SRC_URI[md5sum] = "00bf5b72d37778e62cc73b1d8909ae27" +SRC_URI[sha256sum] = "f4f6e119474e58e04a2b1af817eb585b4fd72bdd89b998624712b5c99be7641c" + +inherit pypi setuptools3 + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-codecs \ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-shell \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.6.2.bb deleted file mode 100644 index 171a6dce4..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.6.2.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "WebSocket client & server library, WAMP real-time framework" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" - -SRC_URI[md5sum] = "bcafb42ea58232308777a265d41c1c98" -SRC_URI[sha256sum] = "6ac6b6653b8d20d632b034adccf6a566154d4efbeaa23abf7c3995fd601e9a01" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-twisted \ - ${PYTHON_PN}-zopeinterface \ - ${PYTHON_PN}-py-ubjson \ - ${PYTHON_PN}-cbor2 \ - ${PYTHON_PN}-u-msgpack-python \ - ${PYTHON_PN}-lz4 \ - ${PYTHON_PN}-snappy \ - ${PYTHON_PN}-pyopenssl \ - ${PYTHON_PN}-txaio \ - ${PYTHON_PN}-six \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.7.1.bb new file mode 100644 index 000000000..29f187cf8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_20.7.1.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "WebSocket client & server library, WAMP real-time framework" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" + +SRC_URI[md5sum] = "1ea21f5e751517a71f605eaaff7f0c38" +SRC_URI[sha256sum] = "86bbce30cdd407137c57670993a8f9bfdfe3f8e994b889181d85e844d5aa8dfb" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-twisted \ + ${PYTHON_PN}-zopeinterface \ + ${PYTHON_PN}-py-ubjson \ + ${PYTHON_PN}-cbor2 \ + ${PYTHON_PN}-u-msgpack-python \ + ${PYTHON_PN}-lz4 \ + ${PYTHON_PN}-snappy \ + ${PYTHON_PN}-pyopenssl \ + ${PYTHON_PN}-txaio \ + ${PYTHON_PN}-six \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-backcall_0.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-backcall_0.2.0.bb new file mode 100644 index 000000000..56b148534 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-backcall_0.2.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "Specifications for callback functions passed in to an API" +HOMEPAGE = "https://github.com/takluyver/backcall" +AUTHOR = "Thomas Kluyver " +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=40e56b724d016484a7f790ec826d3ffc" + +PYPI_PACKAGE = "backcall" + +SRC_URI[md5sum] = "1f4c9a370c78743406296f48e56e8821" +SRC_URI[sha256sum] = "5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e" + +inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb deleted file mode 100644 index 3b9cd52f2..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.1.7.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Modern password hashing for your software and your servers." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c" - -DEPENDS += "${PYTHON_PN}-cffi-native" - -SRC_URI[md5sum] = "5d6f93b575ce52470af37a8e7dce76fe" -SRC_URI[sha256sum] = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-six \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.2.0.bb new file mode 100644 index 000000000..360f14be1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.2.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Modern password hashing for your software and your servers." +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c" + +DEPENDS += "${PYTHON_PN}-cffi-native" + +SRC_URI[md5sum] = "fe31390dab603728f756cd3d6830c80a" +SRC_URI[sha256sum] = "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-cffi \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-six \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.4.1.bb deleted file mode 100644 index 4866e8464..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.4.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "A high-level Python efficient arrays of booleans -- C extension" -HOMEPAGE = "https://github.com/ilanschnell/bitarray" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" - -SRC_URI[md5sum] = "dfb3fe66ae989e4724747fcb0f704f56" -SRC_URI[sha256sum] = "9e26d3dc7fad932fed66e08da3fcf93dd15e8402aa84e764e1e2a9e1b6ae2b7f" - -inherit setuptools3 pypi - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.5.2.bb new file mode 100644 index 000000000..15393001a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_1.5.2.bb @@ -0,0 +1,11 @@ +SUMMARY = "A high-level Python efficient arrays of booleans -- C extension" +HOMEPAGE = "https://github.com/ilanschnell/bitarray" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" + +SRC_URI[md5sum] = "ccd872c5effef77bf4028c67c0619f6c" +SRC_URI[sha256sum] = "38fe66d5f7720835703a07fe8d0a4b5eda87f692f3cf4fb01543407b79857edf" + +inherit setuptools3 pypi + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.1.0.bb deleted file mode 100644 index a9638fbd2..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.1.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "CAN BUS tools in Python 3." -HOMEPAGE = "https://github.com/eerimoq/cantools" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" - -SRC_URI[md5sum] = "46b71bbfec33146d9dbba708489a8ae2" -SRC_URI[sha256sum] = "bd0ac5b16bb7fe2ada0c9436c91a0b3795217bed7126296dde1565919a3f44f1" - -PYPI_PACKAGE = "cantools" - -inherit pypi setuptools3 - -CLEANBROKEN = "1" - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.3.0.bb new file mode 100644 index 000000000..c79e51e33 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_35.3.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "CAN BUS tools in Python 3." +HOMEPAGE = "https://github.com/eerimoq/cantools" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" + +SRC_URI[md5sum] = "068514ac776e03ebaa8b2d02dd16fc77" +SRC_URI[sha256sum] = "5e3a6f679ad3dcb31142e388e052187d5fc5bd481c4fc3b2791eaa1e681cca98" + +PYPI_PACKAGE = "cantools" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.1.bb deleted file mode 100644 index 6b26da2a6..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.1.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "An implementation of RFC 7049 - Concise Binary Object Representation (CBOR)." -DEPENDS +="${PYTHON_PN}-setuptools-scm-native" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -SRC_URI[sha256sum] = "09e9607ea50e2ebb718791d475f11620cb244b0cc3758ce2e76cf36e8372ad64" -SRC_URI[md5sum] = "b034d7edfd22c1f98e600aaedbd90f39" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-unixadmin \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-datetime \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.2.bb new file mode 100644 index 000000000..c65be7226 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.2.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "An implementation of RFC 7049 - Concise Binary Object Representation (CBOR)." +DEPENDS +="${PYTHON_PN}-setuptools-scm-native" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +SRC_URI[sha256sum] = "91759bd0ee5ef0d4fa24144dfa551670730baeca8cf2fff1cc59f734ecd21de6" +SRC_URI[md5sum] = "693c1bd6635bee8a591a70ea924ad676" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unixadmin \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-datetime \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb deleted file mode 100644 index 53c8ee265..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Foreign Function Interface for Python calling C code" -HOMEPAGE = "http://cffi.readthedocs.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" -DEPENDS += "libffi ${PYTHON_PN}-pycparser" - -SRC_URI[md5sum] = "74845f8d2b7b583dd9a3574f402edf39" -SRC_URI[sha256sum] = "2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6" - -inherit pypi setuptools3 - -RDEPENDS_${PN}_class-target = " \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-pycparser \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.2.bb new file mode 100644 index 000000000..57c28954a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.2.bb @@ -0,0 +1,19 @@ +SUMMARY = "Foreign Function Interface for Python calling C code" +HOMEPAGE = "http://cffi.readthedocs.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" +DEPENDS += "libffi ${PYTHON_PN}-pycparser" + +SRC_URI[md5sum] = "3cc2f1daf62dd66eda79b4d6281cebfc" +SRC_URI[sha256sum] = "ae8f34d50af2c2154035984b8b5fc5d9ed63f32fe615646ab435b05b132ca91b" + +inherit pypi setuptools3 + +RDEPENDS_${PN}_class-target = " \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-pycparser \ + ${PYTHON_PN}-shell \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.1.0.bb deleted file mode 100644 index bc74b5ab5..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.1.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Extra features for standard library's cmd module" -HOMEPAGE = "http://packages.python.org/cmd2/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9791cd24ca7d1807388ccd55cd066def" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -SRC_URI[md5sum] = "2b4a3b15ac52d239664c40c2d661b0c7" -SRC_URI[sha256sum] = "d233b5ad4b9ee264a43fb14668f287d25f998f4b443a81b4efdfd292f1a77108" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-attrs \ - ${PYTHON_PN}-colorama \ - ${PYTHON_PN}-pyperclip \ - ${PYTHON_PN}-wcwidth \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.3.bb new file mode 100644 index 000000000..a44f02f00 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.3.bb @@ -0,0 +1,20 @@ +SUMMARY = "Extra features for standard library's cmd module" +HOMEPAGE = "https://github.com/python-cmd2/cmd2" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9791cd24ca7d1807388ccd55cd066def" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +SRC_URI[md5sum] = "c8ffa926c50673f00fd8ff8533e9f959" +SRC_URI[sha256sum] = "38015008ff4639edfd66591063a0e9bb75a62dccb14ee3ec7bf3a6cb130de5cf" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-colorama \ + ${PYTHON_PN}-pyperclip \ + ${PYTHON_PN}-wcwidth \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.1.0.bb deleted file mode 100644 index ea4c575eb..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.1.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "A colored formatter for the python logging module" -HOMEPAGE = "https://github.com/borntyping/python-colorlog" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.md;md5=05592f7a5b83bfc756f62dbd70a9b9b5" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "colorlog" - -SRC_URI[md5sum] = "25f79b76421132e2a9e08da15e4e0a73" -SRC_URI[sha256sum] = "30aaef5ab2a1873dec5da38fd6ba568fa761c9fa10b40241027fa3edea47f3d2" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.2.1.bb new file mode 100644 index 000000000..a4aaa3cb6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.2.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "A colored formatter for the python logging module" +HOMEPAGE = "https://github.com/borntyping/python-colorlog" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://README.md;md5=05592f7a5b83bfc756f62dbd70a9b9b5" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "colorlog" + +SRC_URI[md5sum] = "a01336efc6f54e58e3ed4f331d76c2f0" +SRC_URI[sha256sum] = "75e55822c3a3387d721579241e776de2cf089c9ef9528b1f09e8b04d403ad118" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.2.1.bb new file mode 100644 index 000000000..48e352c1d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.2.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "Code coverage measurement for Python" +HOMEPAGE = "https://coverage.readthedocs.io" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" + +SRC_URI[md5sum] = "9e6165146b9bda60a779953c79e8ca54" +SRC_URI[sha256sum] = "a34cb28e0747ea15e82d13e14de606747e9e484fb28d63c999483f5d5188e89b" + +inherit pypi setuptools3 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.2.bb deleted file mode 100644 index 72558e10c..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_5.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Code coverage measurement for Python" -HOMEPAGE = "https://coverage.readthedocs.io" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" - -SRC_URI[md5sum] = "bfe80a336636160a3916467f55842bc5" -SRC_URI[sha256sum] = "1874bdc943654ba46d28f179c1846f5710eda3aeb265ff029e0ac2b52daae404" - -inherit pypi setuptools3 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch new file mode 100644 index 000000000..9f07c7380 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography/h-test.patch @@ -0,0 +1,10 @@ +--- a/tests/hypothesis/__init__.py ++++ b/tests/hypothesis/__init__.py +@@ -3,3 +3,7 @@ + # for complete details. + + from __future__ import absolute_import, division, print_function ++ ++import pytest ++hypothesis = pytest.importorskip("hypothesis") ++ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_2.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_2.8.bb deleted file mode 100644 index c75dabb97..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_2.8.bb +++ /dev/null @@ -1,65 +0,0 @@ -SUMMARY = "Provides cryptographic recipes and primitives to python developers" -HOMEPAGE = "https://cryptography.io/" -SECTION = "devel/python" -LICENSE = "Apache-2.0 | BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=097f805837700cfac572ac274cd38124" - -LDSHARED += "-pthread" - -SRC_URI[md5sum] = "77730058b556c6d9838679a94c6229ce" -SRC_URI[sha256sum] = "3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651" - -SRC_URI += " \ - file://run-ptest \ -" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-cffi-native \ - ${PYTHON_PN}-asn1crypto \ - ${PYTHON_PN}-six \ -" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-idna \ - ${PYTHON_PN}-asn1crypto \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ -" - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-idna \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-asn1crypto \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-threading \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PN} \ - ${PYTHON_PN}-cryptography-vectors \ - ${PYTHON_PN}-iso8601 \ - ${PYTHON_PN}-pretend \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytz \ -" - -inherit ptest - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - install -d ${D}${PTEST_PATH}/tests/hazmat - cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/ -} - -FILES_${PN}-dbg += " \ - ${libdir}/${PYTHON_PN}2.7/site-packages/${SRCNAME}/hazmat/bindings/.debug \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.0.bb new file mode 100644 index 000000000..05a2350e3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.0.bb @@ -0,0 +1,66 @@ +SUMMARY = "Provides cryptographic recipes and primitives to python developers" +HOMEPAGE = "https://cryptography.io/" +SECTION = "devel/python" +LICENSE = "Apache-2.0 | BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=097f805837700cfac572ac274cd38124" + +LDSHARED += "-pthread" + +SRC_URI[md5sum] = "163608a7cb838c6b39360e1e64377d54" +SRC_URI[sha256sum] = "8e924dbc025206e97756e8903039662aa58aa9ba357d8e1d8fc29e3092322053" + +SRC_URI += " \ + file://run-ptest \ + file://h-test.patch \ +" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-cffi \ + ${PYTHON_PN}-cffi-native \ + ${PYTHON_PN}-asn1crypto \ + ${PYTHON_PN}-six \ +" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-cffi \ + ${PYTHON_PN}-idna \ + ${PYTHON_PN}-asn1crypto \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-six \ +" + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-cffi \ + ${PYTHON_PN}-idna \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-asn1crypto \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-threading \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PN} \ + ${PYTHON_PN}-cryptography-vectors \ + ${PYTHON_PN}-iso8601 \ + ${PYTHON_PN}-pretend \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-pytz \ +" + +inherit ptest + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/hazmat + cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/ +} + +FILES_${PN}-dbg += " \ + ${libdir}/${PYTHON_PN}2.7/site-packages/${SRCNAME}/hazmat/bindings/.debug \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.11.1.bb new file mode 100644 index 000000000..81f55ff9e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.11.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "djangorestframework" +DESCRIPTION = "pip3 install djangorestframework" +HOMEPAGE = "https://pypi.python.org/pypi/djangorestframework" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7879a5a716147a784f7e524c9cf103c1" + +SRC_URI[md5sum] = "c8ea3e4c3c0d705acf70184faeb2b696" +SRC_URI[sha256sum] = "6dd02d5a4bd2516fb93f80360673bf540c3b6641fec8766b1da2870a5aa00b32" +PYPI_PACKAGE = "djangorestframework" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-django \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb deleted file mode 100644 index 9ed6d1726..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-djangorestframework.inc -inherit setuptools3 \ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.16.0.bb deleted file mode 100644 index 66cd88363..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.16.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "DNS toolkit for Python" -HOMEPAGE = "http://www.dnspython.org/" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34" - -SRC_URI[md5sum] = "bc9ca3b3a82164667d5730ec6d5248a2" -SRC_URI[sha256sum] = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01" - -PYPI_PACKAGE_EXT = "zip" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.0.0.bb new file mode 100644 index 000000000..a4e984619 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.0.0.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "DNS toolkit for Python" +HOMEPAGE = "http://www.dnspython.org/" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34" + +SRC_URI[md5sum] = "42f922c9223dde0275e8c0695ead37da" +SRC_URI[sha256sum] = "044af09374469c3a39eeea1a146e8cac27daec951f1f1f157b1962fc7cb9d1b7" + +PYPI_PACKAGE_EXT = "zip" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-threading \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dynamic-dispatch_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dynamic-dispatch_1.0.2.bb deleted file mode 100644 index 6485f9d57..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dynamic-dispatch_1.0.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "dynamic dispatch decorator for classes and functions" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ea70b07c354e36056bd35e17c9c3face" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "0e29d2afa806b9b87dadfbed6a0afd6d" -SRC_URI[sha256sum] = "ec7025b2890e7a882ceef95ff82fd154265136af930cab42533070b557d2a15d" - -PYPI_PACKAGE = "dynamic_dispatch" - -DEPENDS += "python3-setuptools-scm-native" -RDEPENDS_${PN} += "\ - python3-typing \ - python3-typeguard \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dynamic-dispatch_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dynamic-dispatch_1.0.3.bb new file mode 100644 index 000000000..2bf487584 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dynamic-dispatch_1.0.3.bb @@ -0,0 +1,19 @@ +SUMMARY = "dynamic dispatch decorator for classes and functions" +HOMEPAGE = "https://github.com/XevoInc/dynamic_dispatch" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ea70b07c354e36056bd35e17c9c3face" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "6bd3cc24427de753eed0656e89d5302c" +SRC_URI[sha256sum] = "fbc676aaedc8ec542056c21e5e206b8b62b8d11c3f3c5cfb32b273936da89604" + +PYPI_PACKAGE = "dynamic_dispatch" + +DEPENDS += "python3-setuptools-scm-native" +RDEPENDS_${PN} += "\ + python3-typing \ + python3-typeguard \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.4.1.bb deleted file mode 100644 index 2d23fe167..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.4.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-flask-login.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.5.0.bb new file mode 100644 index 000000000..d776ce968 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.5.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "User session management for Flask" +DESCRIPTION = "Flask-Login provides user session management for Flask. \ +It handles the common tasks of logging in, logging out, and remembering \ +your users’ sessions over extended periods of time." +HOMEPAGE = " https://github.com/maxcountryman/flask-login" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8aa87a1cd9fa41d969ad32cfdac2c596" + +SRC_URI[md5sum] = "a2d94aa6ae935345ebc68eb3cbb5fccd" +SRC_URI[sha256sum] = "6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b" + +PYPI_PACKAGE = "Flask-Login" + +inherit pypi setuptools3 + +RDEPENDS_${PN}_class-target = "${PYTHON_PN}-flask" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.3.3.bb deleted file mode 100644 index 9d24ddc3e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.3.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "A generic AST to represent Python2 and Python3's Abstract Syntax Tree(AST)." -HOMEPAGE = "https://github.com/serge-sans-paille/gast" -SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a3ad9b6802e713fc5e307e1230f1ea90" - -SRC_URI[md5sum] = "213b1820f576db14ed4fdf57efbfa67f" -SRC_URI[sha256sum] = "b881ef288a49aa81440d2c5eb8aeefd4c2bb8993d5f50edae7413a85bfdb3b57" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.4.0.bb new file mode 100644 index 000000000..7ef2eb468 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.4.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "A generic AST to represent Python2 and Python3's Abstract Syntax Tree(AST)." +HOMEPAGE = "https://github.com/serge-sans-paille/gast" +SECTION = "devel/python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a3ad9b6802e713fc5e307e1230f1ea90" + +SRC_URI[md5sum] = "d1f258eb70bb916f8fe5535351d5ff05" +SRC_URI[sha256sum] = "40feb7b8b8434785585ab224d1568b857edb18297e5a3047f1ba012bc83b42c1" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.5.bb deleted file mode 100644 index 379c7679c..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.5.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Client for MQTT protocol" -HOMEPAGE = "https://github.com/wialon/gmqtt" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=903f1792621a3b35ee546da75d139177" - -SRC_URI[md5sum] = "9388ec09b6536c4e68c5ac5c31de3dc9" -SRC_URI[sha256sum] = "c12b2d7d5a90f3304b7291b1d9d21df47e228dfb4ff990e965008fdd1a55ce60" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - python3-asyncio \ - python3-core \ - python3-datetime \ - python3-json \ - python3-logging \ - python3-netclient \ - python3-typing \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.7.bb new file mode 100644 index 000000000..2bf9d0753 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.7.bb @@ -0,0 +1,21 @@ +SUMMARY = "Client for MQTT protocol" +HOMEPAGE = "https://github.com/wialon/gmqtt" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=903f1792621a3b35ee546da75d139177" + +SRC_URI[md5sum] = "9e26fec7d5b64afab63d6d82faacc208" +SRC_URI[sha256sum] = "86b3679de400b8068dfadf871ce063a7040ed5052d30cc323aed69430888b422" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + python3-asyncio \ + python3-core \ + python3-datetime \ + python3-json \ + python3-logging \ + python3-netclient \ + python3-typing \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.10.0.bb new file mode 100644 index 000000000..37b6fc621 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.10.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "The Google API Client for Python is a client library for accessing the Plus, Moderator, and many other Google APIs." +HOMEPAGE = "https://github.com/googleapis/google-api-python-client" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3" + +SRC_URI[md5sum] = "a0064953388af9f9c61d8347f1e2ae0c" +SRC_URI[sha256sum] = "fa24f07f6124ff2e91ee9b7550e240481bcb31b8f77a75e8d481be1c44a6ff07" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.9.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.9.3.bb deleted file mode 100644 index af4aa5287..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.9.3.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "The Google API Client for Python is a client library for accessing the Plus, Moderator, and many other Google APIs." -HOMEPAGE = "https://github.com/googleapis/google-api-python-client" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3" - -SRC_URI[md5sum] = "eb5fa1e3f83b659ff978df1346a55576" -SRC_URI[sha256sum] = "220349ce189a85229fc46875d467101318495a4a735c0ff2f165b9bdbc7511a0" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.1.bb new file mode 100644 index 000000000..f26a1efce --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Graphviz protocol implementation" +HOMEPAGE = "https://graphviz.readthedocs.io/en/stable/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f7831c564aeff14e68aa4ff7a93dc89f" + +SRC_URI[md5sum] = "436cb0f41f6a949f916357ca037e205a" +SRC_URI[sha256sum] = "f5aad52a652c06825dcc5ee018d920fca26aef339386866094597fb3f2f222ce" + +inherit pypi setuptools3 + +PYPI_PACKAGE_EXT = "zip" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-logging \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.bb deleted file mode 100644 index 98bbddd21..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.14.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Graphviz protocol implementation" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRC_URI[sha256sum] = "e104ba036c8aef84320ec80560e544cd3cad68c9f90394b4e2b87bc44ab09791" - -inherit pypi setuptools3 - -PYPI_PACKAGE_EXT = "zip" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-logging \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.2.0.bb deleted file mode 100644 index cac6be954..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.2.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "a little task queue for python" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5cac039fcc82f01141cc170b48f315d4" - -PYPI_PACKAGE = "huey" -SRC_URI[sha256sum] = "15cef4225f7ae200fbecf89a0fed13e389fd751d6c8e1d3b26562b7df953de0e" - -inherit pypi setuptools3 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.3.0.bb new file mode 100644 index 000000000..f70a349fd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.3.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "a little task queue for python" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5cac039fcc82f01141cc170b48f315d4" + +PYPI_PACKAGE = "huey" + +SRC_URI[md5sum] = "aa9f2a8f54cb68c62690c5e28589f49c" +SRC_URI[sha256sum] = "76978840a875607cd77c283c4ebf3ea5071b2ec06a1ac428d63be0d88f1e7070" + +inherit pypi setuptools3 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_2.5.0.bb deleted file mode 100644 index 255933a5c..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_2.5.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Python humanize utilities" -HOMEPAGE = "http://github.com/jmoiron/humanize" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" - -SRC_URI[md5sum] = "636e2c0fa1465abf8f1ff677d00e11c4" -SRC_URI[sha256sum] = "8a68bd9bccb899fd9bfb1e6d96c1e84e4475551cc9a5b5bdbd69b9b1cfd19c80" - -inherit pypi setuptools3 - -DEPENDS += "\ - ${PYTHON_PN}-setuptools-scm-native \ -" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_2.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_2.6.0.bb new file mode 100644 index 000000000..de1e98574 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_2.6.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "Python humanize utilities" +HOMEPAGE = "http://github.com/jmoiron/humanize" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" + +SRC_URI[md5sum] = "de3a507d9274912a3a177849a9349edb" +SRC_URI[sha256sum] = "8ee358ea6c23de896b9d1925ebe6a8504bb2ba7e98d5ccf4d07ab7f3b28f3819" + +inherit pypi setuptools3 + +DEPENDS += "\ + ${PYTHON_PN}-setuptools-scm-native \ +" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_19.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_19.0.0.bb deleted file mode 100644 index 3ee098ad6..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_19.0.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "A featureful, correct URL for Python" -HOMEPAGE = "https://github.com/python-hyper/hyperlink" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3893d4ed05dcc823f8ed685a9ea19bcb" - -SRC_URI[sha256sum] = "4288e34705da077fada1111a24a0aa08bb1e76699c9ce49876af722441845654" -SRC_URI[md5sum] = "4772fb4d87c26a1ab22a6161424e3cba" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "${PYTHON_PN}-stringold ${PYTHON_PN}-netclient ${PYTHON_PN}-idna" - -PACKAGES =. "${PN}-test " - -FILES_${PN}-test += " \ - ${PYTHON_SITEPACKAGES_DIR}/hyperlinkt/test \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_20.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_20.0.1.bb new file mode 100644 index 000000000..c9e281504 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_20.0.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A featureful, correct URL for Python" +HOMEPAGE = "https://github.com/python-hyper/hyperlink" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6dc5b4bd3d02faedf08461621aa2aeca" + +SRC_URI[sha256sum] = "47fcc7cd339c6cb2444463ec3277bdcfe142c8b1daf2160bdd52248deec815af" +SRC_URI[md5sum] = "d7983e3d2625e5f7dffc8d12da8803ab" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-stringold ${PYTHON_PN}-netclient ${PYTHON_PN}-idna" + +PACKAGES =. "${PN}-test " + +FILES_${PN}-test += " \ + ${PYTHON_SITEPACKAGES_DIR}/hyperlinkt/test \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb new file mode 100644 index 000000000..587aea1f0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython-genutils_0.2.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "Vestigial utilities from IPython" +HOMEPAGE = "http://ipython.org" +AUTHOR = "IPython Development Team " +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING.md;md5=f7c3032c3ac398265224533a0a333a35" + +PYPI_PACKAGE = "ipython_genutils" + +SRC_URI[md5sum] = "5a4f9781f78466da0ea1a648f3e1f79f" +SRC_URI[sha256sum] = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8" + +inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.17.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.17.0.bb new file mode 100644 index 000000000..ddcddd60b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.17.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "IPython: Productive Interactive Computing" +HOMEPAGE = "https://ipython.org" +AUTHOR = "The IPython Development Team " +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" + +PYPI_PACKAGE = "ipython" + +SRC_URI[md5sum] = "1f2257d771de9d2fb40d9e3cfcea429d" +SRC_URI[sha256sum] = "b70974aaa2674b05eb86a910c02ed09956a33f2dd6c71afc60f0b128a77e7f28" + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-jedi \ + ${PYTHON_PN}-decorator \ + ${PYTHON_PN}-pickleshare \ + ${PYTHON_PN}-traitlets \ + ${PYTHON_PN}-prompt-toolkit \ + ${PYTHON_PN}-pygments \ + ${PYTHON_PN}-backcall \ + ${PYTHON_PN}-pydoc \ + ${PYTHON_PN}-debugger \ + ${PYTHON_PN}-pexpect \ + ${PYTHON_PN}-unixadmin \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-sqlite3 \ +" + +inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.1.4.bb deleted file mode 100644 index 59ff2ffe1..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.1.4.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "A Python utility / library to sort Python imports." -HOMEPAGE = "https://pypi.python.org/pypi/isort" -LICENSE = "MIT" -SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=8227180126797a0148f94f483f3e1489" - -SRC_URI[md5sum] = "64d552bbcef48219572cc39649c48fbd" -SRC_URI[sha256sum] = "145072eedc4927cc9c1f9478f2d83b2fc1e6469df4129c02ef4e8c742207a46c" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.4.2.bb new file mode 100644 index 000000000..6b1cee40d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.4.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "A Python utility / library to sort Python imports." +HOMEPAGE = "https://pypi.python.org/pypi/isort" +LICENSE = "MIT" +SECTION = "devel/python" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=8227180126797a0148f94f483f3e1489" + +SRC_URI[md5sum] = "59592b6e14beba48149d651e900e3815" +SRC_URI[sha256sum] = "d488ba1c5a2db721669cc180180d5acf84ebdc5af7827f7aaeaa75f73cf0e2b8" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-shell \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.0.1.bb deleted file mode 100644 index 49d258ca8..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.0.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Module for serializing and de-serializing Java objects." -DESCRIPTION = "python-javaobj is a python library that provides functions\ - for reading and writing (writing is WIP currently) Java objects serialized\ - or will be deserialized by ObjectOutputStream. This form of object\ - representation is a standard data interchange format in Java world." -HOMEPAGE = "https://github.com/tcalmant/python-javaobj" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://setup.py;beginline=15;endline=27;md5=af9ce26ac2de1b7436eb08c9308b4a1e" - -SRC_URI[md5sum] = "352fe0df9336b8699ad0799ef152da6b" -SRC_URI[sha256sum] = "18c44cfaa214813784a823432b4ab9829c9626b2b00072011627b4008b0067cd" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.1.bb new file mode 100644 index 000000000..c83140a89 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.4.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "Module for serializing and de-serializing Java objects." +DESCRIPTION = "python-javaobj is a python library that provides functions\ + for reading and writing (writing is WIP currently) Java objects serialized\ + or will be deserialized by ObjectOutputStream. This form of object\ + representation is a standard data interchange format in Java world." +HOMEPAGE = "https://github.com/tcalmant/python-javaobj" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87" + +SRC_URI[md5sum] = "47632071c3c3ca14b6c42f2a4e2e1309" +SRC_URI[sha256sum] = "419ff99543469e68149f875abb0db5251cecd350c03d2bfb4c94a5796f1cbc14" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_3.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_3.6.2.bb new file mode 100644 index 000000000..43f6e1849 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_3.6.2.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Jalali implementation of Python's datetime module" +HOMEPAGE = "https://github.com/slashmili/python-jalali" +LICENSE = "Python-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=fc0a323542d2fbe0ad822fa0b1a0a96f" + +SRC_URI[md5sum] = "3c9ee1bc7de48ff4d9c773046b2eb081" +SRC_URI[sha256sum] = "a589e35f0dab89283c1a3de9d70ed6cf657932aaed8e8ce1b0e5801aaab1da67" + +PYPI_PACKAGE = "jdatetime" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-modules \ +" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.17.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.17.2.bb new file mode 100644 index 000000000..aa5e69874 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.17.2.bb @@ -0,0 +1,14 @@ +SUMMARY = "An autocompletion tool for Python that can be used for text editors." +HOMEPAGE = "https://github.com/davidhalter/jedi" +AUTHOR = "David Halter " +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5ed06eebfcb244cd66ebf6cef9c23ab4" + +PYPI_PACKAGE = "jedi" + +SRC_URI[md5sum] = "f012668907d76cebe9c4766f3b806fcf" +SRC_URI[sha256sum] = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20" + +RDEPENDS_${PN} = "${PYTHON_PN}-parso" + +inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.0.bb deleted file mode 100644 index 60d0e169f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "A fast and thorough lazy object proxy" -HOMEPAGE = "https://python-lazy-object-proxy.readthedocs.io/" -LICENSE = "BSD-2-Clause" -SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9c5c2c74370826468065c5702b8a1fcf" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -SRC_URI[md5sum] = "ea5c009f1995d86942d024714096624e" -SRC_URI[sha256sum] = "a0aed261060cd0372abf08d16399b1224dbb5b400312e6b00f2b23eabe1d4e96" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.1.bb new file mode 100644 index 000000000..4ba947923 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.5.1.bb @@ -0,0 +1,12 @@ +SUMMARY = "A fast and thorough lazy object proxy" +HOMEPAGE = "https://python-lazy-object-proxy.readthedocs.io/" +LICENSE = "BSD-2-Clause" +SECTION = "devel/python" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9c5c2c74370826468065c5702b8a1fcf" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +SRC_URI[md5sum] = "c168cec73acdec25a49f6f467f5b1eaa" +SRC_URI[sha256sum] = "9723364577b79ad9958a68851fe2acb94da6fd25170c595516a8289e6a129043" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb new file mode 100644 index 000000000..fc75e4348 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Generator for random text that looks like Latin" +HOMEPAGE = "https://github.com/sfischer13/python-lorem" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5301c01b2bcdeedba23645f94db2f179" +SRC_URI[md5sum] = "e3f0064a94c13e19780eb724affdb426" +SRC_URI[sha256sum] = "785f4109a241fc2891e59705e85d065f6e6d3ed6ad91750a8cb54d4f3e59d934" + +PYPI_PACKAGE = "lorem" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + +RDEPENDS_${PN} += " \ + python3 \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.14.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.14.0.bb deleted file mode 100644 index 503acc824..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.14.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A component library to support SBC display drivers" -DESCRIPTION = "A component library to support SBC display drivers" -HOMEPAGE = "https://github.com/rm-hull/luma.core" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=eda804060ba2312e41fe96b6fa334fd7" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "c049eabcdd50c4c1e630282c058e18f8" -SRC_URI[sha256sum] = "1501901f08c279abb9a5f1b76347955d6a15238c1e86e055aef96acd3e2e4215" - -CLEANBROKEN = "1" - -PYPI_PACKAGE = "luma.core" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pillow \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-smbus2 \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.15.0.bb new file mode 100644 index 000000000..17445e727 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.15.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "A component library to support SBC display drivers" +DESCRIPTION = "A component library to support SBC display drivers" +HOMEPAGE = "https://github.com/rm-hull/luma.core" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=eda804060ba2312e41fe96b6fa334fd7" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "9c890fa8e387a035ff0d1ae96a0715f1" +SRC_URI[sha256sum] = "e0e14c762695fb8758e8b15cfd28cd4c1618bf2fd93157c8770a2e8e0e254ae5" + +CLEANBROKEN = "1" + +PYPI_PACKAGE = "luma.core" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-pillow \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-smbus2 \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.5.1.bb deleted file mode 100644 index a4198b029..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.5.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." -DESCRIPTION = "lxml is a Pythonic, mature binding for the libxml2 and \ -libxslt libraries. It provides safe and convenient access to these \ -libraries using the ElementTree API. It extends the ElementTree API \ -significantly to offer support for XPath, RelaxNG, XML Schema, XSLT, \ -C14N and much more." -HOMEPAGE = "http://codespeak.net/lxml" -SECTION = "devel/python" -LICENSE = "BSD & GPLv2 & MIT & PSF" -LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ - file://doc/licenses/elementtree.txt;md5=eb34d036a6e3d56314ee49a6852ac891 \ - file://doc/licenses/BSD.txt;md5=700a1fc17f4797d4f2d34970c8ee694b \ - file://doc/licenses/GPL.txt;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://src/lxml/isoschematron/resources/rng/iso-schematron.rng;beginline=2;endline=7;md5=fc85684a8dd5fa272c086bceb0d99e10 \ - file://src/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl;beginline=2;endline=24;md5=cc86b7b2bbc678e13f58ea403eb9929b \ - file://src/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl;beginline=2;endline=7;md5=5b03236d293dc3784205542b409d2f53 \ - " - -DEPENDS += "libxml2 libxslt" - -SRC_URI[md5sum] = "4d3cca9c0018dd98f39e0ac54fcc3d14" -SRC_URI[sha256sum] = "27ee0faf8077c7c1a589573b1450743011117f1aa1a91d5ae776bbc5ca6070f2" - -inherit pypi setuptools3 - -# {standard input}: Assembler messages: -# {standard input}:1488805: Error: branch out of range -DEBUG_OPTIMIZATION_remove_mips = " -Og" -DEBUG_OPTIMIZATION_append_mips = " -O" -BUILD_OPTIMIZATION_remove_mips = " -Og" -BUILD_OPTIMIZATION_append_mips = " -O" - -DEBUG_OPTIMIZATION_remove_mipsel = " -Og" -DEBUG_OPTIMIZATION_append_mipsel = " -O" -BUILD_OPTIMIZATION_remove_mipsel = " -Og" -BUILD_OPTIMIZATION_append_mipsel = " -O" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS_${PN} += "libxml2 libxslt ${PYTHON_PN}-compression" - -CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.5.2.bb new file mode 100644 index 000000000..7e11a67e7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.5.2.bb @@ -0,0 +1,42 @@ +SUMMARY = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." +DESCRIPTION = "lxml is a Pythonic, mature binding for the libxml2 and \ +libxslt libraries. It provides safe and convenient access to these \ +libraries using the ElementTree API. It extends the ElementTree API \ +significantly to offer support for XPath, RelaxNG, XML Schema, XSLT, \ +C14N and much more." +HOMEPAGE = "http://codespeak.net/lxml" +SECTION = "devel/python" +LICENSE = "BSD & GPLv2 & MIT & PSF" +LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ + file://doc/licenses/elementtree.txt;md5=eb34d036a6e3d56314ee49a6852ac891 \ + file://doc/licenses/BSD.txt;md5=700a1fc17f4797d4f2d34970c8ee694b \ + file://doc/licenses/GPL.txt;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://src/lxml/isoschematron/resources/rng/iso-schematron.rng;beginline=2;endline=7;md5=fc85684a8dd5fa272c086bceb0d99e10 \ + file://src/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl;beginline=2;endline=24;md5=cc86b7b2bbc678e13f58ea403eb9929b \ + file://src/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl;beginline=2;endline=7;md5=5b03236d293dc3784205542b409d2f53 \ + " + +DEPENDS += "libxml2 libxslt" + +SRC_URI[md5sum] = "83ad758eab6c254b3565715967d553a6" +SRC_URI[sha256sum] = "cdc13a1682b2a6241080745b1953719e7fe0850b40a5c71ca574f090a1391df6" + +inherit pypi setuptools3 + +# {standard input}: Assembler messages: +# {standard input}:1488805: Error: branch out of range +DEBUG_OPTIMIZATION_remove_mips = " -Og" +DEBUG_OPTIMIZATION_append_mips = " -O" +BUILD_OPTIMIZATION_remove_mips = " -Og" +BUILD_OPTIMIZATION_append_mips = " -O" + +DEBUG_OPTIMIZATION_remove_mipsel = " -Og" +DEBUG_OPTIMIZATION_append_mipsel = " -O" +BUILD_OPTIMIZATION_remove_mipsel = " -Og" +BUILD_OPTIMIZATION_append_mipsel = " -O" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS_${PN} += "libxml2 libxslt ${PYTHON_PN}-compression" + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.2.2.bb deleted file mode 100644 index b32177d9b..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.2.2.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "matplotlib: plotting with Python" -DESCRIPTION = "\ -Matplotlib is a Python 2D plotting library which produces \ -publication-quality figures in a variety of hardcopy formats \ -and interactive environments across platforms." -HOMEPAGE = "https://github.com/matplotlib/matplotlib" -SECTION = "devel/python" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "\ - file://setup.py;beginline=253;endline=253;md5=2a114620e4e6843aa7568d5902501753 \ - file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74 \ -" -DEPENDS = "\ - freetype \ - libpng \ - python3-numpy-native \ - python3-dateutil-native \ - python3-pytz-native \ -" - -SRC_URI[md5sum] = "b60cd68f792a30173d825e16482aedd8" -SRC_URI[sha256sum] = "3d77a6630d093d74cbbfebaa0571d00790966be1ed204e4a8239f5cbd6835c5d" - -inherit pypi setuptools3 pkgconfig - -RDEPENDS_${PN} = "\ - freetype \ - libpng \ - python3-numpy \ - python3-pyparsing \ - python3-cycler \ - python3-dateutil \ - python3-kiwisolver \ - python3-pytz \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.1.bb new file mode 100644 index 000000000..6273ee2f2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib_3.3.1.bb @@ -0,0 +1,46 @@ +SUMMARY = "matplotlib: plotting with Python" +DESCRIPTION = "\ +Matplotlib is a Python 2D plotting library which produces \ +publication-quality figures in a variety of hardcopy formats \ +and interactive environments across platforms." +HOMEPAGE = "https://github.com/matplotlib/matplotlib" +SECTION = "devel/python" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "\ + file://setup.py;beginline=251;endline=251;md5=e0ef37de7122ce842bcd1fb54482b353 \ + file://LICENSE/LICENSE;md5=afec61498aa5f0c45936687da9a53d74 \ +" +DEPENDS = "\ + freetype \ + libpng \ + python3-numpy-native \ + python3-dateutil-native \ + python3-pytz-native \ + python3-certifi-native \ +" + +SRC_URI[md5sum] = "f3a405f340be5b151cb2042c4d8d16f7" +SRC_URI[sha256sum] = "87f53bcce90772f942c2db56736788b39332d552461a5cb13f05ff45c1680f0e" + +inherit pypi setuptools3 pkgconfig + +# LTO with clang needs lld +LDFLAGS_append_toolchain-clang = " -fuse-ld=lld" + +RDEPENDS_${PN} = "\ + freetype \ + libpng \ + python3-numpy \ + python3-pyparsing \ + python3-cycler \ + python3-dateutil \ + python3-kiwisolver \ + python3-pytz \ +" + +do_compile_prepend() { + echo [libs] > ${S}/setup.cfg + echo system_freetype = true >> ${S}/setup.cfg +} + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.3.bb deleted file mode 100644 index 018c4abe2..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.3.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "openpyxl is a Python library to read/write Excel 2010 xlsx/xlsm/xltx/xltm files" -DESCRIPTION = "It was born from lack of existing library to read/write natively \ -from Python the Office Open XML format. All kudos to the PHPExcel team as openpyxl \ -was initially based on PHPExcel." - -HOMEPAGE = "http://www.python-excel.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=a6e506457afab4a25ecbaeb4bc3ed623" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "9583cea56b9d4441d96eb63a8a5c92a4" -SRC_URI[sha256sum] = "547a9fc6aafcf44abe358b89ed4438d077e9d92e4f182c87e2dc294186dc4b64" - -RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell ${PYTHON_PN}-jdcal ${PYTHON_PN}-et-xmlfile" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.4.bb new file mode 100644 index 000000000..d0946e49a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.0.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "openpyxl is a Python library to read/write Excel 2010 xlsx/xlsm/xltx/xltm files" +DESCRIPTION = "It was born from lack of existing library to read/write natively \ +from Python the Office Open XML format. All kudos to the PHPExcel team as openpyxl \ +was initially based on PHPExcel." + +HOMEPAGE = "http://www.python-excel.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "8491219f6bd83ca6ad8334bf77435cf5" +SRC_URI[sha256sum] = "d88dd1480668019684c66cfff3e52a5de4ed41e9df5dd52e008cbf27af0dbf87" + +RDEPENDS_${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell ${PYTHON_PN}-jdcal ${PYTHON_PN}-et-xmlfile" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.0.5.bb deleted file mode 100644 index d8db4cef3..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.0.5.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "pandas library for high-performance data analysis tools" -DESCRIPTION = "pandas is an open source, BSD-licensed library providing \ -high-performance, easy-to-use data structures and data analysis tools for \ -the Python programming language." -HOMEPAGE = "http://pandas.pydata.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ee0470f2de336c370a71c2f8d5e81c11" - -SRC_URI[md5sum] = "5183db713194e6fbc96c45f30a0d1311" -SRC_URI[sha256sum] = "69c5d920a0b2a9838e677f78f4dde506b95ea8e4d30da25859db6469ded84fa8" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-numpy-native ${PYTHON_PN}-cython-native \ -" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-numpy \ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-pytz \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.0.bb new file mode 100644 index 000000000..7d65287cb --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "pandas library for high-performance data analysis tools" +DESCRIPTION = "pandas is an open source, BSD-licensed library providing \ +high-performance, easy-to-use data structures and data analysis tools for \ +the Python programming language." +HOMEPAGE = "http://pandas.pydata.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c2a8f987b2ce77c368c6b3e1b5b10774" + +SRC_URI[md5sum] = "512da48424b85bf198002bdbdf38af5a" +SRC_URI[sha256sum] = "b39508562ad0bb3f384b0db24da7d68a2608b9ddc85b1d931ccaaa92d5e45273" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-numpy-native ${PYTHON_PN}-cython-native \ +" + +CFLAGS_append_toolchain-clang = " -Wno-error=deprecated-declarations" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-numpy \ + ${PYTHON_PN}-dateutil \ + ${PYTHON_PN}-pytz \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_2.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_2.7.1.bb new file mode 100644 index 000000000..0ead23608 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_2.7.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "The leading native Python SSHv2 protocol library." +HOMEPAGE = "https://github.com/paramiko/paramiko/" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fd0120fc2e9f841c73ac707a30389af5" + +SRC_URI[md5sum] = "bf8239dc820ca86dd3c3226f4281c35f" +SRC_URI[sha256sum] = "920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f" + +PYPI_PACKAGE = "paramiko" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.15.0.bb deleted file mode 100644 index bff41449c..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.15.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Parse strings using a specification based on the Python format() syntax" -HOMEPAGE = "https://github.com/r1chardj0n3s/parse" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://parse.py;beginline=1325;endline=1345;md5=3d987b2e73881bbce768a80f9cdd23d9" - -SRC_URI[md5sum] = "a5aa82b2b8b4d733d227e3c99d7d01b4" -SRC_URI[sha256sum] = "a6d4e2c2f1fbde6717d28084a191a052950f758c0cbd83805357e6575c2b95c0" - -inherit pypi setuptools3 ptest - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-logging \ - " - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - cp -f ${S}/test_parse.py ${D}${PTEST_PATH}/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.16.0.bb new file mode 100644 index 000000000..a1e945276 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.16.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "Parse strings using a specification based on the Python format() syntax" +HOMEPAGE = "https://github.com/r1chardj0n3s/parse" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8ab458ad281b60e6f1b39b3feafbfc05" + +SRC_URI[md5sum] = "ba263b3143e9528ae960bbba4d56bf25" +SRC_URI[sha256sum] = "cd89e57aed38dcf3e0ff8253f53121a3b23e6181758993323658bffc048a5c19" + +inherit pypi setuptools3 ptest + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-logging \ + " + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + cp -f ${S}/test_parse.py ${D}${PTEST_PATH}/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.0.bb new file mode 100644 index 000000000..507087909 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "A Python Parser" +HOMEPAGE = "https://github.com/davidhalter/parso" +AUTHOR = "David Halter " +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cbaa2675b2424d771451332a7a69503f" + +PYPI_PACKAGE = "parso" + +SRC_URI[md5sum] = "ee3592994bfc0d0843790544c1b2b702" +SRC_URI[sha256sum] = "2b6db14759c528d857eeb9eac559c2166b2554548af39f5198bdfb976f72aa64" + +inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb new file mode 100644 index 000000000..9d67e4f33 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pickleshare_0.7.5.bb @@ -0,0 +1,12 @@ +SUMMARY = "Tiny 'shelve'-like database with concurrency support" +HOMEPAGE = "https://github.com/pickleshare/pickleshare" +AUTHOR = "Ville Vainio " +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=905c08218089ffebea3a64c82fc4d7d0" + +PYPI_PACKAGE = "pickleshare" + +SRC_URI[md5sum] = "44ab782615894a812ab96669a122a634" +SRC_URI[sha256sum] = "87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca" + +inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_3.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_3.0.3.bb deleted file mode 100644 index 170c99b93..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_3.0.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Pidfile featuring stale detection and file-locking, can also \ -be used as context-manager or decorator" -HOMEPAGE = "https://github.com/trbs/pid/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=83d53cbd3105063f20305bc313464e29" - -SRC_URI[md5sum] = "5c011ebebbdfd529f6e85d2e0396dae8" -SRC_URI[sha256sum] = "925b61c35b6f2bc6b43075f493e99792f1473575a0beeb85bcf7de1d6a4a3c7d" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "${PYTHON_PN}-fcntl ${PYTHON_PN}-logging ${PYTHON_PN}-io" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_3.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_3.0.4.bb new file mode 100644 index 000000000..7a307a6dd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_3.0.4.bb @@ -0,0 +1,12 @@ +SUMMARY = "Pidfile featuring stale detection and file-locking, can also \ +be used as context-manager or decorator" +HOMEPAGE = "https://github.com/trbs/pid/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=83d53cbd3105063f20305bc313464e29" + +SRC_URI[md5sum] = "af607e6e2a51129e3fef516b7994c85b" +SRC_URI[sha256sum] = "0e33670e83f6a33ebb0822e43a609c3247178d4a375ff50a4689e266d853eb66" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-fcntl ${PYTHON_PN}-logging ${PYTHON_PN}-io" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.5.bb deleted file mode 100644 index b4d20c2cd..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.5.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Library for building powerful interactive command lines in Python" -HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" - -SRC_URI[md5sum] = "96ba0be8d3145eb70e3da25654987670" -SRC_URI[sha256sum] = "563d1a4140b63ff9dd587bda9557cffb2fe73650205ab6f4383092fb882e7dc8" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "prompt_toolkit" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-wcwidth \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.6.bb new file mode 100644 index 000000000..806e67c09 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.6.bb @@ -0,0 +1,24 @@ +SUMMARY = "Library for building powerful interactive command lines in Python" +HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" + +SRC_URI[md5sum] = "e50cb328715b338480d8d29dda54ff5d" +SRC_URI[sha256sum] = "7630ab85a23302839a0f26b31cc24f518e6155dea1ed395ea61b42c45941b6a6" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "prompt_toolkit" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-terminal \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-wcwidth \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-image \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.8.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.8.4.bb deleted file mode 100644 index b7da1a43d..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.8.4.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-pyalsaaudio.inc -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.9.0.bb new file mode 100644 index 000000000..90050fb14 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.9.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "ALSA bindings" +SECTION = "devel/python" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1a3b161aa0fcec32a0c8907a2219ad9d" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "48c40424a79c2568676a41643d93f1f7" +SRC_URI[sha256sum] = "3ca069c736c8ad2a3047b5033468d983a2480f94fad4feb0169c056060e01e69" + +DEPENDS += "alsa-lib" + +RDEPENDS_${PN} += "libasound" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11-json_0.2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11-json_0.2.6.bb new file mode 100644 index 000000000..c56c70ad3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11-json_0.2.6.bb @@ -0,0 +1,12 @@ +SUMMARY = "Using nlohmann::json with pybind11" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0e25ff0ec476d06d366439e1120cce98" + +SRCREV = "d1d00888bc0eb7c50dde6cff1a5eb4586e620b65" +SRC_URI = "git://github.com/pybind/pybind11_json" + +DEPENDS += "nlohmann-json python3-pybind11" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb index 46bba8d8d..9674ec093 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb @@ -17,4 +17,18 @@ BBCLASSEXTEND = "native" EXTRA_OECMAKE = "-DPYBIND11_TEST=OFF" -inherit cmake python3native +inherit cmake setuptools3 python3native + +do_configure() { + cmake_do_configure +} + +do_compile() { + distutils3_do_compile + cmake_do_compile +} + +do_install() { + distutils3_do_install + cmake_do_install +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.2.bb deleted file mode 100644 index 98dbf33b2..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.1.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." -HOMEPAGE = "https://github.com/balloob/pychromecast" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" - -SRC_URI[md5sum] = "6ca5102b09009c85424a9ab628005992" -SRC_URI[sha256sum] = "adcf478d7fc539e9decde59b2db7b6a4b1d679c4cf78d515d880adb1c4bc1c30" - -PYPI_PACKAGE = "PyChromecast" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.2.0.bb new file mode 100644 index 000000000..257778ba9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.2.0.bb @@ -0,0 +1,11 @@ +SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." +HOMEPAGE = "https://github.com/balloob/pychromecast" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" + +SRC_URI[md5sum] = "20ed7ec024fd4739446d42f8d19813b8" +SRC_URI[sha256sum] = "c522c5ecb554471ca8e5690c05530b1c237c301349061d3839c506984f8d3c2d" + +PYPI_PACKAGE = "PyChromecast" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.10.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.10.1.bb deleted file mode 100644 index f69ca53cf..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.10.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Python driver for MongoDB " -DESCRIPTION = "\ -The PyMongo distribution contains tools for interacting with MongoDB \ -database from Python. The bson package is an implementation of the BSON \ -format for Python. The pymongo package is a native Python driver for \ -MongoDB. The gridfs package is a gridfs implementation on top of pymongo." -HOMEPAGE = "http://github.com/mongodb/mongo-python-driver" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI[md5sum] = "e31b9c0190c9eaf1f792d0277b2a8ebe" -SRC_URI[sha256sum] = "993257f6ca3cde55332af1f62af3e04ca89ce63c08b56a387cdd46136c72f2fa" - -inherit pypi setuptools3 - -PACKAGES =+ "${PYTHON_PN}-bson" - -FILES_${PYTHON_PN}-bson = "${PYTHON_SITEPACKAGES_DIR}/bson/*" - -RDEPENDS_${PYTHON_PN}-bson += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ -" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-bson \ - ${PYTHON_PN}-pprint \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.0.bb new file mode 100644 index 000000000..635de22d2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.11.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "Python driver for MongoDB " +DESCRIPTION = "\ +The PyMongo distribution contains tools for interacting with MongoDB \ +database from Python. The bson package is an implementation of the BSON \ +format for Python. The pymongo package is a native Python driver for \ +MongoDB. The gridfs package is a gridfs implementation on top of pymongo." +HOMEPAGE = "http://github.com/mongodb/mongo-python-driver" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRC_URI[md5sum] = "5d166c8f9500c83314deadebb95b6fd5" +SRC_URI[sha256sum] = "076a7f2f7c251635cf6116ac8e45eefac77758ee5a77ab7bd2f63999e957613b" + +inherit pypi setuptools3 + +PACKAGES =+ "${PYTHON_PN}-bson" + +FILES_${PYTHON_PN}-bson = "${PYTHON_SITEPACKAGES_DIR}/bson/*" + +RDEPENDS_${PYTHON_PN}-bson += " \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-threading \ +" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-bson \ + ${PYTHON_PN}-pprint \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pynacl_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynacl_1.4.0.bb new file mode 100644 index 000000000..6fd42ebf8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynacl_1.4.0.bb @@ -0,0 +1,32 @@ +SUMMARY = "Python binding to the Networking and Cryptography (NaCl) library" +DESCRIPTION = "Python binding to the Networking and Cryptography (NaCl) library" +HOMEPAGE = "https://github.com/pyca/pynacl" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8cc789b082b3d97e1ccc5261f8594d3f" + +SRC_URI[md5sum] = "8c6c57893327a694c72510fb620e4744" +SRC_URI[sha256sum] = "54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505" + +PYPI_PACKAGE = "PyNaCl" + +inherit pypi setuptools3 + +DEPENDS += "\ + ${PYTHON_PN}-wheel-native \ + ${PYTHON_PN}-cffi-native \ + libsodium \ +" + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-cffi \ + libsodium \ +" + +do_compile_prepend() { + export SODIUM_INSTALL=system +} + +do_install_prepend() { + export SODIUM_INSTALL=system +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.12.bb deleted file mode 100644 index 440f8993c..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.12.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "A pure Python netlink and Linux network configuration library" -LICENSE = "GPLv2 & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.GPL.v2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.Apache.v2;md5=34281e312165f843a2b7d1f114fe65ce" - -SRC_URI[md5sum] = "4370e9a5875486a1223705ea9b001eff" -SRC_URI[sha256sum] = "0157801c5496177856c3296b590065e691b041a3adde6fb8ffad2a8d05013ed3" - -inherit setuptools3 pypi ptest - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-distutils \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-unixadmin \ -" - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-fcntl \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.13.bb new file mode 100644 index 000000000..4fb401957 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.5.13.bb @@ -0,0 +1,37 @@ +SUMMARY = "A pure Python netlink and Linux network configuration library" +LICENSE = "GPLv2 & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.GPL.v2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.Apache.v2;md5=34281e312165f843a2b7d1f114fe65ce" + +SRC_URI[md5sum] = "6c72ffa7147bbfa1610942e5734c8c87" +SRC_URI[sha256sum] = "518365f3313e73b0f024b9fa7a580b29bfa2fe2c5230be0bc69c068bbf6637e9" + +inherit setuptools3 pypi ptest + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-distutils \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-unixadmin \ +" + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-fcntl \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.12.0.bb deleted file mode 100644 index d83c42de3..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.12.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "pytest-asyncio is an Apache2 licensed library, written in Python, for testing asyncio code with pytest" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README.rst;md5=3faed73a08162b5b5367cdcaee996f75" - -SRC_URI[sha256sum] = "475bd2f3dc0bc11d2463656b3cbaafdbec5a47b47508ea0b329ee693040eebd2" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pytest \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.14.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.14.0.bb new file mode 100644 index 000000000..1e94c25f7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.14.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "pytest-asyncio is an Apache2 licensed library, written in Python, for testing asyncio code with pytest" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" + +SRC_URI[md5sum] = "b63593bc08f445f6e3f14c34128a68ed" +SRC_URI[sha256sum] = "9882c0c6b24429449f5f969a5158b528f39bde47dc32e85b9f0403965017e700" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-pytest \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.10.0.bb new file mode 100644 index 000000000..70cc98f29 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.10.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "pytest-metadata is a plugin that allowed for accessing pytest metadata" +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" + +SRC_URI[sha256sum] = "b7e6e0a45adacb17a03a97bf7a2ef60cc1f4e172bcce9732ce5e814191932315" +SRC_URI[md5sum] = "4fcf9764e6210c4555411fce8109e7cd" + +PYPI_PACKAGE = "pytest-metadata" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = " \ + ${PYTHON_PN}-pytest \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.9.0.bb deleted file mode 100644 index 4a77af3cf..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.9.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "pytest-metadata is a plugin that allowed for accessing pytest metadata" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" - -SRC_URI[sha256sum] = "168d203abba8cabb65cf1b5fa675b0ba60dccbf1825d147960876a7e6f7c219c" - -PYPI_PACKAGE = "pytest-metadata" - -inherit pypi setuptools3 - -RDEPENDS_${PN} = " \ - ${PYTHON_PN}-pytest \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_1.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_1.4.1.bb deleted file mode 100644 index 506f4c065..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_1.4.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "py.test plugin to abort hanging tests" -HOMEPAGE = "https://github.com/pytest-dev/pytest-timeout/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d8048cd156eda3df2e7f111b0ae9ceff" - -PYPI_PACKAGE = "pytest-timeout" - -SRC_URI[md5sum] = "c458dd7d417a5f2dbae0f1f6073845f7" -SRC_URI[sha256sum] = "6d0fb4ce74cebb81be252e4e0d9c2a91f30270b33208cfa0f1da6eed9abf18ac" - -inherit pypi setuptools3 - -RDEPENDS_${PN} = "${PYTHON_PN}-pytest" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_1.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_1.4.2.bb new file mode 100644 index 000000000..906d67064 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_1.4.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "py.test plugin to abort hanging tests" +HOMEPAGE = "https://github.com/pytest-dev/pytest-timeout/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d8048cd156eda3df2e7f111b0ae9ceff" + +PYPI_PACKAGE = "pytest-timeout" + +SRC_URI[md5sum] = "552cc293447b00f7a294ce7a1fb3839f" +SRC_URI[sha256sum] = "20b3113cf6e4e80ce2d403b6fb56e9e1b871b510259206d40ff8d609f48bda76" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "${PYTHON_PN}-pytest" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.10114.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.10114.bb deleted file mode 100644 index 7f8affb4f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.10114.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "This module provides ctypes-based bindings for the native libvlc API of the VLC video player." -HOMEPAGE = "wiki.videolan.org/PythonBinding" -LICENSE = "LGPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[md5sum] = "17dba9a55903cdcae10814080fcadb8f" -SRC_URI[sha256sum] = "c1a8a295bea8277fa3d9a07dcdf873fe18c5f11a0e4d1f618df47c316fe0003b" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.11115.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.11115.bb new file mode 100644 index 000000000..014509d55 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.11115.bb @@ -0,0 +1,9 @@ +SUMMARY = "This module provides ctypes-based bindings for the native libvlc API of the VLC video player." +HOMEPAGE = "wiki.videolan.org/PythonBinding" +LICENSE = "LGPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[md5sum] = "422fd025294af2e55dfdcf9bc7d7dbac" +SRC_URI[sha256sum] = "a4d3bdddfce84a8fb1b2d5447193a0239c55c16ca246e5194d48efd59c4e236b" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_2.10.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_2.10.6.bb deleted file mode 100644 index 7a9cc3f79..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_2.10.6.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Python client for Redis key-value store" -DESCRIPTION = "The Python interface to the Redis key-value store." -HOMEPAGE = "http://github.com/andymccurdy/redis-py" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=51d9ad56299ab60ba7be65a621004f27" - -SRC_URI[md5sum] = "048348d8cfe0b5d0bba2f4d835005c3b" -SRC_URI[sha256sum] = "a22ca993cea2962dbb588f9f30d0015ac4afcc45bee27d3978c0dbe9e97c6c0f" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-cryptography \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_3.5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_3.5.3.bb new file mode 100644 index 000000000..1887bf9e8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_3.5.3.bb @@ -0,0 +1,15 @@ +SUMMARY = "Python client for Redis key-value store" +DESCRIPTION = "The Python interface to the Redis key-value store." +HOMEPAGE = "http://github.com/andymccurdy/redis-py" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=51d9ad56299ab60ba7be65a621004f27" + +SRC_URI[md5sum] = "7a00d4540374f34e152a33faa1fcee5f" +SRC_URI[sha256sum] = "0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-cryptography \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.6.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.6.8.bb deleted file mode 100644 index d09f63840..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.6.8.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Alternative regular expression module, to replace re." -HOMEPAGE = "https://bitbucket.org/mrabarnett/mrab-regex/src" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=ee7987010dadc17745d623f406b500ec" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "a991f73b0ccfe8f6e9a99bd1bc9071b1" -SRC_URI[sha256sum] = "e9b64e609d37438f7d6e68c2546d2cb8062f3adb27e6336bc129b51be20773ac" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.7.14.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.7.14.bb new file mode 100644 index 000000000..5c608c989 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.7.14.bb @@ -0,0 +1,11 @@ +SUMMARY = "Alternative regular expression module, to replace re." +HOMEPAGE = "https://bitbucket.org/mrabarnett/mrab-regex/src" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=ee7987010dadc17745d623f406b500ec" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "c3a53929c3797289566368be4b6b964a" +SRC_URI[sha256sum] = "3a3af27a8d23143c49a3420efe5b3f8cf1a48c6fc8bc6856b03f638abc1833bb" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_3.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_3.4.2.bb deleted file mode 100644 index 759214fa3..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_3.4.2.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Pure-Python RSA implementation" -SECTION = "devel/python" -AUTHOR = "Sybren A. Stuvel" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c403f6882d4f97a9cd927df987d55634" - -SRC_URI[sha256sum] = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5" - -inherit pypi setuptools3 update-alternatives - -ALTERNATIVE_${PN} = "\ - pyrsa-decrypt \ - pyrsa-decrypt-bigfile \ - pyrsa-encrypt \ - pyrsa-encrypt-bigfile \ - pyrsa-keygen \ - pyrsa-priv2pub \ - pyrsa-sign \ - pyrsa-verify \ -" - -ALTERNATIVE_LINK_NAME[pyrsa-decrypt] = "${bindir}/pyrsa-decrypt" -ALTERNATIVE_LINK_NAME[pyrsa-decrypt-bigfile] = "${bindir}/pyrsa-decrypt-bigfile" -ALTERNATIVE_LINK_NAME[pyrsa-encrypt] = "${bindir}/pyrsa-encrypt" -ALTERNATIVE_LINK_NAME[pyrsa-encrypt-bigfile] = "${bindir}/pyrsa-encrypt-bigfile" -ALTERNATIVE_LINK_NAME[pyrsa-keygen] = "${bindir}/pyrsa-keygen" -ALTERNATIVE_LINK_NAME[pyrsa-priv2pub] = "${bindir}/pyrsa-priv2pub" -ALTERNATIVE_LINK_NAME[pyrsa-sign] = "${bindir}/pyrsa-sign" -ALTERNATIVE_LINK_NAME[pyrsa-verify] = "${bindir}/pyrsa-verify" -ALTERNATIVE_PRIORITY = "30" - - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-pickle \ -" - -RDEPENDS_${PN} += "${PYTHON_PN}-pyasn1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.6.bb new file mode 100644 index 000000000..d2b108635 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.6.bb @@ -0,0 +1,41 @@ +SUMMARY = "Pure-Python RSA implementation" +SECTION = "devel/python" +AUTHOR = "Sybren A. Stuvel" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c403f6882d4f97a9cd927df987d55634" + +SRC_URI[md5sum] = "bbf1c954865319bd542600ab07f92aca" +SRC_URI[sha256sum] = "109ea5a66744dd859bf16fe904b8d8b627adafb9408753161e766a92e7d681fa" + +inherit pypi setuptools3 update-alternatives + +ALTERNATIVE_${PN} = "\ + pyrsa-decrypt \ + pyrsa-encrypt \ + pyrsa-keygen \ + pyrsa-priv2pub \ + pyrsa-sign \ + pyrsa-verify \ +" + +ALTERNATIVE_LINK_NAME[pyrsa-decrypt] = "${bindir}/pyrsa-decrypt" +ALTERNATIVE_LINK_NAME[pyrsa-encrypt] = "${bindir}/pyrsa-encrypt" +ALTERNATIVE_LINK_NAME[pyrsa-keygen] = "${bindir}/pyrsa-keygen" +ALTERNATIVE_LINK_NAME[pyrsa-priv2pub] = "${bindir}/pyrsa-priv2pub" +ALTERNATIVE_LINK_NAME[pyrsa-sign] = "${bindir}/pyrsa-sign" +ALTERNATIVE_LINK_NAME[pyrsa-verify] = "${bindir}/pyrsa-verify" +ALTERNATIVE_PRIORITY = "30" + + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-doctest \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-pickle \ +" + +RDEPENDS_${PN} += "${PYTHON_PN}-pyasn1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.16.0.bb deleted file mode 100644 index b3f149029..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.16.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "The new Python SDK for Sentry.io" -DESCRIPTION = "This is the next line of the Python SDK \ -for Sentry, intended to replace the raven package on PyPI." -HOMEPAGE = "https://github.com/getsentry/sentry-python" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" - -SRC_URI[md5sum] = "8cfa879e803add117b073cad20c1d74d" -SRC_URI[sha256sum] = "da06bc3641e81ec2c942f87a0676cd9180044fa3d1697524a0005345997542e2" - -PYPI_PACKAGE = "sentry-sdk" -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.16.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.16.5.bb new file mode 100644 index 000000000..ad01f6f5b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.16.5.bb @@ -0,0 +1,12 @@ +SUMMARY = "The new Python SDK for Sentry.io" +DESCRIPTION = "This is the next line of the Python SDK \ +for Sentry, intended to replace the raven package on PyPI." +HOMEPAGE = "https://github.com/getsentry/sentry-python" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" + +SRC_URI[md5sum] = "6d65fda758929b6a8d16e6030302c811" +SRC_URI[sha256sum] = "e12eb1c2c01cd9e9cfe70608dbda4ef451f37ef0b7cbb92e5d43f87c341d6334" + +PYPI_PACKAGE = "sentry-sdk" +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.18.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.18.bb deleted file mode 100644 index a5e1737b0..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.18.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ -application developers the full power and flexibility of SQL" -HOMEPAGE = "http://www.sqlalchemy.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c19467890539ff718c00a019c9c7a7b2" - -SRC_URI[md5sum] = "96e085d318297b1ad36ef2685f54287a" -SRC_URI[sha256sum] = "da2fb75f64792c1fc64c82313a00c728a7c301efe6a60b7a9fe35b16b4368ce7" - -PYPI_PACKAGE = "SQLAlchemy" -inherit pypi setuptools3 - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.19.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.19.bb new file mode 100644 index 000000000..52e7bf376 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.3.19.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ +application developers the full power and flexibility of SQL" +HOMEPAGE = "http://www.sqlalchemy.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c19467890539ff718c00a019c9c7a7b2" + +SRC_URI[md5sum] = "a5710b0aee19a743e513f3bf002072a8" +SRC_URI[sha256sum] = "3bba2e9fbedb0511769780fe1d63007081008c5c2d7d715e91858c94dbaa260e" + +PYPI_PACKAGE = "SQLAlchemy" +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-threading \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.6.1.bb deleted file mode 100644 index fafd591a8..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.6.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -# This recipe is adapted from one in meta-jupyter: -# https://github.com/Xilinx/meta-jupyter/blob/master/recipes-python/python3-sympy_1.1.bb - -SUMMARY = "Computer algebra system (CAS) in Python" -HOMEPAGE = "https://pypi.org/project/sympy/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ebb06e9df8f57522b72d0edb0fcf83d4" - -SRC_URI[md5sum] = "8bdf8473751722fd1714aa7125b1478b" -SRC_URI[sha256sum] = "7386dba4f7e162e90766b5ea7cab5938c2fe3c620b310518c8ff504b283cb15b" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "python3-mpmath" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.6.2.bb new file mode 100644 index 000000000..428b40c3b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.6.2.bb @@ -0,0 +1,16 @@ +# This recipe is adapted from one in meta-jupyter: +# https://github.com/Xilinx/meta-jupyter/blob/master/recipes-python/python3-sympy_1.1.bb + +SUMMARY = "Computer algebra system (CAS) in Python" +HOMEPAGE = "https://pypi.org/project/sympy/" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ebb06e9df8f57522b72d0edb0fcf83d4" + +SRC_URI[md5sum] = "50d6b69b1de36b757484b9ff833a9e0a" +SRC_URI[sha256sum] = "1cfadcc80506e4b793f5b088558ca1fcbeaec24cd6fc86f1fdccaa3ee1d48708" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "python3-mpmath" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-textparser_0.23.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-textparser_0.23.0.bb new file mode 100644 index 000000000..0c626e7aa --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-textparser_0.23.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "A text parser written in the Python language." +HOMEPAGE = "https://github.com/eerimoq/textparser" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fe9942a8bba5458a9dbd11277bc347ad" + +SRC_URI[md5sum] = "d5378eac93406156e9029114aaa1b515" +SRC_URI[sha256sum] = "f009d0f6f78aa7c1e648dca4e3961f6d67495f7f520f1a705245ffad33f4b470" + +PYPI_PACKAGE = "textparser" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.47.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.47.0.bb deleted file mode 100644 index fad758e3f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.47.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Fast, Extensible Progress Meter" -HOMEPAGE = "http://tqdm.github.io/" -SECTION = "devel/python" - -LICENSE = "MIT & MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENCE;md5=7ea57584e3f8bbde2ae3e1537551de25" - -SRC_URI[md5sum] = "1594eab5b5aef37ef1fd6d36ce4f8f4c" -SRC_URI[sha256sum] = "63ef7a6d3eb39f80d6b36e4867566b3d8e5f1fe3d6cb50c5e9ede2b3198ba7b7" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.48.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.48.2.bb new file mode 100644 index 000000000..831468095 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.48.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "Fast, Extensible Progress Meter" +HOMEPAGE = "http://tqdm.github.io/" +SECTION = "devel/python" + +LICENSE = "MIT & MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENCE;md5=7ea57584e3f8bbde2ae3e1537551de25" + +SRC_URI[md5sum] = "d29c836d74d2f2ec6a10d052937f7371" +SRC_URI[sha256sum] = "564d632ea2b9cb52979f7956e093e831c28d441c11751682f84c86fc46e4fd21" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_4.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_4.3.3.bb new file mode 100644 index 000000000..edfb3abfa --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_4.3.3.bb @@ -0,0 +1,18 @@ +SUMMARY = "Traitlets Python config system" +HOMEPAGE = "http://ipython.org" +AUTHOR = "IPython Development Team " +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING.md;md5=eec4de4d599518742e54e75954e33b46" + +PYPI_PACKAGE = "traitlets" + +SRC_URI[md5sum] = "3a4f263af65d3d79f1c279f0247077ef" +SRC_URI[sha256sum] = "d023ee369ddd2763310e4c3eae1ff649689440d4ae59d7485eb4cfbbe3e359f7" + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-ipython-genutils \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-decorator \ +" + +inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.6.0.bb deleted file mode 100644 index f3f321e18..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.6.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "A portable, lightweight MessagePack serializer and deserializer written in pure Python." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9eb4691bcb66360acee473a8cf75f594" - -SRC_URI[sha256sum] = "754edb07eaee39a9686a99823892e3a1be4e0948d9cc5c717946750c27643c9c" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - cp -f ${S}/test_umsgpack.py ${D}${PTEST_PATH}/ -} - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-datetime \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.7.0.bb new file mode 100644 index 000000000..4797a3535 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.7.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "A portable, lightweight MessagePack serializer and deserializer written in pure Python." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9eb4691bcb66360acee473a8cf75f594" + +SRC_URI[md5sum] = "231609d87aa58459a1491c8f5df4e4cd" +SRC_URI[sha256sum] = "996e4c4454771f0ff0fd2a7566b1a159d305d3611cd755addf444e3533e2bc54" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + cp -f ${S}/test_umsgpack.py ${D}${PTEST_PATH}/ +} + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-datetime \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_3.0.0.bb deleted file mode 100644 index 352aedcf9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_3.0.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Ultra fast JSON encoder and decoder for Python" -DESCRIPTION = "UltraJSON is an ultra fast JSON encoder and decoder written in pure C with bindings for Python 2.5+ and 3." - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=10fa10456417c0252bcb8a498e498ffe" - -SRC_URI[md5sum] = "1c13a485776a2a0dfa1795d101bb3d57" -SRC_URI[sha256sum] = "e0199849d61cc6418f94d52a314c6a27524d65e82174d2a043fb718f73d1520d" - -inherit pypi ptest setuptools3 - -SRC_URI += " \ - file://run-ptest \ -" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-numbers \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytz \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_3.1.0.bb new file mode 100644 index 000000000..ef57b2a1f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_3.1.0.bb @@ -0,0 +1,32 @@ +SUMMARY = "Ultra fast JSON encoder and decoder for Python" +DESCRIPTION = "UltraJSON is an ultra fast JSON encoder and decoder written in pure C with bindings for Python 2.5+ and 3." + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=10fa10456417c0252bcb8a498e498ffe" + +SRC_URI[md5sum] = "875ac729018f3cac786d471422306fa8" +SRC_URI[sha256sum] = "00bda1de275ed6fe81817902189c75dfd156b4fa29b44dc1f4620775d2f50cf7" + +inherit pypi ptest setuptools3 + +SRC_URI += " \ + file://run-ptest \ +" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-numbers \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytz \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.10.bb new file mode 100644 index 000000000..db985a2ff --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.10.bb @@ -0,0 +1,23 @@ +SUMMARY = "Python HTTP library with thread-safe connection pooling, file post support, sanity friendly, and more" +HOMEPAGE = "https://github.com/shazow/urllib3" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=65715c2eb961313d71b297dd5a04f85e" + +SRC_URI[md5sum] = "94e3d4d472a14e788d4bd1a903fd102b" +SRC_URI[sha256sum] = "91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-certifi \ + ${PYTHON_PN}-cryptography \ + ${PYTHON_PN}-email \ + ${PYTHON_PN}-idna \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-pyopenssl \ + ${PYTHON_PN}-threading \ +" + +CVE_PRODUCT = "urllib3" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.9.bb deleted file mode 100644 index 8cbc1f9f9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.9.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Python HTTP library with thread-safe connection pooling, file post support, sanity friendly, and more" -HOMEPAGE = "https://github.com/shazow/urllib3" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=65715c2eb961313d71b297dd5a04f85e" - -SRC_URI[md5sum] = "dbf9b868b90880b24b1ac278094e912e" -SRC_URI[sha256sum] = "3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-certifi \ - ${PYTHON_PN}-cryptography \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-idna \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-pyopenssl \ - ${PYTHON_PN}-threading \ -" - -CVE_PRODUCT = "urllib3" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.34.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.34.2.bb deleted file mode 100644 index 8633a4fc9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.34.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "The official binary distribution format for Python " -HOMEPAGE = "https://github.com/pypa/wheel" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9d66b41bc2a080e7174acc5dffecd752" - -SRC_URI[md5sum] = "ce2a27f99c130a927237b5da1ff5ceaf" -SRC_URI[sha256sum] = "8788e9155fe14f54164c1b9eb0a319d98ef02c160725587ad60f14ddc57b6f96" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native" - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.35.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.35.1.bb new file mode 100644 index 000000000..b4e77ea84 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-wheel_0.35.1.bb @@ -0,0 +1,13 @@ +SUMMARY = "The official binary distribution format for Python " +HOMEPAGE = "https://github.com/pypa/wheel" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=10;endline=10;md5=8227180126797a0148f94f483f3e1489" + +SRC_URI[md5sum] = "7ec7c435cc73eefebd9f0af43c120044" +SRC_URI[sha256sum] = "99a22d87add3f634ff917310a3d87e499f19e663413a52eb9232c447aa646c9f" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.3.1.bb deleted file mode 100644 index 9f081b68c..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.3.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "A flexible forms validation and rendering library for python web development." -HOMEPAGE = "https://pypi.python.org/pypi/WTForms" -SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=208ce1c159f911ecf389806650582021" - -SRC_URI[md5sum] = "bff06943e59671581af07f80d14bda5f" -SRC_URI[sha256sum] = "861a13b3ae521d6700dac3b2771970bd354a63ba7043ecc3a82b5288596a1972" - -PYPI_PACKAGE = "WTForms" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-numbers \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.3.3.bb new file mode 100644 index 000000000..a6e7a5b2e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.3.3.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A flexible forms validation and rendering library for python web development." +HOMEPAGE = "https://pypi.python.org/pypi/WTForms" +SECTION = "devel/python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=53dbfa56f61b90215a9f8f0d527c043d" + +SRC_URI[md5sum] = "2b6ea167a71c6becf20f0934417fd06c" +SRC_URI[sha256sum] = "81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c" + +PYPI_PACKAGE = "WTForms" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-numbers \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.2.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.2.9.bb deleted file mode 100644 index cba856143..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.2.9.bb +++ /dev/null @@ -1,5 +0,0 @@ -inherit setuptools3 -require python-xlsxwriter.inc - -SRC_URI[md5sum] = "20f8b7df7f1705fa2f7ac3f84789d2ca" -SRC_URI[sha256sum] = "828b3285fc95105f5b1946a6a015b31cf388bd5378fdc6604e4d1b7839df2e77" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.3.bb new file mode 100644 index 000000000..e2a304437 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.3.bb @@ -0,0 +1,14 @@ +SUMMARY = "Python 2 and 3 compatibility library" +HOMEPAGE = "https://xlsxwriter.readthedocs.io" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0960d52d61b0801760f39463288c2672" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "XlsxWriter" + +SRC_URI[md5sum] = "7c7191afe3149e41dca0e17d535421fb" +SRC_URI[sha256sum] = "830cad0a88f0f95e5a8945ee082182aa68ab89e7d9725d0c32c196207634244b" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.4.bb deleted file mode 100644 index 97f4e358b..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_1.4.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "xxhash is a Python binding for the xxHash library by Yann Collet." -SECTION = "devel/python" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5a8d76283514a1b7e6a414aba38629b5" - -SRC_URI[md5sum] = "0194cc926dd7676d27aba0f89da9798b" -SRC_URI[sha256sum] = "7d6df9d217977d085b8abd74b61efa40405ac416f2d8bdacc40826bd5cb1b746" - -SRC_URI += " \ - file://run-ptest \ -" - -inherit pypi setuptools3 ptest - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_2.0.0.bb new file mode 100644 index 000000000..c5add103c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_2.0.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "xxhash is a Python binding for the xxHash library by Yann Collet." +SECTION = "devel/python" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5a8d76283514a1b7e6a414aba38629b5" + +SRC_URI[md5sum] = "010fda0427b621e5fe6930ad42511d88" +SRC_URI[sha256sum] = "58ca818554c1476fa1456f6cd4b87002e2294f09baf0f81e5a2a4968e62c423c" + +SRC_URI += " \ + file://run-ptest \ +" + +inherit pypi setuptools3 ptest + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.4.2.bb deleted file mode 100644 index 15d92065d..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.4.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "The module provides handy URL class for url parsing and changing" -HOMEPAGE = "https://github.com/aio-libs/yarl/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b334fc90d45983db318f54fd5bf6c90b" - -SRC_URI[md5sum] = "08ba0d6e18f460b44d9e5459f3d217ba" -SRC_URI[sha256sum] = "58cd9c469eced558cd81aa3f484b2924e8897049e06889e8ff2510435b7ef74b" - -SRC_URI += " \ - file://run-ptest \ -" - -PYPI_PACKAGE = "yarl" - -inherit pypi ptest setuptools3 - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-multidict \ - ${PYTHON_PN}-idna \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.5.1.bb new file mode 100644 index 000000000..40f0e4db0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.5.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "The module provides handy URL class for url parsing and changing" +HOMEPAGE = "https://github.com/aio-libs/yarl/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b334fc90d45983db318f54fd5bf6c90b" + +SRC_URI[md5sum] = "a9b20bf0b8a6962e1101b28908a67bf8" +SRC_URI[sha256sum] = "c22c75b5f394f3d47105045ea551e08a3e804dc7e01b37800ca35b58f856c3d6" + +SRC_URI += " \ + file://run-ptest \ +" + +PYPI_PACKAGE = "yarl" + +inherit pypi ptest setuptools3 + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-multidict \ + ${PYTHON_PN}-idna \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.17.3.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.17.3.bb deleted file mode 100644 index 930f04896..000000000 --- a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.17.3.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "Python WBEM Client and Provider Interface" -DESCRIPTION = "\ -A Python library for making CIM (Common Information Model) operations over \ -HTTP using the WBEM CIM-XML protocol. It is based on the idea that a good \ -WBEM client should be easy to use and not necessarily require a large amount \ -of programming knowledge. It is suitable for a large range of tasks from \ -simply poking around to writing web and GUI applications. \ -\ -WBEM, or Web Based Enterprise Management is a manageability protocol, like \ -SNMP, standardised by the Distributed Management Task Force (DMTF) available \ -at http://www.dmtf.org/standards/wbem. \ -\ -It also provides a Python provider interface, and is the fastest and easiest \ -way to write providers on the planet." -HOMEPAGE = "http://pywbem.github.io" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" - -SRC_URI[md5sum] = "9fbee6b4327f035eb212017b6cd84309" -SRC_URI[sha256sum] = "1de9963adda97d89d191d027ddc64167699a11ac42ecc3ea35dddf7679ac2441" - -inherit pypi setuptools3 update-alternatives - -DEPENDS += " \ - ${PYTHON_PN}-ply-native \ - ${PYTHON_PN}-pyyaml-native \ - ${PYTHON_PN}-six-native \ -" - -do_install_append() { - mv ${D}${bindir}/wbemcli.py ${D}${bindir}/pywbemcli - - rm -f ${D}${bindir}/*.bat -} - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-ply \ - ${PYTHON_PN}-pyyaml \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-unixadmin \ - ${PYTHON_PN}-xml \ -" - -ALTERNATIVE_${PN} = "mof_compiler pywbemcli wbemcli" -ALTERNATIVE_TARGET[mof_compiler] = "${bindir}/mof_compiler" -ALTERNATIVE_TARGET[pywbemcli] = "${bindir}/pywbemcli" -ALTERNATIVE_TARGET[wbemcli] = "${bindir}/wbemcli" - -ALTERNATIVE_PRIORITY = "60" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.17.4.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.17.4.bb new file mode 100644 index 000000000..a804b0cc0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_0.17.4.bb @@ -0,0 +1,56 @@ +SUMMARY = "Python WBEM Client and Provider Interface" +DESCRIPTION = "\ +A Python library for making CIM (Common Information Model) operations over \ +HTTP using the WBEM CIM-XML protocol. It is based on the idea that a good \ +WBEM client should be easy to use and not necessarily require a large amount \ +of programming knowledge. It is suitable for a large range of tasks from \ +simply poking around to writing web and GUI applications. \ +\ +WBEM, or Web Based Enterprise Management is a manageability protocol, like \ +SNMP, standardised by the Distributed Management Task Force (DMTF) available \ +at http://www.dmtf.org/standards/wbem. \ +\ +It also provides a Python provider interface, and is the fastest and easiest \ +way to write providers on the planet." +HOMEPAGE = "http://pywbem.github.io" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" + +SRC_URI[md5sum] = "b65c03026bf2174e58e3e47a5e7e4825" +SRC_URI[sha256sum] = "5b54b65a5434bb16432415743c0d154feee0c6d7a8a2fee208719c67d6d24c97" + +inherit pypi setuptools3 update-alternatives + +DEPENDS += " \ + ${PYTHON_PN}-ply-native \ + ${PYTHON_PN}-pyyaml-native \ + ${PYTHON_PN}-six-native \ +" + +do_install_append() { + mv ${D}${bindir}/wbemcli.py ${D}${bindir}/pywbemcli + + rm -f ${D}${bindir}/*.bat +} + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-ply \ + ${PYTHON_PN}-pyyaml \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-stringold \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-unixadmin \ + ${PYTHON_PN}-xml \ +" + +ALTERNATIVE_${PN} = "mof_compiler pywbemcli wbemcli" +ALTERNATIVE_TARGET[mof_compiler] = "${bindir}/mof_compiler" +ALTERNATIVE_TARGET[pywbemcli] = "${bindir}/pywbemcli" +ALTERNATIVE_TARGET[wbemcli] = "${bindir}/wbemcli" + +ALTERNATIVE_PRIORITY = "60" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb index 3cbab22c3..0ef2bd7f4 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb @@ -13,9 +13,9 @@ RDEPENDS_${PN} += "apache2" # fork contains patches from the modules ML and fixes CVE compliance issues SRC_URI = "git://github.com/jchampio/apache-websocket.git" -SRCREV = "6968083264b90b89b1b9597a4ca03ba29e7ea2e1" +SRCREV = "0ee34c77fc78ff08fd548706300b80a7bc7874e4" -PV = "0.1.1+git${SRCPV}" +PV = "0.1.2+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.10.bb b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.10.bb deleted file mode 100644 index ed3df1939..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.10.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "Lightweight secure web server" -HOMEPAGE = "http://www.hiawatha-webserver.org" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "libxml2 libxslt virtual/crypt" - -SECTION = "net" - -SRC_URI = "http://hiawatha-webserver.org/files/${BP}.tar.gz \ - file://hiawatha-init \ - file://hiawatha.service " - -SRC_URI[md5sum] = "3bf2c12c7037ecc3dfdbec72e7a2f04f" -SRC_URI[sha256sum] = "b5e46f5757fa647e77d21d24f7eea912d59f26a75558cba780b45c1c3a33a4d9" - -INITSCRIPT_NAME = "hiawatha" -INITSCRIPT_PARAMS = "defaults 70" - -SYSTEMD_SERVICE_${PN} = "hiawatha.service" - -inherit cmake update-rc.d systemd - -EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ - -DENABLE_CACHE=OFF \ - -DENABLE_DEBUG=OFF \ - -DENABLE_TLS=OFF \ - -DENABLE_TOOLKIT=OFF \ - -DENABLE_CHROOT=OFF \ - -DENABLE_XSLT=ON \ - -DENABLE_TOMAHAWK=OFF \ - -DCMAKE_INSTALL_MANDIR=${mandir} \ - -DCMAKE_INSTALL_BINDIR=${bindir} \ - -DCMAKE_INSTALL_SBINDIR=${sbindir} \ - -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \ - -DCMAKE_INSTALL_LIBDIR=${libdir} \ - -DCMAKE_INSTALL_FULL_LOCALSTATEDIR=${localstatedir}" - -do_install_append() { - # Copy over init script and sed in the correct sbin path - sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init - mkdir -p ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha - - # configure php-fcgi to have a working configuration - # by default if php is installed - echo "Server = ${bindir}/php-cgi ; 2 ; 127.0.0.1:2005 ; nobody:nobody ; ${sysconfdir}/php/hiawatha-php5/php.ini" >> ${D}${sysconfdir}/hiawatha/php-fcgi.conf - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/hiawatha.service ${D}/${systemd_unitdir}/system - fi - - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" "${D}${localstatedir}/run" -} - -CONFFILES_${PN} = " \ - ${sysconfdir}/hiawatha/cgi-wrapper.conf \ - ${sysconfdir}/hiawatha/hiawatha.conf \ - ${sysconfdir}/hiawatha/index.xslt \ - ${sysconfdir}/hiawatha/mimetype.conf \ - ${sysconfdir}/hiawatha/php-fcgi.conf \ -" - -FILES_${PN}-dev = "${libdir}/hiawatha/*${SOLIBSDEV}" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.11.bb b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.11.bb new file mode 100644 index 000000000..89910841f --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.11.bb @@ -0,0 +1,64 @@ +SUMMARY = "Lightweight secure web server" +HOMEPAGE = "http://www.hiawatha-webserver.org" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "libxml2 libxslt virtual/crypt" + +SECTION = "net" + +SRC_URI = "http://hiawatha-webserver.org/files/${BP}.tar.gz \ + file://hiawatha-init \ + file://hiawatha.service " + +SRC_URI[md5sum] = "6dcec72e94facbdc69b103006fa5819f" +SRC_URI[sha256sum] = "79d85d165d68dd7043bbd337f5bc7dd10d8632d68ba61d0e557f84bd687c9727" + +INITSCRIPT_NAME = "hiawatha" +INITSCRIPT_PARAMS = "defaults 70" + +SYSTEMD_SERVICE_${PN} = "hiawatha.service" + +inherit cmake update-rc.d systemd + +EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ + -DENABLE_CACHE=OFF \ + -DENABLE_DEBUG=OFF \ + -DENABLE_TLS=OFF \ + -DENABLE_TOOLKIT=OFF \ + -DENABLE_CHROOT=OFF \ + -DENABLE_XSLT=ON \ + -DENABLE_TOMAHAWK=OFF \ + -DCMAKE_INSTALL_MANDIR=${mandir} \ + -DCMAKE_INSTALL_BINDIR=${bindir} \ + -DCMAKE_INSTALL_SBINDIR=${sbindir} \ + -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \ + -DCMAKE_INSTALL_LIBDIR=${libdir} \ + -DCMAKE_INSTALL_FULL_LOCALSTATEDIR=${localstatedir}" + +do_install_append() { + # Copy over init script and sed in the correct sbin path + sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init + mkdir -p ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha + + # configure php-fcgi to have a working configuration + # by default if php is installed + echo "Server = ${bindir}/php-cgi ; 2 ; 127.0.0.1:2005 ; nobody:nobody ; ${sysconfdir}/php/hiawatha-php5/php.ini" >> ${D}${sysconfdir}/hiawatha/php-fcgi.conf + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/hiawatha.service ${D}/${systemd_unitdir}/system + fi + + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" "${D}${localstatedir}/run" +} + +CONFFILES_${PN} = " \ + ${sysconfdir}/hiawatha/cgi-wrapper.conf \ + ${sysconfdir}/hiawatha/hiawatha.conf \ + ${sysconfdir}/hiawatha/index.xslt \ + ${sysconfdir}/hiawatha/mimetype.conf \ + ${sysconfdir}/hiawatha/php-fcgi.conf \ +" + +FILES_${PN}-dev = "${libdir}/hiawatha/*${SOLIBSDEV}" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb deleted file mode 100644 index 559d251bd..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb +++ /dev/null @@ -1,77 +0,0 @@ -SUMMARY = "Fast and Lightweight HTTP Server for Linux" -HOMEPAGE = "http://monkey-project.com" -BUGTRACKER = "https://github.com/monkey/monkey/issues" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" - -SECTION = "net" - -DEPENDS_append_libc-musl = " libexecinfo" - -SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz \ - file://0001-configure-Respect-LIBS-variable-from-env.patch \ - file://monkey.service \ - file://monkey.init" - -SRC_URI[md5sum] = "9699e4c9ea6ce6b989907c252ae80254" -SRC_URI[sha256sum] = "7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22" - -UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" -UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+).tar.gz" - -EXTRA_OECONF = "--plugdir=${libdir}/monkey/ \ - --logdir=${localstatedir}/log/monkey/ \ - --pidfile=${localstatedir}/run/monkey.pid \ - --default-user=www-data \ - --datadir=${localstatedir}/www/monkey/ \ - --sysconfdir=${sysconfdir}/monkey/ \ - --enable-plugins=* \ - --disable-plugins=mbedtls \ - --debug \ - --malloc-libc" - -do_configure_prepend_libc-musl() { - export LIBS="-lexecinfo" -} - -DISABLE_STATIC = "" -CLEANBROKEN = "1" - -inherit autotools-brokensep pkgconfig update-rc.d systemd - -INITSCRIPT_NAME = "monkey" -INITSCRIPT_PARAMS = "defaults 70" - -SYSTEMD_SERVICE_${PN} = "monkey.service" - -FILES_${PN} += "${localstatedir}/www/monkey/" - -CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \ - ${sysconfdir}/monkey/sites/default \ - ${sysconfdir}/monkey/monkey.mime \ - ${sysconfdir}/monkey/plugins.load \ - ${sysconfdir}/monkey/plugins/proxy_reverse/proxy_reverse.conf \ - ${sysconfdir}/monkey/plugins/mandril/mandril.conf \ - ${sysconfdir}/monkey/plugins/fastcgi/fastcgi.conf \ - ${sysconfdir}/monkey/plugins/logger/logger.conf \ - ${sysconfdir}/monkey/plugins/cgi/cgi.conf \ - ${sysconfdir}/monkey/plugins/cheetah/cheetah.conf \ - ${sysconfdir}/monkey/plugins/dirlisting/dirhtml.conf \ - ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/header.theme \ - ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/footer.theme \ - ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/entry.theme \ - ${sysconfdir}/monkey/plugins/auth/README \ - ${sysconfdir}/monkey/plugins/auth/monkey.users \ - " - -do_install_append() { - - mkdir -p ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system - fi -} diff --git a/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb new file mode 100644 index 000000000..289f069b1 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -0,0 +1,78 @@ +SUMMARY = "Fast and Lightweight HTTP Server for Linux" +HOMEPAGE = "http://monkey-project.com" +BUGTRACKER = "https://github.com/monkey/monkey/issues" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +SECTION = "net" + +SRC_URI = "http://monkey-project.com/releases/1.6/monkey-${PV}.tar.gz \ + file://monkey.service \ + file://monkey.init" + +SRC_URI[sha256sum] = "f1122e89cda627123286542b0a18fcaa131cbe9d4f5dd897d9455157289148fb" + +UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" +UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+).tar.gz" + +EXTRA_OECMAKE = "-DINSTALL_LOGDIR=${localstatedir}/log/monkey/ \ + -DPID_FILE=${localstatedir}/run/monkey.pid \ + -DINSTALL_SYSCONFDIR=${sysconfdir}/monkey/ \ + -DWITH_PLUGINS=* \ + -DWITHOUT_PLUGINS=mbedtls \ + -DWITH_DEBUG=1 \ + -DDEFAULT_USER='www-data' \ + -DWITH_SYSTEM_MALLOC=1 \ + " + +EXTRA_OECMAKE_append_libc-musl = " -DWITH_MUSL=1 " + +# GCC-10+ defaults to -fno-common +CFLAGS += "-fcommon" + +DISABLE_STATIC = "" + +inherit cmake pkgconfig update-rc.d systemd + +OECMAKE_GENERATOR = "Unix Makefiles" + +do_install_append() { + rm -rf ${D}/run + install -Dm 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -Dm 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system/monkey.service + fi +} + +INITSCRIPT_NAME = "monkey" +INITSCRIPT_PARAMS = "defaults 70" + +SYSTEMD_SERVICE_${PN} = "monkey.service" + +PACKAGES += "${PN}-plugins" + +FILES_${PN}-plugins = "${libdir}/monkey-*.so" + +FILES_${PN} += "${localstatedir}/www/monkey/ /run" + + +CONFFILES_${PN} = "${sysconfdir}/monkey/monkey.conf \ + ${sysconfdir}/monkey/sites/default \ + ${sysconfdir}/monkey/monkey.mime \ + ${sysconfdir}/monkey/plugins.load \ + ${sysconfdir}/monkey/plugins/proxy_reverse/proxy_reverse.conf \ + ${sysconfdir}/monkey/plugins/mandril/mandril.conf \ + ${sysconfdir}/monkey/plugins/fastcgi/fastcgi.conf \ + ${sysconfdir}/monkey/plugins/logger/logger.conf \ + ${sysconfdir}/monkey/plugins/cgi/cgi.conf \ + ${sysconfdir}/monkey/plugins/cheetah/cheetah.conf \ + ${sysconfdir}/monkey/plugins/dirlisting/dirhtml.conf \ + ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/header.theme \ + ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/footer.theme \ + ${sysconfdir}/monkey/plugins/dirlisting/themes/guineo/entry.theme \ + ${sysconfdir}/monkey/plugins/auth/README \ + ${sysconfdir}/monkey/plugins/auth/monkey.users \ + " + diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.7.bb b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.7.bb deleted file mode 100644 index d13ef74fe..000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.7.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "A simple, fast and secure HTTP server" -HOMEPAGE = "http://www.nazgul.ch/dev_nostromo.html" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://src/nhttpd/main.c;beginline=2;endline=14;md5=0bb3711a867b9704d3bfabcf5529b64e" - -SRC_URI = "http://www.nazgul.ch/dev/${BPN}-${PV}.tar.gz \ - file://0001-GNUmakefile-add-possibility-to-override-variables.patch \ - file://nhttpd.conf \ - file://volatiles \ - file://tmpfiles.conf \ - file://nostromo \ -" - -SRC_URI[md5sum] = "6189714845b3ad5d0fc490f8cf48dacf" -SRC_URI[sha256sum] = "33c635f317fb441e10d5297bb4218ae0ea62c48f2fc3029c08f5d2167c6cdfca" - -TARGET_CC_ARCH += "${LDFLAGS}" - -DEPENDS = "openssl groff-native base-passwd virtual/crypt" - -inherit update-rc.d - -INITSCRIPT_NAME = "nostromo" -INITSCRIPT_PARAMS = "defaults 70" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}/${sbindir} - install -m 0755 src/nhttpd/nhttpd ${D}/${sbindir}/nhttpd - install -m 0755 src/tools/crypt ${D}/${sbindir}/crypt - install -d ${D}/${mandir}/man8 - install -m 0444 src/nhttpd/nhttpd.8 ${D}/${mandir}/man8/nhttpd.8 - install -d ${D}${localstatedir}/nostromo/conf - install -d ${D}${localstatedir}/nostromo/htdocs/cgi-bin - install -d ${D}${localstatedir}/nostromo/icons - install -d ${D}${sysconfdir}/init.d - install -m 0644 conf/mimes ${D}${localstatedir}/nostromo/conf/mimes - install -m 0644 ${WORKDIR}/nhttpd.conf ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/nostromo ${D}${sysconfdir}/init.d - install -D -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/nostromo - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -D -m 0644 ${WORKDIR}/tmpfiles.conf ${D}${sysconfdir}/tmpfiles.d/nostromo.conf - fi - install -m 0644 htdocs/index.html ${D}${localstatedir}/nostromo/htdocs/index.html - install -m 0644 htdocs/nostromo.gif ${D}${localstatedir}/nostromo/htdocs/nostromo.gif - install -m 0644 icons/dir.gif ${D}${localstatedir}/nostromo/icons/dir.gif - install -m 0644 icons/file.gif ${D}${localstatedir}/nostromo/icons/file.gif - chown -R www-data:www-data ${D}/${localstatedir}/nostromo -} - -CONFFILES_${PN} += "/var/nostromo/conf/mimes ${sysconfdir}/nhttpd.conf" - -pkg_postinst_${PN} () { - if [ -z "$D" ]; then - if [ -e /sys/fs/cgroup/systemd ]; then - systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/nostromo.conf - elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then - ${sysconfdir}/init.d/populate-volatile.sh update - fi - fi -} diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb new file mode 100644 index 000000000..e726c9ac6 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.9.bb @@ -0,0 +1,64 @@ +SUMMARY = "A simple, fast and secure HTTP server" +HOMEPAGE = "http://www.nazgul.ch/dev_nostromo.html" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://src/nhttpd/main.c;beginline=2;endline=14;md5=0bb3711a867b9704d3bfabcf5529b64e" + +SRC_URI = "http://www.nazgul.ch/dev/${BPN}-${PV}.tar.gz \ + file://0001-GNUmakefile-add-possibility-to-override-variables.patch \ + file://nhttpd.conf \ + file://volatiles \ + file://tmpfiles.conf \ + file://nostromo \ +" + +SRC_URI[md5sum] = "a054eb8e09560082793aaad676e33bd3" +SRC_URI[sha256sum] = "1fad0a28d934835b582cedc98857e12e5adb991b14b87b52b39e6a501f4a9486" + +TARGET_CC_ARCH += "${LDFLAGS}" + +DEPENDS = "openssl groff-native base-passwd virtual/crypt" + +inherit update-rc.d + +INITSCRIPT_NAME = "nostromo" +INITSCRIPT_PARAMS = "defaults 70" + +do_compile() { + oe_runmake +} + +do_install() { + install -d ${D}/${sbindir} + install -m 0755 src/nhttpd/nhttpd ${D}/${sbindir}/nhttpd + install -m 0755 src/tools/crypt ${D}/${sbindir}/crypt + install -d ${D}/${mandir}/man8 + install -m 0444 src/nhttpd/nhttpd.8 ${D}/${mandir}/man8/nhttpd.8 + install -d ${D}${localstatedir}/nostromo/conf + install -d ${D}${localstatedir}/nostromo/htdocs/cgi-bin + install -d ${D}${localstatedir}/nostromo/icons + install -d ${D}${sysconfdir}/init.d + install -m 0644 conf/mimes ${D}${localstatedir}/nostromo/conf/mimes + install -m 0644 ${WORKDIR}/nhttpd.conf ${D}${sysconfdir} + install -m 0755 ${WORKDIR}/nostromo ${D}${sysconfdir}/init.d + install -D -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/nostromo + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -D -m 0644 ${WORKDIR}/tmpfiles.conf ${D}${sysconfdir}/tmpfiles.d/nostromo.conf + fi + install -m 0644 htdocs/index.html ${D}${localstatedir}/nostromo/htdocs/index.html + install -m 0644 htdocs/nostromo.gif ${D}${localstatedir}/nostromo/htdocs/nostromo.gif + install -m 0644 icons/dir.gif ${D}${localstatedir}/nostromo/icons/dir.gif + install -m 0644 icons/file.gif ${D}${localstatedir}/nostromo/icons/file.gif + chown -R www-data:www-data ${D}/${localstatedir}/nostromo +} + +CONFFILES_${PN} += "/var/nostromo/conf/mimes ${sysconfdir}/nhttpd.conf" + +pkg_postinst_${PN} () { + if [ -z "$D" ]; then + if [ -e /sys/fs/cgroup/systemd ]; then + systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/nostromo.conf + elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi + fi +} diff --git a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch new file mode 100644 index 000000000..53280581b --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings/imsettings-gcc10.patch @@ -0,0 +1,31 @@ +Fix build with -fno-common + +Imported from https://src.fedoraproject.org/rpms/imsettings/raw/master/f/imsettings-gcc10.patch + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +diff -pruN imsettings-1.8.2.orig/imsettings-daemon/imsettings-proc.c imsettings-1.8.2/imsettings-daemon/imsettings-proc.c +--- imsettings-1.8.2.orig/imsettings-daemon/imsettings-proc.c 2019-01-18 20:52:58.000000000 +0900 ++++ imsettings-1.8.2/imsettings-daemon/imsettings-proc.c 2020-01-29 13:33:07.051676780 +0900 +@@ -84,7 +84,7 @@ static gboolean _stop_process + + G_DEFINE_TYPE_WITH_PRIVATE (IMSettingsProc, imsettings_proc, G_TYPE_OBJECT); + +-guint signals[LAST_SIGNAL] = { 0 }; ++static guint signals[LAST_SIGNAL] = { 0 }; + + /*< private >*/ + static gboolean +diff -pruN imsettings-1.8.2.orig/imsettings-daemon/imsettings-server.c imsettings-1.8.2/imsettings-daemon/imsettings-server.c +--- imsettings-1.8.2.orig/imsettings-daemon/imsettings-server.c 2019-11-14 14:08:03.000000000 +0900 ++++ imsettings-1.8.2/imsettings-daemon/imsettings-server.c 2020-01-29 13:32:50.827832726 +0900 +@@ -91,7 +91,7 @@ GDBusInterfaceVTable __iface_vtable = { + NULL, + NULL, + }; +-guint signals[LAST_SIGNAL]; ++static guint signals[LAST_SIGNAL]; + + G_DEFINE_TYPE_WITH_PRIVATE (IMSettingsServer, imsettings_server, G_TYPE_OBJECT); + G_LOCK_DEFINE_STATIC (logger); diff --git a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb deleted file mode 100644 index c8f495edb..000000000 --- a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Delivery framework for general Input Method configuration" -DESCRIPTION = "IMSettings is a framework that delivers Input Method \ -settings and applies the changes so they take effect \ -immediately without any need to restart applications \ -or the desktop. \ -This package contains the core DBus services and some utilities." -HOMEPAGE = "http://code.google.com/p/imsettings/" -SECTION = "Applications/System" - -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -inherit autotools gtk-doc gobject-introspection gettext features_check - -DEPENDS = "gtk+3 libnotify" - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "c04341a008d8c60e1532f033f4020f44" -SRC_URI[sha256sum] = "ebf578299a10c6a1fea9047be6577df6d2b6470d3cc9d40f8a6589a3c13c4c8b" - -EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \ - --disable-static \ - " - -PACKAGECONFIG ??= "xfce" -PACKAGECONFIG[xfce] = ",,xfconf" -PACKAGECONFIG[xim] = ",,libgxim" - -RDEPENDS_${PN} += "bash" - -FILES_${PN} += "${datadir}/dbus-1/*" diff --git a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb new file mode 100644 index 000000000..bb7ff4235 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.2.bb @@ -0,0 +1,34 @@ +SUMMARY = "Delivery framework for general Input Method configuration" +DESCRIPTION = "IMSettings is a framework that delivers Input Method \ +settings and applies the changes so they take effect \ +immediately without any need to restart applications \ +or the desktop. \ +This package contains the core DBus services and some utilities." +HOMEPAGE = "http://code.google.com/p/imsettings/" +SECTION = "Applications/System" + +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +inherit autotools gtk-doc gobject-introspection gettext features_check + +DEPENDS = "gtk+3 libnotify" + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ + file://imsettings-gcc10.patch \ + " +SRC_URI[sha256sum] = "412abf3165dbee3cbe03db0c296bab103569a49029429d038569c586ebe9efa9" + +EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \ + --disable-static \ + " + +PACKAGECONFIG ??= "xfce" +PACKAGECONFIG[xfce] = ",,xfconf" +PACKAGECONFIG[xim] = ",,libgxim" + +RDEPENDS_${PN} += "bash" + +FILES_${PN} += "${datadir}/dbus-1/*" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch new file mode 100644 index 000000000..d5238d00f --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch @@ -0,0 +1,33 @@ +Fix build with -fno-common + +Part of Patch from https://src.fedoraproject.org/rpms/xfce4-cpufreq-plugin/raw/master/f/xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- a/panel-plugin/xfce4-cpufreq-plugin.c ++++ b/panel-plugin/xfce4-cpufreq-plugin.c +@@ -37,7 +37,8 @@ + #include "xfce4-cpufreq-linux.h" + #endif /* __linux__ */ + +- ++CpuFreqPlugin *cpuFreq; ++GtkCssProvider *currentProvider; + + void + cpufreq_label_set_font (void) +--- a/panel-plugin/xfce4-cpufreq-plugin.h ++++ b/panel-plugin/xfce4-cpufreq-plugin.h +@@ -93,9 +93,9 @@ typedef struct + gint timeoutHandle; + } CpuFreqPlugin; + +-CpuFreqPlugin *cpuFreq; ++extern CpuFreqPlugin *cpuFreq; + +-GtkCssProvider *currentProvider; ++extern GtkCssProvider *currentProvider; + + G_BEGIN_DECLS + diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb index 6addc3b65..5dce51b92 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.1.bb @@ -7,4 +7,6 @@ inherit xfce-panel-plugin SRC_URI[md5sum] = "ccd8f0f7aef51bc4caf1049986d9614f" SRC_URI[sha256sum] = "c5e044c0dc401d2066f208a3df82a588b3e51ff01425f155d0a1d0f8fce8f5b5" -SRC_URI += "file://0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch" +SRC_URI += "file://0001-Fix-memory-leak-and-reduce-cpu-load-slightly.patch \ + file://xfce4-cpufreq-plugin-1.2.1-gcc10-common.patch \ + " diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.0.bb deleted file mode 100644 index e5c21a1ac..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Panel plugin with graphical representation of the cpu frequency" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "6e274ceda37c7a8ae0821d9d49e965e9" -SRC_URI[sha256sum] = "fdae00036383105a15d12e9809abd5945a8f2152b17e16ccdfbfe5bd9733f29d" - -FILES_${PN} += "${datadir}/xfce4/eyes" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.1.bb new file mode 100644 index 000000000..3d8bc854f --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "Panel plugin with graphical representation of the cpu frequency" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "4db780178e529391d53da180e49386904e69a5a33b3bd5185835d0a7e6ff5ac5" + +FILES_${PN} += "${datadir}/xfce4/eyes" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch new file mode 100644 index 000000000..30cb487c8 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch @@ -0,0 +1,118 @@ +From 6c6de7c07290248a3c72a50c7790885ee4bc13a2 Mon Sep 17 00:00:00 2001 +From: Robin Lee +Date: Mon, 24 Feb 2020 17:52:39 +0800 +Subject: [PATCH] Fix multiple definition errors under GCC 10.0 + +Fixes #16436, RHBZ#1800268 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + include/sensors-interface-common.h | 22 ++++++++++++++-------- + lib/sensors-interface-common.c | 1 + + 2 files changed, 15 insertions(+), 8 deletions(-) + +diff --git a/include/sensors-interface-common.h b/include/sensors-interface-common.h +index 62a27eb..05146c5 100644 +--- a/include/sensors-interface-common.h ++++ b/include/sensors-interface-common.h +@@ -146,6 +146,12 @@ t_sensors_dialog; + + + ++#ifdef XFCE4_SENSORS_INTERFACE_COMMON_DEFINING ++#define EXTERN ++#else ++#define EXTERN extern ++#endif ++ + /* Extern functions that need to be re-implemented in the sensors-viewer and + * the panel code. + * They kind of need to be registered at the library by any software +@@ -157,7 +163,7 @@ t_sensors_dialog; + * @param ptr_widget: Pointer to original widget, i.e, the update timer box + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*adjustment_value_changed) (GtkWidget *ptr_widget, + t_sensors_dialog *ptr_sensorsdialog); + +@@ -167,7 +173,7 @@ void + * @param ptr_widget: Pointer to original widget, i.e, the sensor entry combobox + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*sensor_entry_changed) (GtkWidget *ptr_widget, + t_sensors_dialog *ptr_sensorsdialog); + +@@ -178,7 +184,7 @@ void + * @param ptr_str_newtext: Pointer to the string containing the new label + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*list_cell_text_edited) (GtkCellRendererText *ptr_cellrenderertext, + gchar *ptr_str_path, gchar *ptr_str_newtext, + t_sensors_dialog *ptr_sensorsdialog); +@@ -189,7 +195,7 @@ void + * @param ptr_str_path: pointer to the string with the path of the changed item + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*list_cell_toggle) (GtkCellRendererToggle *ptr_cellrenderertoggle, gchar *ptr_str_path, + t_sensors_dialog *ptr_sensorsdialog); + +@@ -201,7 +207,7 @@ void + * hexadecimal rgb format #0011ff + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*list_cell_color_edited) (GtkCellRendererText *ptr_cellrenderertext, + gchar *ptr_str_path, gchar *ptr_str_newcolor, + t_sensors_dialog *ptr_sensorsdialog); +@@ -214,7 +220,7 @@ void + * temperature + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*minimum_changed) (GtkCellRendererText *ptr_cellrenderertext, gchar *ptr_str_path, + gchar *ptr_str_newmin, t_sensors_dialog *ptr_sensorsdialog); + +@@ -226,7 +232,7 @@ void + * temperature + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*maximum_changed) (GtkCellRendererText *ptr_cellrenderertext, gchar *ptr_str_path, + gchar *ptr_str_newmax, t_sensors_dialog *ptr_sensorsdialog); + +@@ -236,7 +242,7 @@ void + * @param ptr_widget: Pointer to original widget, i.e, the update timer box + * @param ptr_sensorsdialog: argument pointer to sensors dialog data + */ +-void ++EXTERN void + (*temperature_unit_change) (GtkWidget *ptr_widget, + t_sensors_dialog *ptr_sensorsdialog); + +diff --git a/lib/sensors-interface-common.c b/lib/sensors-interface-common.c +index 70aa154..8c79f1d 100644 +--- a/lib/sensors-interface-common.c ++++ b/lib/sensors-interface-common.c +@@ -28,6 +28,7 @@ + #include + + /* Local/package includes */ ++#define XFCE4_SENSORS_INTERFACE_COMMON_DEFINING + #include + #include + #include +-- +2.24.1 + diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb index 3fd0ff6cf..aa5fe019d 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb @@ -7,7 +7,9 @@ inherit xfce-panel-plugin SRC_URI[md5sum] = "7327c4c316ebd5d93665e77b432b8d89" SRC_URI[sha256sum] = "3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112" -SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" +SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch \ + file://0001-Fix-multiple-definition-errors-under-GCC-10.0.patch \ + " EXTRA_OECONF = " \ --disable-procacpi \ diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb deleted file mode 100644 index 2ddc6f67c..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "XFCE panel plugin to generate alarm messages" -DESCRIPTION = "This is a simple plugin that lets the user run an alarm at a specified time or at the end of a specified countdown period" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=ae39271267fd63eb7619432ff24e7ff1" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "32e6a14e80bf9a93db2f2b3bfd7de920" -SRC_URI[sha256sum] = "2e4e5343e39926230cc981d5fe56cd58a2f3817d2e9b6089b5673a2e39bf7e9b" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.1.bb new file mode 100644 index 000000000..f154023e2 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "XFCE panel plugin to generate alarm messages" +DESCRIPTION = "This is a simple plugin that lets the user run an alarm at a specified time or at the end of a specified countdown period" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=ae39271267fd63eb7619432ff24e7ff1" + +inherit xfce-panel-plugin + +SRC_URI[md5sum] = "e0df5b6be30993719d084fc4f78a6218" +SRC_URI[sha256sum] = "4b52d2911b1949e945971be6533155ee6ba99c77078eac7fd43b0f2aeca824e3" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.5.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.5.bb deleted file mode 100644 index 65ceb8c54..000000000 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.5.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "An alternate menu for the Xfce desktop environment" -HOMEPAGE = "http://gottcode.org/xfce4-whiskermenu-plugin/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -inherit xfce-panel-plugin cmake - -SRC_URI[md5sum] = "adb064538b2e2cbc7ddd1d8ac57cec36" -SRC_URI[sha256sum] = "f5241910ea6411840b8c9f9471f0d262ab0583150bb82f9b280eccbaadb0ebbe" - -RRECOMMENDS_${PN} += "menulibre" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.6.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.6.bb new file mode 100644 index 000000000..bbb274ed9 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.4.6.bb @@ -0,0 +1,11 @@ +SUMMARY = "An alternate menu for the Xfce desktop environment" +HOMEPAGE = "http://gottcode.org/xfce4-whiskermenu-plugin/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-panel-plugin cmake + +SRC_URI[md5sum] = "81a4a4c7635273485fac5c2d98e48d02" +SRC_URI[sha256sum] = "8974d38cc87df528693efe4b6e14bcd233cdb49d2018a23ddddf745110b25744" + +RRECOMMENDS_${PN} += "menulibre" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.8.bb b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.8.bb deleted file mode 100644 index e0d4845a0..000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.8.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "Thumbnail service implementing the thumbnail management D-Bus specification" -SECTION = "x11/libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf" - -inherit xfce gtk-doc - -SRC_URI[md5sum] = "5d541608b3962fd2b16e23a266fd7a10" -SRC_URI[sha256sum] = "0999b9a3deb57010956db6630ae7205813999147043171049a7b6c333be93e96" - -INSANE_SKIP_${PN} = "dev-so" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gstreamer-thumbnailer] = "--enable-gstreamer-thumbnailer,--disable-gstreamer-thumbnailer,gstreamer1.0 gstreamer1.0-plugins-base" - -do_install_append() { - # Makefile seems to race on creation of symlink. So ensure creation here - # until fixed properly - ln -sf tumbler-xdg-cache.so ${D}${libdir}/tumbler-1/plugins/cache/tumbler-cache-plugin.so -} - -FILES_${PN} += "${datadir}/dbus-1/services \ - ${libdir}/tumbler-1/tumblerd \ - ${libdir}/tumbler-1/plugins/*.so \ - ${libdir}/tumbler-1/plugins/cache/*.so \ -" - -FILES_${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ - ${libdir}/tumbler-1/plugins/cache/*.la \ -" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.9.bb b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.9.bb new file mode 100644 index 000000000..d364c8033 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.9.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Thumbnail service implementing the thumbnail management D-Bus specification" +SECTION = "x11/libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf" + +inherit xfce gtk-doc + +SRC_URI[sha256sum] = "6508906f03e5a6ae3f6503b71b056df47d336d5504f39df6ce0bb9c5248007b6" + +INSANE_SKIP_${PN} = "dev-so" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gstreamer-thumbnailer] = "--enable-gstreamer-thumbnailer,--disable-gstreamer-thumbnailer,gstreamer1.0 gstreamer1.0-plugins-base" + +do_install_append() { + # Makefile seems to race on creation of symlink. So ensure creation here + # until fixed properly + ln -sf tumbler-xdg-cache.so ${D}${libdir}/tumbler-1/plugins/cache/tumbler-cache-plugin.so +} + +FILES_${PN} += "${datadir}/dbus-1/services \ + ${libdir}/tumbler-1/tumblerd \ + ${libdir}/tumbler-1/plugins/*.so \ + ${libdir}/tumbler-1/plugins/cache/*.so \ +" + +FILES_${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ + ${libdir}/tumbler-1/plugins/cache/*.la \ +" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb deleted file mode 100644 index b6066a526..000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.2.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Xfce4 Window Manager" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama exo-native" - -inherit xfce update-alternatives features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += "file://0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch" -SRC_URI[md5sum] = "6d61d07b6ea88a429c43e1b9c3293eb8" -SRC_URI[sha256sum] = "b15b40342596a3b6ab5167a58371262adf5484e165cb25a31fef42f0aa8ffd92" - -PACKAGECONFIG ?= " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ - xpresent \ - startup-notification \ -" - -PACKAGECONFIG[epoxy] = "--enable-epoxy,--disable-epoxy,libepoxy" -PACKAGECONFIG[xpresent] = "--enable-xpresent,--disable-xpresent,libxpresent" -PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" - -python populate_packages_prepend () { - themedir = d.expand('${datadir}/themes') - do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) -} - -PACKAGES_DYNAMIC += "^xfwm4-theme-.*" - -ALTERNATIVE_${PN} = "x-window-manager" -ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4" -ALTERNATIVE_PRIORITY[x-window-manager] = "30" - -RDEPENDS_${PN} = "xfwm4-theme-default" -FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ - ${datadir}/xfwm4/defaults \ -" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb new file mode 100644 index 000000000..f8febe804 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.14.5.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "Xfce4 Window Manager" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama exo-native" + +inherit xfce update-alternatives features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI += "file://0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch" +SRC_URI[sha256sum] = "d7a7c63fa42ec6d7cb3caab130d6f496be5bd7689b775d20e8786b7f3e282930" + +PACKAGECONFIG ?= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ + xpresent \ + startup-notification \ +" + +PACKAGECONFIG[epoxy] = "--enable-epoxy,--disable-epoxy,libepoxy" +PACKAGECONFIG[xpresent] = "--enable-xpresent,--disable-xpresent,libxpresent" +PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" + +python populate_packages_prepend () { + themedir = d.expand('${datadir}/themes') + do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True) +} + +PACKAGES_DYNAMIC += "^xfwm4-theme-.*" + +ALTERNATIVE_${PN} = "x-window-manager" +ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/xfwm4" +ALTERNATIVE_PRIORITY[x-window-manager] = "30" + +RDEPENDS_${PN} = "xfwm4-theme-default" +FILES_${PN} += "${libdir}/xfce4/xfwm4/helper-dialog \ + ${datadir}/xfwm4/defaults \ +" -- cgit v1.2.3 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 --- .../meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb | 1 + .../meta-gnome/recipes-gnome/gjs/gjs_1.58.7.bb | 37 - .../meta-gnome/recipes-gnome/gjs/gjs_1.58.8.bb | 36 + .../gnome-desktop/gnome-desktop3_3.36.5.bb | 37 - .../gnome-desktop/gnome-desktop3_3.36.6.bb | 37 + .../gnome-settings-daemon_3.36.1.bb | 2 - .../meta-gnome/recipes-gnome/grilo/grilo_0.3.12.bb | 29 - .../meta-gnome/recipes-gnome/grilo/grilo_0.3.13.bb | 28 + .../recipes-gnome/gspell/gspell_1.8.3.bb | 11 - .../recipes-gnome/gspell/gspell_1.8.4.bb | 10 + .../recipes-gnome/libgdata/libgdata_0.17.12.bb | 34 - .../recipes-gnome/libgdata/libgdata_0.17.13.bb | 33 + .../recipes-gnome/tracker/tracker-miners_2.3.3.bb | 72 - .../recipes-gnome/tracker/tracker-miners_2.3.5.bb | 71 + .../recipes-gnome/tracker/tracker_2.3.4.bb | 52 - .../recipes-gnome/tracker/tracker_2.3.6.bb | 51 + .../recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb | 2 +- meta-openembedded/meta-multimedia/README | 2 +- .../licenses/AOM-Patent-License-1.0 | 108 + .../recipes-multimedia/aom/aom_2.0.0.bb | 20 + .../recipes-multimedia/libuvc/libuvc.bb | 14 + .../packagegroups/packagegroup-meta-multimedia.bb | 2 + .../recipes-multimedia/vlc/vlc_3.0.11.1.bb | 134 + .../recipes-multimedia/vlc/vlc_3.0.11.bb | 134 - .../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 + .../recipes-daemons/ippool/ippool/ippool.service | 1 - .../arno-iptables-firewall_2.1.0.bb | 33 - .../arno-iptables-firewall_2.1.1.bb | 33 + .../meta-networking/recipes-irc/znc/znc_1.8.1.bb | 32 - .../meta-networking/recipes-irc/znc/znc_1.8.2.bb | 32 + .../recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb | 2 +- .../recipes-support/cifs/cifs-utils_6.11.bb | 2 - .../recipes-support/ifenslave/ifenslave_2.11.bb | 2 +- .../recipes-support/ssmtp/ssmtp_2.64.bb | 10 +- ...lete-setting-regarding-the-Standard-Outpu.patch | 34 + .../recipes-support/strongswan/strongswan_5.8.4.bb | 1 + meta-openembedded/meta-oe/README | 4 +- .../recipes-benchmark/iozone3/iozone3_490.bb | 2 +- ...ugetlbfs-fix-Ttext-segment-argument-on-AA.patch | 210 + .../libhugetlbfs/libhugetlbfs_git.bb | 1 + .../0001-Define-mword16-and-mword8-once.patch | 57 - .../recipes-benchmark/memtester/memtester_4.3.0.bb | 26 - .../recipes-benchmark/memtester/memtester_4.4.0.bb | 25 + .../meta-oe/recipes-connectivity/ace/ace_6.5.10.bb | 2 +- .../recipes-connectivity/zeromq/cppzmq_git.bb | 4 +- .../packagegroups/packagegroup-meta-oe.bb | 3 + .../0001-cmake-Add-check-for-atomic-support.patch | 23 +- .../0001-cmake-Use-exported-target-for-bz2.patch | 43 + .../0001-db-write_thread.cc-Initialize-state.patch | 31 - .../meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 9 +- .../dnf-plugin-tui/dnf-plugin-tui_git.bb | 4 +- .../meta-oe/recipes-devtools/musl/musl-nscd_git.bb | 37 + .../0001-byacc-do-not-reorder-CC-and-CFLAGS.patch | 39 +- .../recipes-extended/byacc/byacc_20200330.bb | 11 - .../recipes-extended/byacc/byacc_20200910.bb | 11 + .../recipes-extended/collectd/collectd_5.12.0.bb | 2 + ...keLists.txt-use-curl-local-source-tarball.patch | 34 + ...SSL.cmake-use-libressl-local-source-tarba.patch | 32 + ...edOSSPUUID.cmake-use-ossp-uuid-local-sour.patch | 34 + .../minifi-cpp/files/minifi.service | 2 +- .../minifi-cpp/files/systemd-volatile.conf | 1 - .../minifi-cpp/files/sysvinit-volatile.conf | 1 - .../minifi-cpp/minifi-cpp_0.7.0.bb | 45 +- .../meta-oe/recipes-extended/redis/redis_6.0.7.bb | 66 - .../meta-oe/recipes-extended/redis/redis_6.0.8.bb | 66 + .../smartmontools/files/smartd.service | 1 - .../recipes-graphics/gphoto2/libgphoto2_2.5.25.bb | 6 + .../recipes-graphics/jasper/jasper_2.0.20.bb | 24 - .../recipes-graphics/jasper/jasper_2.0.22.bb | 24 + .../meta-oe/recipes-graphics/suckless/st_0.8.4.bb | 10 + .../ttf-fonts/ttf-hunkyfonts_0.3.1.bb | 2 +- .../recipes-multimedia/live555/live555_20200721.bb | 62 - .../recipes-multimedia/live555/live555_20200819.bb | 62 + .../recipes-multimedia/mplayer/mpv_0.32.0.bb | 1 - .../meta-oe/recipes-support/glog/glog_0.3.5.bb | 7 + .../meta-oe/recipes-support/libgpiod/libgpiod.inc | 19 - .../recipes-support/libgpiod/libgpiod_0.3.3.bb | 8 - .../recipes-support/libgpiod/libgpiod_1.4.4.bb | 26 +- .../recipes-support/libssh2/files/run-ptest | 7 + .../recipes-support/libssh2/libssh2_1.9.0.bb | 17 +- ...efile-replace-perl-with-sed-in-install-ta.patch | 40 + .../multipath-tools/multipath-tools_0.8.4.bb | 1 + .../0001-numademo-fix-error-on-32bit-system.patch | 100 - .../meta-oe/recipes-support/numactl/numactl_git.bb | 8 +- .../recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb | 58 - .../recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb | 58 + .../tbb/tbb/improve-reproducibility.patch | 30 + .../meta-oe/recipes-support/tbb/tbb_2020.2.bb | 45 - .../meta-oe/recipes-support/tbb/tbb_2020.3.bb | 46 + .../recipes-support/utouch/utouch-evemu_git.bb | 2 +- .../recipes-support/utouch/utouch-frame_git.bb | 2 +- .../recipes-support/utouch/utouch-mtview_git.bb | 2 +- .../vboxguestdrivers/021-linux-5-8.patch | 5046 -------------------- .../vboxguestdrivers/vboxguestdrivers_6.1.12.bb | 83 - .../vboxguestdrivers/vboxguestdrivers_6.1.14.bb | 82 + .../meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb | 39 + .../cmocka/files/cmocka-uintptr_t.patch | 53 + .../meta-oe/recipes-test/cmocka/files/run-ptest | 10 + .../python-h2/python3-h2_3.2.0.bb | 12 - .../python-h2/python3-h2_4.0.0.bb | 12 + .../packagegroups/packagegroup-meta-python.bb | 8 +- .../python/python-flask-uploads.inc | 12 - .../recipes-devtools/python/python-pycrypto.inc | 21 - .../python/python-pycrypto/CVE-2013-7459.patch | 98 - .../python/python-pycrypto/cross-compiling.patch | 23 - ...y-move-pytest-runner-to-test_requirements.patch | 32 - .../python/python3-argcomplete_1.12.1.bb | 18 + .../python/python3-beautifulsoup4_4.9.1.bb | 17 - .../python/python3-beautifulsoup4_4.9.3.bb | 17 + .../recipes-devtools/python/python3-cbor2_5.1.2.bb | 30 - .../recipes-devtools/python/python3-cbor2_5.2.0.bb | 30 + .../recipes-devtools/python/python3-cmd2_1.3.11.bb | 20 + .../recipes-devtools/python/python3-cmd2_1.3.9.bb | 20 - .../python/python3-colorlog_4.2.1.bb | 11 - .../python/python3-colorlog_4.4.0.bb | 11 + .../python/python3-configparser_5.0.0.bb | 14 - .../python/python3-configparser_5.0.1.bb | 14 + .../python/python3-cryptography-vectors_3.1.1.bb | 20 + .../python/python3-cryptography-vectors_3.1.bb | 20 - .../python/python3-cryptography_3.1.1.bb | 66 + .../python/python3-cryptography_3.1.bb | 66 - .../python/python3-dateutil_2.8.1.bb | 2 +- .../python/python3-djangorestframework_3.11.1.bb | 16 - .../python/python3-djangorestframework_3.12.1.bb | 16 + .../python/python3-docopt_0.6.2.bb | 11 + .../python/python3-flask-uploads_0.2.1.bb | 14 +- .../python/python3-gevent_20.6.2.bb | 34 - .../python/python3-gevent_20.9.0.bb | 34 + .../python3-google-api-python-client_1.12.1.bb | 9 - .../python3-google-api-python-client_1.12.3.bb | 9 + .../python/python3-greenlet_0.4.16.bb | 9 - .../python/python3-greenlet_0.4.17.bb | 9 + .../python/python3-humanize_2.6.0.bb | 20 - .../python/python3-humanize_3.0.1.bb | 20 + .../python/python3-importlib-metadata_1.7.0.bb | 18 - .../python/python3-importlib-metadata_2.0.0.bb | 18 + .../python/python3-iniconfig_1.0.1.bb | 8 + .../recipes-devtools/python/python3-isort_5.5.2.bb | 17 - .../recipes-devtools/python/python3-isort_5.5.4.bb | 17 + .../python/python3-jinja2/run-ptest | 3 - .../python/python3-jinja2_2.%.bbappend | 2 + .../python/python3-jinja2_2.11.2.bb | 43 - .../python/python3-langtable_0.0.52.bb | 24 - .../python/python3-langtable_0.0.53.bb | 24 + .../python/python3-luma-core_1.16.1.bb | 20 - .../python/python3-luma-core_1.17.1.bb | 20 + .../python/python3-luma-oled_3.5.0.bb | 20 - .../python/python3-luma-oled_3.6.0.bb | 20 + .../python/python3-markdown_3.2.2.bb | 14 - .../python/python3-markdown_3.3.bb | 13 + .../python/python3-markupsafe/run-ptest | 3 - .../python/python3-markupsafe_1.%.bbappend | 2 + .../python/python3-markupsafe_1.1.1.bb | 27 - .../python/python3-multidict_4.7.6.bb | 25 - .../python/python3-multidict_5.0.0.bb | 25 + .../python/python3-nocasedict_1.0.0.bb | 9 - .../python/python3-nocasedict_1.0.1.bb | 9 + .../python/python3-nocaselist_1.0.2.bb | 9 - .../python/python3-nocaselist_1.0.3.bb | 9 + .../python/python3-paho-mqtt_1.5.0.bb | 24 - .../python/python3-paho-mqtt_1.5.1.bb | 24 + .../python/python3-pandas_1.1.2.bb | 25 - .../python/python3-pandas_1.1.3.bb | 25 + .../recipes-devtools/python/python3-pint_0.16.1.bb | 36 + .../recipes-devtools/python/python3-pint_0.16.bb | 36 - .../python/python3-prettytable_0.7.2.bb | 37 - .../python/python3-prettytable_1.0.1.bb | 39 + .../python/python3-pybind11_2.5.0.bb | 2 + .../python/python3-pychromecast_7.3.0.bb | 11 - .../python/python3-pychromecast_7.5.0.bb | 11 + .../python/python3-pycrypto/CVE-2013-7459.patch | 98 + .../python/python3-pycrypto/cross-compiling.patch | 23 + .../python/python3-pycrypto_2.6.1.bb | 24 +- .../0001-rule.py-fix-missing-comma.patch | 34 + .../python/python3-pykwalify_1.7.0.bb | 5 +- .../python/python3-pyperclip_1.8.0.bb | 15 - .../python/python3-pyperclip_1.8.1.bb | 15 + .../python/python3-pystemd_0.7.0.bb | 13 - .../python/python3-pystemd_0.8.0.bb | 13 + ...ove-the-setup_requires-for-setuptools-scm.patch | 35 +- .../python/python3-pytest_5.4.3.bb | 37 - .../python/python3-pytest_6.1.0.bb | 38 + .../python/python3-regex_2020.10.11.bb | 11 + .../python/python3-regex_2020.7.14.bb | 11 - .../python/python3-rfc3339-validator_0.1.1.bb | 25 - .../python/python3-rfc3339-validator_0.1.2.bb | 21 + .../python/python3-sentry-sdk_0.17.5.bb | 12 - .../python/python3-sentry-sdk_0.18.0.bb | 12 + .../recipes-devtools/python/python3-smbus_4.1.bb | 2 +- .../recipes-devtools/python/python3-tqdm_4.49.0.bb | 13 - .../recipes-devtools/python/python3-tqdm_4.50.2.bb | 13 + .../python/python3-xlsxwriter_1.3.3.bb | 14 - .../python/python3-xlsxwriter_1.3.6.bb | 14 + .../recipes-devtools/python/python3-yarl_1.5.1.bb | 29 - .../recipes-devtools/python/python3-yarl_1.6.0.bb | 29 + .../recipes-devtools/python/python3-zipp_3.1.0.bb | 19 - .../recipes-devtools/python/python3-zipp_3.3.0.bb | 19 + .../pywbem/python3-pywbem_1.0.2.bb | 48 - .../pywbem/python3-pywbem_1.1.0.bb | 48 + .../pywbemtools/python3-pywbemtools_0.7.1.bb | 40 - .../pywbemtools/python3-pywbemtools_0.7.3.bb | 40 + .../xfce4-notifyd/xfce4-notifyd_0.6.1.bb | 34 - .../xfce4-notifyd/xfce4-notifyd_0.6.2.bb | 33 + 212 files changed, 3169 insertions(+), 7477 deletions(-) delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.58.7.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.58.8.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.5.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.6.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.12.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.13.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.3.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.4.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.12.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.13.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.5.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.6.bb create mode 100644 meta-openembedded/meta-multimedia/licenses/AOM-Patent-License-1.0 create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_2.0.0.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/libuvc/libuvc.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.bb 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 delete mode 100644 meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb delete mode 100644 meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.4.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-db-write_thread.cc-Initialize-state.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200330.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200910.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-CMakeLists.txt-use-curl-local-source-tarball.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0002-cmake-LibreSSL.cmake-use-libressl-local-source-tarba.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.20.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.22.bb delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200721.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200819.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc delete mode 100644 meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest create mode 100644 meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/021-linux-5-8.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb create mode 100644 meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch create mode 100644 meta-openembedded/meta-oe/recipes-test/cmocka/files/run-ptest delete mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_3.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_4.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-flask-uploads.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/CVE-2013-7459.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/cross-compiling.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-rfc3339-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.9.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.9.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.11.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.9.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.2.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.4.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_5.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_5.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.11.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-docopt_0.6.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_20.6.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_20.9.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.16.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.17.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_2.6.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_1.7.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_2.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-iniconfig_1.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.5.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.5.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.11.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.52.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.53.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.16.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.17.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.5.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.6.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.2.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_4.7.6.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_5.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.16.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.16.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_0.7.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_1.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.5.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto/CVE-2013-7459.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto/cross-compiling.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify/0001-rule.py-fix-missing-comma.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.7.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.8.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.4.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_6.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.11.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.7.14.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.17.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.18.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.49.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.50.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.5.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.7.1.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.7.3.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.1.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb') diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb index afd9146ac..506bd11c7 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb @@ -36,4 +36,5 @@ FILES_${PN}-python += " \ ${PYTHON_SITEPACKAGES_DIR} \ " +RDEPENDS_${PN} += "gsettings-desktop-schemas" RRECOMMENDS_${PN} += "source-code-pro-fonts" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.58.7.bb b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.58.7.bb deleted file mode 100644 index 58342b6c2..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.58.7.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Javascript bindings for GNOME" -LICENSE = "MIT & LGPLv2+" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=beb29cf17fabe736f0639b09ee6e76fa \ - file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7 \ -" - -GNOMEBASEBUILDCLASS = "autotools" - -DEPENDS = "mozjs gtk+3" - -inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even - -SRC_URI[archive.md5sum] = "c8c530d4593133f496ae69098273a675" -SRC_URI[archive.sha256sum] = "2014509019ea4e7a8ab8e0dd0c472bbcf0ad3067928af88c29f5e2879c58c7a9" -SRC_URI += "file://0001-Disable-tests-on-host.patch" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection" - -EXTRA_OECONF = " \ - --without-dbus-tests \ - --disable-installed-tests \ -" - -do_configure_prepend() { - # make configure find gobject-introspection test code. Although we set - # --disable-installed-tests gjs builds them - sed -i 's|:$GI_DATADIR|:${STAGING_DIR_NATIVE}$GI_DATADIR|g' ${S}/configure.ac -} - -FILES_${PN} += "${datadir}/gjs-1.0/lsan" - -PACKAGES =+ "${PN}-valgrind" -FILES_${PN}-valgrind = "${datadir}/gjs-1.0/valgrind" -RSEPENDS_${PN}-valgrind += "valgrind" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.58.8.bb b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.58.8.bb new file mode 100644 index 000000000..dbb04ef8e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.58.8.bb @@ -0,0 +1,36 @@ +SUMMARY = "Javascript bindings for GNOME" +LICENSE = "MIT & LGPLv2+" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=beb29cf17fabe736f0639b09ee6e76fa \ + file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7 \ +" + +GNOMEBASEBUILDCLASS = "autotools" + +DEPENDS = "mozjs gtk+3" + +inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even + +SRC_URI[archive.sha256sum] = "7fb3eb746c17363d9ee47f4a5d0bb048f0075611763eb0da11d85e0e57aff381" +SRC_URI += "file://0001-Disable-tests-on-host.patch" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection" + +EXTRA_OECONF = " \ + --without-dbus-tests \ + --disable-installed-tests \ +" + +do_configure_prepend() { + # make configure find gobject-introspection test code. Although we set + # --disable-installed-tests gjs builds them + sed -i 's|:$GI_DATADIR|:${STAGING_DIR_NATIVE}$GI_DATADIR|g' ${S}/configure.ac +} + +FILES_${PN} += "${datadir}/gjs-1.0/lsan" + +PACKAGES =+ "${PN}-valgrind" +FILES_${PN}-valgrind = "${datadir}/gjs-1.0/valgrind" +RSEPENDS_${PN}-valgrind += "valgrind" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.5.bb deleted file mode 100644 index fcdb2aee4..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.5.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "GNOME library for reading .desktop files" -SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ -" - -BPN = "gnome-desktop" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" - -SRC_URI[archive.sha256sum] = "eea1242994109fa3f05793963ee25c3df23bc84b0f0b81f03ec3c294c27ab753" - -SRC_URI += " \ - file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ - file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ -" - -DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" - -inherit features_check gtk-doc -REQUIRED_DISTRO_FEATURES += "x11" - -GTKDOC_MESON_OPTION = "gtk_doc" -EXTRA_OEMESON = "-Ddesktop_docs=false" - -PACKAGES =+ "libgnome-desktop3" -FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" - -RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.6.bb new file mode 100644 index 000000000..a383da479 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.6.bb @@ -0,0 +1,37 @@ +SUMMARY = "GNOME library for reading .desktop files" +SECTION = "x11/gnome" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ +" + +BPN = "gnome-desktop" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +SRC_URI[archive.sha256sum] = "d23c76947c781f447fb39538dec509408b161b291a75a4ce1c14c2b3d33344f6" + +SRC_URI += " \ + file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ + file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ +" + +DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" + +inherit features_check gtk-doc +REQUIRED_DISTRO_FEATURES += "x11" + +GTKDOC_MESON_OPTION = "gtk_doc" +EXTRA_OEMESON = "-Ddesktop_docs=false" + +PACKAGES =+ "libgnome-desktop3" +FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" + +RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb index d14d6b503..e14891a23 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb @@ -55,5 +55,3 @@ FILES_${PN} += " \ ${systemd_user_unitdir} \ ${libdir}/gnome-settings-daemon-3.0/libgsd.so \ " - -RDEPEND_${PN} += "gdbus" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.12.bb b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.12.bb deleted file mode 100644 index 0338455bc..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.12.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Grilo is a framework forsearching media content from various sources" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -DEPENDS = " \ - libxml2 \ - glib-2.0 \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gobject-introspection gtk-doc gettext vala - -SRC_URI[archive.md5sum] = "b464ce84db6f9354996a1d47b3c613da" -SRC_URI[archive.sha256sum] = "dbfbd6082103288592af97568180b9cc81a336a274ed5160412f87675ec11a71" - -GIR_MESON_OPTION = "enable-introspection" -GTKDOC_MESON_OPTION = "enable-gtk-doc" - -# Note: removing 'net' from PACKAGECONFIG causes -# | bindings/vala/meson.build:15:0: ERROR: Unknown variable "grlnet_gir". -PACKAGECONFIG ??= "net" - -PACKAGECONFIG[net] = "-Denable-grl-net=true, -Denable-grl-net=false, libsoup-2.4" -PACKAGECONFIG[test-ui] = "-Denable-test-ui=true, -Denable-test-ui=false, gtk+3 liboauth" - -# Once we have a recipe for 'totem-plparser' this can turn into a PACKAGECONFIG -EXTRA_OEMESON = "-Denable-grl-pls=false" - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.13.bb b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.13.bb new file mode 100644 index 000000000..fe6858f45 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.13.bb @@ -0,0 +1,28 @@ +SUMMARY = "Grilo is a framework forsearching media content from various sources" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = " \ + libxml2 \ + glib-2.0 \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gobject-introspection gtk-doc gettext vala + +SRC_URI[archive.sha256sum] = "d14837f22341943ed8a189d9f0827a17016b802d18d0ed080e1413de0fdc927b" + +GIR_MESON_OPTION = "enable-introspection" +GTKDOC_MESON_OPTION = "enable-gtk-doc" + +# Note: removing 'net' from PACKAGECONFIG causes +# | bindings/vala/meson.build:15:0: ERROR: Unknown variable "grlnet_gir". +PACKAGECONFIG ??= "net" + +PACKAGECONFIG[net] = "-Denable-grl-net=true, -Denable-grl-net=false, libsoup-2.4" +PACKAGECONFIG[test-ui] = "-Denable-test-ui=true, -Denable-test-ui=false, gtk+3 liboauth" + +# Once we have a recipe for 'totem-plparser' this can turn into a PACKAGECONFIG +EXTRA_OEMESON = "-Denable-grl-pls=false" + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.3.bb deleted file mode 100644 index 44cdefc33..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "gspell adds spell-checking to a GTK+ applications" -HOMEPAGE = "https://wiki.gnome.org/Projects/gspell" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=8c2e1ec1540fb3e0beb68361344cba7e" - -DEPENDS = "gtk+3 iso-codes enchant2" - -inherit gnomebase gettext gobject-introspection - -SRC_URI[archive.md5sum] = "d0892000d944e87fd74e8611ef400cdb" -SRC_URI[archive.sha256sum] = "5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.4.bb new file mode 100644 index 000000000..f7f493dc3 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.4.bb @@ -0,0 +1,10 @@ +SUMMARY = "gspell adds spell-checking to a GTK+ applications" +HOMEPAGE = "https://wiki.gnome.org/Projects/gspell" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=8c2e1ec1540fb3e0beb68361344cba7e" + +DEPENDS = "gtk+3 iso-codes enchant2" + +inherit gnomebase gettext gobject-introspection + +SRC_URI[archive.sha256sum] = "cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.12.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.12.bb deleted file mode 100644 index 9ce8bb8e9..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.12.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "GLib-based library for accessing online service APIs using the GData protocol" -HOMEPAGE = "http://live.gnome.org/libgdata" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ - file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \ - file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef" - -DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr json-glib" - -GTKDOC_MESON_OPTION = "gtk_doc" -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase pkgconfig gettext gtk-doc vala gobject-introspection manpages features_check - -# gcr -REQUIRED_DISTRO_FEATURES = "x11" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs" -} - -# goa is required for gnome-photos -PACKAGECONFIG ??= "goa gtk" -PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" -PACKAGECONFIG[goa] = "-Dgoa=enabled,-Dgoa=disabled,gnome-online-accounts" -PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" -PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" - -EXTRA_OEMESON = "-Dalways_build_tests=false" - -SRC_URI[archive.md5sum] = "9d5692a2308bb949af801be66989e164" -SRC_URI[archive.sha256sum] = "a0fd6f8820e8bae019c1f6ffab5af7fcd6d7f147915bb968b56df3ad61b42318" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.13.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.13.bb new file mode 100644 index 000000000..de33fd829 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.13.bb @@ -0,0 +1,33 @@ +SUMMARY = "GLib-based library for accessing online service APIs using the GData protocol" +HOMEPAGE = "http://live.gnome.org/libgdata" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ + file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \ + file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef" + +DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr json-glib" + +GTKDOC_MESON_OPTION = "gtk_doc" +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase pkgconfig gettext gtk-doc vala gobject-introspection manpages features_check + +# gcr +REQUIRED_DISTRO_FEATURES = "x11" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs" +} + +# goa is required for gnome-photos +PACKAGECONFIG ??= "goa gtk" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" +PACKAGECONFIG[goa] = "-Dgoa=enabled,-Dgoa=disabled,gnome-online-accounts" +PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" +PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" + +EXTRA_OEMESON = "-Dalways_build_tests=false" + +SRC_URI[archive.sha256sum] = "eab9ef792c3c2b9ece19d45aea15225aba8df2521bc12785b1b2d3318d8c472e" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb deleted file mode 100644 index e2ced395c..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb +++ /dev/null @@ -1,72 +0,0 @@ -SUMMARY = "Tracker miners and metadata extractors" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ - file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ -" - -DEPENDS = " \ - intltool-native \ - tracker \ - zlib \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check - -SRC_URI[archive.md5sum] = "a317bc50c5e63dd0746a48af478fb92b" -SRC_URI[archive.sha256sum] = "7472aa28d7862620d3ca2bbec3b103df547d7319c12e95a7f7aa9f9f6dee4b19" -SRC_URI += "file://0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" - -PACKAGECONFIG ??= " \ - ffmpeg \ - flac \ - gexiv2 \ - gstreamer \ - icu \ - libexif \ - libgsf \ - jpeg \ - png \ - tiff \ - xml \ - pdf \ -" - -PACKAGECONFIG[ffmpeg] = ",,ffmpeg" -PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" -PACKAGECONFIG[gexiv2] = ",,gexiv2" -PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base" -PACKAGECONFIG[gupnp] = ",,gupnp-dlna" -PACKAGECONFIG[icu] = ",,icu" -PACKAGECONFIG[libexif] = "-Dexif=enabled,-Dexif=disabled,libexif" -PACKAGECONFIG[libgsf] = "-Dgsf=enabled,-Dgsf=disabled,libgsf" -PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" -PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" -PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" -PACKAGECONFIG[xml] = "-Dxml=enabled,-Dxml=disabled,libxml2" -PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis" -PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler" -PACKAGECONFIG[upower] = ",,upower" - -# For security reasons it is strongly recommended to set add meta-security in -# your layers and 'libseccomp' to PACKAGECONFIG". -PACKAGECONFIG[libseccomp] = ",,libseccomp" -# not yet in meta-gnome -PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" - -EXTRA_OEMESON += " \ - -Dsystemd_user_services=${systemd_user_unitdir} \ -" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/tracker \ - ${libdir}/tracker-miners-2.0 \ - ${systemd_user_unitdir} \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.5.bb new file mode 100644 index 000000000..097bcdb6f --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.5.bb @@ -0,0 +1,71 @@ +SUMMARY = "Tracker miners and metadata extractors" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ + file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" + +DEPENDS = " \ + intltool-native \ + tracker \ + zlib \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check + +SRC_URI[archive.sha256sum] = "9509d37fb29acd233058f4df5bd1234b692ac6f946bc2e5f7b8dbf51dfe5b9fa" +SRC_URI += "file://0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +PACKAGECONFIG ??= " \ + ffmpeg \ + flac \ + gexiv2 \ + gstreamer \ + icu \ + libexif \ + libgsf \ + jpeg \ + png \ + tiff \ + xml \ + pdf \ +" + +PACKAGECONFIG[ffmpeg] = ",,ffmpeg" +PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" +PACKAGECONFIG[gexiv2] = ",,gexiv2" +PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[gupnp] = ",,gupnp-dlna" +PACKAGECONFIG[icu] = ",,icu" +PACKAGECONFIG[libexif] = "-Dexif=enabled,-Dexif=disabled,libexif" +PACKAGECONFIG[libgsf] = "-Dgsf=enabled,-Dgsf=disabled,libgsf" +PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" +PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" +PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" +PACKAGECONFIG[xml] = "-Dxml=enabled,-Dxml=disabled,libxml2" +PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis" +PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler" +PACKAGECONFIG[upower] = ",,upower" + +# For security reasons it is strongly recommended to set add meta-security in +# your layers and 'libseccomp' to PACKAGECONFIG". +PACKAGECONFIG[libseccomp] = ",,libseccomp" +# not yet in meta-gnome +PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" + +EXTRA_OEMESON += " \ + -Dsystemd_user_services=${systemd_user_unitdir} \ +" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/tracker \ + ${libdir}/tracker-miners-2.0 \ + ${systemd_user_unitdir} \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb deleted file mode 100644 index b36e66b45..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Tracker is a file search engine" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ - file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ -" - -DEPENDS = " \ - libxml2-native \ - dbus-native \ - glib-2.0 \ - sqlite3 \ - libarchive \ - dbus \ - icu \ - json-glib \ - libsoup-2.4 \ - libstemmer \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check - -SRC_URI[archive.md5sum] = "9937cf4812ca85078907324c7cdf7dd8" -SRC_URI[archive.sha256sum] = "577952244ab977c78b0b88e2f63c4197eaba16e4d66bff692b7f58993e06516d" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" - -PACKAGECONFIG ??= "fts" -PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanger" -# full text search requires sqlite3 build with PACKAGECONFIG[fts5] set -PACKAGECONFIG[fts] = "-Dfts=true,-Dfts=false" - -# set required cross property sqlite3_has_fts5 -do_write_config[vardeps] += "PACKAGECONFIG" -do_write_config_append() { - echo "[properties]" > ${WORKDIR}/meson-tracker.cross - echo "sqlite3_has_fts5 = '${@bb.utils.contains('PACKAGECONFIG', 'fts', 'true', 'false', d)}'" >> ${WORKDIR}/meson-tracker.cross -} - -EXTRA_OEMESON = "--cross-file ${WORKDIR}/meson-tracker.cross \ - -Dsystemd_user_services=${systemd_user_unitdir} \ -" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${libdir}/tracker-2.0 \ - ${systemd_user_unitdir} \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.6.bb new file mode 100644 index 000000000..2c11976ca --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_2.3.6.bb @@ -0,0 +1,51 @@ +SUMMARY = "Tracker is a file search engine" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ + file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" + +DEPENDS = " \ + libxml2-native \ + dbus-native \ + glib-2.0 \ + sqlite3 \ + libarchive \ + dbus \ + icu \ + json-glib \ + libsoup-2.4 \ + libstemmer \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check + +SRC_URI[archive.sha256sum] = "bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" + +PACKAGECONFIG ??= "fts" +PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanger" +# full text search requires sqlite3 build with PACKAGECONFIG[fts5] set +PACKAGECONFIG[fts] = "-Dfts=true,-Dfts=false" + +# set required cross property sqlite3_has_fts5 +do_write_config[vardeps] += "PACKAGECONFIG" +do_write_config_append() { + echo "[properties]" > ${WORKDIR}/meson-tracker.cross + echo "sqlite3_has_fts5 = '${@bb.utils.contains('PACKAGECONFIG', 'fts', 'true', 'false', d)}'" >> ${WORKDIR}/meson-tracker.cross +} + +EXTRA_OEMESON = "--cross-file ${WORKDIR}/meson-tracker.cross \ + -Dsystemd_user_services=${systemd_user_unitdir} \ +" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${libdir}/tracker-2.0 \ + ${systemd_user_unitdir} \ +" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb index 0475cbeae..d32238162 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb @@ -18,7 +18,7 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git \ file://0005-common.h-replace-getline-with-fgets.patch \ " -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" EXTRA_OECONF += "--disable-tests --without-jffs --without-ubifs" diff --git a/meta-openembedded/meta-multimedia/README b/meta-openembedded/meta-multimedia/README index 3c4b1af7f..b4c2455a1 100644 --- a/meta-openembedded/meta-multimedia/README +++ b/meta-openembedded/meta-multimedia/README @@ -14,6 +14,6 @@ Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-mult When sending single patches, please use something like: 'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-multimedia][PATCH -You are encouraged to fork the mirror on github https://github.com/openembedded/meta-oe/ to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like gitorious, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch ' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. +You are encouraged to fork the mirror on github https://github.com/openembedded/meta-openembedded to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like GitLab, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch ' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. Layer maintainer: Andreas Müller diff --git a/meta-openembedded/meta-multimedia/licenses/AOM-Patent-License-1.0 b/meta-openembedded/meta-multimedia/licenses/AOM-Patent-License-1.0 new file mode 100644 index 000000000..493f61637 --- /dev/null +++ b/meta-openembedded/meta-multimedia/licenses/AOM-Patent-License-1.0 @@ -0,0 +1,108 @@ +Alliance for Open Media Patent License 1.0 + +1. License Terms. + +1.1. Patent License. Subject to the terms and conditions of this License, each + Licensor, on behalf of itself and successors in interest and assigns, + grants Licensee a non-sublicensable, perpetual, worldwide, non-exclusive, + no-charge, royalty-free, irrevocable (except as expressly stated in this + License) patent license to its Necessary Claims to make, use, sell, offer + for sale, import or distribute any Implementation. + +1.2. Conditions. + +1.2.1. Availability. As a condition to the grant of rights to Licensee to make, + sell, offer for sale, import or distribute an Implementation under + Section 1.1, Licensee must make its Necessary Claims available under + this License, and must reproduce this License with any Implementation + as follows: + + a. For distribution in source code, by including this License in the + root directory of the source code with its Implementation. + + b. For distribution in any other form (including binary, object form, + and/or hardware description code (e.g., HDL, RTL, Gate Level Netlist, + GDSII, etc.)), by including this License in the documentation, legal + notices, and/or other written materials provided with the + Implementation. + +1.2.2. Additional Conditions. This license is directly from Licensor to + Licensee. Licensee acknowledges as a condition of benefiting from it + that no rights from Licensor are received from suppliers, distributors, + or otherwise in connection with this License. + +1.3. Defensive Termination. If any Licensee, its Affiliates, or its agents + initiates patent litigation or files, maintains, or voluntarily + participates in a lawsuit against another entity or any person asserting + that any Implementation infringes Necessary Claims, any patent licenses + granted under this License directly to the Licensee are immediately + terminated as of the date of the initiation of action unless 1) that suit + was in response to a corresponding suit regarding an Implementation first + brought against an initiating entity, or 2) that suit was brought to + enforce the terms of this License (including intervention in a third-party + action by a Licensee). + +1.4. Disclaimers. The Reference Implementation and Specification are provided + "AS IS" and without warranty. The entire risk as to implementing or + otherwise using the Reference Implementation or Specification is assumed + by the implementer and user. Licensor expressly disclaims any warranties + (express, implied, or otherwise), including implied warranties of + merchantability, non-infringement, fitness for a particular purpose, or + title, related to the material. IN NO EVENT WILL LICENSOR BE LIABLE TO + ANY OTHER PARTY FOR LOST PROFITS OR ANY FORM OF INDIRECT, SPECIAL, + INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER FROM ANY CAUSES OF + ACTION OF ANY KIND WITH RESPECT TO THIS LICENSE, WHETHER BASED ON BREACH + OF CONTRACT, TORT (INCLUDING NEGLIGENCE), OR OTHERWISE, AND WHETHER OR + NOT THE OTHER PARTRY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +2. Definitions. + +2.1. Affiliate. "Affiliate" means an entity that directly or indirectly + Controls, is Controlled by, or is under common Control of that party. + +2.2. Control. "Control" means direct or indirect control of more than 50% of + the voting power to elect directors of that corporation, or for any other + entity, the power to direct management of such entity. + +2.3. Decoder. "Decoder" means any decoder that conforms fully with all + non-optional portions of the Specification. + +2.4. Encoder. "Encoder" means any encoder that produces a bitstream that can + be decoded by a Decoder only to the extent it produces such a bitstream. + +2.5. Final Deliverable. "Final Deliverable" means the final version of a + deliverable approved by the Alliance for Open Media as a Final + Deliverable. + +2.6. Implementation. "Implementation" means any implementation, including the + Reference Implementation, that is an Encoder and/or a Decoder. An + Implementation also includes components of an Implementation only to the + extent they are used as part of an Implementation. + +2.7. License. "License" means this license. + +2.8. Licensee. "Licensee" means any person or entity who exercises patent + rights granted under this License. + +2.9. Licensor. "Licensor" means (i) any Licensee that makes, sells, offers + for sale, imports or distributes any Implementation, or (ii) a person + or entity that has a licensing obligation to the Implementation as a + result of its membership and/or participation in the Alliance for Open + Media working group that developed the Specification. + +2.10. Necessary Claims. "Necessary Claims" means all claims of patents or + patent applications, (a) that currently or at any time in the future, + are owned or controlled by the Licensor, and (b) (i) would be an + Essential Claim as defined by the W3C Policy as of February 5, 2004 + (https://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential) + as if the Specification was a W3C Recommendation; or (ii) are infringed + by the Reference Implementation. + +2.11. Reference Implementation. "Reference Implementation" means an Encoder + and/or Decoder released by the Alliance for Open Media as a Final + Deliverable. + +2.12. Specification. "Specification" means the specification designated by + the Alliance for Open Media as a Final Deliverable for which this + License was issued. + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_2.0.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_2.0.0.bb new file mode 100644 index 000000000..c5ad1f806 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_2.0.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "Alliance for Open Media - AV1 Codec Library" +DESCRIPTION = "Alliance for Open Media AV1 codec library" + +LICENSE = "BSD-2-Clause & AOM-Patent-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6ea91368c1bbdf877159435572b931f5 \ + file://PATENTS;md5=e69ad12202bd20da3c76a5d3648cfa83 \ + " + +SRC_URI = "git://aomedia.googlesource.com/aom;protocol=https" + +SRCREV = "d1d1226af626a61f7ca664b270dd473b92228984" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig +DEPENDS = " yasm-native" + +EXTRA_OECMAKE = " -DBUILD_SHARED_LIBS=1 -DENABLE_TESTS=0 \ + -DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl \ + " diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libuvc/libuvc.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libuvc/libuvc.bb new file mode 100644 index 000000000..4d301fb2f --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libuvc/libuvc.bb @@ -0,0 +1,14 @@ +SUMMARY = "library for USB video devices built atop libusb" +HOMEPAGE = "https://github.com/libuvc/libuvc.git" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2f1963e0bb88c93463af750daf9ba0c2" +DEPENDS = "libusb jpeg" + +SRC_URI = "git://github.com/libuvc/libuvc.git" +SRCREV = "ad6c72a4e390367f0d2be81aac00cfc0b6680d74" +PV = "v0.0.6+git${SRCPV}" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index 2bf8877bb..c9db21ab5 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -21,6 +21,7 @@ RDEPENDS_packagegroup-meta-multimedia = "\ RDEPENDS_packagegroup-meta-multimedia = "\ alsa-equal \ + aom \ caps \ cdparanoia \ dcadec \ @@ -60,6 +61,7 @@ RDEPENDS_packagegroup-meta-multimedia = "\ vorbis-tools \ libdvbcsa \ libopenmpt \ + libuvc \ mimic \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "minidlna", "", d)} \ mycroft \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb new file mode 100644 index 000000000..44178a10d --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.1.bb @@ -0,0 +1,134 @@ +DESCRIPTION = "Video player and streamer - davinci edition" +HOMEPAGE = "http://www.videolan.org" +SECTION = "multimedia" + +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \ + dbus libxml2 gnutls \ + tremor faad2 ffmpeg flac alsa-lib \ + lua-native lua libidn \ + avahi jpeg xz libmodplug mpeg2dec \ + libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ + tiff" + +LDFLAGS_append_riscv64 = " -latomic" + +# While this item does not require it, it depends on ffmpeg which does +LICENSE_FLAGS = "commercial" + +SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \ + file://0001-make-opencv-configurable.patch \ + file://0002-use-vorbisidec.patch \ + file://0003-fix-luaL-checkint.patch \ + file://0004-Use-packageconfig-to-detect-mmal-support.patch \ + file://0005-Fix-build-with-Qt-5.15.patch \ +" +SRC_URI[sha256sum] = "189311d28aa814f106a7b3645211ac52c0b3e2b9f4b348de2f63bab3218086b8" + +inherit autotools features_check gettext pkgconfig mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +export BUILDCC = "${BUILD_CC}" +EXTRA_OECONF = "\ + --enable-run-as-root \ + --enable-xvideo \ + --disable-screen --disable-caca \ + --enable-vlm \ + --enable-freetype \ + --enable-tremor \ + --enable-v4l2 --disable-aa --disable-faad \ + --enable-dbus \ + --without-contrib \ + --without-kde-solid \ + --enable-realrtsp \ + --disable-libtar \ + --enable-avcodec \ + ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \ + ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \ + ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \ +" + +PACKAGECONFIG ?= " \ + live555 dc1394 dv1394 notify fontconfig fluidsynth freetype dvdread png \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + x264 \ +" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} + +PACKAGECONFIG[mmal] = "--enable-omxil --enable-omxil-vout --enable-rpi-omxil --enable-mmal,,userland" +PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" +PACKAGECONFIG[fluidsynth] = ",,fluidsynth" +PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" +PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" +PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[live555] = "--enable-live555 LIVE555_PREFIX=${STAGING_DIR_HOST}${prefix},--disable-live555,live555" +PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" +PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" +PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" +PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" +PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" +PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" +PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" +PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" +PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" +PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" +PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" +PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" +PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav libdvdcss" +PACKAGECONFIG[sftp] = "--enable-sftp,--disable-sftp,libssh2" +PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" +PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis libogg" +PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394" +PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libavc1394" +PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg" +PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo" +PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+3" +PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig" +PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" +PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" +PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" +PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" +PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" +PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native" + +do_configure_append() { + sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool + + # moc needs support: precreate build paths + for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do + mkdir -p "${B}/modules/gui/qt/$qtpath" + done +} + +# This recipe packages vlc as a library as well, so qt4 dependencies +# can be avoided when only the library is installed. +PACKAGES =+ "libvlc" + +LEAD_SONAME_libvlc = "libvlc.so.5" +FILES_libvlc = "${libdir}/lib*.so.*" + +FILES_${PN} += "\ + ${bindir}/vlc \ + ${libdir}/vlc/vlc/libvlc_vdpau.so \ + ${datadir}/applications \ + ${datadir}/vlc/ \ + ${datadir}/icons \ + ${datadir}/metainfo/vlc.appdata.xml \ +" + +FILES_${PN}-dbg += "\ + ${libdir}/vlc/*/.debug \ + ${libdir}/vlc/plugins/*/.debug \ +" + +FILES_${PN}-staticdev += "\ + ${libdir}/vlc/plugins/*/*.a \ +" + +INSANE_SKIP_${PN} = "dev-so" + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.bb deleted file mode 100644 index dd9486e8a..000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.11.bb +++ /dev/null @@ -1,134 +0,0 @@ -DESCRIPTION = "Video player and streamer - davinci edition" -HOMEPAGE = "http://www.videolan.org" -SECTION = "multimedia" - -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \ - dbus libxml2 gnutls \ - tremor faad2 ffmpeg flac alsa-lib \ - lua-native lua libidn \ - avahi jpeg xz libmodplug mpeg2dec \ - libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ - tiff" - -LDFLAGS_append_riscv64 = " -latomic" - -# While this item does not require it, it depends on ffmpeg which does -LICENSE_FLAGS = "commercial" - -SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \ - file://0001-make-opencv-configurable.patch \ - file://0002-use-vorbisidec.patch \ - file://0003-fix-luaL-checkint.patch \ - file://0004-Use-packageconfig-to-detect-mmal-support.patch \ - file://0005-Fix-build-with-Qt-5.15.patch \ -" -SRC_URI[sha256sum] = "3e94a1acf33445e9da15d528aa48657aa26b912eaa2656b403d43860a8834919" - -inherit autotools features_check gettext pkgconfig mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -export BUILDCC = "${BUILD_CC}" -EXTRA_OECONF = "\ - --enable-run-as-root \ - --enable-xvideo \ - --disable-screen --disable-caca \ - --enable-vlm \ - --enable-freetype \ - --enable-tremor \ - --enable-v4l2 --disable-aa --disable-faad \ - --enable-dbus \ - --without-contrib \ - --without-kde-solid \ - --enable-realrtsp \ - --disable-libtar \ - --enable-avcodec \ - ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \ - ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \ - ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \ -" - -PACKAGECONFIG ?= " \ - live555 dc1394 dv1394 notify fontconfig fluidsynth freetype dvdread png \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - x264 \ -" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} - -PACKAGECONFIG[mmal] = "--enable-omxil --enable-omxil-vout --enable-rpi-omxil --enable-mmal,,userland" -PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" -PACKAGECONFIG[fluidsynth] = ",,fluidsynth" -PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" -PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" -PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" -PACKAGECONFIG[live555] = "--enable-live555 LIVE555_PREFIX=${STAGING_DIR_HOST}${prefix},--disable-live555,live555" -PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" -PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" -PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" -PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" -PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" -PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" -PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" -PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" -PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" -PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" -PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" -PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" -PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav libdvdcss" -PACKAGECONFIG[sftp] = "--enable-sftp,--disable-sftp,libssh2" -PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" -PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis libogg" -PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394" -PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libavc1394" -PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg" -PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo" -PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+3" -PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig" -PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" -PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" -PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" -PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" -PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" -PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" -PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native" - -do_configure_append() { - sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool - - # moc needs support: precreate build paths - for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do - mkdir -p "${B}/modules/gui/qt/$qtpath" - done -} - -# This recipe packages vlc as a library as well, so qt4 dependencies -# can be avoided when only the library is installed. -PACKAGES =+ "libvlc" - -LEAD_SONAME_libvlc = "libvlc.so.5" -FILES_libvlc = "${libdir}/lib*.so.*" - -FILES_${PN} += "\ - ${bindir}/vlc \ - ${libdir}/vlc/vlc/libvlc_vdpau.so \ - ${datadir}/applications \ - ${datadir}/vlc/ \ - ${datadir}/icons \ - ${datadir}/metainfo/vlc.appdata.xml \ -" - -FILES_${PN}-dbg += "\ - ${libdir}/vlc/*/.debug \ - ${libdir}/vlc/plugins/*/.debug \ -" - -FILES_${PN}-staticdev += "\ - ${libdir}/vlc/plugins/*/*.a \ -" - -INSANE_SKIP_${PN} = "dev-so" - 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 b380eaf94..e59d2f437 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 ddf5ff88e..000000000 --- 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 000000000..a76877652 --- /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 000000000..a04473d21 --- /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 000000000..e1b8ca15b --- /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 000000000..65567610b --- /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 000000000..18cb0cd8e --- /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 000000000..4676769a4 --- /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 db7b0d486..000000000 --- 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 000000000..61cf1cc62 --- /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" diff --git a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool.service b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool.service index e5917fc14..281ae5fd1 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool.service +++ b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool.service @@ -9,7 +9,6 @@ Type=simple ExecStart=@SBINDIR@/ippoold -f # Normal output will go to syslog, so suppress stdout. StandardOutput=null -StandardError=syslog # ExecStop is not needed. systemd will send SIGTERM # and ippoold will exit status 1. SuccessExitStatus=1 diff --git a/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.0.bb b/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.0.bb deleted file mode 100644 index 115353fec..000000000 --- a/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "IPTables based firewall scripts" -HOMEPAGE = "http://rocky.eld.leidenuniv.nl/joomla/index.php?option=com_content&view=article&id=45&Itemid=63" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://gpl_license.txt;md5=11c7b65c4a4acb9d5175f7e9bf99c403" - -SRCREV = "39276d14b659684c4c0612725ab83ea841c6ef99" -SRC_URI = "git://github.com/arno-iptables-firewall/aif" - -S = "${WORKDIR}/git" - -inherit systemd - -do_install() { - install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${bindir} ${D}${systemd_unitdir}/system ${D}${sysconfdir}/init.d - install -d ${D}${datadir}/arno-iptables-firewall ${D}${sysconfdir}/arno-iptables-firewall - cp -r ${S}${sysconfdir}/arno-iptables-firewall ${D}${sysconfdir}/ - install -m 0755 ${S}${sysconfdir}/init.d/arno-iptables-firewall ${D}${bindir} - install -m 0755 ${S}/bin/arno-iptables-firewall ${D}${sbindir} - install -m 0755 ${S}/bin/arno-fwfilter ${D}${bindir} - cp -r ${S}/share/arno-iptables-firewall/* ${D}${datadir}/arno-iptables-firewall - cp -r ${S}/etc/arno-iptables-firewall/* ${D}${sysconfdir}/arno-iptables-firewall - install -m 0644 ${S}/${systemd_unitdir}/system/arno-iptables-firewall.service ${D}${systemd_unitdir}/system - sed -i -e 's%/usr/local/sbin%${bindir}%g' ${D}${systemd_unitdir}/system/arno-iptables-firewall.service - sed -i -e 's%/usr/local/sbin%${sbindir}%g' ${D}${bindir}/arno-iptables-firewall - sed -i -e 's%/usr/local%${exec_prefix}%g' ${D}${sysconfdir}/arno-iptables-firewall/firewall.conf - sed -i -e 's%#!/bin/bash%#!/bin/sh%g' ${D}${bindir}/arno-fwfilter - sed -i -e 's%#!/bin/bash%#!/bin/sh%g' ${D}${datadir}/arno-iptables-firewall/plugins/traffic-accounting-helper - sed -i -e 's%#!/bin/bash%#!/bin/sh%g' ${D}${datadir}/arno-iptables-firewall/plugins/dyndns-host-open-helper -} - -SYSTEMD_SERVICE_${PN} = "arno-iptables-firewall.service" -FILES_${PN} += "${systemd_unitdir}/system/arno-iptables-firewall.service" diff --git a/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb b/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb new file mode 100644 index 000000000..bc9297eab --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb @@ -0,0 +1,33 @@ +SUMMARY = "IPTables based firewall scripts" +HOMEPAGE = "http://rocky.eld.leidenuniv.nl/joomla/index.php?option=com_content&view=article&id=45&Itemid=63" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://gpl_license.txt;md5=11c7b65c4a4acb9d5175f7e9bf99c403" + +SRCREV = "a96b81da4a9b619e4045805f5f13a1e982c95663" +SRC_URI = "git://github.com/arno-iptables-firewall/aif" + +S = "${WORKDIR}/git" + +inherit systemd + +do_install() { + install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${bindir} ${D}${systemd_unitdir}/system ${D}${sysconfdir}/init.d + install -d ${D}${datadir}/arno-iptables-firewall ${D}${sysconfdir}/arno-iptables-firewall + cp -r ${S}${sysconfdir}/arno-iptables-firewall ${D}${sysconfdir}/ + install -m 0755 ${S}${sysconfdir}/init.d/arno-iptables-firewall ${D}${bindir} + install -m 0755 ${S}/bin/arno-iptables-firewall ${D}${sbindir} + install -m 0755 ${S}/bin/arno-fwfilter ${D}${bindir} + cp -r ${S}/share/arno-iptables-firewall/* ${D}${datadir}/arno-iptables-firewall + cp -r ${S}/etc/arno-iptables-firewall/* ${D}${sysconfdir}/arno-iptables-firewall + install -m 0644 ${S}/${systemd_unitdir}/system/arno-iptables-firewall.service ${D}${systemd_unitdir}/system + sed -i -e 's%/usr/local/sbin%${bindir}%g' ${D}${systemd_unitdir}/system/arno-iptables-firewall.service + sed -i -e 's%/usr/local/sbin%${sbindir}%g' ${D}${bindir}/arno-iptables-firewall + sed -i -e 's%/usr/local%${exec_prefix}%g' ${D}${sysconfdir}/arno-iptables-firewall/firewall.conf + sed -i -e 's%#!/bin/bash%#!/bin/sh%g' ${D}${bindir}/arno-fwfilter + sed -i -e 's%#!/bin/bash%#!/bin/sh%g' ${D}${datadir}/arno-iptables-firewall/plugins/traffic-accounting-helper + sed -i -e 's%#!/bin/bash%#!/bin/sh%g' ${D}${datadir}/arno-iptables-firewall/plugins/dyndns-host-open-helper +} + +SYSTEMD_SERVICE_${PN} = "arno-iptables-firewall.service" +FILES_${PN} += "${systemd_unitdir}/system/arno-iptables-firewall.service" diff --git a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.1.bb b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.1.bb deleted file mode 100644 index c54e617fd..000000000 --- a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "ZNC, an advanced IRC bouncer" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -DEPENDS = "openssl zlib icu" - -SRC_URI = "git://github.com/znc/znc.git;name=znc \ - git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket \ - " -SRCREV_znc = "0a3909beaa15e0da499473d6d041e5b75c14e885" -SRCREV_Csocket = "e8d9e0bb248c521c2c7fa01e1c6a116d929c41b4" - -# This constructs a composite revision based on multiple SRCREV's. -# -SRCREV_FORMAT = "znc_Csocket" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep pkgconfig - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -# ZNC has a custom autogen.sh that states that this command is needed *and* expected to fail -do_configure_prepend() { - automake --add-missing || true -} - -do_install_append() { - sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc -} diff --git a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb new file mode 100644 index 000000000..806d622d7 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb @@ -0,0 +1,32 @@ +SUMMARY = "ZNC, an advanced IRC bouncer" +SECTION = "net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +DEPENDS = "openssl zlib icu" + +SRC_URI = "git://github.com/znc/znc.git;name=znc \ + git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket \ + " +SRCREV_znc = "bf253640d33d03331310778e001fb6f5aba2989e" +SRCREV_Csocket = "e8d9e0bb248c521c2c7fa01e1c6a116d929c41b4" + +# This constructs a composite revision based on multiple SRCREV's. +# +SRCREV_FORMAT = "znc_Csocket" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +# ZNC has a custom autogen.sh that states that this command is needed *and* expected to fail +do_configure_prepend() { + automake --add-missing || true +} + +do_install_append() { + sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc +} diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb index f6c05daa1..70fb4cf5f 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb @@ -31,7 +31,7 @@ PAM_SRC_URI = "file://rexec.pam \ " SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" -inherit pkgconfig +inherit pkgconfig update-alternatives CFLAGS += " -D_GNU_SOURCE -Wno-deprecated-declarations" LDFLAGS += " -L${STAGING_LIBDIR} -lutil -lcrypt" diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb index 09b793119..de3fbb094 100644 --- a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb +++ b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.11.bb @@ -4,8 +4,6 @@ SECTION = "otherosfs" LICENSE = "GPLv3 & LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -PV = "6.10" - SRCREV = "ded4e81796a18cde73329e838357f084aa05720f" SRC_URI = "git://git.samba.org/cifs-utils.git" diff --git a/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb b/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb index 72a7eeec5..0db9e8a0a 100644 --- a/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb +++ b/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.11.bb @@ -11,7 +11,7 @@ MAN_PKG = "${PN}" SRCREV = "c26e9310f552e69d0d44eb48746e02c9ae4b4f6f" SRC_URI = "git://salsa.debian.org/debian/ifenslave.git;protocol=https" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" do_install() { install -m 0755 -D ${S}/debian/ifenslave.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/ifenslave diff --git a/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb b/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb index 3739c496a..bae29aa80 100644 --- a/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb +++ b/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb @@ -36,13 +36,7 @@ do_install_append () { ALTERNATIVE_PRIORITY_${PN} = "100" -ALTERNATIVE_${PN} = "mailq newalias sendmail" +ALTERNATIVE_${PN} = "mailq newaliases sendmail" ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" -ALTERNATIVE_LINK_NAME[newalias] = "${sbindir}/newalias" +ALTERNATIVE_LINK_NAME[newaliases] = "${sbindir}/newaliases" ALTERNATIVE_LINK_NAME[mailq] = "${sbindir}/mailq" - -ALTERNATIVE_PRIORITY_${PN}-doc = "100" -ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" -ALTERNATIVE_LINK_NAME[mailq.1] = "${mandir}/man1/mailq.1" -ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1" -ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1" diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch b/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch new file mode 100644 index 000000000..78adcf813 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch @@ -0,0 +1,34 @@ +From 7b1e376d7d22244feab466e9889ba77561117357 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 23 Sep 2020 16:20:22 +0800 +Subject: [PATCH] Remove obsolete setting regarding the Standard Output + +The Standard output type "syslog" is obsolete, causing a warning since systemd +version 246 [1]. + +Please consider using "journal" or "journal+console" + +[1] https://github.com/systemd/systemd/blob/master/NEWS#L202 + +Upstream-Status: Submitted [https://github.com/strongswan/strongswan/pull/181] + +Signed-off-by: Mingli Yu +--- + init/systemd-starter/strongswan-starter.service.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/init/systemd-starter/strongswan-starter.service.in b/init/systemd-starter/strongswan-starter.service.in +index 474284a19..6a0672352 100644 +--- a/init/systemd-starter/strongswan-starter.service.in ++++ b/init/systemd-starter/strongswan-starter.service.in +@@ -4,7 +4,6 @@ After=syslog.target network-online.target + + [Service] + ExecStart=@SBINDIR@/@IPSEC_SCRIPT@ start --nofork +-StandardOutput=syslog + Restart=on-abnormal + + [Install] +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb index 0a2733195..8a8809243 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb @@ -10,6 +10,7 @@ DEPENDS = "gmp openssl flex-native flex bison-native" SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ file://fix-funtion-parameter.patch \ file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \ + file://0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch \ " SRC_URI[md5sum] = "0634e7f40591bd3f6770e583c3f27d29" diff --git a/meta-openembedded/meta-oe/README b/meta-openembedded/meta-oe/README index 6a0d7c0a1..8d787df68 100644 --- a/meta-openembedded/meta-oe/README +++ b/meta-openembedded/meta-oe/README @@ -19,10 +19,10 @@ Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe]' When sending single patches, please use something like: 'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix="meta-oe][PATCH"' -You are encouraged to fork the mirror on GitHub https://github.com/openembedded/openembedded-core +You are encouraged to fork the mirror on GitHub https://github.com/openembedded/meta-openembedded to share your patches, this is preferred for patch sets consisting of more than one patch. -Other services like gitorious, repo.or.cz or self-hosted setups are of course accepted as well, +Other services like GitLab, repo.or.cz or self-hosted setups are of course accepted as well, 'git fetch ' works the same on all of them. We recommend GitHub because it is free, easy to use, has been proven to be reliable and has a really good web GUI. diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb index ecf08cb33..1d2e53a31 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "5eadb4235ae2a956911204c50ebf2d8d8d59ddcd4a2841a1baf42f3145 UPSTREAM_CHECK_REGEX = "iozone3_(?P\d+).tar" -S = "${WORKDIR}/${BPN}_${PV}/src/current/" +S = "${WORKDIR}/${BPN}_${PV}/src/current" # # All other arches can use the default OEMAKE except those diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch new file mode 100644 index 000000000..0787ef27d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch @@ -0,0 +1,210 @@ +From 0a163f60b4a316c4b6f1726a71c84755f3bd85e7 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 16 Sep 2020 04:36:04 -0700 +Subject: [PATCH] Revert "ld.hugetlbfs: fix -Ttext-segment argument on AArch64" + +This reverts commit 852dcc963ce44861ed7c4e225aa92ff2b5b43579. + +* works around + ERROR: libhugetlbfs-1_2.23-r0 do_populate_sysroot: Fatal errors occurred in subprocesses: + Command '['arm-oe-linux-gnueabi-strip', '--remove-section=.comment', '--remove-section=.note', 'libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw']' returned non-zero exit status 1. + Subprocess output:arm-oe-linux-gnueabi-strip: + libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/stmuFa58: error: PHDR segment not covered by LOAD segment + arm-oe-linux-gnueabi-strip: libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/stmuFa58[.interp]: file format not recognized + +I don't see anything suspicious in the build (the same cmdline as in 2.22 +version), but it uses + +libhugetlbfs/1_2.22-r0-old/temp/log.do_compile:arm-oe-linux-gnueabi-gcc + -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1 +-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now +-fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security +-Werror=format-security -Werror=return-type +--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.22-r0/recipe-sysroot +-I.. -O2 -Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c +libhugetlbfs/1_2.22-r0-old/temp/log.do_compile:arm-oe-linux-gnueabi-gcc + -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1 +-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now +-fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security +-Werror=format-security -Werror=return-type +--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.22-r0/recipe-sysroot +-B./obj32 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now +-ldl -L../obj32 -o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl +-lhugetlbfs_privutils -Wl,--hugetlbfs-align obj32/linkhuge_rw.o +obj32/testutils.o +libhugetlbfs/1_2.23-r0-new/temp/log.do_compile:arm-oe-linux-gnueabi-gcc + -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1 +-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now +-fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security +-Werror=format-security -Werror=return-type +--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.23-r0/recipe-sysroot +-I.. -O2 -Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c +libhugetlbfs/1_2.23-r0-new/temp/log.do_compile:arm-oe-linux-gnueabi-gcc + -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1 +-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now +-fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security +-Werror=format-security -Werror=return-type +--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.23-r0/recipe-sysroot +-B./obj32 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now +-ldl -L../obj32 -o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl +-lhugetlbfs_privutils -Wl,--hugetlbfs-align obj32/linkhuge_rw.o +obj32/testutils.o + +And the git log between 2.22 and 2.23 is also very short and looks +reasonable. +https://github.com/libhugetlbfs/libhugetlbfs/compare/2.22...2.23 + +When checking with readelf -l it also shows the error about PHDR segment: +arm-oe-linux-gnueabi-readelf -l +./1_2.22-r0-old/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw + +Elf file type is DYN (Shared object file) +Entry point 0x201105 +There are 10 program headers, starting at offset 52 + +Program Headers: + Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align + PHDR 0x000034 0x00200034 0x00200034 0x00140 0x00140 R 0x4 + INTERP 0x000174 0x00200174 0x00200174 0x0001d 0x0001d R 0x1 + [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3] + LOAD 0x000000 0x00200000 0x00200000 0x1222c 0x1222c R E 0x200000 + LOAD 0x1ffdf0 0x005ffdf0 0x005ffdf0 0x102e0 0x202ec RW 0x200000 + DYNAMIC 0x1ffdf8 0x005ffdf8 0x005ffdf8 0x00128 0x00128 RW 0x4 + NOTE 0x000194 0x00200194 0x00200194 0x00044 0x00044 R 0x4 + GNU_EH_FRAME 0x012224 0x00212224 0x00212224 0x00008 0x00008 R 0x4 + GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10 + EXIDX 0x001c5c 0x00201c5c 0x00201c5c 0x00008 0x00008 R 0x4 + GNU_RELRO 0x1ffdf0 0x005ffdf0 0x005ffdf0 0x00210 0x00210 RW 0x4 + + Section to Segment mapping: + Segment Sections... + 00 + 01 .interp + 02 .interp .note.ABI-tag .note.gnu.build-id .dynsym .dynstr +.gnu.hash .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text +.fini .ARM.extab .ARM.exidx .rodata .eh_frame .eh_frame_hdr + 03 .fini_array .init_array .dynamic .got .data .bss + 04 .dynamic + 05 .note.ABI-tag .note.gnu.build-id + 06 .eh_frame_hdr + 07 + 08 .ARM.extab .ARM.exidx + 09 .fini_array .init_array .dynamic .got + +arm-oe-linux-gnueabi-readelf -l +./1_2.23-r0-new/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw + +Elf file type is DYN (Shared object file) +Entry point 0x31cd1 +There are 10 program headers, starting at offset 52 + +Program Headers: + Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align + PHDR 0x000000 0x00000000 0x00000000 0x00000 0x00000 R 0 +readelf: Error: the PHDR segment is not covered by a LOAD segment + INTERP 0x030d40 0x00030d40 0x00030d40 0x0001d 0x0001d R 0x1 + [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3] + LOAD 0x030d40 0x00030d40 0x00030d40 0x120b8 0x120b8 R E 0x200000 + LOAD 0x1ffdf0 0x003ffdf0 0x003ffdf0 0x102e0 0x202ec RW 0x200000 + DYNAMIC 0x1ffdf8 0x003ffdf8 0x003ffdf8 0x00128 0x00128 RW 0x4 + NOTE 0x030d60 0x00030d60 0x00030d60 0x00044 0x00044 R 0x4 + GNU_EH_FRAME 0x042df0 0x00042df0 0x00042df0 0x00008 0x00008 R 0x4 + GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10 + EXIDX 0x032828 0x00032828 0x00032828 0x00008 0x00008 R 0x4 + GNU_RELRO 0x1ffdf0 0x003ffdf0 0x003ffdf0 0x00210 0x00210 RW 0x4 + + Section to Segment mapping: + Segment Sections... + 00 + 01 .interp + 02 .interp .note.ABI-tag .note.gnu.build-id .dynsym .dynstr +.gnu.hash .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text +.fini .ARM.extab .ARM.exidx .rodata .eh_frame .eh_frame_hdr + 03 .fini_array .init_array .dynamic .got .data .bss + 04 .dynamic + 05 .note.ABI-tag .note.gnu.build-id + 06 .eh_frame_hdr + 07 + 08 .ARM.extab .ARM.exidx + 09 .fini_array .init_array .dynamic .got + +And the diff between these 2: + +1_2.22-r0-old/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw.readelf +1_2.23-r0-new/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw.readelf + Elf file type is DYN (Shared object file) +-Entry point 0x201105 ++Entry point 0x31cd1 + There are 10 program headers, starting at offset 52 + + Program Headers: + Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align +- PHDR 0x000034 0x00200034 0x00200034 0x00140 0x00140 R 0x4 +- INTERP 0x000174 0x00200174 0x00200174 0x0001d 0x0001d R 0x1 ++ PHDR 0x000000 0x00000000 0x00000000 0x00000 0x00000 R 0 ++readelf: Error: the PHDR segment is not covered by a LOAD segment ++ INTERP 0x030d40 0x00030d40 0x00030d40 0x0001d 0x0001d R 0x1 + [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3] +- LOAD 0x000000 0x00200000 0x00200000 0x1222c 0x1222c R E 0x200000 +- LOAD 0x1ffdf0 0x005ffdf0 0x005ffdf0 0x102e0 0x202ec RW 0x200000 +- DYNAMIC 0x1ffdf8 0x005ffdf8 0x005ffdf8 0x00128 0x00128 RW 0x4 +- NOTE 0x000194 0x00200194 0x00200194 0x00044 0x00044 R 0x4 +- GNU_EH_FRAME 0x012224 0x00212224 0x00212224 0x00008 0x00008 R 0x4 ++ LOAD 0x030d40 0x00030d40 0x00030d40 0x120b8 0x120b8 R E 0x200000 ++ LOAD 0x1ffdf0 0x003ffdf0 0x003ffdf0 0x102e0 0x202ec RW 0x200000 ++ DYNAMIC 0x1ffdf8 0x003ffdf8 0x003ffdf8 0x00128 0x00128 RW 0x4 ++ NOTE 0x030d60 0x00030d60 0x00030d60 0x00044 0x00044 R 0x4 ++ GNU_EH_FRAME 0x042df0 0x00042df0 0x00042df0 0x00008 0x00008 R 0x4 + GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10 +- EXIDX 0x001c5c 0x00201c5c 0x00201c5c 0x00008 0x00008 R 0x4 +- GNU_RELRO 0x1ffdf0 0x005ffdf0 0x005ffdf0 0x00210 0x00210 RW 0x4 ++ EXIDX 0x032828 0x00032828 0x00032828 0x00008 0x00008 R 0x4 ++ GNU_RELRO 0x1ffdf0 0x003ffdf0 0x003ffdf0 0x00210 0x00210 RW 0x4 + + Section to Segment mapping: + +Revert fixes this build issue, but I still don't see why it fails this way. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# Date: Wed Sep 16 13:43:09 2020 +0200 +# +# On branch jansa/master +# Changes to be committed: +# new file: meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch +# modified: meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +# +# Untracked files: +# counts.txt +# diff +# log.svn +# log.svn2 +# wip/ +# +--- + ld.hugetlbfs | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/ld.hugetlbfs b/ld.hugetlbfs +index 5e4e497..6ee8238 100755 +--- a/ld.hugetlbfs ++++ b/ld.hugetlbfs +@@ -130,9 +130,7 @@ if [ "$HTLB_ALIGN" == "slice" ]; then + # targeting the ARM platform one needs to explicitly set the text segment offset + # otherwise it will be NULL. + case "$EMU" in +- armelf*_linux_eabi|aarch64elf*|aarch64linux*) +- printf -v TEXTADDR "%x" "$SLICE_SIZE" +- HTLBOPTS="$HTLBOPTS -Ttext-segment=$TEXTADDR" ;; ++ armelf*_linux_eabi|aarch64elf*|aarch64linux*) HTLBOPTS="$HTLBOPTS -Ttext-segment=$SLICE_SIZE" ;; + elf_i386) HTLBOPTS="$HTLBOPTS -Ttext-segment=0x08000000" ;; + elf64ppc|elf64lppc) + if [ "$MMU_TYPE" == "Hash" ] ; then +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index b349096ec..2f07c938b 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -25,6 +25,7 @@ SRC_URI = " \ file://0005-Include-dirent.h-for-ino_t.patch \ file://0006-include-limits.h-for-PATH_MAX.patch \ file://0001-huge_page_setup_helper-use-python3-interpreter.patch \ + file://0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch b/meta-openembedded/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch deleted file mode 100644 index ffd9b9f26..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/memtester/files/0001-Define-mword16-and-mword8-once.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 01f1c05702eb534271777648c976ab6402a5145b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 12 Aug 2020 23:18:30 -0700 -Subject: [PATCH] Define mword16 and mword8 once - -Defining them in .h meant they are defined in all .c files including -this .h file - -Fixes build with gcc 10+ - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - tests.c | 9 +++++++++ - types.h | 9 --------- - 2 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/tests.c b/tests.c -index be1b350..4305bed 100644 ---- a/tests.c -+++ b/tests.c -@@ -27,6 +27,15 @@ char progress[] = "-\\|/"; - #define PROGRESSOFTEN 2500 - #define ONE 0x00000001L - -+union { -+ unsigned char bytes[UL_LEN/8]; -+ ul val; -+} mword8; -+ -+union { -+ unsigned short u16s[UL_LEN/16]; -+ ul val; -+} mword16; - /* Function definitions. */ - - int compare_regions(ulv *bufa, ulv *bufb, size_t count) { -diff --git a/types.h b/types.h -index ad7ce73..e14ea32 100644 ---- a/types.h -+++ b/types.h -@@ -25,12 +25,3 @@ struct test { - int (*fp)(); - }; - --union { -- unsigned char bytes[UL_LEN/8]; -- ul val; --} mword8; -- --union { -- unsigned short u16s[UL_LEN/16]; -- ul val; --} mword16; --- -2.28.0 - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb deleted file mode 100644 index 3d2905578..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Utility to test for faulty memory subsystem" -HOMEPAGE = "http://pyropus.ca/software/memtester/" -SECTION = "console/utils" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz \ - file://Makefile.patch \ - file://0001-Define-mword16-and-mword8-once.patch \ - " -SRC_URI[md5sum] = "598f41b7308e1f736164bca3ab84ddbe" -SRC_URI[sha256sum] = "f9dfe2fd737c38fad6535bbab327da9a21f7ce4ea6f18c7b3339adef6bf5fd88" - -do_compile () { - echo '${CC} ${CFLAGS} -DPOSIX -c' > conf-cc - echo '${CC} ${LDFLAGS}' > conf-ld - oe_runmake -} - -do_install () { - install -d ${D}${bindir} - install -d ${D}${mandir}/man8 - install -m 0755 memtester ${D}${bindir}/ - install -m 0755 memtester.8 ${D}${mandir}/man8/ -} diff --git a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.4.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.4.0.bb new file mode 100644 index 000000000..646ff90ba --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.4.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Utility to test for faulty memory subsystem" +HOMEPAGE = "http://pyropus.ca/software/memtester/" +SECTION = "console/utils" +LICENSE = "GPLv2" + +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz \ + file://Makefile.patch \ + " +SRC_URI[md5sum] = "e1883b69cd7c0bb74ef6a475c93a4fbf" +SRC_URI[sha256sum] = "6ffe23e6e6449b42c577c7953778fb6f698050196797a94fc619d9badc59f8e8" + +do_compile () { + echo '${CC} ${CFLAGS} -DPOSIX -c' > conf-cc + echo '${CC} ${LDFLAGS}' > conf-ld + oe_runmake +} + +do_install () { + install -d ${D}${bindir} + install -d ${D}${mandir}/man8 + install -m 0755 memtester ${D}${bindir}/ + install -m 0755 memtester.8 ${D}${mandir}/man8/ +} diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb index df194f95a..80ae363dc 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.10.bb @@ -23,7 +23,7 @@ export ACE_ROOT="${WORKDIR}/ACE_wrappers" inherit pkgconfig CXXFLAGS_append = " -fpermissive -Wnodeprecated-declarations" - +CXX_append = " -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= " EXTRA_OEMAKE += "INSTALL_LIB=${baselib}" do_install() { diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb index 0b66970a9..9f68eb48a 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb @@ -4,8 +4,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94" DEPENDS = "zeromq" -SRCREV = "8d5c9a88988dcbebb72939ca0939d432230ffde1" -PV = "4.6.0" +SRCREV = "fef905d5982aaeb4f4bac5cccbdf8bea72728a10" +PV = "4.7.0" SRC_URI = "git://github.com/zeromq/cppzmq.git" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 46cc935c6..5a4375d72 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -284,6 +284,7 @@ RDEPENDS_packagegroup-meta-oe-devtools_append_x86 = " cpuid msr-tools pmtools" RDEPENDS_packagegroup-meta-oe-devtools_append_x86-64 = " cpuid msr-tools pcimem pmtools" RDEPENDS_packagegroup-meta-oe-devtools_append_arm = " pcimem" RDEPENDS_packagegroup-meta-oe-devtools_append_aarch64 = " pcimem" +RDEPENDS_packagegroup-meta-oe-devtools_append_libc-musl = " musl-nscd" RDEPENDS_packagegroup-meta-oe-devtools_remove_arm = "concurrencykit" RDEPENDS_packagegroup-meta-oe-devtools_remove_armv5 = "uftrace nodejs" @@ -886,6 +887,7 @@ RDEPENDS_packagegroup-meta-oe-support_remove_powerpc = "ssiapi" RDEPENDS_packagegroup-meta-oe-test ="\ bats \ + cmocka \ cppunit \ cukinia \ cunit \ @@ -916,6 +918,7 @@ RDEPENDS_packagegroup-meta-oe-ptest-packages = "\ uthash-ptest \ libee-ptest \ poco-ptest \ + cmocka-ptest \ " RDEPENDS_packagegroup-meta-oe-ptest-packages_append_x86 = " mcelog-ptest" RDEPENDS_packagegroup-meta-oe-ptest-packages_append_x86-64 = " mcelog-ptest" diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch index 9bfb1f31d..eb9928a0c 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch @@ -1,4 +1,4 @@ -From ba0a0e54d9544babbd3963891f4e3200dd5583f5 Mon Sep 17 00:00:00 2001 +From cf168ae0b7bceab8432d096719b331f18428fe39 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2020 15:10:37 -0700 Subject: [PATCH] cmake: Add check for atomic support @@ -20,27 +20,31 @@ Fixes Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/6555] Signed-off-by: Khem Raj --- - CMakeLists.txt | 6 +++ + CMakeLists.txt | 5 +++ cmake/modules/CheckAtomic.cmake | 69 +++++++++++++++++++++++++++++++++ - 2 files changed, 75 insertions(+) + 2 files changed, 74 insertions(+) create mode 100644 cmake/modules/CheckAtomic.cmake +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f9c8f3346..4d604004b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -780,7 +780,13 @@ if(WIN32) +@@ -852,7 +852,12 @@ endif() + if(WIN32) set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib) - set(LIBS ${ROCKSDB_STATIC_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) else() + # check if linking against libatomic is necessary + include(CheckAtomic) -+ set(SYSTEM_LIBS ${CMAKE_THREAD_LIBS_INIT}) + if(HAVE_CXX_ATOMIC_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB) + set(SYSTEM_LIBS ${SYSTEM_LIBS} atomic) + endif() - set(LIBS ${ROCKSDB_SHARED_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) + endif() - add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES}) + add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES}) +diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake +new file mode 100644 +index 000000000..8b7dc8a37 --- /dev/null +++ b/cmake/modules/CheckAtomic.cmake @@ -0,0 +1,69 @@ @@ -113,3 +117,6 @@ Signed-off-by: Khem Raj + endif() +endif() + +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch new file mode 100644 index 000000000..57433b057 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch @@ -0,0 +1,43 @@ +From 46a4e585175cac8d76bd0b64f0fc27c9e22f04a1 Mon Sep 17 00:00:00 2001 +From: Pascal Bach +Date: Mon, 12 Oct 2020 21:22:46 +0200 +Subject: [PATCH] cmake: Use exported target for bz2 + +Without this change, CMake puts the entire path into the generated file. +This is not portable and makes it fail in environment like Yocto. + +Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7541] +--- + CMakeLists.txt | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 676192913..801586c30 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,7 +32,7 @@ + # 3. cmake .. + # 4. make -j + +-cmake_minimum_required(VERSION 3.5.1) ++cmake_minimum_required(VERSION 3.7.2) + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules/") + include(ReadVersion) +@@ -148,12 +148,7 @@ else() + if(WITH_BZ2) + find_package(BZip2 REQUIRED) + add_definitions(-DBZIP2) +- if(BZIP2_INCLUDE_DIRS) +- include_directories(${BZIP2_INCLUDE_DIRS}) +- else() +- include_directories(${BZIP2_INCLUDE_DIR}) +- endif() +- list(APPEND THIRDPARTY_LIBS ${BZIP2_LIBRARIES}) ++ list(APPEND THIRDPARTY_LIBS BZip2::BZip2) + endif() + + if(WITH_LZ4) +-- +2.28.0 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-db-write_thread.cc-Initialize-state.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-db-write_thread.cc-Initialize-state.patch deleted file mode 100644 index 97ddbce59..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-db-write_thread.cc-Initialize-state.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 49dcd22dcf1aae5995c42eac0fda68516fc1cd43 Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Wed, 19 Jun 2019 17:57:24 +0800 -Subject: [PATCH] db/write_thread.cc: Initialize state - -Fixed an error when compiled without -O2: -db/write_thread.cc:183:14: error: 'state' may be used uninitialized in this function [-Werror=maybe-uninitialized] - -Upstream-Status: Pending - -Signed-off-by: Robert Yang ---- - db/write_thread.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/db/write_thread.cc b/db/write_thread.cc -index 835992c..6f99a11 100644 ---- a/db/write_thread.cc -+++ b/db/write_thread.cc -@@ -59,7 +59,7 @@ uint8_t WriteThread::BlockingAwaitState(Writer* w, uint8_t goal_mask) { - - uint8_t WriteThread::AwaitState(Writer* w, uint8_t goal_mask, - AdaptationContext* ctx) { -- uint8_t state; -+ uint8_t state = 0; - - // 1. Busy loop using "pause" for 1 micro sec - // 2. Else SOMETIMES busy loop using "yield" for 100 micro sec (default) --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb index b9038df81..7ebc5ab1d 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" -SRCREV = "551a110918493a19d11243f53408b97485de1411" -SRCBRANCH = "6.6.fb" -PV = "6.6.4" +SRCREV = "48bfca38f6f175435052a59791922a1a453d9609" +SRCBRANCH = "6.11.fb" +PV = "6.11.4" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ - file://0001-db-write_thread.cc-Initialize-state.patch \ file://0001-cmake-Add-check-for-atomic-support.patch \ + file://0001-cmake-Use-exported-target-for-bz2.patch \ " S = "${WORKDIR}/git" @@ -31,6 +31,7 @@ PACKAGECONFIG[gflags] = "-DWITH_GFLAGS=ON,-DWITH_GFLAGS=OFF,gflags" EXTRA_OECMAKE = "\ -DPORTABLE=ON \ -DWITH_TESTS=OFF \ + -DWITH_BENCHMARK_TOOLS=OFF \ -DWITH_TOOLS=OFF \ -DFAIL_ON_WARNINGS=OFF \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index 406494ebb..2a4209344 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -4,8 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master " -SRCREV = "c5416adeb210154dc4ccc4c3e1c5297d83ebd41e" -PV = "1.1" +SRCREV = "95f3c6ab36840fb1e0f4935f34dbf8f708b7780c" +PV = "1.2" SRC_URI_append_class-target = "file://oe-remote.repo.sample" diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb new file mode 100644 index 000000000..374f94409 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb @@ -0,0 +1,37 @@ +# Copyright (C) 2020 Armin Kuster +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Musl-nscd is an implementation of the NSCD protocol, suitable for use with musl and with standard NSS modules" +HOMEPAGE = "https://github.com/pikhq/musl-nscd" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9bf479a145bcaff8489e743da58afeee" +SECTION = "utils" + +PV = "1.0.2" + +CFLAGS += "-fcommon" + +SRCREV = "8f278675e1b6a3a02c8ee1b8ca000f80570dc5d6" +SRC_URI = "git://github.com/pikhq/musl-nscd" + +UPSTREAM_CHECK_COMMITS = "1" + +inherit autotools-brokensep + +S = "${WORKDIR}/git" + +do_configure () { + # no debug set -s flag + sed -i -e 's/LDFLAGS_AUTO=-s/LDFLAGS_AUTO=/' ${S}/configure + ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} +} + +do_compile () { + oe_runmake +} + +do_install () { + make DESTDIR=${D} install +} + +COMPATIBLE_HOST = ".*-musl.*" diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch index c7830ed90..5dcc6afdf 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch @@ -15,16 +15,19 @@ Signed-off-by: Zheng Ruoqin Update for 20191103. Signed-off-by: Zheng Ruoqin + +Update for 20200910. +Signed-off-by: Zang Ruochen --- aclocal.m4 | 1 - - configure | 259 ------------------------------------------------------------- + configure | 259 ----------------------------------------------------- 2 files changed, 260 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 -index b90cfe6..413ea9c 100644 +index 1c6a3ee..2f7e9b5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -1232,7 +1232,6 @@ CF_GCC_VERSION +@@ -1317,7 +1317,6 @@ CF_GCC_VERSION CF_ACVERSION_CHECK(2.52, [AC_PROG_CC_STDC], [CF_ANSI_CC_REQD]) @@ -33,20 +36,20 @@ index b90cfe6..413ea9c 100644 dnl --------------------------------------------------------------------------- dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19 diff --git a/configure b/configure -index ec77bba..234f271 100755 +index 378f27d..8f40229 100755 --- a/configure +++ b/configure -@@ -2059,265 +2059,6 @@ esac +@@ -2066,265 +2066,6 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} --echo "$as_me:2062: checking \$CFLAGS variable" >&5 +-echo "$as_me:2069: checking \$CFLAGS variable" >&5 -echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 -case "x$CFLAGS" in -(*-[IUD]*) -- echo "$as_me:2066: result: broken" >&5 +- echo "$as_me:2073: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:2068: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 +- { echo "$as_me:2075: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} - cf_flags="$CFLAGS" - CFLAGS= @@ -154,18 +157,18 @@ index ec77bba..234f271 100755 - done - ;; -(*) -- echo "$as_me:2176: result: ok" >&5 +- echo "$as_me:2183: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - --echo "$as_me:2181: checking \$CC variable" >&5 +-echo "$as_me:2188: checking \$CC variable" >&5 -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 -case "$CC" in -(*[\ \ ]-*) -- echo "$as_me:2185: result: broken" >&5 +- echo "$as_me:2192: result: broken" >&5 -echo "${ECHO_T}broken" >&6 -- { echo "$as_me:2187: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 +- { echo "$as_me:2194: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} - # humor him... - cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -282,26 +285,26 @@ index ec77bba..234f271 100755 - done - test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 - --echo "${as_me:-configure}:2304: testing resulting CC: '$CC' ..." 1>&5 +-echo "${as_me:-configure}:2311: testing resulting CC: '$CC' ..." 1>&5 - - test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 - --echo "${as_me:-configure}:2308: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2315: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 - - test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 - --echo "${as_me:-configure}:2312: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +-echo "${as_me:-configure}:2319: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 - - ;; -(*) -- echo "$as_me:2316: result: ok" >&5 +- echo "$as_me:2323: result: ok" >&5 -echo "${ECHO_T}ok" >&6 - ;; -esac - - echo "$as_me:2321: checking whether ${MAKE-make} sets \${MAKE}" >&5 + echo "$as_me:2328: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200330.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200330.bb deleted file mode 100644 index 975311c92..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200330.bb +++ /dev/null @@ -1,11 +0,0 @@ -# Sigh. This is one of those places where everyone licenses it differently. Someone -# even apply UCB to it (Free/Net/OpenBSD). The maintainer states that: -# "I've found no reliable source which states that byacc must bear a UCB copyright." -# Setting to PD as this is what the upstream has it as. - -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=262857ec5923f073fa06a1f1812225ea" -require byacc.inc - -SRC_URI[md5sum] = "decf6e6b82ea2efae6bbad32d7777da8" -SRC_URI[sha256sum] = "e099e2dd8a684d739ac6b9a0e43d468314a5bc34fd21466502d120b18df51fb0" diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200910.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200910.bb new file mode 100644 index 000000000..b7640ffca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20200910.bb @@ -0,0 +1,11 @@ +# Sigh. This is one of those places where everyone licenses it differently. Someone +# even apply UCB to it (Free/Net/OpenBSD). The maintainer states that: +# "I've found no reliable source which states that byacc must bear a UCB copyright." +# Setting to PD as this is what the upstream has it as. + +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=262857ec5923f073fa06a1f1812225ea" +require byacc.inc + +SRC_URI[md5sum] = "5726a5a655c6fd4e8f950552cceeae29" +SRC_URI[sha256sum] = "0a5906073aeaf23ddc20aaac0ea61cb5ccc18572870b113375dec4ffe85ecf30" diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb index 40a8442a5..b9e735f27 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb @@ -49,6 +49,8 @@ PACKAGECONFIG[libesmtp] = "--with-libesmtp,--without-libesmtp,libesmtp" PACKAGECONFIG[libmnl] = "--with-libmnl,--without-libmnl,libmnl" PACKAGECONFIG[libatasmart] = "--with-libatasmart,--without-libatasmart,libatasmart" PACKAGECONFIG[ldap] = "--enable-openldap --with-libldap,--disable-openldap --without-libldap, openldap" +PACKAGECONFIG[rrdtool] = "--enable-rrdtool,--disable-rrdtool,rrdtool" +PACKAGECONFIG[rrdcached] = "--enable-rrdcached,--disable-rrdcached,rrdcached" EXTRA_OECONF = " \ ${FPLAYOUT} \ diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-CMakeLists.txt-use-curl-local-source-tarball.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-CMakeLists.txt-use-curl-local-source-tarball.patch new file mode 100644 index 000000000..183a006e8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-CMakeLists.txt-use-curl-local-source-tarball.patch @@ -0,0 +1,34 @@ +From 8d99edeefb23c9d7574a0b5a0e2e3f41b0433490 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Thu, 10 Sep 2020 16:14:10 +0800 +Subject: [PATCH] CMakeLists.txt: use curl local source tarball + +Do not download curl source during compile. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + CMakeLists.txt | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7cd550fb..215a4ef4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -314,11 +314,7 @@ endif() + + ExternalProject_Add( + curl-external +- GIT_REPOSITORY "https://github.com/curl/curl.git" +- GIT_TAG "f3294d9d86e6a7915a967efff2842089b8b0d071" # Version 7.64.0 +- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-src" +- LIST_SEPARATOR % # This is needed for passing semicolon-separated lists +- TLS_VERIFY OFF ++ SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/curl-7.64.0" + CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS} + "-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-install" + "-DCMAKE_INSTALL_LIBDIR=lib${LIBSUFFIX}" +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0002-cmake-LibreSSL.cmake-use-libressl-local-source-tarba.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0002-cmake-LibreSSL.cmake-use-libressl-local-source-tarba.patch new file mode 100644 index 000000000..da5ee9754 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0002-cmake-LibreSSL.cmake-use-libressl-local-source-tarba.patch @@ -0,0 +1,32 @@ +From 5a5317044b0039e9e19aabcecb7b666a3f13e136 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Thu, 10 Sep 2020 15:08:19 +0800 +Subject: [PATCH] cmake/LibreSSL.cmake: use libressl local source tarball + +Do not download libressl source during compile. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + cmake/LibreSSL.cmake | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/cmake/LibreSSL.cmake b/cmake/LibreSSL.cmake +index 57319e40..bab30129 100644 +--- a/cmake/LibreSSL.cmake ++++ b/cmake/LibreSSL.cmake +@@ -43,9 +43,7 @@ function(use_libre_ssl SOURCE_DIR BINARY_DIR) + + ExternalProject_Add( + libressl-portable +- URL https://cdn.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz https://gentoo.osuosl.org/distfiles/libressl-2.8.3.tar.gz +- URL_HASH "SHA256=9b640b13047182761a99ce3e4f000be9687566e0828b4a72709e9e6a3ef98477" +- SOURCE_DIR "${BINARY_DIR}/thirdparty/libressl-src" ++ SOURCE_DIR "${SOURCE_DIR}/thirdparty/libressl-2.8.3" + PATCH_COMMAND ${PATCH} + CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS} + "-DCMAKE_INSTALL_PREFIX=${BINARY_DIR}/thirdparty/libressl-install" +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch new file mode 100644 index 000000000..a39e15b79 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch @@ -0,0 +1,34 @@ +From 74ade26f7ccd0dbc4ad97cb3082204118a67c92b Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Thu, 10 Sep 2020 15:12:41 +0800 +Subject: [PATCH] cmake/BundledOSSPUUID.cmake: use ossp-uuid local source + tarball + +Do not download ossp-uuid source during compile. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + cmake/BundledOSSPUUID.cmake | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/cmake/BundledOSSPUUID.cmake b/cmake/BundledOSSPUUID.cmake +index 1103156d..0cf4bac0 100644 +--- a/cmake/BundledOSSPUUID.cmake ++++ b/cmake/BundledOSSPUUID.cmake +@@ -47,10 +47,8 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR) + + ExternalProject_Add( + ossp-uuid-external +- URL "https://deb.debian.org/debian/pool/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz" +- URL_HASH "SHA256=11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0" + BUILD_IN_SOURCE true +- SOURCE_DIR "${BINARY_DIR}/thirdparty/ossp-uuid-src" ++ SOURCE_DIR "${SOURCE_DIR}/thirdparty/uuid-1.6.2" + BUILD_COMMAND make + CMAKE_COMMAND "" + UPDATE_COMMAND "" +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service index 5802a7b2f..059cdbcc2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/minifi.service @@ -5,7 +5,7 @@ RequiresMountsFor=/var [Service] Type=simple -WorkingDirectory=@LOCALSTATEDIR@/run/minifi +WorkingDirectory=@LOCALSTATEDIR@/lib/minifi Environment=MINIFI_HOME=@SYSCONFDIR@/minifi ExecStart=@BINDIR@/minifi diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf index c828b49fa..6da442da3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/systemd-volatile.conf @@ -1,2 +1 @@ -d @MINIFI_RUN@ 0755 root root - d @MINIFI_LOG@ 0755 root root - diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf index 2ad14e677..db149d01f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/sysvinit-volatile.conf @@ -1,2 +1 @@ -d root root 0755 @MINIFI_RUN@ none d root root 0755 @MINIFI_LOG@ none diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 37036ebbb..5127e11d8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -12,6 +12,9 @@ RDEPENDS_${PN} = "python3-core" SRCREV = "aa42957a2e227df41510047cece3cd606dc1cb6a" SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ + https://curl.haxx.se/download/curl-7.64.0.tar.bz2;name=curl;subdir=git/thirdparty \ + https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz;name=libressl;subdir=git/thirdparty \ + ${DEBIAN_MIRROR}/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz;name=ossp-uuid;subdir=git/thirdparty \ file://fix-minifi-compile.patch \ file://fix-libressl-compile.patch \ file://fix-libressl-avoid-BSWAP-assembly-for-ARM-v6.patch \ @@ -21,10 +24,21 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ file://fix-rocksdb-cross-compile.patch \ file://remove_const_due_to_std_lock_guard.patch \ file://0001-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch \ + file://0001-CMakeLists.txt-use-curl-local-source-tarball.patch \ + file://0002-cmake-LibreSSL.cmake-use-libressl-local-source-tarba.patch \ + file://0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch \ file://minifi.service \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \ " + +SRC_URI[curl.md5sum] = "d0bcc586873cfef08b4b9594e5395a33" +SRC_URI[curl.sha256sum] = "d573ba1c2d1cf9d8533fadcce480d778417964e8d04ccddcc76e591d544cf2eb" +SRC_URI[libressl.md5sum] = "0f1127bd21b4aa8495a910379c2ad936" +SRC_URI[libressl.sha256sum] = "9b640b13047182761a99ce3e4f000be9687566e0828b4a72709e9e6a3ef98477" +SRC_URI[ossp-uuid.md5sum] = "5db0d43a9022a6ebbbc25337ae28942f" +SRC_URI[ossp-uuid.sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0" + S = "${WORKDIR}/git" inherit pkgconfig cmake systemd @@ -52,19 +66,20 @@ TARGET_CXXFLAGS_append_riscv32 += "-fpic" TARGET_CFLAGS_append_riscv64 += "-fpic" TARGET_CXXFLAGS_append_riscv64 += "-fpic" +do_install[cleandirs] += "${WORKDIR}/minifi-install" do_install() { - DESTDIR='${B}/minifi-install' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} - - MINIFI_BIN=${base_prefix}${bindir} - MINIFI_HOME=${base_prefix}${sysconfdir}/minifi - MINIFI_RUN=${base_prefix}${localstatedir}/run/minifi - MINIFI_LOG=${base_prefix}${localstatedir}/log/minifi + DESTDIR='${WORKDIR}/minifi-install' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} + MINIFI_BIN=${bindir} + MINIFI_HOME=${sysconfdir}/minifi + MINIFI_RUN=${localstatedir}/lib/minifi + MINIFI_LOG=${localstatedir}/log/minifi install -d ${D}${MINIFI_BIN} install -d ${D}${MINIFI_HOME}/conf - cp -a ${B}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/ - cp -a ${B}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/ + install -m 755 -d ${D}${localstatedir}/lib/minifi + cp -a ${WORKDIR}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/ + cp -a ${WORKDIR}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/ sed -i 's|#appender.rolling.directory=.*|appender.rolling.directory='${MINIFI_LOG}'|g' \ ${D}${MINIFI_HOME}/conf/minifi-log.properties @@ -79,11 +94,11 @@ do_install() { sed -i 's|export MINIFI_HOME=.*|export MINIFI_HOME='${MINIFI_HOME}'|g' ${D}${MINIFI_BIN}/minifi.sh sed -i 's|bin_dir=${MINIFI_HOME}/bin|bin_dir='${MINIFI_BIN}'|g' ${D}${MINIFI_BIN}/minifi.sh - sed -i 's|pid_file=${bin_dir}|pid_file='${MINIFI_RUN}'|g' ${D}${MINIFI_BIN}/minifi.sh + sed -i 's|pid_file=${bin_dir}/.|pid_file='${localstatedir}/run/'|g' ${D}${MINIFI_BIN}/minifi.sh if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 0644 ${WORKDIR}/systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ + install -m 0644 ${WORKDIR}/systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/minifi.conf install -m 0755 -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/minifi.service ${D}${systemd_unitdir}/system/ @@ -91,14 +106,12 @@ do_install() { sed -i 's|@SYSCONFDIR@|${sysconfdir}|g' ${D}${systemd_unitdir}/system/minifi.service sed -i 's|@BINDIR@|${bindir}|g' ${D}${systemd_unitdir}/system/minifi.service - sed -i 's|@MINIFI_RUN@|'${MINIFI_RUN}'|g' ${D}${sysconfdir}/tmpfiles.d/systemd-volatile.conf - sed -i 's|@MINIFI_LOG@|'${MINIFI_LOG}'|g' ${D}${sysconfdir}/tmpfiles.d/systemd-volatile.conf + sed -i 's|@MINIFI_LOG@|'${MINIFI_LOG}'|g' ${D}${sysconfdir}/tmpfiles.d/minifi.conf elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/sysvinit-volatile.conf ${D}${sysconfdir}/default/volatiles/99_minifi - sed -i 's|@MINIFI_RUN@|'${MINIFI_RUN}'|g' ${D}${sysconfdir}/default/volatiles/99_minifi sed -i 's|@MINIFI_LOG@|'${MINIFI_LOG}'|g' ${D}${sysconfdir}/default/volatiles/99_minifi fi } @@ -112,9 +125,3 @@ pkg_postinst_${PN}() { fi fi } - -FILES_${PN} = " \ - ${bindir} \ - ${sysconfdir} \ - ${systemd_unitdir} \ - " diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.7.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.7.bb deleted file mode 100644 index 791e41e6e..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.7.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "Redis key-value store" -DESCRIPTION = "Redis is an open source, advanced key-value store." -HOMEPAGE = "http://redis.io" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" -DEPENDS = "readline lua ncurses" - -SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ - file://redis.conf \ - file://init-redis-server \ - file://redis.service \ - file://hiredis-use-default-CC-if-it-is-set.patch \ - file://lua-update-Makefile-to-use-environment-build-setting.patch \ - file://oe-use-libc-malloc.patch \ - file://0001-src-Do-not-reset-FINAL_LIBS.patch \ - file://GNU_SOURCE.patch \ - " - -SRC_URI[md5sum] = "ac57b7188b771bbc08e8d7d6dddb3a80" -SRC_URI[sha256sum] = "c2aaa1a4c7e72c70adedf976fdd5e1d34d395989283dab9d7840e0a304bb2393" - -inherit autotools-brokensep update-rc.d systemd useradd - -FINAL_LIBS_x86_toolchain-clang = "-latomic" -FINAL_LIBS_mips = "-latomic" -FINAL_LIBS_arm = "-latomic" -FINAL_LIBS_powerpc = "-latomic" - -export FINAL_LIBS - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" -GROUPADD_PARAM_${PN} = "--system redis" - -REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" - -do_compile_prepend() { - (cd deps && oe_runmake hiredis lua linenoise) -} - -do_install() { - export PREFIX=${D}/${prefix} - oe_runmake install - install -d ${D}/${sysconfdir}/redis - install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server - install -d ${D}/var/lib/redis/ - chown redis.redis ${D}/var/lib/redis/ - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service - - if [ "${REDIS_ON_SYSTEMD}" = true ]; then - sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf - fi -} - -CONFFILES_${PN} = "${sysconfdir}/redis/redis.conf" - -INITSCRIPT_NAME = "redis-server" -INITSCRIPT_PARAMS = "defaults 87" - -SYSTEMD_SERVICE_${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb new file mode 100644 index 000000000..64b137c1b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.0.8.bb @@ -0,0 +1,66 @@ +SUMMARY = "Redis key-value store" +DESCRIPTION = "Redis is an open source, advanced key-value store." +HOMEPAGE = "http://redis.io" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" +DEPENDS = "readline lua ncurses" + +SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ + file://redis.conf \ + file://init-redis-server \ + file://redis.service \ + file://hiredis-use-default-CC-if-it-is-set.patch \ + file://lua-update-Makefile-to-use-environment-build-setting.patch \ + file://oe-use-libc-malloc.patch \ + file://0001-src-Do-not-reset-FINAL_LIBS.patch \ + file://GNU_SOURCE.patch \ + " + +SRC_URI[md5sum] = "70113b4b8ea7ee4c7e148be62b5d1e0b" +SRC_URI[sha256sum] = "04fa1fddc39bd1aecb6739dd5dd73858a3515b427acd1e2947a66dadce868d68" + +inherit autotools-brokensep update-rc.d systemd useradd + +FINAL_LIBS_x86_toolchain-clang = "-latomic" +FINAL_LIBS_mips = "-latomic" +FINAL_LIBS_arm = "-latomic" +FINAL_LIBS_powerpc = "-latomic" + +export FINAL_LIBS + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" +GROUPADD_PARAM_${PN} = "--system redis" + +REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" + +do_compile_prepend() { + (cd deps && oe_runmake hiredis lua linenoise) +} + +do_install() { + export PREFIX=${D}/${prefix} + oe_runmake install + install -d ${D}/${sysconfdir}/redis + install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server + install -d ${D}/var/lib/redis/ + chown redis.redis ${D}/var/lib/redis/ + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service + + if [ "${REDIS_ON_SYSTEMD}" = true ]; then + sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf + fi +} + +CONFFILES_${PN} = "${sysconfdir}/redis/redis.conf" + +INITSCRIPT_NAME = "redis-server" +INITSCRIPT_PARAMS = "defaults 87" + +SYSTEMD_SERVICE_${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartd.service b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartd.service index f3db946c8..e90a7c4de 100644 --- a/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartd.service +++ b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartd.service @@ -6,7 +6,6 @@ After=syslog.target EnvironmentFile=-@SYSCONFDIR@/smartmontools ExecStart=@SBINDIR@/smartd -n $smart_opts ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID -StandardOutput=syslog [Install] WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.25.bb b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.25.bb index 8daf737a5..fe7657f54 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.25.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.25.bb @@ -29,6 +29,12 @@ do_configure_append() { cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/ cd ${S}/libgphoto2_port/ autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths + + # remove WORKDIR information from config to improve reproducibility + # libgphoto2_port recheck config will set the WORKDIR info again, so dont do that + sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h + sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/libgphoto2_port/config.status + sed -i '/config\.status/ s/\-\-recheck//' ${B}/libgphoto2_port/Makefile cd ${S} } diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.20.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.20.bb deleted file mode 100644 index 356c78c0d..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.20.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Jpeg 2000 implementation" -HOMEPAGE = "https://github.com/jasper-software/jasper" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" - -SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https" -SRCREV = "d10a710f31da3d079a984d35ff6cc82a853d25d7" - -S = "${WORKDIR}/git" - -inherit cmake - -PACKAGECONFIG ??= "" -PACKAGECONFIG[jpeg] = "-DJAS_ENABLE_LIBJPEG=true, -DJAS_ENABLE_LIBJPEG=false, jpeg" -PACKAGECONFIG[opengl] = "-DJAS_ENABLE_OPENGL=true, -DJAS_ENABLE_OPENGL=false, freeglut" - -EXTRA_OECMAKE_append = " -DJAS_ENABLE_SHARED=true" - -do_install_append() { - chrpath -d ${D}${bindir}/jasper - chrpath -d ${D}${bindir}/imginfo - chrpath -d ${D}${bindir}/imgcmp - chrpath -d ${D}${libdir}/libjasper.so.* -} diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.22.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.22.bb new file mode 100644 index 000000000..b2b053a28 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.22.bb @@ -0,0 +1,24 @@ +SUMMARY = "Jpeg 2000 implementation" +HOMEPAGE = "https://jasper-software.github.io/jasper/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" + +SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https" +SRCREV = "95b2f0583a71c92cddefb54b522efe717b7a5adc" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGECONFIG ??= "" +PACKAGECONFIG[jpeg] = "-DJAS_ENABLE_LIBJPEG=true, -DJAS_ENABLE_LIBJPEG=false, jpeg" +PACKAGECONFIG[opengl] = "-DJAS_ENABLE_OPENGL=true, -DJAS_ENABLE_OPENGL=false, freeglut" + +EXTRA_OECMAKE_append = " -DJAS_ENABLE_SHARED=true" + +do_install_append() { + chrpath -d ${D}${bindir}/jasper + chrpath -d ${D}${bindir}/imginfo + chrpath -d ${D}${bindir}/imgcmp + chrpath -d ${D}${libdir}/libjasper.so.* +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/suckless/st_0.8.4.bb b/meta-openembedded/meta-oe/recipes-graphics/suckless/st_0.8.4.bb index 906179501..1f0f2f7f2 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/suckless/st_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/suckless/st_0.8.4.bb @@ -23,3 +23,13 @@ do_install() { FILES_${PN} += " \ ${datadir}/terminfo \ " + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "50" + +ALTERNATIVE_${PN} = "st st-256color" + +ALTERNATIVE_LINK_NAME[st] = "${datadir}/terminfo/s/st" + +ALTERNATIVE_LINK_NAME[st-256color] = "${datadir}/terminfo/s/st-256color" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb index 4df0c3afb..9c89f97f3 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb @@ -8,7 +8,7 @@ PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/hunkyfonts/hunkyfonts-${PV}.tar.bz2" -S = "${WORKDIR}/hunkyfonts-${PV}/TTF/" +S = "${WORKDIR}/hunkyfonts-${PV}/TTF" PACKAGES = "ttf-hunky-sans ttf-hunky-serif" FONT_PACKAGES = "ttf-hunky-sans ttf-hunky-serif" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200721.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200721.bb deleted file mode 100644 index df85cd484..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200721.bb +++ /dev/null @@ -1,62 +0,0 @@ -# live555 OE build file -# Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION = "LIVE555 Streaming Media libraries" -HOMEPAGE = "http://live.com/" -LICENSE = "LGPLv3" -SECTION = "devel" - -DEPENDS = "openssl" - -URLV = "${@d.getVar('PV')[0:4]}.${@d.getVar('PV')[4:6]}.${@d.getVar('PV')[6:8]}" -SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz \ - file://config.linux-cross" - -# only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older -MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" - -SRC_URI[sha256sum] = "89b2d99589de2ce9b4007ea6625dfce28317421604cf5131f4e1bf5bf7040b63" - -S = "${WORKDIR}/live" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - " - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure() { - cp ${WORKDIR}/config.linux-cross . - echo "COMPILE_OPTS+=" -fPIC -DXLOCALE_NOT_USED"" >> config.linux-cross - ./genMakefiles linux-cross -} - -do_install() { - install -d ${D}${includedir}/BasicUsageEnvironment - install -d ${D}${includedir}/groupsock - install -d ${D}${includedir}/liveMedia - install -d ${D}${includedir}/UsageEnvironment - install -d ${D}${libdir} - cp -R --no-dereference --preserve=mode,links -v ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/ - cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/ - cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/ - cp -R --no-dereference --preserve=mode,links -v ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/ - cp -R --no-dereference --preserve=mode,links -v ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/ - # Find all the headers - for i in $(find . -name "*.hh") $(find . -name "*.h") ; do - install ${i} ${D}${includedir} - done - cp ${S}/*/*.a ${D}${libdir} - install -d ${D}${bindir} - for i in MPEG2TransportStreamIndexer openRTSP playSIP sapWatch testMPEG1or2ProgramToTransportStream testMPEG1or2Splitter testMPEG1or2VideoReceiver testMPEG2TransportStreamTrickPlay testOnDemandRTSPServer testRelay testAMRAudioStreamer testDVVideoStreamer testMP3Receiver testMP3Streamer testMPEG1or2AudioVideoStreamer testMPEG1or2VideoStreamer testMPEG2TransportStreamer testMPEG4VideoStreamer testWAVAudioStreamer vobStreamer; do - install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/ - done - install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/ -} - -PACKAGES =+ "live555-openrtsp live555-playsip live555-mediaserver live555-examples" -FILES_live555-openrtsp = "${bindir}/openRTSP" -FILES_live555-playsip = "${bindir}/playSIP" -FILES_live555-mediaserver = "${bindir}/live555MediaServer" -FILES_live555-examples = "${bindir}/*" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200819.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200819.bb new file mode 100644 index 000000000..c746b6e97 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20200819.bb @@ -0,0 +1,62 @@ +# live555 OE build file +# Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION = "LIVE555 Streaming Media libraries" +HOMEPAGE = "http://live.com/" +LICENSE = "LGPLv3" +SECTION = "devel" + +DEPENDS = "openssl" + +URLV = "${@d.getVar('PV')[0:4]}.${@d.getVar('PV')[4:6]}.${@d.getVar('PV')[6:8]}" +SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz \ + file://config.linux-cross" + +# only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older +MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" + +SRC_URI[sha256sum] = "af3af7f2510b0b45f38892c232abca2cee2ab36a62503e7085b47ed2c3c2c537" + +S = "${WORKDIR}/live" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + " + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_configure() { + cp ${WORKDIR}/config.linux-cross . + echo "COMPILE_OPTS+=" -fPIC -DXLOCALE_NOT_USED"" >> config.linux-cross + ./genMakefiles linux-cross +} + +do_install() { + install -d ${D}${includedir}/BasicUsageEnvironment + install -d ${D}${includedir}/groupsock + install -d ${D}${includedir}/liveMedia + install -d ${D}${includedir}/UsageEnvironment + install -d ${D}${libdir} + cp -R --no-dereference --preserve=mode,links -v ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/ + cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/ + cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/ + cp -R --no-dereference --preserve=mode,links -v ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/ + cp -R --no-dereference --preserve=mode,links -v ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/ + # Find all the headers + for i in $(find . -name "*.hh") $(find . -name "*.h") ; do + install ${i} ${D}${includedir} + done + cp ${S}/*/*.a ${D}${libdir} + install -d ${D}${bindir} + for i in MPEG2TransportStreamIndexer openRTSP playSIP sapWatch testMPEG1or2ProgramToTransportStream testMPEG1or2Splitter testMPEG1or2VideoReceiver testMPEG2TransportStreamTrickPlay testOnDemandRTSPServer testRelay testAMRAudioStreamer testDVVideoStreamer testMP3Receiver testMP3Streamer testMPEG1or2AudioVideoStreamer testMPEG1or2VideoStreamer testMPEG2TransportStreamer testMPEG4VideoStreamer testWAVAudioStreamer vobStreamer; do + install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/ + done + install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/ +} + +PACKAGES =+ "live555-openrtsp live555-playsip live555-mediaserver live555-examples" +FILES_live555-openrtsp = "${bindir}/openRTSP" +FILES_live555-playsip = "${bindir}/playSIP" +FILES_live555-mediaserver = "${bindir}/live555MediaServer" +FILES_live555-examples = "${bindir}/*" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb index e5f1096b6..057f9c6f3 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb @@ -42,7 +42,6 @@ PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ " -PACKAGECONFIG_remove_aarch64 = "lua" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" PACKAGECONFIG[xv] = "--enable-xv,--disable-xv,libxv" PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.5.bb b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.5.bb index 9a8332836..56bf51554 100644 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.5.bb @@ -25,3 +25,10 @@ PACKAGECONFIG_remove_riscv32 = "unwind" PACKAGECONFIG[unwind] = "-DWITH_UNWIND=ON,-DWITH_UNWIND=OFF,libunwind,libunwind" PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," + +do_configure_append() { + # remove WORKDIR info to improve reproducibility + if [ -f "${B}/config.h" ] ; then + sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h + fi +} diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc deleted file mode 100644 index cae3145dd..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "C library and tools for interacting with the linux GPIO character device" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" - -SRC_URI = "https://www.kernel.org/pub/software/libs/libgpiod/${BP}.tar.xz" - -inherit autotools pkgconfig - -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" - -EXTRA_OECONF = "--enable-tools" - -PACKAGES =+ " ${PN}-tools" - -FILES_${PN}-tools = "${bindir}/*" - -PACKAGES =+ "libgpiodcxx" -FILES_libgpiodcxx = "${libdir}/libgpiodcxx.so.*" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb deleted file mode 100644 index c4d2bddf4..000000000 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb +++ /dev/null @@ -1,8 +0,0 @@ -require libgpiod.inc - -PACKAGECONFIG ?= "" - -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" - -SRC_URI[md5sum] = "2aa1e1a80c3c919ae142ab9a55fb59ca" -SRC_URI[sha256sum] = "b773e557af1a497f786825462a776b7bf90168e67ee0a5bc5d2473a5674dc38c" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb index a9a462866..6433675ca 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb @@ -1,19 +1,31 @@ -require libgpiod.inc +SUMMARY = "C library and tools for interacting with the linux GPIO character device" +AUTHOR = "Bartosz Golaszewski " -DEPENDS += "autoconf-archive-native" +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" +SRC_URI = "https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz" SRC_URI[md5sum] = "064c2627397e6641c52de09a26951112" SRC_URI[sha256sum] = "f1cda2789e6a13a92aefc012a76e5a7cc57a1b402d66f71df8719ee314b67699" -# enable cxx bindings -PACKAGECONFIG ?= "cxx" +inherit autotools pkgconfig python3native -PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" - +PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" -inherit python3native +# Enable cxx bindings by default. +PACKAGECONFIG ?= "cxx" + +# Always build tools - they don't have any additional +# requirements over the library. +EXTRA_OECONF = "--enable-tools" + +DEPENDS += "autoconf-archive-native" + +PACKAGES =+ "${PN}-tools libgpiodcxx" +FILES_${PN}-tools = "${bindir}/*" +FILES_libgpiodcxx = "${libdir}/libgpiodcxx.so.*" PACKAGES =+ "${PN}-python" FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest b/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest new file mode 100644 index 000000000..2a7922f1a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/files/run-ptest @@ -0,0 +1,7 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +for test in $(ls $ptestdir/tests) +do + ./test-driver --test-name $test --log-file $test.log --trs-file $test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./tests/$test +done diff --git a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb index c1f337a44..a1d85617a 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb @@ -9,11 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ file://CVE-2019-17498.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest EXTRA_OECONF += "\ --with-libz \ @@ -26,3 +27,17 @@ PACKAGECONFIG[openssl] = "--with-crypto=openssl --with-libssl-prefix=${STAGING_L PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGING_EXECPREFIXDIR}, , libgcrypt" BBCLASSEXTEND = "native nativesdk" + +RDEPENDS_${PN}-ptest = "bash" + +do_compile_ptest() { + sed -i "/\$(MAKE) \$(AM_MAKEFLAGS) check-TESTS/d" tests/Makefile + oe_runmake check +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/tests/.libs/simple ${D}${PTEST_PATH}/tests/ + install -m 0755 ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ + install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/ +} diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch new file mode 100644 index 000000000..b35d67cf5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch @@ -0,0 +1,40 @@ +From 35421d03898ac1b38f97a76241e6a29086d0c9f1 Mon Sep 17 00:00:00 2001 +From: Geoff Parker +Date: Fri, 9 Oct 2020 17:48:47 +0000 +Subject: [PATCH] libdmmp/Makefile: replace perl with sed in install target to + work with pseudo + +The multipath-tools libdmmp/Makefile install target uses 'perl -i' instead +of 'sed -i' for string substitutions. The perl method creates a temporary file +and overwrites the original which changes the inodes and corrupts the pseudo +db. Changes to pseduo cause a build abort rather than allow possible bad +ownership or permissions settings on the files. 'sed -i' is compatible +with pseudo. + +Signed-off-by: Geoff Parker +--- + libdmmp/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libdmmp/Makefile b/libdmmp/Makefile +index 1dd3f340..8166075c 100644 +--- a/libdmmp/Makefile ++++ b/libdmmp/Makefile +@@ -34,11 +34,11 @@ install: + $(LN) $(LIBS) $(DESTDIR)$(usrlibdir)/$(DEVLIB) + $(INSTALL_PROGRAM) -m 644 -D \ + $(PKGFILE).in $(DESTDIR)$(pkgconfdir)/$(PKGFILE) +- perl -i -pe 's|__VERSION__|$(LIBDMMP_VERSION)|g' \ ++ sed -i 's|__VERSION__|$(LIBDMMP_VERSION)|g' \ + $(DESTDIR)$(pkgconfdir)/$(PKGFILE) +- perl -i -pe 's|__LIBDIR__|$(usrlibdir)|g' \ ++ sed -i 's|__LIBDIR__|$(usrlibdir)|g' \ + $(DESTDIR)$(pkgconfdir)/$(PKGFILE) +- perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \ ++ sed -i 's|__INCLUDEDIR__|$(includedir)|g' \ + $(DESTDIR)$(pkgconfdir)/$(PKGFILE) + @for file in docs/man/*.3.gz; do \ + $(INSTALL_PROGRAM) -m 644 -D \ +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index 48a348d80..331c0cd01 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -43,6 +43,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ file://0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \ file://0030-Always-use-devmapper.patch \ file://0031-Always-use-devmapper-for-kpartx.patch \ + file://0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch \ file://0001-fix-bug-of-do_compile-and-do_install.patch \ file://0001-add-explicit-dependency-on-libraries.patch \ file://0001-fix-boolean-value-with-json-c-0.14.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch deleted file mode 100644 index 506101711..000000000 --- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 68485f8516884377e54c623b0deff73f97321d96 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" -Date: Thu, 19 Sep 2019 04:32:31 -0400 -Subject: [PATCH] numademo: fix error on 32bit system - -Error Info on 32bit: -root@intel-x86:~# numademo -t -e 1M -Configured Nodes does not match available memory nodes - -That's because sizeof(long)=4Word, but sizeof(long long)=8Word -on 32bit. So (long long) assigning to (long) maybe cause overflow. - -long numa_node_size(int node, long *freep) -{ - ... - long sz = numa_node_size64_int(node, &f2); - ~^^~ - return sz; - ... -} -long long numa_node_size64(int node, long long *freep) -~^^ ^^~ -{ - ... -} - -Unify the return type of above functions. - -Upstream-Status: Accepted [next version is after 2.0.13 or 2.0.14] -[https://github.com/numactl/numactl/commit/a7c4bc790a191d3e42b63850b409c1a72b75a4e1] - Submitted [https://github.com/numactl/numactl/pull/79] -[The first patch was merged but has a error, then the second fix it.] - -Signed-off-by: Hongzhi.Song ---- - libnuma.c | 4 ++-- - numa.h | 2 +- - numademo.c | 2 +- - test/move_pages.c | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libnuma.c b/libnuma.c -index cac8851..8b5c6aa 100644 ---- a/libnuma.c -+++ b/libnuma.c -@@ -791,10 +791,10 @@ long long numa_node_size64(int node, long long *freep) - - make_internal_alias(numa_node_size64); - --long numa_node_size(int node, long *freep) -+long long numa_node_size(int node, long long *freep) - { - long long f2; -- long sz = numa_node_size64_int(node, &f2); -+ long long sz = numa_node_size64_int(node, &f2); - if (freep) - *freep = f2; - return sz; -diff --git a/numa.h b/numa.h -index 3a8c543..268fb1d 100644 ---- a/numa.h -+++ b/numa.h -@@ -143,7 +143,7 @@ int numa_preferred(void); - - /* Return node size and free memory */ - long long numa_node_size64(int node, long long *freep); --long numa_node_size(int node, long *freep); -+long long numa_node_size(int node, long long *freep); - - int numa_pagesize(void); - -diff --git a/numademo.c b/numademo.c -index a720db0..8c56da8 100644 ---- a/numademo.c -+++ b/numademo.c -@@ -301,7 +301,7 @@ int max_node, numnodes; - int get_node_list(void) - { - int a, got_nodes = 0; -- long free_node_sizes; -+ long long free_node_sizes; - - numnodes = numa_num_configured_nodes(); - node_to_use = (int *)malloc(numnodes * sizeof(int)); -diff --git a/test/move_pages.c b/test/move_pages.c -index d1d8436..f8ff25d 100644 ---- a/test/move_pages.c -+++ b/test/move_pages.c -@@ -26,7 +26,7 @@ int *node_to_use; - int get_node_list() - { - int a, got_nodes = 0, max_node, numnodes; -- long free_node_sizes; -+ long long free_node_sizes; - - numnodes = numa_num_configured_nodes(); - node_to_use = (int *)malloc(numnodes * sizeof(int)); --- -2.23.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb b/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb index 20b7fed86..504fe0327 100644 --- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb @@ -10,15 +10,14 @@ inherit autotools-brokensep ptest LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e481299f3f677b21bb" -SRCREV = "5d9f16722e3df49dc618a9f361bd482559695db7" -PV = "2.0.13+git${SRCPV}" +SRCREV = "dd6de072c92c892a86e18c0fd0dfa1ba57a9a05d" +PV = "2.0.14+git${SRCPV}" SRC_URI = "git://github.com/numactl/numactl \ file://Fix-the-test-output-format.patch \ file://Makefile \ file://run-ptest \ file://0001-define-run-test-target.patch \ - file://0001-numademo-fix-error-on-32bit-system.patch \ " S = "${WORKDIR}/git" @@ -26,6 +25,9 @@ S = "${WORKDIR}/git" # ARM does not currently support NUMA COMPATIBLE_HOST = "^((?!arm).*)$" +LDFLAGS_append_riscv64 = " -latomic" +LDFLAGS_append_riscv32 = " -latomic" + do_install() { oe_runmake DESTDIR=${D} prefix=${D}/usr install #remove the empty man2 directory diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb deleted file mode 100644 index 91d77ac93..000000000 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.26.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "PC/SC Lite smart card framework and applications" -HOMEPAGE = "http://pcsclite.alioth.debian.org/" -LICENSE = "BSD & GPLv3+" -LICENSE_${PN} = "BSD" -LICENSE_${PN}-lib = "BSD" -LICENSE_${PN}-doc = "BSD" -LICENSE_${PN}-dev = "BSD" -LICENSE_${PN}-dbg = "BSD & GPLv3+" -LICENSE_${PN}-spy = "GPLv3+" -LICENSE_${PN}-spy-dev = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6" - -SRC_URI = "\ - https://pcsclite.apdu.fr/files/${BP}.tar.bz2 \ - file://0001-pcsc-spy-use-python3-only.patch \ -" -SRC_URI[md5sum] = "9d36882998449daceec267c68a21ff0d" -SRC_URI[sha256sum] = "3eb7be7d6ef618c0a444316cf5c1f2f9d7227aedba7a192f389fe3e7c0dfbbd9" - -inherit autotools systemd pkgconfig perlnative - -EXTRA_OECONF = " \ - --disable-libusb \ - --enable-usbdropdir=${libdir}/pcsc/drivers \ -" - -S = "${WORKDIR}/pcsc-lite-${PV}" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} udev" -PACKAGECONFIG_class-native ??= "" - -PACKAGECONFIG[systemd] = ",--disable-libsystemd,systemd," -PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev" - -PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev" - -RRECOMMENDS_${PN} = "ccid" -RRECOMMENDS_${PN}_class-native = "" - -FILES_${PN} = "${sbindir}/pcscd" -FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" -FILES_${PN}-dev = "${includedir} \ - ${libdir}/pkgconfig \ - ${libdir}/libpcsclite.la \ - ${libdir}/libpcsclite.so" - -FILES_${PN}-spy = "${bindir}/pcsc-spy \ - ${libdir}/libpcscspy*${SOLIBS}" -FILES_${PN}-spy-dev = "${libdir}/libpcscspy.la \ - ${libdir}/libpcscspy.so " - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "pcscd.socket" -RDEPENDS_${PN}-spy +="python3" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb new file mode 100644 index 000000000..6f38d65e0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb @@ -0,0 +1,58 @@ +SUMMARY = "PC/SC Lite smart card framework and applications" +HOMEPAGE = "http://pcsclite.alioth.debian.org/" +LICENSE = "BSD & GPLv3+" +LICENSE_${PN} = "BSD" +LICENSE_${PN}-lib = "BSD" +LICENSE_${PN}-doc = "BSD" +LICENSE_${PN}-dev = "BSD" +LICENSE_${PN}-dbg = "BSD & GPLv3+" +LICENSE_${PN}-spy = "GPLv3+" +LICENSE_${PN}-spy-dev = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6" + +SRC_URI = "\ + https://pcsclite.apdu.fr/files/${BP}.tar.bz2 \ + file://0001-pcsc-spy-use-python3-only.patch \ +" +SRC_URI[md5sum] = "eb595f2d398ff229207a6ec09fbc4e98" +SRC_URI[sha256sum] = "0148d403137124552c5d0f10f8cdab2cbb8dfc7c6ce75e018faf667be34f2ef9" + +inherit autotools systemd pkgconfig perlnative + +EXTRA_OECONF = " \ + --disable-libusb \ + --enable-usbdropdir=${libdir}/pcsc/drivers \ +" + +S = "${WORKDIR}/pcsc-lite-${PV}" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} udev" +PACKAGECONFIG_class-native ??= "" + +PACKAGECONFIG[systemd] = ",--disable-libsystemd,systemd," +PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev" + +PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev" + +RRECOMMENDS_${PN} = "ccid" +RRECOMMENDS_${PN}_class-native = "" + +FILES_${PN} = "${sbindir}/pcscd" +FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" +FILES_${PN}-dev = "${includedir} \ + ${libdir}/pkgconfig \ + ${libdir}/libpcsclite.la \ + ${libdir}/libpcsclite.so" + +FILES_${PN}-spy = "${bindir}/pcsc-spy \ + ${libdir}/libpcscspy*${SOLIBS}" +FILES_${PN}-spy-dev = "${libdir}/libpcscspy.la \ + ${libdir}/libpcscspy.so " + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "pcscd.socket" +RDEPENDS_${PN}-spy +="python3" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch new file mode 100644 index 000000000..91d10cb7a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch @@ -0,0 +1,30 @@ +From f56eeb18a07df139864a99e1967d450cc5c8c0bb Mon Sep 17 00:00:00 2001 +From: Lee Chee Yang +Date: Wed, 30 Sep 2020 16:18:35 +0800 +Subject: [PATCH] improve reproducibility + +remove the WORKDIR info from BUILD_COMMAND to improve reproducibility. +also use SOURCE_DATE_EPOCH as DATETIME wherever possible. + +Upstream-Status: Inappropriate [sed WORKDIR does not applies to upstream] +Signed-off-by: Lee Chee Yang +--- + build/version_info_linux.sh | 4 +- + 1 file changed, 2 insertion(+), 2 deletion(-) + +diff --git a/build/version_info_linux.sh b/build/version_info_linux.sh +index 793cad11..ed6f4b2a 100644 +--- a/build/version_info_linux.sh ++++ b/build/version_info_linux.sh +@@ -25,6 +25,6 @@ echo '#N": BUILD_GCC'"\t\t"`g++ --version &1 | grep 'g++'`'" ENDL \ + echo '#N": BUILD_LIBC'"\t"`getconf GNU_LIBC_VERSION | grep glibc | sed -e 's/^glibc //'`'" ENDL \' + echo '#N": BUILD_LD'"\t\t"`ld -v 2>&1 | grep 'version'`'" ENDL \' + echo '#N": BUILD_TARGET'"\t$arch on $runtime"'" ENDL \' +-echo '#N": BUILD_COMMAND'"\t"$*'" ENDL \' ++echo '#N": BUILD_COMMAND'"\t"$(echo $* | sed 's#'$WORKDIR'#/workdir#g')'" ENDL \' + echo "" +-echo "#define __TBB_DATETIME \""`date -u`"\"" ++echo "#define __TBB_DATETIME \""`$(date -u -d "@$SOURCE_DATE_EPOCH" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" 2>/dev/null || date -u )`"\"" +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.2.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.2.bb deleted file mode 100644 index 2f9fd7f58..000000000 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.2.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "Parallelism library for C++ - runtime files \ - TBB is a library that helps you leverage multi-core processor \ - performance without having to be a threading expert. It represents a \ - higher-level, task-based parallelism that abstracts platform details \ - and threading mechanism for performance and scalability." -HOMEPAGE = "https://software.intel.com/en-us/tbb" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -BRANCH = "tbb_2020" -SRCREV = "60b7d0a78f8910976678ba63a19fdaee22c0ef65" -SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ - file://cross-compile.patch \ - file://0001-mallinfo-is-glibc-specific-API-mark-it-so.patch \ - file://GLIBC-PREREQ-is-not-defined-on-musl.patch \ - file://tbb.pc \ -" - -S = "${WORKDIR}/git" -PE = "1" - -COMPILER ?= "gcc" -COMPILER_toolchain-clang = "clang" - -do_compile() { - oe_runmake compiler=${COMPILER} arch=${HOST_ARCH} -} - -do_install() { - install -d ${D}${includedir} ${D}${libdir} - rm ${S}/include/tbb/index.html -f - cp -R --no-dereference --preserve=mode,links -v ${S}/include/tbb ${D}${includedir} - for f in ${B}/build/linux_*_release/lib*.so* - do - install -Dm 0755 $f ${D}${libdir}/ - done - install -Dm 0644 ${WORKDIR}/tbb.pc ${D}${libdir}/pkgconfig/tbb.pc -} - -# fails with thumb enabled: -# | arm-oe-linux-gnueabi-g++ -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a9 -mcpu=cortex-a9 -D__ARM__ -D__LINUX_ARM_ARCH__=7 -funwind-tables -mvectorize-with-neon-quad -rdynamic --sysroot=/OE/sysroots/m14tv -c -MMD -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD -fPIC -D__TBB_BUILD=1 -Wall -Wno-parentheses -Wno-non-virtual-dtor -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I../../src -I../../src/rml/include -I../../include ../../src/tbb/concurrent_queue.cpp -# | {standard input}: Assembler messages: -# | {standard input}:250: Error: thumb conditional instruction should be in IT block -- `strexeq r2,r3,[r4]' -# ... -# | make[1]: *** [concurrent_queue.o] Error 1 -ARM_INSTRUCTION_SET = "arm" diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.3.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.3.bb new file mode 100644 index 000000000..8e0094b31 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2020.3.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "Parallelism library for C++ - runtime files \ + TBB is a library that helps you leverage multi-core processor \ + performance without having to be a threading expert. It represents a \ + higher-level, task-based parallelism that abstracts platform details \ + and threading mechanism for performance and scalability." +HOMEPAGE = "https://software.intel.com/en-us/tbb" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" +BRANCH = "tbb_2020" +SRCREV = "eca91f16d7490a8abfdee652dadf457ec820cc37" +SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ + file://cross-compile.patch \ + file://0001-mallinfo-is-glibc-specific-API-mark-it-so.patch \ + file://GLIBC-PREREQ-is-not-defined-on-musl.patch \ + file://tbb.pc \ + file://improve-reproducibility.patch \ +" + +S = "${WORKDIR}/git" +PE = "1" + +COMPILER ?= "gcc" +COMPILER_toolchain-clang = "clang" + +do_compile() { + oe_runmake compiler=${COMPILER} arch=${HOST_ARCH} +} + +do_install() { + install -d ${D}${includedir} ${D}${libdir} + rm ${S}/include/tbb/index.html -f + cp -R --no-dereference --preserve=mode,links -v ${S}/include/tbb ${D}${includedir} + for f in ${B}/build/linux_*_release/lib*.so* + do + install -Dm 0755 $f ${D}${libdir}/ + done + install -Dm 0644 ${WORKDIR}/tbb.pc ${D}${libdir}/pkgconfig/tbb.pc +} + +# fails with thumb enabled: +# | arm-oe-linux-gnueabi-g++ -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a9 -mcpu=cortex-a9 -D__ARM__ -D__LINUX_ARM_ARCH__=7 -funwind-tables -mvectorize-with-neon-quad -rdynamic --sysroot=/OE/sysroots/m14tv -c -MMD -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD -fPIC -D__TBB_BUILD=1 -Wall -Wno-parentheses -Wno-non-virtual-dtor -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I../../src -I../../src/rml/include -I../../include ../../src/tbb/concurrent_queue.cpp +# | {standard input}: Assembler messages: +# | {standard input}:250: Error: thumb conditional instruction should be in IT block -- `strexeq r2,r3,[r4]' +# ... +# | make[1]: *** [concurrent_queue.o] Error 1 +ARM_INSTRUCTION_SET = "arm" diff --git a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb index 7c5a73439..a5a881d1f 100644 --- a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb @@ -14,6 +14,6 @@ SRCREV = "9752b50e922572e4cd214ac45ed95e4ee410fe24" PV = "1.0.6+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb index 1ebebfa9f..ca74d911f 100644 --- a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb @@ -18,4 +18,4 @@ SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc" PV = "1.1.2+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb index 5f07bf28e..04d1f3fc7 100644 --- a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb @@ -16,4 +16,4 @@ DEPENDS += "mtdev utouch-frame utouch-evemu libx11" PV = "1.1.7+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/021-linux-5-8.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/021-linux-5-8.patch deleted file mode 100644 index 9d4575060..000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/021-linux-5-8.patch +++ /dev/null @@ -1,5046 +0,0 @@ -fix Linux 5.8 - -This is a squashed patch with following upstream revisions: - - r85208 - r85430 - r85431 - r85432 - r85447 # context required adjustment - r85453 - r85460 - r85461 # context required adjustment - r85500 - r85501 - r85503 - r85504 - r85505 - r85506 - r85507 # context required adjustment - r85509 - r85510 - r85511 - r85514 - r85516 - r85517 - r85518 - r85525 - r85526 - r85527 - r85533 - r85534 - r85540 - r85541 - r85545 - r85546 - r85552 - r85555 - r85556 - r85590 - -Thanks a lot to loqs for his hard work on FS#67488! - ---- a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c -+++ b/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c -@@ -31,6 +31,12 @@ - #define LOG_GROUP RTLOGGROUP_TIME - #include "the-linux-kernel.h" - #include "internal/iprt.h" -+/* Make sure we have the setting functions we need for RTTimeNow: */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16) -+# define RTTIME_INCL_TIMEVAL -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) -+# define RTTIME_INCL_TIMESPEC -+#endif - #include - #include - -@@ -181,22 +187,19 @@ RT_EXPORT_SYMBOL(RTTimeSystemMilliTS); - RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPEC pTime) - { - IPRT_LINUX_SAVE_EFL_AC(); --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16) --/* On Linux 4.20, time.h includes time64.h and we have to use 64-bit times. */ --# ifdef _LINUX_TIME64_H -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) - struct timespec64 Ts; -- ktime_get_real_ts64(&Ts); --# else -- struct timespec Ts; -- ktime_get_real_ts(&Ts); --# endif -+ ktime_get_real_ts64(&Ts); /* ktime_get_real_ts64 was added as a macro in 3.17, function since 4.18. */ - IPRT_LINUX_RESTORE_EFL_AC(); --# ifdef _LINUX_TIME64_H - return RTTimeSpecSetTimespec64(pTime, &Ts); --# else -+ -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16) -+ struct timespec Ts; -+ ktime_get_real_ts(&Ts); /* ktime_get_real_ts was removed in Linux 4.20. */ -+ IPRT_LINUX_RESTORE_EFL_AC(); - return RTTimeSpecSetTimespec(pTime, &Ts); --# endif --#else /* < 2.6.16 */ -+ -+#else /* < 2.6.16 */ - struct timeval Tv; - do_gettimeofday(&Tv); - IPRT_LINUX_RESTORE_EFL_AC(); ---- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c -@@ -52,6 +52,14 @@ - # define PAGE_READONLY_EXEC PAGE_READONLY - #endif - -+/** @def IPRT_USE_ALLOC_VM_AREA_FOR_EXEC -+ * Whether we use alloc_vm_area (3.2+) for executable memory. -+ * This is a must for 5.8+, but we enable it all the way back to 3.2.x for -+ * better W^R compliance (fExecutable flag). */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) || defined(DOXYGEN_RUNNING) -+# define IPRT_USE_ALLOC_VM_AREA_FOR_EXEC -+#endif -+ - /* - * 2.6.29+ kernels don't work with remap_pfn_range() anymore because - * track_pfn_vma_new() is apparently not defined for non-RAM pages. -@@ -72,12 +80,27 @@ - # define gfp_t unsigned - #endif - -+/* -+ * Wrappers around mmap_lock/mmap_sem difference. -+ */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) -+# define LNX_MM_DOWN_READ(a_pMm) down_read(&(a_pMm)->mmap_lock) -+# define LNX_MM_UP_READ(a_pMm) up_read(&(a_pMm)->mmap_lock) -+# define LNX_MM_DOWN_WRITE(a_pMm) down_write(&(a_pMm)->mmap_lock) -+# define LNX_MM_UP_WRITE(a_pMm) up_write(&(a_pMm)->mmap_lock) -+#else -+# define LNX_MM_DOWN_READ(a_pMm) down_read(&(a_pMm)->mmap_sem) -+# define LNX_MM_UP_READ(a_pMm) up_read(&(a_pMm)->mmap_sem) -+# define LNX_MM_DOWN_WRITE(a_pMm) down_write(&(a_pMm)->mmap_sem) -+# define LNX_MM_UP_WRITE(a_pMm) up_write(&(a_pMm)->mmap_sem) -+#endif -+ - - /********************************************************************************************************************************* - * Structures and Typedefs * - *********************************************************************************************************************************/ - /** -- * The Darwin version of the memory object structure. -+ * The Linux version of the memory object structure. - */ - typedef struct RTR0MEMOBJLNX - { -@@ -90,11 +113,20 @@ typedef struct RTR0MEMOBJLNX - bool fExecutable; - /** Set if we've vmap'ed the memory into ring-0. */ - bool fMappedToRing0; -+#ifdef IPRT_USE_ALLOC_VM_AREA_FOR_EXEC -+ /** Return from alloc_vm_area() that we now need to use for executable -+ * memory. */ -+ struct vm_struct *pArea; -+ /** PTE array that goes along with pArea (must be freed). */ -+ pte_t **papPtesForArea; -+#endif - /** The pages in the apPages array. */ - size_t cPages; - /** Array of struct page pointers. (variable size) */ - struct page *apPages[1]; --} RTR0MEMOBJLNX, *PRTR0MEMOBJLNX; -+} RTR0MEMOBJLNX; -+/** Pointer to the linux memory object. */ -+typedef RTR0MEMOBJLNX *PRTR0MEMOBJLNX; - - - static void rtR0MemObjLinuxFreePages(PRTR0MEMOBJLNX pMemLnx); -@@ -182,7 +214,7 @@ static pgprot_t rtR0MemObjLinuxConvertPr - * Worker for rtR0MemObjNativeReserveUser and rtR0MemObjNativerMapUser that creates - * an empty user space mapping. - * -- * We acquire the mmap_sem of the task! -+ * We acquire the mmap_sem/mmap_lock of the task! - * - * @returns Pointer to the mapping. - * (void *)-1 on failure. -@@ -222,9 +254,9 @@ static void *rtR0MemObjLinuxDoMmap(RTR3P - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) - ulAddr = vm_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0); - #else -- down_write(&pTask->mm->mmap_sem); -+ LNX_MM_DOWN_WRITE(pTask->mm); - ulAddr = do_mmap(NULL, R3PtrFixed, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, 0); -- up_write(&pTask->mm->mmap_sem); -+ LNX_MM_UP_WRITE(pTask->mm); - #endif - } - else -@@ -232,9 +264,9 @@ static void *rtR0MemObjLinuxDoMmap(RTR3P - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) - ulAddr = vm_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0); - #else -- down_write(&pTask->mm->mmap_sem); -+ LNX_MM_DOWN_WRITE(pTask->mm); - ulAddr = do_mmap(NULL, 0, cb, fLnxProt, MAP_SHARED | MAP_ANONYMOUS, 0); -- up_write(&pTask->mm->mmap_sem); -+ LNX_MM_UP_WRITE(pTask->mm); - #endif - if ( !(ulAddr & ~PAGE_MASK) - && (ulAddr & (uAlignment - 1))) -@@ -257,7 +289,7 @@ static void *rtR0MemObjLinuxDoMmap(RTR3P - * Worker that destroys a user space mapping. - * Undoes what rtR0MemObjLinuxDoMmap did. - * -- * We acquire the mmap_sem of the task! -+ * We acquire the mmap_sem/mmap_lock of the task! - * - * @param pv The ring-3 mapping. - * @param cb The size of the mapping. -@@ -269,13 +301,13 @@ static void rtR0MemObjLinuxDoMunmap(void - Assert(pTask == current); RT_NOREF_PV(pTask); - vm_munmap((unsigned long)pv, cb); - #elif defined(USE_RHEL4_MUNMAP) -- down_write(&pTask->mm->mmap_sem); -+ LNX_MM_DOWN_WRITE(pTask->mm); - do_munmap(pTask->mm, (unsigned long)pv, cb, 0); /* should it be 1 or 0? */ -- up_write(&pTask->mm->mmap_sem); -+ LNX_MM_UP_WRITE(pTask->mm); - #else -- down_write(&pTask->mm->mmap_sem); -+ LNX_MM_DOWN_WRITE(pTask->mm); - do_munmap(pTask->mm, (unsigned long)pv, cb); -- up_write(&pTask->mm->mmap_sem); -+ LNX_MM_UP_WRITE(pTask->mm); - #endif - } - -@@ -520,15 +552,49 @@ static int rtR0MemObjLinuxVMap(PRTR0MEMO - pgprot_val(fPg) |= _PAGE_NX; - # endif - -+# ifdef IPRT_USE_ALLOC_VM_AREA_FOR_EXEC -+ if (fExecutable) -+ { -+ pte_t **papPtes = (pte_t **)kmalloc_array(pMemLnx->cPages, sizeof(papPtes[0]), GFP_KERNEL); -+ if (papPtes) -+ { -+ pMemLnx->pArea = alloc_vm_area(pMemLnx->Core.cb, papPtes); /* Note! pArea->nr_pages is not set. */ -+ if (pMemLnx->pArea) -+ { -+ size_t i; -+ Assert(pMemLnx->pArea->size >= pMemLnx->Core.cb); /* Note! includes guard page. */ -+ Assert(pMemLnx->pArea->addr); -+# ifdef _PAGE_NX -+ pgprot_val(fPg) |= _PAGE_NX; /* Uses RTR0MemObjProtect to clear NX when memory ready, W^X fashion. */ -+# endif -+ pMemLnx->papPtesForArea = papPtes; -+ for (i = 0; i < pMemLnx->cPages; i++) -+ *papPtes[i] = mk_pte(pMemLnx->apPages[i], fPg); -+ pMemLnx->Core.pv = pMemLnx->pArea->addr; -+ pMemLnx->fMappedToRing0 = true; -+ } -+ else -+ { -+ kfree(papPtes); -+ rc = VERR_MAP_FAILED; -+ } -+ } -+ else -+ rc = VERR_MAP_FAILED; -+ } -+ else -+# endif -+ { - # ifdef VM_MAP -- pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_MAP, fPg); -+ pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_MAP, fPg); - # else -- pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_ALLOC, fPg); -+ pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_ALLOC, fPg); - # endif -- if (pMemLnx->Core.pv) -- pMemLnx->fMappedToRing0 = true; -- else -- rc = VERR_MAP_FAILED; -+ if (pMemLnx->Core.pv) -+ pMemLnx->fMappedToRing0 = true; -+ else -+ rc = VERR_MAP_FAILED; -+ } - #else /* < 2.4.22 */ - rc = VERR_NOT_SUPPORTED; - #endif -@@ -554,6 +620,22 @@ static int rtR0MemObjLinuxVMap(PRTR0MEMO - static void rtR0MemObjLinuxVUnmap(PRTR0MEMOBJLNX pMemLnx) - { - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 22) -+# ifdef IPRT_USE_ALLOC_VM_AREA_FOR_EXEC -+ if (pMemLnx->pArea) -+ { -+# if 0 -+ pte_t **papPtes = pMemLnx->papPtesForArea; -+ size_t i; -+ for (i = 0; i < pMemLnx->cPages; i++) -+ *papPtes[i] = 0; -+# endif -+ free_vm_area(pMemLnx->pArea); -+ kfree(pMemLnx->papPtesForArea); -+ pMemLnx->pArea = NULL; -+ pMemLnx->papPtesForArea = NULL; -+ } -+ else -+# endif - if (pMemLnx->fMappedToRing0) - { - Assert(pMemLnx->Core.pv); -@@ -593,7 +675,7 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR - size_t iPage; - Assert(pTask); - if (pTask && pTask->mm) -- down_read(&pTask->mm->mmap_sem); -+ LNX_MM_DOWN_READ(pTask->mm); - - iPage = pMemLnx->cPages; - while (iPage-- > 0) -@@ -608,7 +690,7 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR - } - - if (pTask && pTask->mm) -- up_read(&pTask->mm->mmap_sem); -+ LNX_MM_UP_READ(pTask->mm); - } - /* else: kernel memory - nothing to do here. */ - break; -@@ -1076,7 +1158,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser - papVMAs = (struct vm_area_struct **)RTMemAlloc(sizeof(*papVMAs) * cPages); - if (papVMAs) - { -- down_read(&pTask->mm->mmap_sem); -+ LNX_MM_DOWN_READ(pTask->mm); - - /* - * Get user pages. -@@ -1162,7 +1244,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser - papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED; - } - -- up_read(&pTask->mm->mmap_sem); -+ LNX_MM_UP_READ(pTask->mm); - - RTMemFree(papVMAs); - -@@ -1189,7 +1271,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser - #endif - } - -- up_read(&pTask->mm->mmap_sem); -+ LNX_MM_UP_READ(pTask->mm); - - RTMemFree(papVMAs); - rc = VERR_LOCK_FAILED; -@@ -1422,6 +1504,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKerne - * Use vmap - 2.4.22 and later. - */ - pgprot_t fPg = rtR0MemObjLinuxConvertProt(fProt, true /* kernel */); -+ /** @todo We don't really care too much for EXEC here... 5.8 always adds NX. */ - Assert(((offSub + cbSub) >> PAGE_SHIFT) <= pMemLnxToMap->cPages); - # ifdef VM_MAP - pMemLnx->Core.pv = vmap(&pMemLnxToMap->apPages[offSub >> PAGE_SHIFT], cbSub >> PAGE_SHIFT, VM_MAP, fPg); -@@ -1604,7 +1687,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser( - const size_t cPages = (offSub + cbSub) >> PAGE_SHIFT; - size_t iPage; - -- down_write(&pTask->mm->mmap_sem); -+ LNX_MM_DOWN_WRITE(pTask->mm); - - rc = VINF_SUCCESS; - if (pMemLnxToMap->cPages) -@@ -1721,7 +1804,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser( - } - #endif /* CONFIG_NUMA_BALANCING */ - -- up_write(&pTask->mm->mmap_sem); -+ LNX_MM_UP_WRITE(pTask->mm); - - if (RT_SUCCESS(rc)) - { -@@ -1753,6 +1836,29 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser( - - DECLHIDDEN(int) rtR0MemObjNativeProtect(PRTR0MEMOBJINTERNAL pMem, size_t offSub, size_t cbSub, uint32_t fProt) - { -+# ifdef IPRT_USE_ALLOC_VM_AREA_FOR_EXEC -+ /* -+ * Currently only supported when we've got addresses PTEs from the kernel. -+ */ -+ PRTR0MEMOBJLNX pMemLnx = (PRTR0MEMOBJLNX)pMem; -+ if (pMemLnx->pArea && pMemLnx->papPtesForArea) -+ { -+ pgprot_t const fPg = rtR0MemObjLinuxConvertProt(fProt, true /*fKernel*/); -+ size_t const cPages = (offSub + cbSub) >> PAGE_SHIFT; -+ pte_t **papPtes = pMemLnx->papPtesForArea; -+ size_t i; -+ -+ for (i = offSub >> PAGE_SHIFT; i < cPages; i++) -+ { -+ set_pte(papPtes[i], mk_pte(pMemLnx->apPages[i], fPg)); -+ } -+ preempt_disable(); -+ __flush_tlb_all(); -+ preempt_enable(); -+ return VINF_SUCCESS; -+ } -+# endif -+ - NOREF(pMem); - NOREF(offSub); - NOREF(cbSub); ---- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c -@@ -144,9 +144,9 @@ static int force_async_tsc = 0; - * Memory for the executable memory heap (in IPRT). - */ - # ifdef DEBUG --# define EXEC_MEMORY_SIZE 8388608 /* 8 MB */ -+# define EXEC_MEMORY_SIZE 10485760 /* 10 MB */ - # else --# define EXEC_MEMORY_SIZE 2097152 /* 2 MB */ -+# define EXEC_MEMORY_SIZE 8388608 /* 8 MB */ - # endif - extern uint8_t g_abExecMemory[EXEC_MEMORY_SIZE]; - # ifndef VBOX_WITH_TEXT_MODMEM_HACK -@@ -756,20 +756,25 @@ EXPORT_SYMBOL(SUPDrvLinuxIDC); - - RTCCUINTREG VBOXCALL supdrvOSChangeCR4(RTCCUINTREG fOrMask, RTCCUINTREG fAndMask) - { --#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) -- RTCCUINTREG uOld = this_cpu_read(cpu_tlbstate.cr4); -- RTCCUINTREG uNew = (uOld & fAndMask) | fOrMask; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) -+ RTCCUINTREG const uOld = __read_cr4(); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) -+ RTCCUINTREG const uOld = this_cpu_read(cpu_tlbstate.cr4); -+#else -+ RTCCUINTREG const uOld = ASMGetCR4(); -+#endif -+ RTCCUINTREG const uNew = (uOld & fAndMask) | fOrMask; - if (uNew != uOld) - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) -+ ASMSetCR4(uNew); -+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) - this_cpu_write(cpu_tlbstate.cr4, uNew); - __write_cr4(uNew); -- } - #else -- RTCCUINTREG uOld = ASMGetCR4(); -- RTCCUINTREG uNew = (uOld & fAndMask) | fOrMask; -- if (uNew != uOld) - ASMSetCR4(uNew); - #endif -+ } - return uOld; - } - ---- a/src/VBox/Additions/linux/sharedfolders/vfsmod.c -+++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.c -@@ -52,7 +52,7 @@ - #endif - #include - #include --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 62) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 62) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - # include - #endif - #include ---- a/Config.kmk -+++ b/Config.kmk -@@ -4462,15 +4462,20 @@ endif # pe - - ifeq ($(VBOX_LDR_FMT),elf) - TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL) --TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) --TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK) --TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding --TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -+TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \ -+ $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \ -+ $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) -+TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \ -+ $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \ -+ $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \ -+ -fno-rtti $(VBOX_GCC_std) $(VBOX_GCC_IPRT_FMT_CHECK) -++TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding -++TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables - TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding - if $(VBOX_GCC_VERSION_CC) < 30400 - TEMPLATE_VBoxR0_DEFS += RT_WITHOUT_PRAGMA_ONCE - endif --ifeq ($(KBUILD_TARGET),solaris) -+ ifeq ($(KBUILD_TARGET),solaris) - TEMPLATE_VBoxR0_LDFLAGS = -r - TEMPLATE_VBoxR0_LDFLAGS.solaris = -u _init -u _info - TEMPLATE_VBoxR0_LIBS.solaris = \ -@@ -4481,19 +4486,32 @@ ifeq ($(KBUILD_TARGET),solaris) - endif - # Solaris driver signing. - TEMPLATE_VBoxR0_POST_CMDS = $(VBOX_SIGN_DRIVER_CMDS) --else -+ else - TEMPLATE_VBoxR0_LDFLAGS = -nostdlib -Bsymbolic -g - ## @todo WTF doesn't the globals work? Debug info is supposed to be split everywhere. GRR - TEMPLATE_VBoxR0_LD_DEBUG = split --endif --ifn1of ($(KBUILD_TARGET),solaris freebsd) -+ endif -+ if1of ($(KBUILD_TARGET), linux) -+VBOX_WITH_VBOXR0_AS_DLL = 1 -+TEMPLATE_VBoxR0_DLLSUFF = .r0 -+TEMPLATE_VBoxR0_CFLAGS += -fPIC -+TEMPLATE_VBoxR0_CXXFLAGS += -fPIC -+TEMPLATE_VBoxR0_LDFLAGS += -+TEMPLATE_VBoxR0_DTRACE_HDR_FLAGS += --pic -+TEMPLATE_VBoxR0_DTRACE_OBJ_FLAGS += --pic -+ else -+TEMPLATE_VBoxR0_CFLAGS.amd64 += -mcmodel=kernel -+TEMPLATE_VBoxR0_CXXFLAGS.amd64 += -mcmodel=kernel -+ endif -+ ifn1of ($(KBUILD_TARGET),solaris freebsd) - TEMPLATE_VBoxR0_LIBS = \ - $(VBOX_GCC_LIBGCC) # intrinsics --endif --if1of ($(KBUILD_TARGET),linux) -- TEMPLATE_VBoxR0_POST_CMDS = $(if $(eq $(tool_do),LINK_SYSMOD),if readelf -S $(out)|grep -q "[cd]tors"; then echo "Found ctors/dtors in $(out)!"; exit 1; fi) --endif --endif -+ endif -+ if1of ($(KBUILD_TARGET),linux) -+ TEMPLATE_VBoxR0_POST_CMDS += $(NLTAB)\ -+ $(if $(eq $(tool_do),LINK_SYSMOD),if readelf -S $(out)|grep -q "[cd]tors"; then echo "Found ctors/dtors in $(out)!"; exit 1; fi) -+ endif -+endif # elf - - ifeq ($(VBOX_LDR_FMT),macho) - TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL) ---- a/tools/bin/gen-slickedit-workspace.sh -+++ b/tools/bin/gen-slickedit-workspace.sh -@@ -496,11 +496,13 @@ my_generate_usercpp_h() - # - # Probe the slickedit user config, picking the most recent version. - # -+ MY_VSLICK_DB_OLD= - if test -z "${MY_SLICK_CONFIG}"; then - if test -d "${HOME}/Library/Application Support/SlickEdit"; then - MY_SLICKDIR_="${HOME}/Library/Application Support/SlickEdit" - MY_USERCPP_H="unxcpp.h" - MY_VSLICK_DB="vslick.sta" # was .stu earlier, 24 is using .sta. -+ MY_VSLICK_DB_OLD="vslick.stu" - elif test -d "${HOMEDRIVE}${HOMEPATH}/Documents/My SlickEdit Config"; then - MY_SLICKDIR_="${HOMEDRIVE}${HOMEPATH}/Documents/My SlickEdit Config" - MY_USERCPP_H="usercpp.h" -@@ -508,7 +510,8 @@ my_generate_usercpp_h() - else - MY_SLICKDIR_="${HOME}/.slickedit" - MY_USERCPP_H="unxcpp.h" -- MY_VSLICK_DB="vslick.stu" -+ MY_VSLICK_DB="vslick.sta" -+ MY_VSLICK_DB_OLD="vslick.stu" - fi - else - MY_SLICKDIR_="${MY_SLICK_CONFIG}" -@@ -517,7 +520,8 @@ my_generate_usercpp_h() - MY_VSLICK_DB="vslick.sta" - else - MY_USERCPP_H="unxcpp.h" -- MY_VSLICK_DB="vslick.stu" -+ MY_VSLICK_DB="vslick.sta" -+ MY_VSLICK_DB_OLD="vslick.stu" - fi - # MacOS: Implement me! - fi -@@ -526,7 +530,9 @@ my_generate_usercpp_h() - MY_VER="0.0.0" - for subdir in "${MY_SLICKDIR_}/"*; - do -- if test -f "${subdir}/${MY_USERCPP_H}" -o -f "${subdir}/${MY_VSLICK_DB}"; then -+ if test -f "${subdir}/${MY_USERCPP_H}" \ -+ -o -f "${subdir}/${MY_VSLICK_DB}" \ -+ -o '(' -n "${MY_VSLICK_DB_OLD}" -a -f "${subdir}/${MY_VSLICK_DB_OLD}" ')'; then - MY_CUR_VER_NUM=0 - MY_CUR_VER=`echo "${subdir}" | ${MY_SED} -e 's,^.*/,,g'` - -@@ -561,6 +567,7 @@ my_generate_usercpp_h() - echo "Found SlickEdit v${MY_VER} preprocessor file: ${MY_USERCPP_H_FULL}" - else - echo "Failed to locate SlickEdit preprocessor file. You need to manually merge ${MY_USERCPP_H}." -+ echo "dbg: MY_SLICKDIR=${MY_SLICKDIR} MY_USERCPP_H_FULL=${MY_USERCPP_H_FULL}" - MY_USERCPP_H_FULL="" - fi - -@@ -717,6 +724,10 @@ EOF - #define RTASN1TYPE_STANDARD_PROTOTYPES_NO_GET_CORE(a_TypeNm, a_DeclMacro, a_ImplExtNm) int a_ImplExtNm##_Init(P##a_TypeNm pThis, PCRTASN1ALLOCATORVTABLE pAllocator); int a_ImplExtNm##_Clone(P##a_TypeNm pThis, PC##a_TypeNm) pSrc, PCRTASN1ALLOCATORVTABLE pAllocator); void a_ImplExtNm##_Delete(P##a_TypeNm pThis); int a_ImplExtNm##_Enum(P##a_TypeNm pThis, PFNRTASN1ENUMCALLBACK pfnCallback, uint32_t uDepth, void *pvUser); int a_ImplExtNm##_Compare(PC##a_TypeNm) pLeft, PC##a_TypeNm pRight); int a_ImplExtNm##_DecodeAsn1(PRTASN1CURSOR pCursor, uint32_t fFlags, P##a_TypeNm pThis, const char *pszErrorTag); int a_ImplExtNm##_CheckSanity(PC##a_TypeNm pThis, uint32_t fFlags, PRTERRINFO pErrInfo, const char *pszErrorTag) - #define RTASN1TYPE_STANDARD_PROTOTYPES(a_TypeNm, a_DeclMacro, a_ImplExtNm, a_Asn1CoreNm) inline PRTASN1CORE a_ImplExtNm##_GetAsn1Core(PC##a_TypeNm pThis) { return (PRTASN1CORE)&pThis->a_Asn1CoreNm; } inline bool a_ImplExtNm##_IsPresent(PC##a_TypeNm pThis) { return pThis && RTASN1CORE_IS_PRESENT(&pThis->a_Asn1CoreNm); } RTASN1TYPE_STANDARD_PROTOTYPES_NO_GET_CORE(a_TypeNm, a_DeclMacro, a_ImplExtNm) - -+#define RTLDRELF_NAME(name) rtldrELF64##name -+#define RTLDRELF_SUFF(name) name##64 -+#define RTLDRELF_MID(pre,suff) pre##64##suff -+ - #define BS3_DECL(type) type - #define BS3_DECL_CALLBACK(type) type - #define TMPL_NM(name) name##_mmm ---- a/include/iprt/asmdefs.mac -+++ b/include/iprt/asmdefs.mac -@@ -841,18 +841,18 @@ size NAME(%1 %+ _EndProc) 0 - ; is defined and RT_WITHOUT_NOCRT_WRAPPERS isn't. - ; - %macro RT_NOCRT_BEGINPROC 1 --%ifdef RT_WITH_NOCRT_ALIASES --BEGINPROC RT_NOCRT(%1) --%ifdef ASM_FORMAT_ELF -+ %ifdef RT_WITH_NOCRT_ALIASES -+BEGINPROC_EXPORTED RT_NOCRT(%1) -+ %ifdef ASM_FORMAT_ELF - global NAME(%1) - weak NAME(%1) - NAME(%1): --%else -+ %else - GLOBALNAME %1 --%endif --%else ; !RT_WITH_NOCRT_ALIASES --BEGINPROC RT_NOCRT(%1) --%endif ; !RT_WITH_NOCRT_ALIASES -+ %endif -+ %else ; !RT_WITH_NOCRT_ALIASES -+BEGINPROC_EXPORTED RT_NOCRT(%1) -+ %endif ; !RT_WITH_NOCRT_ALIASES - %endmacro ; RT_NOCRT_BEGINPROC - - %ifdef RT_WITH_NOCRT_ALIASES ---- a/src/VBox/Runtime/testcase/tstLdr-4.cpp -+++ b/src/VBox/Runtime/testcase/tstLdr-4.cpp -@@ -35,9 +35,9 @@ - #include - #include - #include --#include - #include - #include -+#include - - #include - -@@ -45,8 +45,9 @@ - /********************************************************************************************************************************* - * Global Variables * - *********************************************************************************************************************************/ --static SUPGLOBALINFOPAGE g_MyGip = { SUPGLOBALINFOPAGE_MAGIC, SUPGLOBALINFOPAGE_VERSION, SUPGIPMODE_INVARIANT_TSC, 42 }; --static PSUPGLOBALINFOPAGE g_pMyGip = &g_MyGip; -+static RTTEST g_hTest; -+static SUPGLOBALINFOPAGE g_MyGip = { SUPGLOBALINFOPAGE_MAGIC, SUPGLOBALINFOPAGE_VERSION, SUPGIPMODE_INVARIANT_TSC, 42 }; -+static PSUPGLOBALINFOPAGE g_pMyGip = &g_MyGip; - - extern "C" DECLEXPORT(int) DisasmTest1(void); - -@@ -58,6 +59,60 @@ static DECLCALLBACK(int) testEnumSegment - " link=%RTptr LB %RTptr align=%RTptr fProt=%#x offFile=%RTfoff\n" - , *piSeg, pSeg->RVA, pSeg->cbMapped, pSeg->pszName, - pSeg->LinkAddress, pSeg->cb, pSeg->Alignment, pSeg->fProt, pSeg->offFile); -+ -+ if (pSeg->RVA != NIL_RTLDRADDR) -+ { -+ RTTESTI_CHECK(pSeg->cbMapped != NIL_RTLDRADDR); -+ RTTESTI_CHECK(pSeg->cbMapped >= pSeg->cb); -+ } -+ else -+ { -+ RTTESTI_CHECK(pSeg->cbMapped == NIL_RTLDRADDR); -+ } -+ -+ /* -+ * Do some address conversion tests: -+ */ -+ if (pSeg->cbMapped != NIL_RTLDRADDR) -+ { -+ /* RTLdrRvaToSegOffset: */ -+ uint32_t iSegConv = ~(uint32_t)42; -+ RTLDRADDR offSegConv = ~(RTLDRADDR)22; -+ int rc = RTLdrRvaToSegOffset(hLdrMod, pSeg->RVA, &iSegConv, &offSegConv); -+ if (RT_FAILURE(rc)) -+ RTTestIFailed("RTLdrRvaToSegOffset failed on Seg #%u / RVA %#RTptr: %Rrc", *piSeg, pSeg->RVA, rc); -+ else if (iSegConv != *piSeg || offSegConv != 0) -+ RTTestIFailed("RTLdrRvaToSegOffset on Seg #%u / RVA %#RTptr returned: iSegConv=%#x offSegConv=%RTptr, expected %#x and 0", -+ *piSeg, pSeg->RVA, iSegConv, offSegConv, *piSeg); -+ -+ /* RTLdrSegOffsetToRva: */ -+ RTLDRADDR uRvaConv = ~(RTLDRADDR)22; -+ rc = RTLdrSegOffsetToRva(hLdrMod, *piSeg, 0, &uRvaConv); -+ if (RT_FAILURE(rc)) -+ RTTestIFailed("RTLdrSegOffsetToRva failed on Seg #%u / off 0: %Rrc", *piSeg, rc); -+ else if (uRvaConv != pSeg->RVA) -+ RTTestIFailed("RTLdrSegOffsetToRva on Seg #%u / off 0 returned: %RTptr, expected %RTptr", *piSeg, uRvaConv, pSeg->RVA); -+ -+ /* RTLdrLinkAddressToRva: */ -+ uRvaConv = ~(RTLDRADDR)22; -+ rc = RTLdrLinkAddressToRva(hLdrMod, pSeg->LinkAddress, &uRvaConv); -+ if (RT_FAILURE(rc)) -+ RTTestIFailed("RTLdrLinkAddressToRva failed on Seg #%u / %RTptr: %Rrc", *piSeg, pSeg->LinkAddress, rc); -+ else if (uRvaConv != pSeg->RVA) -+ RTTestIFailed("RTLdrLinkAddressToRva on Seg #%u / %RTptr returned: %RTptr, expected %RTptr", -+ *piSeg, pSeg->LinkAddress, uRvaConv, pSeg->RVA); -+ -+ /* RTLdrLinkAddressToSegOffset: */ -+ iSegConv = ~(uint32_t)42; -+ offSegConv = ~(RTLDRADDR)22; -+ rc = RTLdrLinkAddressToSegOffset(hLdrMod, pSeg->LinkAddress, &iSegConv, &offSegConv); -+ if (RT_FAILURE(rc)) -+ RTTestIFailed("RTLdrLinkAddressToSegOffset failed on Seg #%u / %#RTptr: %Rrc", *piSeg, pSeg->LinkAddress, rc); -+ else if (iSegConv != *piSeg || offSegConv != 0) -+ RTTestIFailed("RTLdrLinkAddressToSegOffset on Seg #%u / %#RTptr returned: iSegConv=%#x offSegConv=%RTptr, expected %#x and 0", -+ *piSeg, pSeg->LinkAddress, iSegConv, offSegConv, *piSeg); -+ } -+ - *piSeg += 1; - RT_NOREF(hLdrMod); - return VINF_SUCCESS; -@@ -125,12 +180,12 @@ static DECLCALLBACK(int) testGetImport(R - * regions the for compare usage. The third is loaded into one - * and then relocated between the two and other locations a few times. - * -- * @returns number of errors. - * @param pszFilename The file to load the mess with. - */ --static int testLdrOne(const char *pszFilename) -+static void testLdrOne(const char *pszFilename) - { -- int cErrors = 0; -+ RTTestSub(g_hTest, RTPathFilename(pszFilename)); -+ - size_t cbImage = 0; - struct Load - { -@@ -155,9 +210,8 @@ static int testLdrOne(const char *pszFil - rc = RTLdrOpen(pszFilename, 0, RTLDRARCH_WHATEVER, &aLoads[i].hLdrMod); - if (RT_FAILURE(rc)) - { -- RTPrintf("tstLdr-4: Failed to open '%s'/%d, rc=%Rrc. aborting test.\n", pszFilename, i, rc); -+ RTTestIFailed("tstLdr-4: Failed to open '%s'/%d, rc=%Rrc. aborting test.", pszFilename, i, rc); - Assert(aLoads[i].hLdrMod == NIL_RTLDRMOD); -- cErrors++; - break; - } - -@@ -165,8 +219,7 @@ static int testLdrOne(const char *pszFil - size_t cb = RTLdrSize(aLoads[i].hLdrMod); - if (cbImage && cb != cbImage) - { -- RTPrintf("tstLdr-4: Size mismatch '%s'/%d. aborting test.\n", pszFilename, i); -- cErrors++; -+ RTTestIFailed("tstLdr-4: Size mismatch '%s'/%d. aborting test.", pszFilename, i); - break; - } - aLoads[i].cbBits = cbImage = cb; -@@ -175,8 +228,7 @@ static int testLdrOne(const char *pszFil - aLoads[i].pvBits = RTMemExecAlloc(cb); - if (!aLoads[i].pvBits) - { -- RTPrintf("tstLdr-4: Out of memory '%s'/%d cbImage=%d. aborting test.\n", pszFilename, i, cbImage); -- cErrors++; -+ RTTestIFailed("Out of memory '%s'/%d cbImage=%d. aborting test.", pszFilename, i, cbImage); - break; - } - -@@ -184,8 +236,7 @@ static int testLdrOne(const char *pszFil - rc = RTLdrGetBits(aLoads[i].hLdrMod, aLoads[i].pvBits, (uintptr_t)aLoads[i].pvBits, testGetImport, NULL); - if (RT_FAILURE(rc)) - { -- RTPrintf("tstLdr-4: Failed to get bits for '%s'/%d, rc=%Rrc. aborting test\n", pszFilename, i, rc); -- cErrors++; -+ RTTestIFailed("Failed to get bits for '%s'/%d, rc=%Rrc. aborting test", pszFilename, i, rc); - break; - } - } -@@ -193,7 +244,7 @@ static int testLdrOne(const char *pszFil - /* - * Execute the code. - */ -- if (!cErrors) -+ if (!RTTestSubErrorCount(g_hTest)) - { - for (i = 0; i < RT_ELEMENTS(aLoads); i += 1) - { -@@ -209,22 +260,18 @@ static int testLdrOne(const char *pszFil - UINT32_MAX, "_DisasmTest1", &Value); - if (RT_FAILURE(rc)) - { -- RTPrintf("tstLdr-4: Failed to get symbol \"DisasmTest1\" from load #%d: %Rrc\n", i, rc); -- cErrors++; -+ RTTestIFailed("Failed to get symbol \"DisasmTest1\" from load #%d: %Rrc", i, rc); - break; - } - DECLCALLBACKPTR(int, pfnDisasmTest1)(void) = (DECLCALLBACKPTR(int, RT_NOTHING)(void))(uintptr_t)Value; /* eeeh. */ -- RTPrintf("tstLdr-4: pfnDisasmTest1=%p / add-symbol-file %s %#x\n", pfnDisasmTest1, pszFilename, aLoads[i].pvBits); -+ RTPrintf("tstLdr-4: pfnDisasmTest1=%p / add-symbol-file %s %#p\n", pfnDisasmTest1, pszFilename, aLoads[i].pvBits); - uint32_t iSeg = 0; - RTLdrEnumSegments(aLoads[i].hLdrMod, testEnumSegment, &iSeg); - - /* call the test function. */ - rc = pfnDisasmTest1(); - if (rc) -- { -- RTPrintf("tstLdr-4: load #%d Test1 -> %#x\n", i, rc); -- cErrors++; -- } -+ RTTestIFailed("load #%d Test1 -> %#x", i, rc); - - /* While we're here, check a couple of RTLdrQueryProp calls too */ - void *pvBits = aLoads[i].pvBits; -@@ -255,56 +302,42 @@ static int testLdrOne(const char *pszFil - { - rc = RTLdrClose(aLoads[i].hLdrMod); - if (RT_FAILURE(rc)) -- { -- RTPrintf("tstLdr-4: Failed to close '%s' i=%d, rc=%Rrc.\n", pszFilename, i, rc); -- cErrors++; -- } -+ RTTestIFailed("Failed to close '%s' i=%d, rc=%Rrc.", pszFilename, i, rc); - } - } - -- return cErrors; - } - - - --int main(int argc, char **argv) -+int main() - { -- int cErrors = 0; -- RTR3InitExe(argc, &argv, 0); -+ RTEXITCODE rcExit = RTTestInitAndCreate("tstLdr-4", &g_hTest); -+ if (rcExit != RTEXITCODE_SUCCESS) -+ return rcExit; - - /* - * Sanity check. - */ - int rc = DisasmTest1(); -- if (rc) -+ if (rc == 0) - { -- RTPrintf("tstLdr-4: FATAL ERROR - DisasmTest1 is buggy: rc=%#x\n", rc); -- return 1; -- } -+ /* -+ * Execute the test. -+ */ -+ char szPath[RTPATH_MAX]; -+ rc = RTPathExecDir(szPath, sizeof(szPath) - sizeof("/tstLdrObjR0.r0")); -+ if (RT_SUCCESS(rc)) -+ { -+ strcat(szPath, "/tstLdrObjR0.r0"); - -- /* -- * Execute the test. -- */ -- char szPath[RTPATH_MAX]; -- rc = RTPathExecDir(szPath, sizeof(szPath) - sizeof("/tstLdrObjR0.r0")); -- if (RT_SUCCESS(rc)) -- { -- strcat(szPath, "/tstLdrObjR0.r0"); -- RTPrintf("tstLdr-4: TESTING '%s'...\n", szPath); -- cErrors += testLdrOne(szPath); -+ testLdrOne(szPath); -+ } -+ else -+ RTTestIFailed("RTPathExecDir -> %Rrc", rc); - } - else -- { -- RTPrintf("tstLdr-4: RTPathExecDir -> %Rrc\n", rc); -- cErrors++; -- } -+ RTTestIFailed("FATAL ERROR - DisasmTest1 is buggy: rc=%#x", rc); - -- /* -- * Test result summary. -- */ -- if (!cErrors) -- RTPrintf("tstLdr-4: SUCCESS\n"); -- else -- RTPrintf("tstLdr-4: FAILURE - %d errors\n", cErrors); -- return !!cErrors; -+ return RTTestSummaryAndDestroy(g_hTest); - } ---- a/include/iprt/formats/elf-common.h -+++ b/include/iprt/formats/elf-common.h -@@ -198,6 +198,12 @@ typedef struct { - #define PT_LOPROC 0x70000000 /* First processor-specific type. */ - #define PT_HIPROC 0x7fffffff /* Last processor-specific type. */ - -+#define PT_GNU_EH_FRAME 0x6474e550 /**< GNU/Linux -> .eh_frame_hdr */ -+#define PT_GNU_STACK 0x6474e551 /**< GNU/Linux -> stack prot (RWX or RW) */ -+#define PT_GNU_RELRO 0x6474e552 /**< GNU/Linux -> make RO after relocations */ -+#define PT_GNU_PROPERTY 0x6474e553 /**< GNU/Linux -> .note.gnu.property */ -+ -+ - /* Values for p_flags. */ - #define PF_X 0x1 /* Executable. */ - #define PF_W 0x2 /* Writable. */ ---- a/src/VBox/Runtime/common/ldr/ldrELF.cpp -+++ b/src/VBox/Runtime/common/ldr/ldrELF.cpp -@@ -51,9 +51,11 @@ - * Defined Constants And Macros * - *********************************************************************************************************************************/ - /** Finds an ELF symbol table string. */ --#define ELF_STR(pHdrs, iStr) ((pHdrs)->pStr + (iStr)) -+#define ELF_STR(pHdrs, iStr) ((pHdrs)->Rel.pStr + (iStr)) -+/** Finds an ELF symbol table string. */ -+#define ELF_DYN_STR(pHdrs, iStr) ((pHdrs)->Dyn.pStr + (iStr)) - /** Finds an ELF section header string. */ --#define ELF_SH_STR(pHdrs, iStr) ((pHdrs)->pShStr + (iStr)) -+#define ELF_SH_STR(pHdrs, iStr) ((pHdrs)->pShStr + (iStr)) - - - -@@ -62,6 +64,7 @@ - *********************************************************************************************************************************/ - #ifdef LOG_ENABLED - static const char *rtldrElfGetShdrType(uint32_t iType); -+static const char *rtldrElfGetPhdrType(uint32_t iType); - #endif - - -@@ -81,6 +84,7 @@ static const char *rtldrElfGetShdrType(u - - - #ifdef LOG_ENABLED -+ - /** - * Gets the section type. - * -@@ -91,23 +95,51 @@ static const char *rtldrElfGetShdrType(u - { - switch (iType) - { -- case SHT_NULL: return "SHT_NULL"; -- case SHT_PROGBITS: return "SHT_PROGBITS"; -- case SHT_SYMTAB: return "SHT_SYMTAB"; -- case SHT_STRTAB: return "SHT_STRTAB"; -- case SHT_RELA: return "SHT_RELA"; -- case SHT_HASH: return "SHT_HASH"; -- case SHT_DYNAMIC: return "SHT_DYNAMIC"; -- case SHT_NOTE: return "SHT_NOTE"; -- case SHT_NOBITS: return "SHT_NOBITS"; -- case SHT_REL: return "SHT_REL"; -- case SHT_SHLIB: return "SHT_SHLIB"; -- case SHT_DYNSYM: return "SHT_DYNSYM"; -+ RT_CASE_RET_STR(SHT_NULL); -+ RT_CASE_RET_STR(SHT_PROGBITS); -+ RT_CASE_RET_STR(SHT_SYMTAB); -+ RT_CASE_RET_STR(SHT_STRTAB); -+ RT_CASE_RET_STR(SHT_RELA); -+ RT_CASE_RET_STR(SHT_HASH); -+ RT_CASE_RET_STR(SHT_DYNAMIC); -+ RT_CASE_RET_STR(SHT_NOTE); -+ RT_CASE_RET_STR(SHT_NOBITS); -+ RT_CASE_RET_STR(SHT_REL); -+ RT_CASE_RET_STR(SHT_SHLIB); -+ RT_CASE_RET_STR(SHT_DYNSYM); - default: - return ""; - } - } --#endif -+ -+/** -+ * Gets the program header type. -+ * -+ * @returns Pointer to read only string. -+ * @param iType The section type index. -+ */ -+static const char *rtldrElfGetPhdrType(uint32_t iType) -+{ -+ switch (iType) -+ { -+ RT_CASE_RET_STR(PT_NULL); -+ RT_CASE_RET_STR(PT_LOAD); -+ RT_CASE_RET_STR(PT_DYNAMIC); -+ RT_CASE_RET_STR(PT_INTERP); -+ RT_CASE_RET_STR(PT_NOTE); -+ RT_CASE_RET_STR(PT_SHLIB); -+ RT_CASE_RET_STR(PT_PHDR); -+ RT_CASE_RET_STR(PT_TLS); -+ RT_CASE_RET_STR(PT_GNU_EH_FRAME); -+ RT_CASE_RET_STR(PT_GNU_STACK); -+ RT_CASE_RET_STR(PT_GNU_RELRO); -+ RT_CASE_RET_STR(PT_GNU_PROPERTY); -+ default: -+ return ""; -+ } -+} -+ -+#endif /* LOG_ENABLED*/ - - - /** -@@ -124,8 +156,6 @@ DECLHIDDEN(int) rtldrELFOpen(PRTLDRREADE - { - const char *pszLogName = pReader->pfnLogName(pReader); NOREF(pszLogName); - -- RT_NOREF_PV(pErrInfo); /** @todo implement */ -- - /* - * Read the ident to decide if this is 32-bit or 64-bit - * and worth dealing with. -@@ -134,6 +164,7 @@ DECLHIDDEN(int) rtldrELFOpen(PRTLDRREADE - int rc = pReader->pfnRead(pReader, &e_ident, sizeof(e_ident), 0); - if (RT_FAILURE(rc)) - return rc; -+ - if ( e_ident[EI_MAG0] != ELFMAG0 - || e_ident[EI_MAG1] != ELFMAG1 - || e_ident[EI_MAG2] != ELFMAG2 -@@ -141,19 +172,17 @@ DECLHIDDEN(int) rtldrELFOpen(PRTLDRREADE - || ( e_ident[EI_CLASS] != ELFCLASS32 - && e_ident[EI_CLASS] != ELFCLASS64) - ) -- { -- Log(("RTLdrELF: %s: Unsupported/invalid ident %.*Rhxs\n", pszLogName, sizeof(e_ident), e_ident)); -- return VERR_BAD_EXE_FORMAT; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Unsupported/invalid ident %.*Rhxs", pszLogName, sizeof(e_ident), e_ident); -+ - if (e_ident[EI_DATA] != ELFDATA2LSB) -- { -- Log(("RTLdrELF: %s: ELF endian %x is unsupported\n", pszLogName, e_ident[EI_DATA])); -- return VERR_LDRELF_ODD_ENDIAN; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_LDRELF_ODD_ENDIAN, -+ "%s: ELF endian %x is unsupported", pszLogName, e_ident[EI_DATA]); -+ - if (e_ident[EI_CLASS] == ELFCLASS32) -- rc = rtldrELF32Open(pReader, fFlags, enmArch, phLdrMod); -+ rc = rtldrELF32Open(pReader, fFlags, enmArch, phLdrMod, pErrInfo); - else -- rc = rtldrELF64Open(pReader, fFlags, enmArch, phLdrMod); -+ rc = rtldrELF64Open(pReader, fFlags, enmArch, phLdrMod, pErrInfo); - return rc; - } - ---- a/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h -+++ b/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h -@@ -29,31 +29,37 @@ - * Defined Constants And Macros * - *******************************************************************************/ - #if ELF_MODE == 32 --#define RTLDRELF_NAME(name) rtldrELF32##name --#define RTLDRELF_SUFF(name) name##32 --#define RTLDRELF_MID(pre,suff) pre##32##suff --#define FMT_ELF_ADDR "%08RX32" --#define FMT_ELF_HALF "%04RX16" --#define FMT_ELF_OFF "%08RX32" --#define FMT_ELF_SIZE "%08RX32" --#define FMT_ELF_SWORD "%RI32" --#define FMT_ELF_WORD "%08RX32" --#define FMT_ELF_XWORD "%08RX32" --#define FMT_ELF_SXWORD "%RI32" -+# define RTLDRELF_NAME(name) rtldrELF32##name -+# define RTLDRELF_SUFF(name) name##32 -+# define RTLDRELF_MID(pre,suff) pre##32##suff -+# define FMT_ELF_ADDR "%08RX32" -+# define FMT_ELF_ADDR7 "%07RX32" -+# define FMT_ELF_HALF "%04RX16" -+# define FMT_ELF_OFF "%08RX32" -+# define FMT_ELF_SIZE "%08RX32" -+# define FMT_ELF_SWORD "%RI32" -+# define FMT_ELF_WORD "%08RX32" -+# define FMT_ELF_XWORD "%08RX32" -+# define FMT_ELF_SXWORD "%RI32" -+# define Elf_Xword Elf32_Word -+# define Elf_Sxword Elf32_Sword - - #elif ELF_MODE == 64 --#define RTLDRELF_NAME(name) rtldrELF64##name --#define RTLDRELF_SUFF(name) name##64 --#define RTLDRELF_MID(pre,suff) pre##64##suff --#define FMT_ELF_ADDR "%016RX64" --#define FMT_ELF_HALF "%04RX16" --#define FMT_ELF_SHALF "%RI16" --#define FMT_ELF_OFF "%016RX64" --#define FMT_ELF_SIZE "%016RX64" --#define FMT_ELF_SWORD "%RI32" --#define FMT_ELF_WORD "%08RX32" --#define FMT_ELF_XWORD "%016RX64" --#define FMT_ELF_SXWORD "%RI64" -+# define RTLDRELF_NAME(name) rtldrELF64##name -+# define RTLDRELF_SUFF(name) name##64 -+# define RTLDRELF_MID(pre,suff) pre##64##suff -+# define FMT_ELF_ADDR "%016RX64" -+# define FMT_ELF_ADDR7 "%08RX64" -+# define FMT_ELF_HALF "%04RX16" -+# define FMT_ELF_SHALF "%RI16" -+# define FMT_ELF_OFF "%016RX64" -+# define FMT_ELF_SIZE "%016RX64" -+# define FMT_ELF_SWORD "%RI32" -+# define FMT_ELF_WORD "%08RX32" -+# define FMT_ELF_XWORD "%016RX64" -+# define FMT_ELF_SXWORD "%RI64" -+# define Elf_Xword Elf64_Xword -+# define Elf_Sxword Elf64_Sxword - #endif - - #define Elf_Ehdr RTLDRELF_MID(Elf,_Ehdr) -@@ -74,6 +80,9 @@ - #define RTLDRMODELF RTLDRELF_MID(RTLDRMODELF,RT_NOTHING) - #define PRTLDRMODELF RTLDRELF_MID(PRTLDRMODELF,RT_NOTHING) - -+#define RTLDRMODELFSHX RTLDRELF_MID(RTLDRMODELFSHX,RT_NOTHING) -+#define PRTLDRMODELFSHX RTLDRELF_MID(PRTLDRMODELFSHX,RT_NOTHING) -+ - #define ELF_R_SYM(info) RTLDRELF_MID(ELF,_R_SYM)(info) - #define ELF_R_TYPE(info) RTLDRELF_MID(ELF,_R_TYPE)(info) - #define ELF_R_INFO(sym, type) RTLDRELF_MID(ELF,_R_INFO)(sym, type) -@@ -86,6 +95,20 @@ - * Structures and Typedefs * - *******************************************************************************/ - /** -+ * Extra section info. -+ */ -+typedef struct RTLDRMODELFSHX -+{ -+ /** The corresponding program header. */ -+ uint16_t idxPhdr; -+ /** The corresponding dynamic section entry (address). */ -+ uint16_t idxDt; -+ /** The DT tag. */ -+ uint32_t uDtTag; -+} RTLDRMODELFSHX; -+typedef RTLDRMODELFSHX *PRTLDRMODELFSHX; -+ -+/** - * The ELF loader structure. - */ - typedef struct RTLDRMODELF -@@ -105,36 +128,82 @@ typedef struct RTLDRMODELF - /** Unmodified section headers (allocated after paShdrs, so no need to free). - * Not valid if the image is DONE. */ - Elf_Shdr const *paOrgShdrs; -+ /** Runs parallel to paShdrs and is part of the same allocation. */ -+ PRTLDRMODELFSHX paShdrExtras; -+ /** Base section number, either 1 or zero depending on whether we've -+ * re-used the NULL entry for .elf.headers in ET_EXEC/ET_DYN. */ -+ unsigned iFirstSect; -+ /** Set if the SHF_ALLOC section headers are in order of sh_addr. */ -+ bool fShdrInOrder; - /** The size of the loaded image. */ - size_t cbImage; - - /** The image base address if it's an EXEC or DYN image. */ - Elf_Addr LinkAddress; - -- /** The symbol section index. */ -- unsigned iSymSh; -- /** Number of symbols in the table. */ -- unsigned cSyms; -- /** Pointer to symbol table within RTLDRMODELF::pvBits. */ -- const Elf_Sym *paSyms; -- -- /** The string section index. */ -- unsigned iStrSh; -- /** Size of the string table. */ -- unsigned cbStr; -- /** Pointer to string table within RTLDRMODELF::pvBits. */ -- const char *pStr; -+ struct -+ { -+ /** The symbol section index. */ -+ unsigned iSymSh; -+ /** Number of symbols in the table. */ -+ unsigned cSyms; -+ /** Pointer to symbol table within RTLDRMODELF::pvBits. */ -+ const Elf_Sym *paSyms; -+ -+ /** The string section index. */ -+ unsigned iStrSh; -+ /** Size of the string table. */ -+ unsigned cbStr; -+ /** Pointer to string table within RTLDRMODELF::pvBits. */ -+ const char *pStr; -+ } Rel /**< Regular symbols and strings. */ -+ , Dyn /**< Dynamic symbols and strings. */; - -- /** Size of the section header string table. */ -- unsigned cbShStr; - /** Pointer to section header string table within RTLDRMODELF::pvBits. */ - const char *pShStr; -+ /** Size of the section header string table. */ -+ unsigned cbShStr; - - /** The '.eh_frame' section index. Zero if not searched for, ~0U if not found. */ - unsigned iShEhFrame; - /** The '.eh_frame_hdr' section index. Zero if not searched for, ~0U if not found. */ - unsigned iShEhFrameHdr; --} RTLDRMODELF, *PRTLDRMODELF; -+ -+ /** The '.dynamic' / SHT_DYNAMIC section index. ~0U if not present. */ -+ unsigned iShDynamic; -+ /** Number of entries in paDynamic. */ -+ unsigned cDynamic; -+ /** The dynamic section (NULL for ET_REL). */ -+ Elf_Dyn *paDynamic; -+ /** Program headers (NULL for ET_REL). */ -+ Elf_Phdr *paPhdrs; -+ -+ /** Info extracted from PT_DYNAMIC and the program headers. */ -+ struct -+ { -+ /** DT_RELA/DT_REL. */ -+ Elf_Addr uPtrRelocs; -+ /** DT_RELASZ/DT_RELSZ. */ -+ Elf_Xword cbRelocs; -+ /** Non-zero if we've seen DT_RELAENT/DT_RELENT. */ -+ unsigned cbRelocEntry; -+ /** DT_RELA or DT_REL. */ -+ unsigned uRelocType; -+ /** The index of the section header matching DT_RELA/DT_REL. */ -+ unsigned idxShRelocs; -+ -+ /** DT_JMPREL. */ -+ Elf_Addr uPtrJmpRelocs; -+ /** DT_PLTRELSZ. */ -+ Elf_Xword cbJmpRelocs; -+ /** DT_RELA or DT_REL (if we've seen DT_PLTREL). */ -+ unsigned uJmpRelocType; -+ /** The index of the section header matching DT_JMPREL. */ -+ unsigned idxShJmpRelocs; -+ } DynInfo; -+} RTLDRMODELF; -+/** Pointer to an ELF module instance. */ -+typedef RTLDRMODELF *PRTLDRMODELF; - - - /** -@@ -154,11 +223,15 @@ static int RTLDRELF_NAME(MapBits)(PRTLDR - if (RT_SUCCESS(rc)) - { - const uint8_t *pu8 = (const uint8_t *)pModElf->pvBits; -- if (pModElf->iSymSh != ~0U) -- pModElf->paSyms = (const Elf_Sym *)(pu8 + pModElf->paShdrs[pModElf->iSymSh].sh_offset); -- if (pModElf->iStrSh != ~0U) -- pModElf->pStr = (const char *)(pu8 + pModElf->paShdrs[pModElf->iStrSh].sh_offset); -- pModElf->pShStr = (const char *)(pu8 + pModElf->paShdrs[pModElf->Ehdr.e_shstrndx].sh_offset); -+ if (pModElf->Rel.iSymSh != ~0U) -+ pModElf->Rel.paSyms = (const Elf_Sym *)(pu8 + pModElf->paShdrs[pModElf->Rel.iSymSh].sh_offset); -+ if (pModElf->Rel.iStrSh != ~0U) -+ pModElf->Rel.pStr = (const char *)(pu8 + pModElf->paShdrs[pModElf->Rel.iStrSh].sh_offset); -+ if (pModElf->Dyn.iSymSh != ~0U) -+ pModElf->Dyn.paSyms = (const Elf_Sym *)(pu8 + pModElf->paShdrs[pModElf->Dyn.iSymSh].sh_offset); -+ if (pModElf->Dyn.iStrSh != ~0U) -+ pModElf->Dyn.pStr = (const char *)(pu8 + pModElf->paShdrs[pModElf->Dyn.iStrSh].sh_offset); -+ pModElf->pShStr = (const char *)(pu8 + pModElf->paShdrs[pModElf->Ehdr.e_shstrndx].sh_offset); - - /* - * Verify that the ends of the string tables have a zero terminator -@@ -167,8 +240,12 @@ static int RTLDRELF_NAME(MapBits)(PRTLDR - * sh_offset and sh_size were verfied in RTLDRELF_NAME(ValidateSectionHeader)() already so they - * are safe to use. - */ -- AssertMsgStmt( pModElf->iStrSh == ~0U -- || pModElf->pStr[pModElf->paShdrs[pModElf->iStrSh].sh_size - 1] == '\0', -+ AssertMsgStmt( pModElf->Rel.iStrSh == ~0U -+ || pModElf->Rel.pStr[pModElf->paShdrs[pModElf->Rel.iStrSh].sh_size - 1] == '\0', -+ ("The string table is not zero terminated!\n"), -+ rc = VERR_LDRELF_UNTERMINATED_STRING_TAB); -+ AssertMsgStmt( pModElf->Dyn.iStrSh == ~0U -+ || pModElf->Dyn.pStr[pModElf->paShdrs[pModElf->Dyn.iStrSh].sh_size - 1] == '\0', - ("The string table is not zero terminated!\n"), - rc = VERR_LDRELF_UNTERMINATED_STRING_TAB); - AssertMsgStmt(pModElf->pShStr[pModElf->paShdrs[pModElf->Ehdr.e_shstrndx].sh_size - 1] == '\0', -@@ -180,10 +257,12 @@ static int RTLDRELF_NAME(MapBits)(PRTLDR - /* Unmap. */ - int rc2 = pModElf->Core.pReader->pfnUnmap(pModElf->Core.pReader, pModElf->pvBits); - AssertRC(rc2); -- pModElf->pvBits = NULL; -- pModElf->paSyms = NULL; -- pModElf->pStr = NULL; -- pModElf->pShStr = NULL; -+ pModElf->pvBits = NULL; -+ pModElf->Rel.paSyms = NULL; -+ pModElf->Rel.pStr = NULL; -+ pModElf->Dyn.paSyms = NULL; -+ pModElf->Dyn.pStr = NULL; -+ pModElf->pShStr = NULL; - } - } - return rc; -@@ -200,6 +279,101 @@ static int RTLDRELF_NAME(MapBits)(PRTLDR - * - */ - -+/** -+ * Get the symbol and symbol value. -+ * -+ * @returns iprt status code. -+ * @param pModElf The ELF loader module instance data. -+ * @param BaseAddr The base address which the module is being fixedup to. -+ * @param pfnGetImport The callback function to use to resolve imports (aka unresolved externals). -+ * @param pvUser User argument to pass to the callback. -+ * @param iSym The symbol to get. -+ * @param ppSym Where to store the symbol pointer on success. (read only) -+ * @param pSymValue Where to store the symbol value on success. -+ */ -+static int RTLDRELF_NAME(SymbolExecDyn)(PRTLDRMODELF pModElf, Elf_Addr BaseAddr, PFNRTLDRIMPORT pfnGetImport, void *pvUser, -+ Elf_Size iSym, const Elf_Sym **ppSym, Elf_Addr *pSymValue) -+{ -+ /* -+ * Validate and find the symbol. -+ */ -+ AssertMsgReturn(iSym < pModElf->Dyn.cSyms, ("iSym=%d is an invalid symbol index!\n", iSym), VERR_LDRELF_INVALID_SYMBOL_INDEX); -+ const Elf_Sym *pSym = &pModElf->Dyn.paSyms[iSym]; -+ *ppSym = pSym; -+ -+ AssertMsgReturn(pSym->st_name < pModElf->Dyn.cbStr, -+ ("iSym=%d st_name=%d str sh_size=%d\n", iSym, pSym->st_name, pModElf->Dyn.cbStr), -+ VERR_LDRELF_INVALID_SYMBOL_NAME_OFFSET); -+ const char * const pszName = pModElf->Dyn.pStr + pSym->st_name; -+ -+ /* -+ * Determine the symbol value. -+ * -+ * Symbols needs different treatment depending on which section their are in. -+ * Undefined and absolute symbols goes into special non-existing sections. -+ */ -+ switch (pSym->st_shndx) -+ { -+ /* -+ * Undefined symbol, needs resolving. -+ * -+ * Since ELF has no generic concept of importing from specific module (the OS/2 ELF format -+ * has but that's an OS extension and only applies to programs and dlls), we'll have to ask -+ * the resolver callback to do a global search. -+ */ -+ case SHN_UNDEF: -+ { -+ /* Try to resolve the symbol. */ -+ RTUINTPTR Value; -+ int rc = pfnGetImport(&pModElf->Core, "", pszName, ~0U, &Value, pvUser); -+ AssertMsgRCReturn(rc, ("Failed to resolve '%s' (iSym=" FMT_ELF_SIZE " rc=%Rrc\n", pszName, iSym, rc), rc); -+ -+ *pSymValue = (Elf_Addr)Value; -+ AssertMsgReturn((RTUINTPTR)*pSymValue == Value, -+ ("Symbol value overflowed! '%s' (iSym=" FMT_ELF_SIZE "\n", pszName, iSym), VERR_SYMBOL_VALUE_TOO_BIG); -+ -+ Log2(("rtldrELF: #%-3d - UNDEF " FMT_ELF_ADDR " '%s'\n", iSym, *pSymValue, pszName)); -+ break; -+ } -+ -+ /* -+ * Absolute symbols needs no fixing since they are, well, absolute. -+ */ -+ case SHN_ABS: -+ *pSymValue = pSym->st_value; -+ Log2(("rtldrELF: #%-3d - ABS " FMT_ELF_ADDR " '%s'\n", iSym, *pSymValue, pszName)); -+ break; -+ -+ /* -+ * All other symbols are addressed relative the image base in DYN and EXEC binaries. -+ */ -+ default: -+ AssertMsgReturn(pSym->st_shndx < pModElf->Ehdr.e_shnum, -+ ("iSym=%d st_shndx=%d e_shnum=%d pszName=%s\n", iSym, pSym->st_shndx, pModElf->Ehdr.e_shnum, pszName), -+ VERR_BAD_EXE_FORMAT); -+ *pSymValue = pSym->st_value + BaseAddr; -+ Log2(("rtldrELF: #%-3d - %5d " FMT_ELF_ADDR " '%s'\n", iSym, pSym->st_shndx, *pSymValue, pszName)); -+ break; -+ } -+ -+ return VINF_SUCCESS; -+} -+ -+ -+#if ELF_MODE == 32 -+/** Helper for RelocateSectionExecDyn. */ -+DECLINLINE(const Elf_Shdr *) RTLDRELF_NAME(RvaToSectionHeader)(PRTLDRMODELF pModElf, Elf_Addr uRva) -+{ -+ const Elf_Shdr * const pShdrFirst = pModElf->paShdrs; -+ const Elf_Shdr *pShdr = pShdrFirst + pModElf->Ehdr.e_shnum; -+ while (--pShdr != pShdrFirst) -+ if (uRva - pShdr->sh_addr /*rva*/ < pShdr->sh_size) -+ return pShdr; -+ AssertFailed(); -+ return pShdr; -+} -+#endif -+ - - /** - * Applies the fixups for a section in an executable image. -@@ -230,84 +404,106 @@ static int RTLDRELF_NAME(RelocateSection - * Iterate the relocations. - * The relocations are stored in an array of Elf32_Rel records and covers the entire relocation section. - */ -+#if ELF_MODE == 32 -+ const Elf_Shdr *pShdr = pModElf->paShdrs; - const Elf_Addr offDelta = BaseAddr - pModElf->LinkAddress; -+#endif - const Elf_Reloc *paRels = (const Elf_Reloc *)pvRelocs; -- const unsigned iRelMax = (unsigned)(cbRelocs / sizeof(paRels[0])); -+ const unsigned iRelMax = (unsigned)(cbRelocs / sizeof(paRels[0])); - AssertMsgReturn(iRelMax == cbRelocs / sizeof(paRels[0]), (FMT_ELF_SIZE "\n", cbRelocs / sizeof(paRels[0])), - VERR_IMAGE_TOO_BIG); - for (unsigned iRel = 0; iRel < iRelMax; iRel++) - { - /* -- * Skip R_XXX_NONE entries early to avoid confusion in the symbol -- * getter code. -+ * Apply fixups not taking a symbol (will 'continue' rather than 'break'). - */ -+ AssertMsgReturn(paRels[iRel].r_offset < cbSec, (FMT_ELF_ADDR " " FMT_ELF_SIZE "\n", paRels[iRel].r_offset, cbSec), -+ VERR_LDRELF_INVALID_RELOCATION_OFFSET); - #if ELF_MODE == 32 -- if (ELF_R_TYPE(paRels[iRel].r_info) == R_386_NONE) -- continue; --#elif ELF_MODE == 64 -- if (ELF_R_TYPE(paRels[iRel].r_info) == R_X86_64_NONE) -- continue; -+ if (paRels[iRel].r_offset - pShdr->sh_addr /*rva*/ >= pShdr->sh_size) -+ pShdr = RTLDRELF_NAME(RvaToSectionHeader)(pModElf, paRels[iRel].r_offset); -+ static const Elf_Addr s_uZero = 0; -+ const Elf_Addr *pAddrR = RT_LIKELY(pShdr->sh_type != SHT_NOBITS) /* Where to read the addend. */ -+ ? (const Elf_Addr *)(pu8SecBaseR + paRels[iRel].r_offset - pShdr->sh_addr /*rva*/ -+ + pShdr->sh_offset) -+ : &s_uZero; - #endif -- -- /* -- * Validate and find the symbol, resolve undefined ones. -- */ -- Elf_Size iSym = ELF_R_SYM(paRels[iRel].r_info); -- if (iSym >= pModElf->cSyms) -- { -- AssertMsgFailed(("iSym=%d is an invalid symbol index!\n", iSym)); -- return VERR_LDRELF_INVALID_SYMBOL_INDEX; -- } -- const Elf_Sym *pSym = &pModElf->paSyms[iSym]; -- if (pSym->st_name >= pModElf->cbStr) -+ Elf_Addr *pAddrW = (Elf_Addr *)(pu8SecBaseW + paRels[iRel].r_offset); /* Where to write the fixup. */ -+ switch (ELF_R_TYPE(paRels[iRel].r_info)) - { -- AssertMsgFailed(("iSym=%d st_name=%d str sh_size=%d\n", iSym, pSym->st_name, pModElf->cbStr)); -- return VERR_LDRELF_INVALID_SYMBOL_NAME_OFFSET; -- } -+ /* -+ * Image relative (addend + base). -+ */ -+#if ELF_MODE == 32 -+ case R_386_RELATIVE: -+ { -+ const Elf_Addr Value = *pAddrR + BaseAddr; -+ *(uint32_t *)pAddrW = Value; -+ Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_386_RELATIVE Value=" FMT_ELF_ADDR "\n", -+ SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, Value)); -+ AssertCompile(sizeof(Value) == sizeof(uint32_t)); -+ continue; -+ } -+#elif ELF_MODE == 64 -+ case R_X86_64_RELATIVE: -+ { -+ const Elf_Addr Value = paRels[iRel].r_addend + BaseAddr; -+ *(uint64_t *)pAddrW = (uint64_t)Value; -+ Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_X86_64_RELATIVE Value=" FMT_ELF_ADDR "\n", -+ SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, Value)); -+ AssertCompile(sizeof(Value) == sizeof(uint64_t)); -+ continue; -+ } -+#endif - -- Elf_Addr SymValue = 0; -- if (pSym->st_shndx == SHN_UNDEF) -- { -- /* Try to resolve the symbol. */ -- const char *pszName = ELF_STR(pModElf, pSym->st_name); -- RTUINTPTR ExtValue; -- int rc = pfnGetImport(&pModElf->Core, "", pszName, ~0U, &ExtValue, pvUser); -- AssertMsgRCReturn(rc, ("Failed to resolve '%s' rc=%Rrc\n", pszName, rc), rc); -- SymValue = (Elf_Addr)ExtValue; -- AssertMsgReturn((RTUINTPTR)SymValue == ExtValue, ("Symbol value overflowed! '%s'\n", pszName), -- VERR_SYMBOL_VALUE_TOO_BIG); -- Log2(("rtldrELF: #%-3d - UNDEF " FMT_ELF_ADDR " '%s'\n", iSym, SymValue, pszName)); -- } -- else -- { -- AssertMsgReturn(pSym->st_shndx < pModElf->Ehdr.e_shnum || pSym->st_shndx == SHN_ABS, ("%#x\n", pSym->st_shndx), -- VERR_LDRELF_INVALID_RELOCATION_OFFSET); --#if ELF_MODE == 64 -- SymValue = pSym->st_value; -+ /* -+ * R_XXX_NONE. -+ */ -+#if ELF_MODE == 32 -+ case R_386_NONE: -+#elif ELF_MODE == 64 -+ case R_X86_64_NONE: - #endif -+ continue; - } - --#if ELF_MODE == 64 -- /* Calc the value (indexes checked above; assumes SHN_UNDEF == 0). */ -- Elf_Addr Value; -- if (pSym->st_shndx < pModElf->Ehdr.e_shnum) -- Value = SymValue + offDelta; -- else /* SHN_ABS: */ -- Value = SymValue + paRels[iRel].r_addend; --#endif -+ /* -+ * Validate and find the symbol, resolve undefined ones. -+ */ -+ const Elf_Sym *pSym = NULL; /* shut up gcc */ -+ Elf_Addr SymValue = 0; /* shut up gcc-4 */ -+ int rc = RTLDRELF_NAME(SymbolExecDyn)(pModElf, BaseAddr, pfnGetImport, pvUser, ELF_R_SYM(paRels[iRel].r_info), &pSym, &SymValue); -+ if (RT_FAILURE(rc)) -+ return rc; - - /* - * Apply the fixup. - */ -- AssertMsgReturn(paRels[iRel].r_offset < cbSec, (FMT_ELF_ADDR " " FMT_ELF_SIZE "\n", paRels[iRel].r_offset, cbSec), VERR_LDRELF_INVALID_RELOCATION_OFFSET); --#if ELF_MODE == 32 -- const Elf_Addr *pAddrR = (const Elf_Addr *)(pu8SecBaseR + paRels[iRel].r_offset); /* Where to read the addend. */ --#endif -- Elf_Addr *pAddrW = (Elf_Addr *)(pu8SecBaseW + paRels[iRel].r_offset); /* Where to write the fixup. */ - switch (ELF_R_TYPE(paRels[iRel].r_info)) - { - #if ELF_MODE == 32 - /* -+ * GOT/PLT. -+ */ -+ case R_386_GLOB_DAT: -+ { -+ *(uint32_t *)pAddrW = (uint32_t)SymValue; -+ Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_386_GLOB_DAT Value=" FMT_ELF_ADDR "\n", -+ SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, SymValue)); -+ AssertCompile(sizeof(SymValue) == sizeof(uint32_t)); -+ break; -+ } -+ -+ case R_386_JMP_SLOT: -+ { -+ *(uint32_t *)pAddrW = (uint32_t)SymValue; -+ Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_386_JMP_SLOT Value=" FMT_ELF_ADDR "\n", -+ SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, SymValue)); -+ AssertCompile(sizeof(SymValue) == sizeof(uint32_t)); -+ break; -+ } -+ -+ /* - * Absolute addressing. - */ - case R_386_32: -@@ -322,7 +518,8 @@ static int RTLDRELF_NAME(RelocateSection - else - AssertFailedReturn(VERR_LDR_GENERAL_FAILURE); /** @todo SHN_COMMON */ - *(uint32_t *)pAddrW = Value; -- Log4((FMT_ELF_ADDR": R_386_32 Value=" FMT_ELF_ADDR "\n", SecAddr + paRels[iRel].r_offset + BaseAddr, Value)); -+ Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_386_32 Value=" FMT_ELF_ADDR "\n", -+ SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, Value)); - break; - } - -@@ -344,20 +541,42 @@ static int RTLDRELF_NAME(RelocateSection - } - else - AssertFailedReturn(VERR_LDR_GENERAL_FAILURE); /** @todo SHN_COMMON */ -- Log4((FMT_ELF_ADDR": R_386_PC32 Value=" FMT_ELF_ADDR "\n", SecAddr + paRels[iRel].r_offset + BaseAddr, Value)); -+ Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_386_PC32 Value=" FMT_ELF_ADDR "\n", -+ SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, Value)); - break; - } - - #elif ELF_MODE == 64 -+ /* -+ * GOT/PLT. -+ */ -+ case R_X86_64_GLOB_DAT: -+ { -+ *(uint64_t *)pAddrW = (uint64_t)SymValue; -+ Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_X86_64_GLOB_DAT Value=" FMT_ELF_ADDR "\n", -+ SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, SymValue)); -+ AssertCompile(sizeof(SymValue) == sizeof(uint64_t)); -+ break; -+ } -+ -+ case R_X86_64_JMP_SLOT: -+ { -+ *(uint64_t *)pAddrW = (uint64_t)SymValue; -+ Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_X86_64_JMP_SLOT Value=" FMT_ELF_ADDR "\n", -+ SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, SymValue)); -+ AssertCompile(sizeof(SymValue) == sizeof(uint64_t)); -+ break; -+ } - - /* -- * Absolute addressing -+ * Absolute addressing. - */ - case R_X86_64_64: - { -+ const Elf_Addr Value = SymValue + paRels[iRel].r_addend; - *(uint64_t *)pAddrW = Value; -- Log4((FMT_ELF_ADDR": R_X86_64_64 Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n", -- SecAddr + paRels[iRel].r_offset + BaseAddr, Value, SymValue)); -+ Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_X86_64_64 Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n", -+ SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, Value, SymValue)); - break; - } - -@@ -366,9 +585,10 @@ static int RTLDRELF_NAME(RelocateSection - */ - case R_X86_64_32: - { -+ const Elf_Addr Value = SymValue + paRels[iRel].r_addend; - *(uint32_t *)pAddrW = (uint32_t)Value; -- Log4((FMT_ELF_ADDR": R_X86_64_32 Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n", -- SecAddr + paRels[iRel].r_offset + BaseAddr, Value, SymValue)); -+ Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_X86_64_32 Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n", -+ SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, Value, SymValue)); - AssertMsgReturn((Elf_Addr)*(uint32_t *)pAddrW == SymValue, ("Value=" FMT_ELF_ADDR "\n", SymValue), - VERR_SYMBOL_VALUE_TOO_BIG); - break; -@@ -379,9 +599,10 @@ static int RTLDRELF_NAME(RelocateSection - */ - case R_X86_64_32S: - { -+ const Elf_Addr Value = SymValue + paRels[iRel].r_addend; - *(int32_t *)pAddrW = (int32_t)Value; -- Log4((FMT_ELF_ADDR": R_X86_64_32S Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n", -- SecAddr + paRels[iRel].r_offset + BaseAddr, Value, SymValue)); -+ Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_X86_64_32S Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n", -+ SecAddr + paRels[iRel].r_offset + BaseAddr, paRels[iRel].r_offset, Value, SymValue)); - AssertMsgReturn((Elf_Addr)*(int32_t *)pAddrW == Value, ("Value=" FMT_ELF_ADDR "\n", Value), VERR_SYMBOL_VALUE_TOO_BIG); /** @todo check the sign-extending here. */ - break; - } -@@ -390,18 +611,17 @@ static int RTLDRELF_NAME(RelocateSection - * PC relative addressing. - */ - case R_X86_64_PC32: -- case R_X86_64_PLT32: /* binutils commit 451875b4f976a527395e9303224c7881b65e12ed feature/regression. */ - { -- const Elf_Addr SourceAddr = SecAddr + paRels[iRel].r_offset + BaseAddr; /* Where the source really is. */ -- Value -= SourceAddr; -+ const Elf_Addr SourceAddr = SecAddr + paRels[iRel].r_offset + BaseAddr; /* Where the source really is. */ -+ const Elf_Addr Value = SymValue + paRels[iRel].r_addend - SourceAddr; - *(int32_t *)pAddrW = (int32_t)Value; -- Log4((FMT_ELF_ADDR": R_X86_64_PC32 Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n", -- SourceAddr, Value, SymValue)); -+ Log4((FMT_ELF_ADDR "/" FMT_ELF_ADDR7 ": R_X86_64_PC32 Value=" FMT_ELF_ADDR " SymValue=" FMT_ELF_ADDR "\n", -+ SourceAddr, paRels[iRel].r_offset, Value, SymValue)); - AssertMsgReturn((Elf_Addr)*(int32_t *)pAddrW == Value, ("Value=" FMT_ELF_ADDR "\n", Value), VERR_SYMBOL_VALUE_TOO_BIG); /** @todo check the sign-extending here. */ - break; - } --#endif - -+#endif - default: - AssertMsgFailed(("Unknown relocation type: %d (iRel=%d iRelMax=%d)\n", - ELF_R_TYPE(paRels[iRel].r_info), iRel, iRelMax)); -@@ -442,19 +662,13 @@ static int RTLDRELF_NAME(Symbol)(PRTLDRM - /* - * Validate and find the symbol. - */ -- if (iSym >= pModElf->cSyms) -- { -- AssertMsgFailed(("iSym=%d is an invalid symbol index!\n", iSym)); -- return VERR_LDRELF_INVALID_SYMBOL_INDEX; -- } -- const Elf_Sym *pSym = &pModElf->paSyms[iSym]; -+ AssertMsgReturn(iSym < pModElf->Rel.cSyms, ("iSym=%d is an invalid symbol index!\n", iSym), VERR_LDRELF_INVALID_SYMBOL_INDEX); -+ const Elf_Sym *pSym = &pModElf->Rel.paSyms[iSym]; - *ppSym = pSym; - -- if (pSym->st_name >= pModElf->cbStr) -- { -- AssertMsgFailed(("iSym=%d st_name=%d str sh_size=%d\n", iSym, pSym->st_name, pModElf->cbStr)); -- return VERR_LDRELF_INVALID_SYMBOL_NAME_OFFSET; -- } -+ AssertMsgReturn(pSym->st_name < pModElf->Rel.cbStr, -+ ("iSym=%d st_name=%d str sh_size=%d\n", iSym, pSym->st_name, pModElf->Rel.cbStr), -+ VERR_LDRELF_INVALID_SYMBOL_NAME_OFFSET); - const char *pszName = ELF_STR(pModElf, pSym->st_name); - - /* -@@ -469,7 +683,7 @@ static int RTLDRELF_NAME(Symbol)(PRTLDRM - * Undefined symbol, needs resolving. - * - * Since ELF has no generic concept of importing from specific module (the OS/2 ELF format -- * has but that's a OS extension and only applies to programs and dlls), we'll have to ask -+ * has but that's an OS extension and only applies to programs and dlls), we'll have to ask - * the resolver callback to do a global search. - */ - case SHN_UNDEF: -@@ -477,17 +691,12 @@ static int RTLDRELF_NAME(Symbol)(PRTLDRM - /* Try to resolve the symbol. */ - RTUINTPTR Value; - int rc = pfnGetImport(&pModElf->Core, "", pszName, ~0U, &Value, pvUser); -- if (RT_FAILURE(rc)) -- { -- AssertMsgFailed(("Failed to resolve '%s' rc=%Rrc\n", pszName, rc)); -- return rc; -- } -+ AssertMsgRCReturn(rc, ("Failed to resolve '%s' (iSym=" FMT_ELF_SIZE " rc=%Rrc\n", pszName, iSym, rc), rc); - *pSymValue = (Elf_Addr)Value; -- if ((RTUINTPTR)*pSymValue != Value) -- { -- AssertMsgFailed(("Symbol value overflowed! '%s'\n", pszName)); -- return VERR_SYMBOL_VALUE_TOO_BIG; -- } -+ -+ AssertMsgReturn((RTUINTPTR)*pSymValue == Value, -+ ("Symbol value overflowed! '%s' (iSym=" FMT_ELF_SIZE ")\n", pszName, iSym), -+ VERR_SYMBOL_VALUE_TOO_BIG); - - Log2(("rtldrELF: #%-3d - UNDEF " FMT_ELF_ADDR " '%s'\n", iSym, *pSymValue, pszName)); - break; -@@ -536,9 +745,9 @@ static int RTLDRELF_NAME(Symbol)(PRTLDRM - * @param pvRelocs Pointer to where we read the relocations from. - * @param cbRelocs Size of the relocations. - */ --static int RTLDRELF_NAME(RelocateSection)(PRTLDRMODELF pModElf, Elf_Addr BaseAddr, PFNRTLDRIMPORT pfnGetImport, void *pvUser, -- const Elf_Addr SecAddr, Elf_Size cbSec, const uint8_t *pu8SecBaseR, uint8_t *pu8SecBaseW, -- const void *pvRelocs, Elf_Size cbRelocs) -+static int RTLDRELF_NAME(RelocateSectionRel)(PRTLDRMODELF pModElf, Elf_Addr BaseAddr, PFNRTLDRIMPORT pfnGetImport, void *pvUser, -+ const Elf_Addr SecAddr, Elf_Size cbSec, const uint8_t *pu8SecBaseR, -+ uint8_t *pu8SecBaseW, const void *pvRelocs, Elf_Size cbRelocs) - { - #if ELF_MODE != 32 - NOREF(pu8SecBaseR); -@@ -702,6 +911,18 @@ static DECLCALLBACK(int) RTLDRELF_NAME(C - pModElf->paShdrs = NULL; - } - -+ if (pModElf->paPhdrs) -+ { -+ RTMemFree(pModElf->paPhdrs); -+ pModElf->paPhdrs = NULL; -+ } -+ -+ if (pModElf->paDynamic) -+ { -+ RTMemFree(pModElf->paDynamic); -+ pModElf->paDynamic = NULL; -+ } -+ - if (pModElf->pvBits) - { - pModElf->Core.pReader->pfnUnmap(pModElf->Core.pReader, pModElf->pvBits); -@@ -721,9 +942,9 @@ static DECLCALLBACK(int) RTLDRELF_NAME(D - } - - --/** @copydoc RTLDROPS::EnumSymbols */ --static DECLCALLBACK(int) RTLDRELF_NAME(EnumSymbols)(PRTLDRMODINTERNAL pMod, unsigned fFlags, const void *pvBits, RTUINTPTR BaseAddress, -- PFNRTLDRENUMSYMS pfnCallback, void *pvUser) -+/** @copydoc RTLDROPS::pfnEnumSymbols */ -+static DECLCALLBACK(int) RTLDRELF_NAME(EnumSymbols)(PRTLDRMODINTERNAL pMod, unsigned fFlags, const void *pvBits, -+ RTUINTPTR BaseAddress, PFNRTLDRENUMSYMS pfnCallback, void *pvUser) - { - PRTLDRMODELF pModElf = (PRTLDRMODELF)pMod; - NOREF(pvBits); -@@ -744,8 +965,20 @@ static DECLCALLBACK(int) RTLDRELF_NAME(E - /* - * Enumerate the symbol table. - */ -- const Elf_Sym *paSyms = pModElf->paSyms; -- unsigned cSyms = pModElf->cSyms; -+ const Elf_Sym *paSyms = pModElf->Rel.paSyms; -+ unsigned cSyms = pModElf->Rel.cSyms; -+ const char *pszzStr = pModElf->Rel.pStr; -+ unsigned cbStr = pModElf->Rel.cbStr; -+ if ( ( !(fFlags & RTLDR_ENUM_SYMBOL_FLAGS_ALL) -+ && pModElf->Dyn.cSyms > 0) -+ || cSyms == 0) -+ { -+ paSyms = pModElf->Dyn.paSyms; -+ cSyms = pModElf->Dyn.cSyms; -+ pszzStr = pModElf->Dyn.pStr; -+ cbStr = pModElf->Dyn.cbStr; -+ } -+ - for (unsigned iSym = 1; iSym < cSyms; iSym++) - { - /* -@@ -774,22 +1007,21 @@ static DECLCALLBACK(int) RTLDRELF_NAME(E - return VERR_BAD_EXE_FORMAT; - } - -- AssertMsgReturn(paSyms[iSym].st_name < pModElf->cbStr, -+ AssertMsgReturn(paSyms[iSym].st_name < cbStr, - ("String outside string table! iSym=%d paSyms[iSym].st_name=%#x\n", iSym, paSyms[iSym].st_name), - VERR_LDRELF_INVALID_SYMBOL_NAME_OFFSET); -+ const char * const pszName = pszzStr + paSyms[iSym].st_name; - -- const char *pszName = ELF_STR(pModElf, paSyms[iSym].st_name); - /* String termination was already checked when the string table was mapped. */ -- if ( (pszName && *pszName) -+ if ( *pszName != '\0' - && ( (fFlags & RTLDR_ENUM_SYMBOL_FLAGS_ALL) -- || ELF_ST_BIND(paSyms[iSym].st_info) == STB_GLOBAL) -- ) -+ || ELF_ST_BIND(paSyms[iSym].st_info) == STB_GLOBAL) ) - { - /* - * Call back. - */ - AssertMsgReturn(Value == (RTUINTPTR)Value, (FMT_ELF_ADDR "\n", Value), VERR_SYMBOL_VALUE_TOO_BIG); -- rc = pfnCallback(pMod, pszName, ~0U, (RTUINTPTR)Value, pvUser); -+ rc = pfnCallback(pMod, pszName, iSym, (RTUINTPTR)Value, pvUser); - if (rc) - return rc; - } -@@ -820,13 +1052,11 @@ static DECLCALLBACK(int) RTLDRELF_NAME(G - switch (pModElf->Ehdr.e_type) - { - case ET_REL: -+ case ET_DYN: - break; - case ET_EXEC: - Log(("RTLdrELF: %s: Executable images are not supported yet!\n", pModElf->Core.pReader->pfnLogName(pModElf->Core.pReader))); - return VERR_LDRELF_EXEC; -- case ET_DYN: -- Log(("RTLdrELF: %s: Dynamic images are not supported yet!\n", pModElf->Core.pReader->pfnLogName(pModElf->Core.pReader))); -- return VERR_LDRELF_DYN; - default: AssertFailedReturn(VERR_BAD_EXE_FORMAT); - } - -@@ -885,13 +1115,11 @@ static DECLCALLBACK(int) RTLDRELF_NAME(R - switch (pModElf->Ehdr.e_type) - { - case ET_REL: -+ case ET_DYN: - break; - case ET_EXEC: - Log(("RTLdrELF: %s: Executable images are not supported yet!\n", pszLogName)); - return VERR_LDRELF_EXEC; -- case ET_DYN: -- Log(("RTLdrELF: %s: Dynamic images are not supported yet!\n", pszLogName)); -- return VERR_LDRELF_DYN; - default: AssertFailedReturn(VERR_BAD_EXE_FORMAT); - } - -@@ -910,8 +1138,9 @@ static DECLCALLBACK(int) RTLDRELF_NAME(R - - /* - * Iterate the sections looking for interesting SHT_REL[A] sections. -- * SHT_REL[A] sections have the section index of the section they contain fixups -- * for in the sh_info member. -+ * -+ * In ET_REL files the SHT_REL[A] sections have the section index of -+ * the section they contain fixups for in the sh_info member. - */ - const Elf_Shdr *paShdrs = pModElf->paShdrs; - Log2(("rtLdrElf: %s: Fixing up image\n", pszLogName)); -@@ -928,36 +1157,37 @@ static DECLCALLBACK(int) RTLDRELF_NAME(R - if (pShdrRel->sh_type != SHT_RELA) - #endif - continue; -- if (pShdrRel->sh_info >= pModElf->Ehdr.e_shnum) -- continue; -- const Elf_Shdr *pShdr = &paShdrs[pShdrRel->sh_info]; /* the section to fixup. */ -- if (!(pShdr->sh_flags & SHF_ALLOC)) -- continue; -- -- /* -- * Relocate the section. -- */ -- Log2(("rtldrELF: %s: Relocation records for #%d [%s] (sh_info=%d sh_link=%d) found in #%d [%s] (sh_info=%d sh_link=%d)\n", -- pszLogName, (int)pShdrRel->sh_info, ELF_SH_STR(pModElf, pShdr->sh_name), (int)pShdr->sh_info, (int)pShdr->sh_link, -- iShdr, ELF_SH_STR(pModElf, pShdrRel->sh_name), (int)pShdrRel->sh_info, (int)pShdrRel->sh_link)); -- -- /** @todo Make RelocateSection a function pointer so we can select the one corresponding to the machine when opening the image. */ - if (pModElf->Ehdr.e_type == ET_REL) -- rc = RTLDRELF_NAME(RelocateSection)(pModElf, BaseAddr, pfnGetImport, pvUser, -- pShdr->sh_addr, -- pShdr->sh_size, -- (const uint8_t *)pModElf->pvBits + pShdr->sh_offset, -- (uint8_t *)pvBits + pShdr->sh_addr, -- (const uint8_t *)pModElf->pvBits + pShdrRel->sh_offset, -- pShdrRel->sh_size); -+ { -+ if (pShdrRel->sh_info >= pModElf->Ehdr.e_shnum) -+ continue; -+ const Elf_Shdr *pShdr = &paShdrs[pShdrRel->sh_info]; /* the section to fixup. */ -+ if (!(pShdr->sh_flags & SHF_ALLOC)) -+ continue; -+ -+ /* -+ * Relocate the section. -+ */ -+ Log2(("rtldrELF: %s: Relocation records for #%d [%s] (sh_info=%d sh_link=%d) found in #%d [%s] (sh_info=%d sh_link=%d)\n", -+ pszLogName, (int)pShdrRel->sh_info, ELF_SH_STR(pModElf, pShdr->sh_name), (int)pShdr->sh_info, (int)pShdr->sh_link, -+ iShdr, ELF_SH_STR(pModElf, pShdrRel->sh_name), (int)pShdrRel->sh_info, (int)pShdrRel->sh_link)); -+ -+ rc = RTLDRELF_NAME(RelocateSectionRel)(pModElf, BaseAddr, pfnGetImport, pvUser, -+ pShdr->sh_addr, -+ pShdr->sh_size, -+ (const uint8_t *)pModElf->pvBits + pShdr->sh_offset, -+ (uint8_t *)pvBits + pShdr->sh_addr, -+ (const uint8_t *)pModElf->pvBits + pShdrRel->sh_offset, -+ pShdrRel->sh_size); -+ } - else - rc = RTLDRELF_NAME(RelocateSectionExecDyn)(pModElf, BaseAddr, pfnGetImport, pvUser, -- pShdr->sh_addr, -- pShdr->sh_size, -- (const uint8_t *)pModElf->pvBits + pShdr->sh_offset, -- (uint8_t *)pvBits + pShdr->sh_addr, -+ 0, (Elf_Size)pModElf->cbImage, -+ (const uint8_t *)pModElf->pvBits /** @todo file offset ?? */, -+ (uint8_t *)pvBits, - (const uint8_t *)pModElf->pvBits + pShdrRel->sh_offset, - pShdrRel->sh_size); -+ - if (RT_FAILURE(rc)) - return rc; - } -@@ -1016,11 +1246,20 @@ static DECLCALLBACK(int) RTLDRELF_NAME(G - /* - * Calc all kinds of pointers before we start iterating the symbol table. - */ -- const Elf_Sym *paSyms = pModElf->paSyms; -- unsigned cSyms = pModElf->cSyms; -+ const Elf_Sym *paSyms = pModElf->Rel.paSyms; -+ unsigned cSyms = pModElf->Rel.cSyms; -+ const char *pszzStr = pModElf->Rel.pStr; -+ unsigned cbStr = pModElf->Rel.cbStr; -+ if (pModElf->Dyn.cSyms > 0) -+ { -+ paSyms = pModElf->Dyn.paSyms; -+ cSyms = pModElf->Dyn.cSyms; -+ pszzStr = pModElf->Dyn.pStr; -+ cbStr = pModElf->Dyn.cbStr; -+ } -+ - if (iOrdinal == UINT32_MAX) - { -- const char *pStr = pModElf->pStr; - for (unsigned iSym = 1; iSym < cSyms; iSym++) - { - /* Undefined symbols are not exports, they are imports. */ -@@ -1029,18 +1268,13 @@ static DECLCALLBACK(int) RTLDRELF_NAME(G - || ELF_ST_BIND(paSyms[iSym].st_info) == STB_WEAK)) - { - /* Validate the name string and try match with it. */ -- if (paSyms[iSym].st_name < pModElf->cbStr) -- { -- if (!strcmp(pszSymbol, pStr + paSyms[iSym].st_name)) -- { -- /* matched! */ -- return RTLDRELF_NAME(ReturnSymbol)(pModElf, &paSyms[iSym], uBaseAddr, pValue); -- } -- } -- else -+ AssertMsgReturn(paSyms[iSym].st_name < cbStr, -+ ("String outside string table! iSym=%d paSyms[iSym].st_name=%#x\n", iSym, paSyms[iSym].st_name), -+ VERR_LDRELF_INVALID_SYMBOL_NAME_OFFSET); -+ if (!strcmp(pszSymbol, pszzStr + paSyms[iSym].st_name)) - { -- AssertMsgFailed(("String outside string table! iSym=%d paSyms[iSym].st_name=%#x\n", iSym, paSyms[iSym].st_name)); -- return VERR_LDRELF_INVALID_SYMBOL_NAME_OFFSET; -+ /* matched! */ -+ return RTLDRELF_NAME(ReturnSymbol)(pModElf, &paSyms[iSym], uBaseAddr, pValue); - } - } - } -@@ -1127,23 +1361,47 @@ static DECLCALLBACK(int) RTLDRELF_NAME(E - - - /** -- * Helper that locates the first allocated section. -+ * Locate the next allocated section by RVA (sh_addr). -+ * -+ * This is a helper for EnumSegments and SegOffsetToRva. - * - * @returns Pointer to the section header if found, NULL if none. -- * @param pShdr The section header to start searching at. -- * @param cLeft The number of section headers left to search. Can be 0. -+ * @param pModElf The module instance. -+ * @param iShdrCur The current section header. - */ --static const Elf_Shdr *RTLDRELF_NAME(GetFirstAllocatedSection)(const Elf_Shdr *pShdr, unsigned cLeft) -+static const Elf_Shdr *RTLDRELF_NAME(GetNextAllocatedSection)(PRTLDRMODELF pModElf, unsigned iShdrCur) - { -- while (cLeft-- > 0) -+ unsigned const cShdrs = pModElf->Ehdr.e_shnum; -+ const Elf_Shdr * const paShdrs = pModElf->paShdrs; -+ if (pModElf->fShdrInOrder) -+ { -+ for (unsigned iShdr = iShdrCur + 1; iShdr < cShdrs; iShdr++) -+ if (paShdrs[iShdr].sh_flags & SHF_ALLOC) -+ return &paShdrs[iShdr]; -+ } -+ else - { -- if (pShdr->sh_flags & SHF_ALLOC) -- return pShdr; -- pShdr++; -+ Elf_Addr const uEndCur = paShdrs[iShdrCur].sh_addr + paShdrs[iShdrCur].sh_size; -+ Elf_Addr offBest = ~(Elf_Addr)0; -+ unsigned iBest = cShdrs; -+ for (unsigned iShdr = pModElf->iFirstSect; iShdr < cShdrs; iShdr++) -+ if ((paShdrs[iShdr].sh_flags & SHF_ALLOC) && iShdr != iShdrCur) -+ { -+ Elf_Addr const offDelta = paShdrs[iShdr].sh_addr - uEndCur; -+ if ( offDelta < offBest -+ && paShdrs[iShdr].sh_addr >= uEndCur) -+ { -+ offBest = offDelta; -+ iBest = iShdr; -+ } -+ } -+ if (iBest < cShdrs) -+ return &paShdrs[iBest]; - } - return NULL; - } - -+ - /** @copydoc RTLDROPS::pfnEnumSegments. */ - static DECLCALLBACK(int) RTLDRELF_NAME(EnumSegments)(PRTLDRMODINTERNAL pMod, PFNRTLDRENUMSEGS pfnCallback, void *pvUser) - { -@@ -1163,15 +1421,23 @@ static DECLCALLBACK(int) RTLDRELF_NAME(E - Elf_Addr uPrevMappedRva = 0; - const Elf_Shdr *paShdrs = pModElf->paShdrs; - const Elf_Shdr *paOrgShdrs = pModElf->paOrgShdrs; -- for (unsigned iShdr = 1; iShdr < pModElf->Ehdr.e_shnum; iShdr++) -+ for (unsigned iShdr = pModElf->iFirstSect; iShdr < pModElf->Ehdr.e_shnum; iShdr++) - { - RTLDRSEG Seg; -- Seg.pszName = ELF_SH_STR(pModElf, paShdrs[iShdr].sh_name); -- Seg.cchName = (uint32_t)strlen(Seg.pszName); -- if (Seg.cchName == 0) -+ if (iShdr != 0) -+ { -+ Seg.pszName = ELF_SH_STR(pModElf, paShdrs[iShdr].sh_name); -+ Seg.cchName = (uint32_t)strlen(Seg.pszName); -+ if (Seg.cchName == 0) -+ { -+ Seg.pszName = szName; -+ Seg.cchName = (uint32_t)RTStrPrintf(szName, sizeof(szName), "UnamedSect%02u", iShdr); -+ } -+ } -+ else - { -- Seg.pszName = szName; -- Seg.cchName = (uint32_t)RTStrPrintf(szName, sizeof(szName), "UnamedSect%02u", iShdr); -+ Seg.pszName = ".elf.headers"; -+ Seg.cchName = 12; - } - Seg.SelFlat = 0; - Seg.Sel16bit = 0; -@@ -1187,14 +1453,11 @@ static DECLCALLBACK(int) RTLDRELF_NAME(E - { - Seg.LinkAddress = paOrgShdrs[iShdr].sh_addr; - Seg.RVA = paShdrs[iShdr].sh_addr; -- const Elf_Shdr *pShdr2 = RTLDRELF_NAME(GetFirstAllocatedSection)(&paShdrs[iShdr + 1], -- pModElf->Ehdr.e_shnum - iShdr - 1); -- if ( pShdr2 -- && pShdr2->sh_addr >= paShdrs[iShdr].sh_addr -- && Seg.RVA >= uPrevMappedRva) -+ const Elf_Shdr *pShdr2 = RTLDRELF_NAME(GetNextAllocatedSection)(pModElf, iShdr); -+ if (pShdr2) - Seg.cbMapped = pShdr2->sh_addr - paShdrs[iShdr].sh_addr; - else -- Seg.cbMapped = RT_MAX(paShdrs[iShdr].sh_size, paShdrs[iShdr].sh_addralign); -+ Seg.cbMapped = pModElf->cbImage - paShdrs[iShdr].sh_addr; - uPrevMappedRva = Seg.RVA; - } - else -@@ -1230,10 +1493,11 @@ static DECLCALLBACK(int) RTLDRELF_NAME(L - PRTLDRMODELF pModElf = (PRTLDRMODELF)pMod; - - const Elf_Shdr *pShdrEnd = NULL; -- unsigned cLeft = pModElf->Ehdr.e_shnum - 1; -- const Elf_Shdr *pShdr = &pModElf->paOrgShdrs[cLeft]; -+ unsigned cLeft = pModElf->Ehdr.e_shnum - pModElf->iFirstSect; -+ const Elf_Shdr *pShdr = &pModElf->paOrgShdrs[pModElf->Ehdr.e_shnum]; - while (cLeft-- > 0) - { -+ pShdr--; - if (pShdr->sh_flags & SHF_ALLOC) - { - RTLDRADDR offSeg = LinkAddress - pShdr->sh_addr; -@@ -1246,13 +1510,12 @@ static DECLCALLBACK(int) RTLDRELF_NAME(L - if (offSeg == pShdr->sh_size) - pShdrEnd = pShdr; - } -- pShdr--; - } - - if (pShdrEnd) - { - *poffSeg = pShdrEnd->sh_size; -- *piSeg = pShdrEnd - pModElf->paOrgShdrs - 1; -+ *piSeg = pShdrEnd - pModElf->paOrgShdrs - pModElf->iFirstSect; - return VINF_SUCCESS; - } - -@@ -1268,7 +1531,7 @@ static DECLCALLBACK(int) RTLDRELF_NAME(L - RTLDRADDR offSeg; - int rc = RTLDRELF_NAME(LinkAddressToSegOffset)(pMod, LinkAddress, &iSeg, &offSeg); - if (RT_SUCCESS(rc)) -- *pRva = pModElf->paShdrs[iSeg + 1].sh_addr + offSeg; -+ *pRva = pModElf->paShdrs[iSeg + pModElf->iFirstSect].sh_addr + offSeg; - return rc; - } - -@@ -1278,14 +1541,13 @@ static DECLCALLBACK(int) RTLDRELF_NAME(S - PRTLDRADDR pRva) - { - PRTLDRMODELF pModElf = (PRTLDRMODELF)pMod; -- if (iSeg >= pModElf->Ehdr.e_shnum - 1U) -+ if (iSeg >= pModElf->Ehdr.e_shnum - pModElf->iFirstSect) - return VERR_LDR_INVALID_SEG_OFFSET; - -- iSeg++; /* skip section 0 */ -+ iSeg += pModElf->iFirstSect; /* skip section 0 if not used */ - if (offSeg > pModElf->paShdrs[iSeg].sh_size) - { -- const Elf_Shdr *pShdr2 = RTLDRELF_NAME(GetFirstAllocatedSection)(&pModElf->paShdrs[iSeg + 1], -- pModElf->Ehdr.e_shnum - iSeg - 1); -+ const Elf_Shdr *pShdr2 = RTLDRELF_NAME(GetNextAllocatedSection)(pModElf, iSeg); - if ( !pShdr2 - || offSeg > (pShdr2->sh_addr - pModElf->paShdrs[iSeg].sh_addr)) - return VERR_LDR_INVALID_SEG_OFFSET; -@@ -1303,13 +1565,13 @@ static DECLCALLBACK(int) RTLDRELF_NAME(S - static DECLCALLBACK(int) RTLDRELF_NAME(RvaToSegOffset)(PRTLDRMODINTERNAL pMod, RTLDRADDR Rva, - uint32_t *piSeg, PRTLDRADDR poffSeg) - { -- PRTLDRMODELF pModElf = (PRTLDRMODELF)pMod; -- -+ PRTLDRMODELF pModElf = (PRTLDRMODELF)pMod; - Elf_Addr PrevAddr = 0; -- unsigned cLeft = pModElf->Ehdr.e_shnum - 1; -- const Elf_Shdr *pShdr = &pModElf->paShdrs[cLeft]; -+ unsigned cLeft = pModElf->Ehdr.e_shnum - pModElf->iFirstSect; -+ const Elf_Shdr *pShdr = &pModElf->paShdrs[pModElf->Ehdr.e_shnum]; - while (cLeft-- > 0) - { -+ pShdr--; - if (pShdr->sh_flags & SHF_ALLOC) - { - Elf_Addr cbSeg = PrevAddr ? PrevAddr - pShdr->sh_addr : pShdr->sh_size; -@@ -1322,7 +1584,6 @@ static DECLCALLBACK(int) RTLDRELF_NAME(R - } - PrevAddr = pShdr->sh_addr; - } -- pShdr--; - } - - return VERR_LDR_INVALID_RVA; -@@ -1413,14 +1674,14 @@ static DECLCALLBACK(int) RTLDRELF_NAME(R - * Apply the relocations. - */ - if (pThis->Ehdr.e_type == ET_REL) -- rc = RTLDRELF_NAME(RelocateSection)(pThis, pThis->LinkAddress, -- RTLDRELF_NAME(GetImportStubCallback), NULL /*pvUser*/, -- pThis->paShdrs[iDbgInfo].sh_addr, -- pThis->paShdrs[iDbgInfo].sh_size, -- (const uint8_t *)pvBuf, -- (uint8_t *)pvBuf, -- pbRelocs, -- pThis->paShdrs[iRelocs].sh_size); -+ rc = RTLDRELF_NAME(RelocateSectionRel)(pThis, pThis->LinkAddress, -+ RTLDRELF_NAME(GetImportStubCallback), NULL /*pvUser*/, -+ pThis->paShdrs[iDbgInfo].sh_addr, -+ pThis->paShdrs[iDbgInfo].sh_size, -+ (const uint8_t *)pvBuf, -+ (uint8_t *)pvBuf, -+ pbRelocs, -+ pThis->paShdrs[iRelocs].sh_size); - else - rc = RTLDRELF_NAME(RelocateSectionExecDyn)(pThis, pThis->LinkAddress, - RTLDRELF_NAME(GetImportStubCallback), NULL /*pvUser*/, -@@ -1562,11 +1823,13 @@ static RTLDROPS RTLDRELF_MID(s_rtldrElf, - * - * @returns iprt status code. - * @param pEhdr Pointer to the ELF header. -- * @param pszLogName The log name. - * @param cbRawImage The size of the raw image. -+ * @param pszLogName The log name. -+ * @param penmArch Where to return the architecture. -+ * @param pErrInfo Where to return extended error info. Optional. - */ --static int RTLDRELF_NAME(ValidateElfHeader)(const Elf_Ehdr *pEhdr, const char *pszLogName, uint64_t cbRawImage, -- PRTLDRARCH penmArch) -+static int RTLDRELF_NAME(ValidateElfHeader)(const Elf_Ehdr *pEhdr, uint64_t cbRawImage, const char *pszLogName, -+ PRTLDRARCH penmArch, PRTERRINFO pErrInfo) - { - Log3(("RTLdrELF: e_ident: %.*Rhxs\n" - "RTLdrELF: e_type: " FMT_ELF_HALF "\n" -@@ -1588,48 +1851,31 @@ static int RTLDRELF_NAME(ValidateElfHead - if ( pEhdr->e_ident[EI_MAG0] != ELFMAG0 - || pEhdr->e_ident[EI_MAG1] != ELFMAG1 - || pEhdr->e_ident[EI_MAG2] != ELFMAG2 -- || pEhdr->e_ident[EI_MAG3] != ELFMAG3 -- ) -- { -- Log(("RTLdrELF: %s: Invalid ELF magic (%.*Rhxs)\n", pszLogName, sizeof(pEhdr->e_ident), pEhdr->e_ident)); NOREF(pszLogName); -- return VERR_BAD_EXE_FORMAT; -- } -+ || pEhdr->e_ident[EI_MAG3] != ELFMAG3) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Invalid ELF magic (%.*Rhxs)", pszLogName, sizeof(pEhdr->e_ident), pEhdr->e_ident); - if (pEhdr->e_ident[EI_CLASS] != RTLDRELF_SUFF(ELFCLASS)) -- { -- Log(("RTLdrELF: %s: Invalid ELF class (%.*Rhxs)\n", pszLogName, sizeof(pEhdr->e_ident), pEhdr->e_ident)); -- return VERR_BAD_EXE_FORMAT; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Invalid ELF class (%.*Rhxs)", pszLogName, sizeof(pEhdr->e_ident), pEhdr->e_ident); - if (pEhdr->e_ident[EI_DATA] != ELFDATA2LSB) -- { -- Log(("RTLdrELF: %s: ELF endian %x is unsupported\n", pszLogName, pEhdr->e_ident[EI_DATA])); -- return VERR_LDRELF_ODD_ENDIAN; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_LDRELF_ODD_ENDIAN, -+ "%s: ELF endian %x is unsupported", pszLogName, pEhdr->e_ident[EI_DATA]); - if (pEhdr->e_version != EV_CURRENT) -- { -- Log(("RTLdrELF: %s: ELF version %x is unsupported\n", pszLogName, pEhdr->e_version)); -- return VERR_LDRELF_VERSION; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_LDRELF_VERSION, -+ "%s: ELF version %x is unsupported", pszLogName, pEhdr->e_version); - - if (sizeof(Elf_Ehdr) != pEhdr->e_ehsize) -- { -- Log(("RTLdrELF: %s: Elf header e_ehsize is %d expected %d!\n", -- pszLogName, pEhdr->e_ehsize, sizeof(Elf_Ehdr))); -- return VERR_BAD_EXE_FORMAT; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Elf header e_ehsize is %d expected %d!", pszLogName, pEhdr->e_ehsize, sizeof(Elf_Ehdr)); - if ( sizeof(Elf_Phdr) != pEhdr->e_phentsize -- && ( pEhdr->e_phnum != 0 -- || pEhdr->e_type == ET_DYN)) -- { -- Log(("RTLdrELF: %s: Elf header e_phentsize is %d expected %d!\n", -- pszLogName, pEhdr->e_phentsize, sizeof(Elf_Phdr))); -- return VERR_BAD_EXE_FORMAT; -- } -+ && ( pEhdr->e_phnum != 0 -+ || pEhdr->e_type == ET_DYN -+ || pEhdr->e_type == ET_EXEC)) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Elf header e_phentsize is %d expected %d!", -+ pszLogName, pEhdr->e_phentsize, sizeof(Elf_Phdr)); - if (sizeof(Elf_Shdr) != pEhdr->e_shentsize) -- { -- Log(("RTLdrELF: %s: Elf header e_shentsize is %d expected %d!\n", -- pszLogName, pEhdr->e_shentsize, sizeof(Elf_Shdr))); -- return VERR_BAD_EXE_FORMAT; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Elf header e_shentsize is %d expected %d!", -+ pszLogName, pEhdr->e_shentsize, sizeof(Elf_Shdr)); - - switch (pEhdr->e_type) - { -@@ -1638,8 +1884,8 @@ static int RTLDRELF_NAME(ValidateElfHead - case ET_DYN: - break; - default: -- Log(("RTLdrELF: %s: image type %#x is not supported!\n", pszLogName, pEhdr->e_type)); -- return VERR_BAD_EXE_FORMAT; -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: image type %#x is not supported!", -+ pszLogName, pEhdr->e_type); - } - - switch (pEhdr->e_machine) -@@ -1655,52 +1901,43 @@ static int RTLDRELF_NAME(ValidateElfHead - break; - #endif - default: -- Log(("RTLdrELF: %s: machine type %u is not supported!\n", pszLogName, pEhdr->e_machine)); -- return VERR_LDRELF_MACHINE; -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_LDRELF_MACHINE, -+ "%s: machine type %u is not supported!", pszLogName, pEhdr->e_machine); - } - - if ( pEhdr->e_phoff < pEhdr->e_ehsize - && !(pEhdr->e_phoff && pEhdr->e_phnum) - && pEhdr->e_phnum) -- { -- Log(("RTLdrELF: %s: The program headers overlap with the ELF header! e_phoff=" FMT_ELF_OFF "\n", -- pszLogName, pEhdr->e_phoff)); -- return VERR_BAD_EXE_FORMAT; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: The program headers overlap with the ELF header! e_phoff=" FMT_ELF_OFF, -+ pszLogName, pEhdr->e_phoff); - if ( pEhdr->e_phoff + pEhdr->e_phnum * pEhdr->e_phentsize > cbRawImage - || pEhdr->e_phoff + pEhdr->e_phnum * pEhdr->e_phentsize < pEhdr->e_phoff) -- { -- Log(("RTLdrELF: %s: The program headers extends beyond the file! e_phoff=" FMT_ELF_OFF " e_phnum=" FMT_ELF_HALF "\n", -- pszLogName, pEhdr->e_phoff, pEhdr->e_phnum)); -- return VERR_BAD_EXE_FORMAT; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: The program headers extends beyond the file! e_phoff=" FMT_ELF_OFF " e_phnum=" FMT_ELF_HALF, -+ pszLogName, pEhdr->e_phoff, pEhdr->e_phnum); - - - if ( pEhdr->e_shoff < pEhdr->e_ehsize - && !(pEhdr->e_shoff && pEhdr->e_shnum)) -- { -- Log(("RTLdrELF: %s: The section headers overlap with the ELF header! e_shoff=" FMT_ELF_OFF "\n", -- pszLogName, pEhdr->e_shoff)); -- return VERR_BAD_EXE_FORMAT; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: The section headers overlap with the ELF header! e_shoff=" FMT_ELF_OFF, -+ pszLogName, pEhdr->e_shoff); - if ( pEhdr->e_shoff + pEhdr->e_shnum * pEhdr->e_shentsize > cbRawImage - || pEhdr->e_shoff + pEhdr->e_shnum * pEhdr->e_shentsize < pEhdr->e_shoff) -- { -- Log(("RTLdrELF: %s: The section headers extends beyond the file! e_shoff=" FMT_ELF_OFF " e_shnum=" FMT_ELF_HALF "\n", -- pszLogName, pEhdr->e_shoff, pEhdr->e_shnum)); -- return VERR_BAD_EXE_FORMAT; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: The section headers extends beyond the file! e_shoff=" FMT_ELF_OFF " e_shnum=" FMT_ELF_HALF, -+ pszLogName, pEhdr->e_shoff, pEhdr->e_shnum); - - if (pEhdr->e_shstrndx == 0 || pEhdr->e_shstrndx > pEhdr->e_shnum) -- { -- Log(("RTLdrELF: %s: The section headers string table is out of bounds! e_shstrndx=" FMT_ELF_HALF " e_shnum=" FMT_ELF_HALF "\n", -- pszLogName, pEhdr->e_shstrndx, pEhdr->e_shnum)); -- return VERR_BAD_EXE_FORMAT; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: The section headers string table is out of bounds! e_shstrndx=" FMT_ELF_HALF " e_shnum=" FMT_ELF_HALF, -+ pszLogName, pEhdr->e_shstrndx, pEhdr->e_shnum); - - return VINF_SUCCESS; - } - -+ - /** - * Gets the section header name. - * -@@ -1741,10 +1978,12 @@ const char *RTLDRELF_NAME(GetSHdrName)(P - * @param pModElf Pointer to the module structure. - * @param iShdr The index of section header which should be validated. - * The section headers are found in the pModElf->paShdrs array. -- * @param pszLogName The log name. - * @param cbRawImage The size of the raw image. -+ * @param pszLogName The log name. -+ * @param pErrInfo Where to return extended error info. Optional. - */ --static int RTLDRELF_NAME(ValidateSectionHeader)(PRTLDRMODELF pModElf, unsigned iShdr, const char *pszLogName, uint64_t cbRawImage) -+static int RTLDRELF_NAME(ValidateSectionHeader)(PRTLDRMODELF pModElf, unsigned iShdr, uint64_t cbRawImage, -+ const char *pszLogName, PRTERRINFO pErrInfo) - { - const Elf_Shdr *pShdr = &pModElf->paShdrs[iShdr]; - char szSectionName[80]; NOREF(szSectionName); -@@ -1776,37 +2015,29 @@ static int RTLDRELF_NAME(ValidateSection - || pShdr->sh_link != SHN_UNDEF - || pShdr->sh_addralign != 0 - || pShdr->sh_entsize != 0 ) -- { -- Log(("RTLdrELF: %s: Bad #0 section: %.*Rhxs\n", pszLogName, sizeof(*pShdr), pShdr )); -- return VERR_BAD_EXE_FORMAT; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Bad #0 section: %.*Rhxs", pszLogName, sizeof(*pShdr), pShdr); - return VINF_SUCCESS; - } - - if (pShdr->sh_name >= pModElf->cbShStr) -- { -- Log(("RTLdrELF: %s: Shdr #%d: sh_name (%d) is beyond the end of the section header string table (%d)!\n", -- pszLogName, iShdr, pShdr->sh_name, pModElf->cbShStr)); NOREF(pszLogName); -- return VERR_BAD_EXE_FORMAT; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Shdr #%d: sh_name (%d) is beyond the end of the section header string table (%d)!", -+ pszLogName, iShdr, pShdr->sh_name, pModElf->cbShStr); - - if (pShdr->sh_link >= pModElf->Ehdr.e_shnum) -- { -- Log(("RTLdrELF: %s: Shdr #%d: sh_link (%d) is beyond the end of the section table (%d)!\n", -- pszLogName, iShdr, pShdr->sh_link, pModElf->Ehdr.e_shnum)); NOREF(pszLogName); -- return VERR_BAD_EXE_FORMAT; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Shdr #%d: sh_link (%d) is beyond the end of the section table (%d)!", -+ pszLogName, iShdr, pShdr->sh_link, pModElf->Ehdr.e_shnum); - - switch (pShdr->sh_type) - { - /** @todo find specs and check up which sh_info fields indicates section table entries */ - case 12301230: - if (pShdr->sh_info >= pModElf->Ehdr.e_shnum) -- { -- Log(("RTLdrELF: %s: Shdr #%d: sh_info (%d) is beyond the end of the section table (%d)!\n", -- pszLogName, iShdr, pShdr->sh_link, pModElf->Ehdr.e_shnum)); -- return VERR_BAD_EXE_FORMAT; -- } -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Shdr #%d: sh_info (%d) is beyond the end of the section table (%d)!", -+ pszLogName, iShdr, pShdr->sh_link, pModElf->Ehdr.e_shnum); - break; - - case SHT_NULL: -@@ -1840,18 +2071,740 @@ static int RTLDRELF_NAME(ValidateSection - uint64_t offEnd = pShdr->sh_offset + pShdr->sh_size; - if ( offEnd > cbRawImage - || offEnd < (uint64_t)pShdr->sh_offset) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Shdr #%d: sh_offset (" FMT_ELF_OFF ") + sh_size (" FMT_ELF_XWORD " = %RX64) is beyond the end of the file (%RX64)!", -+ pszLogName, iShdr, pShdr->sh_offset, pShdr->sh_size, offEnd, cbRawImage); -+ if (pShdr->sh_offset < sizeof(Elf_Ehdr)) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Shdr #%d: sh_offset (" FMT_ELF_OFF ") + sh_size (" FMT_ELF_XWORD ") is starting in the ELF header!", -+ pszLogName, iShdr, pShdr->sh_offset, pShdr->sh_size); -+ } -+ -+ return VINF_SUCCESS; -+} -+ -+ -+/** -+ * Process the section headers. -+ * -+ * @returns iprt status code. -+ * @param pModElf Pointer to the module structure. -+ * @param paShdrs The section headers. -+ * @param cbRawImage The size of the raw image. -+ * @param pszLogName The log name. -+ * @param pErrInfo Where to return extended error info. Optional. -+ */ -+static int RTLDRELF_NAME(ValidateAndProcessSectionHeaders)(PRTLDRMODELF pModElf, Elf_Shdr *paShdrs, uint64_t cbRawImage, -+ const char *pszLogName, PRTERRINFO pErrInfo) -+{ -+ Elf_Addr uNextAddr = 0; -+ for (unsigned i = 0; i < pModElf->Ehdr.e_shnum; i++) -+ { -+ int rc = RTLDRELF_NAME(ValidateSectionHeader)(pModElf, i, cbRawImage, pszLogName, pErrInfo); -+ if (RT_FAILURE(rc)) -+ return rc; -+ -+ /* -+ * We're looking for symbol tables. -+ */ -+ if (paShdrs[i].sh_type == SHT_SYMTAB) - { -- Log(("RTLdrELF: %s: Shdr #%d: sh_offset (" FMT_ELF_OFF ") + sh_size (" FMT_ELF_XWORD " = %RX64) is beyond the end of the file (%RX64)!\n", -- pszLogName, iShdr, pShdr->sh_offset, pShdr->sh_size, offEnd, cbRawImage)); -- return VERR_BAD_EXE_FORMAT; -+ if (pModElf->Rel.iSymSh != ~0U) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_LDRELF_MULTIPLE_SYMTABS, -+ "%s: Multiple symbol tabs! iSymSh=%d i=%d", pszLogName, pModElf->Rel.iSymSh, i); -+ pModElf->Rel.iSymSh = i; -+ pModElf->Rel.cSyms = (unsigned)(paShdrs[i].sh_size / sizeof(Elf_Sym)); -+ AssertBreakStmt(pModElf->Rel.cSyms == paShdrs[i].sh_size / sizeof(Elf_Sym), rc = VERR_IMAGE_TOO_BIG); -+ pModElf->Rel.iStrSh = paShdrs[i].sh_link; -+ pModElf->Rel.cbStr = (unsigned)paShdrs[pModElf->Rel.iStrSh].sh_size; -+ AssertBreakStmt(pModElf->Rel.cbStr == paShdrs[pModElf->Rel.iStrSh].sh_size, rc = VERR_IMAGE_TOO_BIG); -+ } -+ else if (paShdrs[i].sh_type == SHT_DYNSYM) -+ { -+ if (pModElf->Dyn.iSymSh != ~0U) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_LDRELF_MULTIPLE_SYMTABS, -+ "%s: Multiple dynamic symbol tabs! iSymSh=%d i=%d", pszLogName, pModElf->Dyn.iSymSh, i); -+ if (pModElf->Ehdr.e_type != ET_DYN && pModElf->Ehdr.e_type != ET_EXEC) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Unexpected SHT_DYNSYM (i=%d) for e_type=%d", pszLogName, i, pModElf->Ehdr.e_type); -+ pModElf->Dyn.iSymSh = i; -+ pModElf->Dyn.cSyms = (unsigned)(paShdrs[i].sh_size / sizeof(Elf_Sym)); -+ AssertBreakStmt(pModElf->Dyn.cSyms == paShdrs[i].sh_size / sizeof(Elf_Sym), rc = VERR_IMAGE_TOO_BIG); -+ pModElf->Dyn.iStrSh = paShdrs[i].sh_link; -+ pModElf->Dyn.cbStr = (unsigned)paShdrs[pModElf->Dyn.iStrSh].sh_size; -+ AssertBreakStmt(pModElf->Dyn.cbStr == paShdrs[pModElf->Dyn.iStrSh].sh_size, rc = VERR_IMAGE_TOO_BIG); - } -- if (pShdr->sh_offset < sizeof(Elf_Ehdr)) -+ /* -+ * We're also look for the dynamic section. -+ */ -+ else if (paShdrs[i].sh_type == SHT_DYNAMIC) -+ { -+ if (pModElf->iShDynamic != ~0U) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Multiple dynamic sections! iShDynamic=%d i=%d", -+ pszLogName, pModElf->iShDynamic, i); -+ if (pModElf->Ehdr.e_type != ET_DYN && pModElf->Ehdr.e_type != ET_EXEC) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Unexpected SHT_DYNAMIC (i=%d) for e_type=%d", pszLogName, i, pModElf->Ehdr.e_type); -+ if (paShdrs[i].sh_entsize != sizeof(Elf_Dyn)) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: SHT_DYNAMIC (i=%d) sh_entsize=" FMT_ELF_XWORD ", expected %#zx", -+ pszLogName, i, paShdrs[i].sh_entsize, sizeof(Elf_Dyn)); -+ pModElf->iShDynamic = i; -+ Elf_Xword const cDynamic = paShdrs[i].sh_size / sizeof(Elf_Dyn); -+ if (cDynamic > _64K || cDynamic < 2) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: SHT_DYNAMIC (i=%d) sh_size=" FMT_ELF_XWORD " is out of range (2..64K)", -+ pszLogName, i, paShdrs[i].sh_size); -+ pModElf->cDynamic = (unsigned)cDynamic; -+ } -+ -+ /* -+ * Special checks for the section string table. -+ */ -+ if (i == pModElf->Ehdr.e_shstrndx) - { -- Log(("RTLdrELF: %s: Shdr #%d: sh_offset (" FMT_ELF_OFF ") + sh_size (" FMT_ELF_XWORD ") is starting in the ELF header!\n", -- pszLogName, iShdr, pShdr->sh_offset, pShdr->sh_size)); -- return VERR_BAD_EXE_FORMAT; -+ if (paShdrs[i].sh_type != SHT_STRTAB) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Section header string table is not a SHT_STRTAB: %#x", -+ pszLogName, paShdrs[i].sh_type); -+ if (paShdrs[i].sh_size == 0) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Section header string table is empty", pszLogName); - } -+ -+ /* -+ * Kluge for the .data..percpu segment in 64-bit linux kernels. -+ */ -+ if (paShdrs[i].sh_flags & SHF_ALLOC) -+ { -+ if ( paShdrs[i].sh_addr == 0 -+ && paShdrs[i].sh_addr < uNextAddr) -+ { -+ Elf_Addr uAddr = RT_ALIGN_T(uNextAddr, paShdrs[i].sh_addralign, Elf_Addr); -+ Log(("RTLdrElf: Out of order section #%d; adjusting sh_addr from " FMT_ELF_ADDR " to " FMT_ELF_ADDR "\n", -+ i, paShdrs[i].sh_addr, uAddr)); -+ paShdrs[i].sh_addr = uAddr; -+ } -+ uNextAddr = paShdrs[i].sh_addr + paShdrs[i].sh_size; -+ } -+ } /* for each section header */ -+ -+ return VINF_SUCCESS; -+} -+ -+ -+/** -+ * Process the section headers. -+ * -+ * @returns iprt status code. -+ * @param pModElf Pointer to the module structure. -+ * @param paShdrs The section headers. -+ * @param cbRawImage The size of the raw image. -+ * @param pszLogName The log name. -+ * @param pErrInfo Where to return extended error info. Optional. -+ */ -+static int RTLDRELF_NAME(ValidateAndProcessDynamicInfo)(PRTLDRMODELF pModElf, uint64_t cbRawImage, uint32_t fFlags, -+ const char *pszLogName, PRTERRINFO pErrInfo) -+{ -+ /* -+ * Check preconditions. -+ */ -+ AssertReturn(pModElf->Ehdr.e_type == ET_DYN || pModElf->Ehdr.e_type == ET_EXEC, VERR_INTERNAL_ERROR_2); -+ if (pModElf->Ehdr.e_phnum <= 1 || pModElf->Ehdr.e_phnum >= _32K) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: e_phnum=%u is out of bounds (2..32K)", pszLogName, pModElf->Ehdr.e_phnum); -+ if (pModElf->iShDynamic == ~0U) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: no .dynamic section", pszLogName); -+ AssertReturn(pModElf->cDynamic > 1 && pModElf->cDynamic <= _64K, VERR_INTERNAL_ERROR_3); -+ -+ /* ASSUME that the sections are ordered by address. That simplifies -+ validation code further down. */ -+ AssertReturn(pModElf->Ehdr.e_shnum >= 2, VERR_INTERNAL_ERROR_4); -+ Elf_Shdr const *paShdrs = pModElf->paShdrs; -+ Elf_Addr uPrevEnd = paShdrs[1].sh_addr + paShdrs[1].sh_size; -+ for (unsigned i = 2; i < pModElf->Ehdr.e_shnum; i++) -+ if (paShdrs[i].sh_flags & SHF_ALLOC) -+ { -+ if (uPrevEnd > paShdrs[i].sh_addr) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: section %u is out of order: uPrevEnd=" FMT_ELF_ADDR " sh_addr=" FMT_ELF_ADDR, -+ pszLogName, i, uPrevEnd, paShdrs[i].sh_addr); -+ uPrevEnd = paShdrs[i].sh_addr + paShdrs[i].sh_size; -+ } -+ -+ /* Must have string and symbol tables. */ -+ if (pModElf->Dyn.iStrSh == ~0U) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: No dynamic string table section", pszLogName); -+ if (pModElf->Dyn.iSymSh == ~0U) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: No dynamic symbol table section", pszLogName); -+ -+ /* -+ * Load the program headers. -+ */ -+ size_t const cbPhdrs = sizeof(pModElf->paPhdrs[0]) * pModElf->Ehdr.e_phnum; -+ Elf_Phdr *paPhdrs = (Elf_Phdr *)RTMemAllocZ(cbPhdrs); -+ pModElf->paPhdrs = paPhdrs; -+ AssertReturn(paPhdrs, VERR_NO_MEMORY); -+ -+ int rc = pModElf->Core.pReader->pfnRead(pModElf->Core.pReader, paPhdrs, cbPhdrs, pModElf->Ehdr.e_phoff); -+ if (RT_FAILURE(rc)) -+ return RTERRINFO_LOG_SET_F(pErrInfo, rc, "%s: pfnRead(,,%#zx, " FMT_ELF_OFF ") -> %Rrc", -+ pszLogName, cbPhdrs, pModElf->Ehdr.e_phoff, rc); -+ -+ /* -+ * Validate them. -+ */ -+ unsigned cbPage = _4K; /** @todo generalize architecture specific stuff using its own code template header. */ -+ switch (pModElf->Core.enmArch) -+ { -+ case RTLDRARCH_AMD64: -+ case RTLDRARCH_X86_32: -+ break; -+ default: -+ AssertFailedBreak(/** @todo page size for got.plt hacks */); - } -+ unsigned iLoad = 0; -+ unsigned iLoadShdr = 1; /* ASSUMES ordered (checked above). */ -+ unsigned cDynamic = 0; -+ Elf_Addr cbImage = 0; -+ Elf_Addr uLinkAddress = ~(Elf_Addr)0; -+ for (unsigned i = 0; i < pModElf->Ehdr.e_phnum; i++) -+ { -+ const Elf_Phdr * const pPhdr = &paPhdrs[i]; -+ Log3(("RTLdrELF: Program Header #%d:\n" -+ "RTLdrELF: p_type: " FMT_ELF_WORD " (%s)\n" -+ "RTLdrELF: p_flags: " FMT_ELF_WORD "\n" -+ "RTLdrELF: p_offset: " FMT_ELF_OFF "\n" -+ "RTLdrELF: p_vaddr: " FMT_ELF_ADDR "\n" -+ "RTLdrELF: p_paddr: " FMT_ELF_ADDR "\n" -+ "RTLdrELF: p_filesz: " FMT_ELF_XWORD "\n" -+ "RTLdrELF: p_memsz: " FMT_ELF_XWORD "\n" -+ "RTLdrELF: p_align: " FMT_ELF_XWORD "\n", -+ i, -+ pPhdr->p_type, rtldrElfGetPhdrType(pPhdr->p_type), pPhdr->p_flags, pPhdr->p_offset, -+ pPhdr->p_vaddr, pPhdr->p_paddr, pPhdr->p_filesz, pPhdr->p_memsz, pPhdr->p_align)); -+ -+ if (pPhdr->p_type == DT_NULL) -+ continue; -+ -+ if ( pPhdr->p_filesz != 0 -+ && ( pPhdr->p_offset >= cbRawImage -+ || pPhdr->p_filesz > cbRawImage -+ || pPhdr->p_offset + pPhdr->p_filesz > cbRawImage)) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Prog Hdr #%u: bogus p_offset=" FMT_ELF_OFF " & p_filesz=" FMT_ELF_XWORD " (file size %#RX64)", -+ pszLogName, i, pPhdr->p_offset, pPhdr->p_filesz, cbRawImage); -+ -+ if (pPhdr->p_flags & ~(Elf64_Word)(PF_X | PF_R | PF_W)) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Prog Hdr #%u: bogus p_flags=" FMT_ELF_WORD, -+ pszLogName, i, pPhdr->p_flags); -+ -+ if (!RT_IS_POWER_OF_TWO(pPhdr->p_align)) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Prog Hdr #%u: bogus p_align=" FMT_ELF_XWORD, -+ pszLogName, i, pPhdr->p_align); -+ -+ if ( pPhdr->p_align > 1 -+ && pPhdr->p_memsz > 0 -+ && pPhdr->p_filesz > 0 -+ && (pPhdr->p_offset & (pPhdr->p_align - 1)) != (pPhdr->p_vaddr & (pPhdr->p_align - 1))) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Prog Hdr #%u: misaligned p_offset=" FMT_ELF_OFF " p_vaddr=" FMT_ELF_ADDR " p_align=" FMT_ELF_XWORD, -+ pszLogName, i, pPhdr->p_offset, pPhdr->p_vaddr, pPhdr->p_align); -+ -+ /* Do some type specfic checks: */ -+ switch (pPhdr->p_type) -+ { -+ case PT_LOAD: -+ { -+ if (pPhdr->p_memsz < pPhdr->p_filesz) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Prog Hdr #%u/LOAD#%u: bogus p_memsz=" FMT_ELF_XWORD " or p_filesz=" FMT_ELF_XWORD, -+ pszLogName, i, iLoad, pPhdr->p_memsz, pPhdr->p_filesz); -+ cbImage = pPhdr->p_vaddr + pPhdr->p_memsz; -+ if (iLoad == 0) -+ uLinkAddress = pPhdr->p_vaddr; -+ -+ /* Find the corresponding sections, checking their addresses and -+ file offsets since the rest of the code is still section based -+ rather than using program headers as it should... */ -+ Elf_Off off = pPhdr->p_offset; -+ Elf_Addr uAddr = pPhdr->p_vaddr; -+ Elf_Xword cbMem = pPhdr->p_memsz; -+ Elf_Xword cbFile = pPhdr->p_filesz; -+ while (cbMem > 0) -+ { -+ if (iLoadShdr < pModElf->Ehdr.e_shnum) -+ { /* likely */ } -+ else if (iLoadShdr == pModElf->Ehdr.e_shnum) -+ { -+ /** @todo anything else to check here? */ -+ iLoadShdr++; -+ break; -+ } -+ else -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Prog Hdr #%u/LOAD#%u: Out of sections at " FMT_ELF_ADDR " LB " FMT_ELF_XWORD, -+ pszLogName, i, iLoad, uAddr, cbMem); -+ if (!(paShdrs[iLoadShdr].sh_flags & SHF_ALLOC)) -+ { -+ if ( paShdrs[iLoadShdr].sh_type != SHT_NOBITS -+ && paShdrs[iLoadShdr].sh_size > 0 -+ && off < paShdrs[iLoadShdr].sh_offset + paShdrs[iLoadShdr].sh_size -+ && paShdrs[iLoadShdr].sh_offset < off + cbMem) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Prog Hdr #%u/LOAD#%u: Overlaps with !SHF_ALLOC section at " FMT_ELF_OFF " LB " FMT_ELF_XWORD, -+ pszLogName, i, iLoad, paShdrs[iLoadShdr].sh_offset, paShdrs[iLoadShdr].sh_size); -+ pModElf->paShdrExtras[iLoadShdr].idxPhdr = UINT16_MAX; -+ iLoadShdr++; -+ continue; -+ } -+ -+ if (uAddr != paShdrs[iLoadShdr].sh_addr) -+ { -+ /* Before the first section we expect headers to be loaded, so -+ that the file is simply mapped from file offset zero. */ -+ if ( iLoadShdr == 1 -+ && iLoad == 0 -+ && paShdrs[1].sh_addr == paShdrs[1].sh_offset -+ && cbFile >= paShdrs[1].sh_offset -+ && cbMem >= paShdrs[1].sh_offset) -+ { -+ /* Modify paShdrs[0] to describe the gap. ".elf.headers" */ -+ pModElf->iFirstSect = 0; -+ pModElf->paShdrs[0].sh_name = 0; -+ pModElf->paShdrs[0].sh_type = SHT_PROGBITS; -+ pModElf->paShdrs[0].sh_flags = SHF_ALLOC -+ | (pPhdr->p_flags & PF_W ? SHF_WRITE : 0) -+ | (pPhdr->p_flags & PF_X ? SHF_EXECINSTR : 0); -+ pModElf->paShdrs[0].sh_addr = uAddr; -+ pModElf->paShdrs[0].sh_offset = off; -+ pModElf->paShdrs[0].sh_size = paShdrs[1].sh_offset; -+ pModElf->paShdrs[0].sh_link = 0; -+ pModElf->paShdrs[0].sh_info = 0; -+ pModElf->paShdrs[0].sh_addralign = pPhdr->p_align; -+ pModElf->paShdrs[0].sh_entsize = 0; -+ *(Elf_Shdr *)pModElf->paOrgShdrs = pModElf->paShdrs[0]; /* (necessary for segment enumeration) */ -+ -+ uAddr += paShdrs[1].sh_offset; -+ cbMem -= paShdrs[1].sh_offset; -+ cbFile -= paShdrs[1].sh_offset; -+ off = paShdrs[1].sh_offset; -+ } -+ /* Alignment padding? Allow up to a page size. */ -+ else if ( paShdrs[iLoadShdr].sh_addr > uAddr -+ && paShdrs[iLoadShdr].sh_addr - uAddr -+ < RT_MAX(paShdrs[iLoadShdr].sh_addralign, cbPage /*got.plt hack*/)) -+ { -+ Elf_Xword cbAlignPadding = paShdrs[iLoadShdr].sh_addr - uAddr; -+ if (cbAlignPadding >= cbMem) -+ break; -+ cbMem -= cbAlignPadding; -+ uAddr += cbAlignPadding; -+ if (cbFile > cbAlignPadding) -+ { -+ off += cbAlignPadding; -+ cbFile -= cbAlignPadding; -+ } -+ else -+ { -+ off += cbFile; -+ cbFile = 0; -+ } -+ } -+ } -+ -+ if ( uAddr == paShdrs[iLoadShdr].sh_addr -+ && cbMem >= paShdrs[iLoadShdr].sh_size -+ && ( paShdrs[iLoadShdr].sh_type != SHT_NOBITS -+ ? off == paShdrs[iLoadShdr].sh_offset -+ && cbFile >= paShdrs[iLoadShdr].sh_size /* this might be too strict... */ -+ : cbFile == 0) ) -+ { -+ if (paShdrs[iLoadShdr].sh_type != SHT_NOBITS) -+ { -+ off += paShdrs[iLoadShdr].sh_size; -+ cbFile -= paShdrs[iLoadShdr].sh_size; -+ } -+ uAddr += paShdrs[iLoadShdr].sh_size; -+ cbMem -= paShdrs[iLoadShdr].sh_size; -+ } -+ else -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Prog Hdr #%u/LOAD#%u: Mismatch at " FMT_ELF_ADDR " LB " FMT_ELF_XWORD " (file " FMT_ELF_OFF " LB " FMT_ELF_XWORD ") with section #%u " FMT_ELF_ADDR " LB " FMT_ELF_XWORD " (file " FMT_ELF_OFF " sh_type=" FMT_ELF_WORD ")", -+ pszLogName, i, iLoad, uAddr, cbMem, off, cbFile, -+ iLoadShdr, paShdrs[iLoadShdr].sh_addr, paShdrs[iLoadShdr].sh_size, -+ paShdrs[iLoadShdr].sh_offset, paShdrs[iLoadShdr].sh_type); -+ -+ pModElf->paShdrExtras[iLoadShdr].idxPhdr = iLoad; -+ iLoadShdr++; -+ } /* section loop */ -+ -+ iLoad++; -+ break; -+ } -+ -+ case PT_DYNAMIC: -+ { -+ const Elf_Shdr *pShdr = &pModElf->paShdrs[pModElf->iShDynamic]; -+ if (pPhdr->p_offset != pShdr->sh_offset) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Prog Hdr #%u/DYNAMIC: p_offset=" FMT_ELF_OFF " expected " FMT_ELF_OFF, -+ pszLogName, i, pPhdr->p_offset, pShdr->sh_offset); -+ if (RT_MAX(pPhdr->p_memsz, pPhdr->p_filesz) != pShdr->sh_size) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: Prog Hdr #%u/DYNAMIC: expected " FMT_ELF_XWORD " for RT_MAX(p_memsz=" FMT_ELF_XWORD ", p_filesz=" FMT_ELF_XWORD ")", -+ pszLogName, i, pShdr->sh_size, pPhdr->p_memsz, pPhdr->p_filesz); -+ cDynamic++; -+ break; -+ } -+ } -+ } -+ -+ if (iLoad == 0) -+ return RTERRINFO_LOG_SET_F(pErrInfo, rc, "%s: No PT_LOAD program headers", pszLogName); -+ if (cDynamic != 1) -+ return RTERRINFO_LOG_SET_F(pErrInfo, rc, "%s: No program header for the DYNAMIC section", pszLogName); -+ -+ cbImage -= uLinkAddress; -+ pModElf->cbImage = (uint64_t)cbImage; -+ pModElf->LinkAddress = uLinkAddress; -+ AssertReturn(pModElf->cbImage == cbImage, VERR_INTERNAL_ERROR_5); -+ Log3(("RTLdrELF: LinkAddress=" FMT_ELF_ADDR " cbImage=" FMT_ELF_ADDR " (from PT_LOAD)\n", uLinkAddress, cbImage)); -+ -+ for (; iLoadShdr < pModElf->Ehdr.e_shnum; iLoadShdr++) -+ if ( !(paShdrs[iLoadShdr].sh_flags & SHF_ALLOC) -+ || paShdrs[iLoadShdr].sh_size == 0) -+ pModElf->paShdrExtras[iLoadShdr].idxPhdr = UINT16_MAX; -+ else -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: No PT_LOAD for section #%u " FMT_ELF_ADDR " LB " FMT_ELF_XWORD " (file " FMT_ELF_OFF " sh_type=" FMT_ELF_WORD ")", -+ pszLogName, iLoadShdr, paShdrs[iLoadShdr].sh_addr, paShdrs[iLoadShdr].sh_size, -+ paShdrs[iLoadShdr].sh_offset, paShdrs[iLoadShdr].sh_type); -+ -+ /* -+ * Load and validate the dynamic table. We have got / will get most of the -+ * info we need from the section table, so we must make sure this matches up. -+ */ -+ Log3(("RTLdrELF: Dynamic section - %u entries\n", pModElf->cDynamic)); -+ size_t const cbDynamic = pModElf->cDynamic * sizeof(pModElf->paDynamic[0]); -+ Elf_Dyn * const paDynamic = (Elf_Dyn *)RTMemAlloc(cbDynamic); -+ AssertReturn(paDynamic, VERR_NO_MEMORY); -+ pModElf->paDynamic = paDynamic; -+ -+ rc = pModElf->Core.pReader->pfnRead(pModElf->Core.pReader, paDynamic, cbDynamic, paShdrs[pModElf->iShDynamic].sh_offset); -+ if (RT_FAILURE(rc)) -+ return RTERRINFO_LOG_SET_F(pErrInfo, rc, "%s: pfnRead(,,%#zx, " FMT_ELF_OFF ") -> %Rrc", -+ pszLogName, cbDynamic, paShdrs[pModElf->iShDynamic].sh_offset, rc); -+ -+ for (uint32_t i = 0; i < pModElf->cDynamic; i++) -+ { -+#define LOG_VALIDATE_PTR_RET(szName) do { \ -+ Log3(("RTLdrELF: DT[%u]: %16s " FMT_ELF_ADDR "\n", i, szName, paDynamic[i].d_un.d_ptr)); \ -+ if ((uint64_t)paDynamic[i].d_un.d_ptr - uLinkAddress < cbImage) { /* likely */ } \ -+ else return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" szName ": Invalid address " FMT_ELF_ADDR " (valid range: " FMT_ELF_ADDR " LB " FMT_ELF_ADDR ")", \ -+ pszLogName, i, paDynamic[i].d_un.d_ptr, uLinkAddress, cbImage); \ -+ } while (0) -+#define LOG_VALIDATE_PTR_VAL_RET(szName, uExpected) do { \ -+ Log3(("RTLdrELF: DT[%u]: %16s " FMT_ELF_ADDR "\n", i, szName, (uint64_t)paDynamic[i].d_un.d_ptr)); \ -+ if (paDynamic[i].d_un.d_ptr == (Elf_Addr)(uExpected)) { /* likely */ } \ -+ else return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" szName ": " FMT_ELF_ADDR ", expected " FMT_ELF_ADDR, \ -+ pszLogName, i, paDynamic[i].d_un.d_ptr, (Elf_Addr)(uExpected)); \ -+ } while (0) -+#define LOG_VALIDATE_STR_RET(szName) do { \ -+ Log3(("RTLdrELF: DT[%u]: %16s %#RX64\n", i, szName, (uint64_t)paDynamic[i].d_un.d_val)); \ -+ if ((uint64_t)paDynamic[i].d_un.d_val < pModElf->Dyn.cbStr) { /* likely */ } \ -+ else return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" szName ": Invalid string table offset %#RX64 (max %#x)", \ -+ pszLogName, i, (uint64_t)paDynamic[i].d_un.d_val, pModElf->Dyn.cbStr); \ -+ } while (0) -+#define LOG_VALIDATE_VAL_RET(szName, uExpected) do { \ -+ Log3(("RTLdrELF: DT[%u]: %16s %#RX64\n", i, szName, (uint64_t)paDynamic[i].d_un.d_val)); \ -+ if ((uint64_t)paDynamic[i].d_un.d_val == (uint64_t)(uExpected)) { /* likely */ } \ -+ else return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" szName ": %#RX64, expected %#RX64", \ -+ pszLogName, i, (uint64_t)paDynamic[i].d_un.d_val, (uint64_t)(uExpected)); \ -+ } while (0) -+#define SET_RELOC_TYPE_RET(a_szName, a_uType) do { \ -+ if (pModElf->DynInfo.uRelocType == 0 || pModElf->DynInfo.uRelocType == (a_uType)) \ -+ pModElf->DynInfo.uRelocType = (a_uType); \ -+ else return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" a_szName ": Mixing DT_RELA and DT_REL", pszLogName, i); \ -+ } while (0) -+#define SET_INFO_FIELD_RET(a_szName, a_Field, a_Value, a_UnsetValue, a_szFmt) do { \ -+ if ((a_Field) == (a_UnsetValue) && (a_Value) != (a_UnsetValue)) \ -+ (a_Field) = (a_Value); /* likely */ \ -+ else if ((a_Field) != (a_UnsetValue)) \ -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" a_szName ": Multiple entries (first value " a_szFmt ", second " a_szFmt ")", pszLogName, i, (a_Field), (a_Value)); \ -+ else if ((a_Value) != (a_UnsetValue)) \ -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" a_szName ": Unexpected value " a_szFmt, pszLogName, i, (a_Value)); \ -+ } while (0) -+#define FIND_MATCHING_SECTION_RET(a_szName, a_ExtraMatchExpr, a_idxShFieldToSet) do { \ -+ unsigned iSh; \ -+ for (iSh = 1; iSh < pModElf->Ehdr.e_shnum; iSh++) \ -+ if ( paShdrs[iSh].sh_addr == paDynamic[i].d_un.d_ptr \ -+ && (a_ExtraMatchExpr)) \ -+ { \ -+ (a_idxShFieldToSet) = iSh; \ -+ if (pModElf->paShdrExtras[iSh].idxDt != UINT16_MAX) \ -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, \ -+ "%s: DT[%u]/" a_szName ": section #%u (" FMT_ELF_ADDR ") already referenced by DT[%u]", \ -+ pszLogName, i, iSh, paShdrs[iSh].sh_addr, pModElf->paShdrExtras[iSh].idxDt); \ -+ pModElf->paShdrExtras[iSh].idxDt = i; \ -+ pModElf->paShdrExtras[iSh].uDtTag = (uint32_t)paDynamic[i].d_tag; \ -+ break; \ -+ } \ -+ if (iSh < pModElf->Ehdr.e_shnum) { /* likely */ } \ -+ else return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" a_szName ": No matching section for " FMT_ELF_ADDR, pszLogName, i, paDynamic[i].d_un.d_ptr); \ -+ } while (0) -+#define ONLY_FOR_DEBUG_OR_VALIDATION_RET(a_szName) do { \ -+ if (fFlags & (RTLDR_O_FOR_DEBUG | RTLDR_O_FOR_VALIDATION)) { /* likely */ } \ -+ else return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/" a_szName ": Not supported (" FMT_ELF_ADDR ")", pszLogName, i, paDynamic[i].d_un.d_ptr); \ -+ } while (0) -+#define LOG_NON_VALUE_ENTRY(a_szName) Log3(("RTLdrELF: DT[%u]: %16s (%#RX64)\n", i, a_szName, (uint64_t)paDynamic[i].d_un.d_val)) -+ -+ switch (paDynamic[i].d_tag) -+ { -+ case DT_NULL: -+ LOG_NON_VALUE_ENTRY("DT_NULL"); -+ for (unsigned iNull = i + 1; iNull < pModElf->cDynamic; iNull++) -+ if (paDynamic[i].d_tag == DT_NULL) /* Not technically a bug, but let's try being extremely strict for now */ -+ LOG_NON_VALUE_ENTRY("DT_NULL"); -+ else if (!(fFlags & (RTLDR_O_FOR_DEBUG | RTLDR_O_FOR_VALIDATION))) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: DT[%u]/DT_NULL: Dynamic section isn't zero padded (extra #%u of #%u)", -+ pszLogName, i, iNull - i, pModElf->cDynamic - i); -+ i = pModElf->cDynamic; -+ break; -+ case DT_NEEDED: -+ LOG_VALIDATE_STR_RET("DT_NEEDED"); -+ break; -+ case DT_PLTRELSZ: -+ Log3(("RTLdrELF: DT[%u]: %16s %#RX64 bytes\n", i, "DT_PLTRELSZ", (uint64_t)paDynamic[i].d_un.d_val)); -+ SET_INFO_FIELD_RET("DT_PLTRELSZ", pModElf->DynInfo.cbJmpRelocs, (Elf_Xword)paDynamic[i].d_un.d_val, 0, FMT_ELF_XWORD); -+ break; -+ case DT_PLTGOT: -+ LOG_VALIDATE_PTR_RET("DT_PLTGOT"); -+ break; -+ case DT_HASH: -+ LOG_VALIDATE_PTR_RET("DT_HASH"); -+ break; -+ case DT_STRTAB: -+ LOG_VALIDATE_PTR_VAL_RET("DT_STRTAB", paShdrs[pModElf->Dyn.iStrSh].sh_addr); -+ pModElf->paShdrExtras[pModElf->Dyn.iStrSh].idxDt = i; -+ pModElf->paShdrExtras[pModElf->Dyn.iSymSh].uDtTag = DT_STRTAB; -+ break; -+ case DT_SYMTAB: -+ LOG_VALIDATE_PTR_VAL_RET("DT_SYMTAB", paShdrs[pModElf->Dyn.iSymSh].sh_addr); -+ pModElf->paShdrExtras[pModElf->Dyn.iSymSh].idxDt = i; -+ pModElf->paShdrExtras[pModElf->Dyn.iSymSh].uDtTag = DT_SYMTAB; -+ break; -+ case DT_RELA: -+ LOG_VALIDATE_PTR_RET("DT_RELA"); -+ SET_RELOC_TYPE_RET("DT_RELA", DT_RELA); -+ SET_INFO_FIELD_RET("DT_RELA", pModElf->DynInfo.uPtrRelocs, paDynamic[i].d_un.d_ptr, ~(Elf_Addr)0, FMT_ELF_ADDR); -+ FIND_MATCHING_SECTION_RET("DT_RELA", paShdrs[iSh].sh_type == SHT_RELA, pModElf->DynInfo.idxShRelocs); -+ break; -+ case DT_RELASZ: -+ Log3(("RTLdrELF: DT[%u]: %16s %#RX64 bytes\n", i, "DT_RELASZ", (uint64_t)paDynamic[i].d_un.d_val)); -+ SET_RELOC_TYPE_RET("DT_RELASZ", DT_RELA); -+ SET_INFO_FIELD_RET("DT_RELASZ", pModElf->DynInfo.cbRelocs, (Elf_Xword)paDynamic[i].d_un.d_val, 0, FMT_ELF_XWORD); -+ break; -+ case DT_RELAENT: -+ LOG_VALIDATE_VAL_RET("DT_RELAENT", sizeof(Elf_Rela)); -+ SET_RELOC_TYPE_RET("DT_RELAENT", DT_RELA); -+ SET_INFO_FIELD_RET("DT_RELAENT", pModElf->DynInfo.cbRelocEntry, (unsigned)sizeof(Elf_Rela), 0, "%u"); -+ break; -+ case DT_STRSZ: -+ LOG_VALIDATE_VAL_RET("DT_STRSZ", pModElf->Dyn.cbStr); -+ break; -+ case DT_SYMENT: -+ LOG_VALIDATE_VAL_RET("DT_SYMENT", sizeof(Elf_Sym)); -+ break; -+ case DT_INIT: -+ LOG_VALIDATE_PTR_RET("DT_INIT"); -+ ONLY_FOR_DEBUG_OR_VALIDATION_RET("DT_INIT"); -+ break; -+ case DT_FINI: -+ LOG_VALIDATE_PTR_RET("DT_FINI"); -+ ONLY_FOR_DEBUG_OR_VALIDATION_RET("DT_FINI"); -+ break; -+ case DT_SONAME: -+ LOG_VALIDATE_STR_RET("DT_SONAME"); -+ break; -+ case DT_RPATH: -+ LOG_VALIDATE_STR_RET("DT_RPATH"); -+ break; -+ case DT_SYMBOLIC: -+ LOG_NON_VALUE_ENTRY("DT_SYMBOLIC"); -+ break; -+ case DT_REL: -+ LOG_VALIDATE_PTR_RET("DT_REL"); -+ SET_RELOC_TYPE_RET("DT_REL", DT_REL); -+ SET_INFO_FIELD_RET("DT_REL", pModElf->DynInfo.uPtrRelocs, paDynamic[i].d_un.d_ptr, ~(Elf_Addr)0, FMT_ELF_ADDR); -+ FIND_MATCHING_SECTION_RET("DT_REL", paShdrs[iSh].sh_type == SHT_REL, pModElf->DynInfo.idxShRelocs); -+ break; -+ case DT_RELSZ: -+ Log3(("RTLdrELF: DT[%u]: %16s %#RX64 bytes\n", i, "DT_RELSZ", (uint64_t)paDynamic[i].d_un.d_val)); -+ SET_RELOC_TYPE_RET("DT_RELSZ", DT_REL); -+ SET_INFO_FIELD_RET("DT_RELSZ", pModElf->DynInfo.cbRelocs, (Elf_Xword)paDynamic[i].d_un.d_val, 0, FMT_ELF_XWORD); -+ break; -+ case DT_RELENT: -+ LOG_VALIDATE_VAL_RET("DT_RELENT", sizeof(Elf_Rel)); -+ SET_RELOC_TYPE_RET("DT_RELENT", DT_REL); -+ SET_INFO_FIELD_RET("DT_RELENT", pModElf->DynInfo.cbRelocEntry, (unsigned)sizeof(Elf_Rel), 0, "%u"); -+ break; -+ case DT_PLTREL: -+ if (paDynamic[i].d_un.d_val != DT_RELA && paDynamic[i].d_un.d_val != DT_REL) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT[%u]/DT_PLTREL: Invalid value %#RX64", -+ pszLogName, i, (uint64_t)paDynamic[i].d_un.d_val); -+ Log3(("RTLdrELF: DT[%u]: %16s DT_REL%s\n", i, "DT_PLTREL", paDynamic[i].d_un.d_val == DT_RELA ? "A" : "")); -+ SET_INFO_FIELD_RET("DT_PLTREL", pModElf->DynInfo.uJmpRelocType, (unsigned)paDynamic[i].d_un.d_val, 0, "%u"); -+ break; -+ case DT_DEBUG: -+ LOG_VALIDATE_PTR_RET("DT_DEBUG"); -+ break; -+ case DT_TEXTREL: -+ LOG_NON_VALUE_ENTRY("DT_TEXTREL"); -+ break; -+ case DT_JMPREL: -+ LOG_VALIDATE_PTR_RET("DT_JMPREL"); -+ SET_INFO_FIELD_RET("DT_JMPREL", pModElf->DynInfo.uPtrJmpRelocs, paDynamic[i].d_un.d_ptr, ~(Elf_Addr)0, FMT_ELF_ADDR); -+ FIND_MATCHING_SECTION_RET("DT_JMPREL", 1, pModElf->DynInfo.idxShJmpRelocs); -+ break; -+ case DT_BIND_NOW: -+ LOG_NON_VALUE_ENTRY("DT_BIND_NOW"); -+ break; -+ case DT_INIT_ARRAY: -+ LOG_VALIDATE_PTR_RET("DT_INIT_ARRAY"); -+ ONLY_FOR_DEBUG_OR_VALIDATION_RET("DT_INIT_ARRAY"); -+ break; -+ case DT_FINI_ARRAY: -+ LOG_VALIDATE_PTR_RET("DT_FINI_ARRAY"); -+ ONLY_FOR_DEBUG_OR_VALIDATION_RET("DT_FINI_ARRAY"); -+ break; -+ case DT_INIT_ARRAYSZ: -+ Log3(("RTLdrELF: DT[%u]: %16s %#RX64 bytes\n", i, "DT_INIT_ARRAYSZ", (uint64_t)paDynamic[i].d_un.d_val)); -+ ONLY_FOR_DEBUG_OR_VALIDATION_RET("DT_INIT_ARRAYSZ"); -+ break; -+ case DT_FINI_ARRAYSZ: -+ Log3(("RTLdrELF: DT[%u]: %16s %#RX64 bytes\n", i, "DT_FINI_ARRAYSZ", (uint64_t)paDynamic[i].d_un.d_val)); -+ ONLY_FOR_DEBUG_OR_VALIDATION_RET("DT_FINI_ARRAYSZ"); -+ break; -+ case DT_RUNPATH: -+ LOG_VALIDATE_STR_RET("DT_RUNPATH"); -+ break; -+ case DT_FLAGS: -+ Log3(("RTLdrELF: DT[%u]: %16s %#RX64\n", i, "DT_FLAGS", (uint64_t)paDynamic[i].d_un.d_val)); -+ break; -+ case DT_PREINIT_ARRAY: -+ LOG_VALIDATE_PTR_RET("DT_PREINIT_ARRAY"); -+ ONLY_FOR_DEBUG_OR_VALIDATION_RET("DT_PREINIT_ARRAY"); -+ break; -+ case DT_PREINIT_ARRAYSZ: -+ Log3(("RTLdrELF: DT[%u]: %16s %#RX64 bytes\n", i, "DT_PREINIT_ARRAYSZ", (uint64_t)paDynamic[i].d_un.d_val)); -+ ONLY_FOR_DEBUG_OR_VALIDATION_RET("DT_PREINIT_ARRAYSZ"); -+ break; -+ default: -+ if ( paDynamic[i].d_un.d_val < DT_ENCODING -+ || (paDynamic[i].d_un.d_val & 1)) -+ Log3(("RTLdrELF: DT[%u]: %#010RX64 %#RX64%s\n", i, (uint64_t)paDynamic[i].d_tag, -+ (uint64_t)paDynamic[i].d_un.d_val, paDynamic[i].d_un.d_val >= DT_ENCODING ? " (val)" : "")); -+ else -+ { -+ Log3(("RTLdrELF: DT[%u]: %#010RX64 " FMT_ELF_ADDR " (addr)\n", -+ i, (uint64_t)paDynamic[i].d_tag, paDynamic[i].d_un.d_ptr)); -+ if ((uint64_t)paDynamic[i].d_un.d_ptr - uLinkAddress >= cbImage) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: DT[%u]/%#RX64: Invalid address " FMT_ELF_ADDR " (valid range: " FMT_ELF_ADDR " LB " FMT_ELF_ADDR ")", -+ pszLogName, i, (uint64_t)paDynamic[i].d_tag, -+ paDynamic[i].d_un.d_ptr, uLinkAddress, cbImage); -+ } -+ break; -+ } -+#undef LOG_VALIDATE_VAL_RET -+#undef LOG_VALIDATE_STR_RET -+#undef LOG_VALIDATE_PTR_VAL_RET -+#undef LOG_VALIDATE_PTR_RET -+#undef SET_RELOC_TYPE_RET -+#undef SET_INFO_FIELD_RET -+#undef FIND_MATCHING_SECTION_RET -+#undef ONLY_FOR_DEBUG_OR_VALIDATION_RET -+ } -+ -+ /* -+ * Validate the relocation information we've gathered. -+ */ -+ Elf_Word uShTypeArch = SHT_RELA; /** @todo generalize architecture specific stuff using its own code template header. */ -+ switch (pModElf->Core.enmArch) -+ { -+ case RTLDRARCH_AMD64: -+ break; -+ case RTLDRARCH_X86_32: -+ uShTypeArch = SHT_REL; -+ break; -+ default: -+ AssertFailedBreak(/** @todo page size for got.plt hacks */); -+ -+ } -+ -+ if (pModElf->DynInfo.uRelocType != 0) -+ { -+ const char * const pszModifier = pModElf->DynInfo.uRelocType == DT_RELA ? "A" : ""; -+ if (pModElf->DynInfo.uPtrRelocs == ~(Elf_Addr)0) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Missing DT_REL%s", pszLogName, pszModifier); -+ if (pModElf->DynInfo.cbRelocs == 0) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Missing DT_REL%sSZ", pszLogName, pszModifier); -+ if (pModElf->DynInfo.cbRelocEntry == 0) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Missing DT_REL%sENT", pszLogName, pszModifier); -+ Elf_Shdr const *pShdrRelocs = &paShdrs[pModElf->DynInfo.idxShRelocs]; -+ Elf_Word const uShType = pModElf->DynInfo.uJmpRelocType == DT_RELA ? SHT_RELA : SHT_REL; -+ if (pShdrRelocs->sh_type != uShType) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT_REL%s* does not match section type: %u vs %u", -+ pszLogName, pszModifier, pShdrRelocs->sh_type, uShType); -+ if (pShdrRelocs->sh_size != pModElf->DynInfo.cbRelocs) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT_REL%sSZ does not match section size: %u vs %u", -+ pszLogName, pszModifier, pShdrRelocs->sh_size, pModElf->DynInfo.cbRelocs); -+ if (uShType != uShTypeArch) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT_REL%s* does not match architecture: %u, arch wants %u", -+ pszLogName, pszModifier, uShType, uShTypeArch); -+ } -+ -+ if ( pModElf->DynInfo.uPtrJmpRelocs != ~(Elf_Addr)0 -+ || pModElf->DynInfo.cbJmpRelocs != 0 -+ || pModElf->DynInfo.uJmpRelocType != 0) -+ { -+ if (pModElf->DynInfo.uPtrJmpRelocs == ~(Elf_Addr)0) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Missing DT_JMPREL", pszLogName); -+ if (pModElf->DynInfo.cbJmpRelocs == 0) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Missing DT_PLTRELSZ", pszLogName); -+ if (pModElf->DynInfo.uJmpRelocType == 0) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: Missing DT_PLTREL", pszLogName); -+ Elf_Shdr const *pShdrRelocs = &paShdrs[pModElf->DynInfo.idxShJmpRelocs]; -+ Elf_Word const uShType = pModElf->DynInfo.uJmpRelocType == DT_RELA ? SHT_RELA : SHT_REL; -+ if (pShdrRelocs->sh_type != uShType) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT_PLTREL does not match section type: %u vs %u", -+ pszLogName, pShdrRelocs->sh_type, uShType); -+ if (pShdrRelocs->sh_size != pModElf->DynInfo.cbJmpRelocs) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT_PLTRELSZ does not match section size: %u vs %u", -+ pszLogName, pShdrRelocs->sh_size, pModElf->DynInfo.cbJmpRelocs); -+ if (uShType != uShTypeArch) -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, "%s: DT_PLTREL does not match architecture: %u, arch wants %u", -+ pszLogName, uShType, uShTypeArch); -+ } -+ -+ /* -+ * Check that there aren't any other relocations hiding in the section table. -+ */ -+ for (uint32_t i = 1; i < pModElf->Ehdr.e_shnum; i++) -+ if ( (paShdrs[i].sh_type == SHT_REL || paShdrs[i].sh_type == SHT_RELA) -+ && pModElf->paShdrExtras[i].uDtTag != DT_REL -+ && pModElf->paShdrExtras[i].uDtTag != DT_RELA -+ && pModElf->paShdrExtras[i].uDtTag != DT_JMPREL) -+ { -+ char szSecHdrNm[80]; -+ return RTERRINFO_LOG_SET_F(pErrInfo, VERR_BAD_EXE_FORMAT, -+ "%s: section header #%u (%s type=" FMT_ELF_WORD " size=" FMT_ELF_XWORD ") contains relocations not referenced by the dynamic section", -+ pszLogName, i, -+ RTLDRELF_NAME(GetSHdrName)(pModElf, paShdrs[i].sh_name, szSecHdrNm, sizeof(szSecHdrNm)), -+ paShdrs[i].sh_type, paShdrs[i].sh_size); -+ } - - return VINF_SUCCESS; - } -@@ -1866,8 +2819,9 @@ static int RTLDRELF_NAME(ValidateSection - * @param fFlags Reserved, MBZ. - * @param enmArch Architecture specifier. - * @param phLdrMod Where to store the handle. -+ * @param pErrInfo Where to return extended error info. Optional. - */ --static int RTLDRELF_NAME(Open)(PRTLDRREADER pReader, uint32_t fFlags, RTLDRARCH enmArch, PRTLDRMOD phLdrMod) -+static int RTLDRELF_NAME(Open)(PRTLDRREADER pReader, uint32_t fFlags, RTLDRARCH enmArch, PRTLDRMOD phLdrMod, PRTERRINFO pErrInfo) - { - const char *pszLogName = pReader->pfnLogName(pReader); - uint64_t cbRawImage = pReader->pfnSize(pReader); -@@ -1891,21 +2845,42 @@ static int RTLDRELF_NAME(Open)(PRTLDRREA - #else - pModElf->Core.enmArch = RTLDRARCH_AMD64; - #endif -- //pModElf->pvBits = NULL; -- //pModElf->Ehdr = {0}; -- //pModElf->paShdrs = NULL; -- //pModElf->paSyms = NULL; -- pModElf->iSymSh = ~0U; -- //pModElf->cSyms = 0; -- pModElf->iStrSh = ~0U; -- //pModElf->cbStr = 0; -- //pModElf->cbImage = 0; -- //pModElf->LinkAddress = 0; -- //pModElf->pStr = NULL; -- //pModElf->cbShStr = 0; -- //pModElf->pShStr = NULL; -- //pModElf->iShEhFrame = 0; -- //pModElf->iShEhFrameHdr = 0; -+ //pModElf->pvBits = NULL; -+ //pModElf->Ehdr = {0}; -+ //pModElf->paShdrs = NULL; -+ //pModElf->Rel.paSyms = NULL; -+ pModElf->Rel.iSymSh = ~0U; -+ //pModElf->Rel.cSyms = 0; -+ pModElf->Rel.iStrSh = ~0U; -+ //pModElf->Rel.cbStr = 0; -+ //pModElf->Rel.pStr = NULL; -+ //pModElf->Dyn.paSyms = NULL; -+ pModElf->Dyn.iSymSh = ~0U; -+ //pModElf->Dyn.cSyms = 0; -+ pModElf->Dyn.iStrSh = ~0U; -+ //pModElf->Dyn.cbStr = 0; -+ //pModElf->Dyn.pStr = NULL; -+ pModElf->iFirstSect = 1; -+ //pModElf->fShdrInOrder = false; -+ //pModElf->cbImage = 0; -+ pModElf->LinkAddress = ~(Elf_Addr)0; -+ //pModElf->cbShStr = 0; -+ //pModElf->pShStr = NULL; -+ //pModElf->iShEhFrame = 0; -+ //pModElf->iShEhFrameHdr= 0; -+ pModElf->iShDynamic = ~0U; -+ //pModElf->cDynamic = 0; -+ //pModElf->paDynamic = NULL; -+ //pModElf->paPhdrs = NULL; -+ pModElf->DynInfo.uPtrRelocs = ~(Elf_Addr)0; -+ //pModElf->DynInfo.cbRelocs = 0; -+ //pModElf->DynInfo.cbRelocEntry = 0; -+ //pModElf->DynInfo.uRelocType = 0; -+ //pModElf->DynInfo.idxShRelocs = 0; -+ pModElf->DynInfo.uPtrJmpRelocs = ~(Elf_Addr)0; -+ //pModElf->DynInfo.cbJmpRelocs = 0; -+ //pModElf->DynInfo.uJmpRelocType = 0; -+ //pModElf->DynInfo.idxShJmpRelocs = 0; - - /* - * Read and validate the ELF header and match up the CPU architecture. -@@ -1914,7 +2889,7 @@ static int RTLDRELF_NAME(Open)(PRTLDRREA - if (RT_SUCCESS(rc)) - { - RTLDRARCH enmArchImage = RTLDRARCH_INVALID; /* shut up gcc */ -- rc = RTLDRELF_NAME(ValidateElfHeader)(&pModElf->Ehdr, pszLogName, cbRawImage, &enmArchImage); -+ rc = RTLDRELF_NAME(ValidateElfHeader)(&pModElf->Ehdr, cbRawImage, pszLogName, &enmArchImage, pErrInfo); - if (RT_SUCCESS(rc)) - { - if ( enmArch != RTLDRARCH_WHATEVER -@@ -1929,7 +2904,7 @@ static int RTLDRELF_NAME(Open)(PRTLDRREA - * introspection methods. - */ - size_t const cbShdrs = pModElf->Ehdr.e_shnum * sizeof(Elf_Shdr); -- Elf_Shdr *paShdrs = (Elf_Shdr *)RTMemAlloc(cbShdrs * 2); -+ Elf_Shdr *paShdrs = (Elf_Shdr *)RTMemAlloc(cbShdrs * 2 + sizeof(RTLDRMODELFSHX) * pModElf->Ehdr.e_shnum); - if (paShdrs) - { - pModElf->paShdrs = paShdrs; -@@ -1939,111 +2914,77 @@ static int RTLDRELF_NAME(Open)(PRTLDRREA - memcpy(&paShdrs[pModElf->Ehdr.e_shnum], paShdrs, cbShdrs); - pModElf->paOrgShdrs = &paShdrs[pModElf->Ehdr.e_shnum]; - -+ pModElf->paShdrExtras = (PRTLDRMODELFSHX)&pModElf->paOrgShdrs[pModElf->Ehdr.e_shnum]; -+ memset(pModElf->paShdrExtras, 0xff, sizeof(RTLDRMODELFSHX) * pModElf->Ehdr.e_shnum); -+ - pModElf->cbShStr = paShdrs[pModElf->Ehdr.e_shstrndx].sh_size; - - /* - * Validate the section headers and find relevant sections. - */ -- Elf_Addr uNextAddr = 0; -- for (unsigned i = 0; i < pModElf->Ehdr.e_shnum; i++) -- { -- rc = RTLDRELF_NAME(ValidateSectionHeader)(pModElf, i, pszLogName, cbRawImage); -- if (RT_FAILURE(rc)) -- break; -- -- /* We're looking for symbol tables. */ -- if (paShdrs[i].sh_type == SHT_SYMTAB) -- { -- if (pModElf->iSymSh != ~0U) -- { -- Log(("RTLdrElf: %s: Multiple symbol tabs! iSymSh=%d i=%d\n", pszLogName, pModElf->iSymSh, i)); -- rc = VERR_LDRELF_MULTIPLE_SYMTABS; -- break; -- } -- pModElf->iSymSh = i; -- pModElf->cSyms = (unsigned)(paShdrs[i].sh_size / sizeof(Elf_Sym)); -- AssertBreakStmt(pModElf->cSyms == paShdrs[i].sh_size / sizeof(Elf_Sym), rc = VERR_IMAGE_TOO_BIG); -- pModElf->iStrSh = paShdrs[i].sh_link; -- pModElf->cbStr = (unsigned)paShdrs[pModElf->iStrSh].sh_size; -- AssertBreakStmt(pModElf->cbStr == paShdrs[pModElf->iStrSh].sh_size, rc = VERR_IMAGE_TOO_BIG); -- } -- -- /* Special checks for the section string table. */ -- if (i == pModElf->Ehdr.e_shstrndx) -- { -- if (paShdrs[i].sh_type != SHT_STRTAB) -- { -- Log(("RTLdrElf: Section header string table is not a SHT_STRTAB: %#x\n", paShdrs[i].sh_type)); -- rc = VERR_BAD_EXE_FORMAT; -- break; -- } -- if (paShdrs[i].sh_size == 0) -- { -- Log(("RTLdrElf: Section header string table is empty\n")); -- rc = VERR_BAD_EXE_FORMAT; -- break; -- } -- } -+ rc = RTLDRELF_NAME(ValidateAndProcessSectionHeaders)(pModElf, paShdrs, cbRawImage, pszLogName, pErrInfo); - -- /* Kluge for the .data..percpu segment in 64-bit linux kernels. */ -- if (paShdrs[i].sh_flags & SHF_ALLOC) -- { -- if ( paShdrs[i].sh_addr == 0 -- && paShdrs[i].sh_addr < uNextAddr) -- { -- Elf_Addr uAddr = RT_ALIGN_T(uNextAddr, paShdrs[i].sh_addralign, Elf_Addr); -- Log(("RTLdrElf: Out of order section #%d; adjusting sh_addr from " FMT_ELF_ADDR " to " FMT_ELF_ADDR "\n", -- i, paShdrs[i].sh_addr, uAddr)); -- paShdrs[i].sh_addr = uAddr; -- } -- uNextAddr = paShdrs[i].sh_addr + paShdrs[i].sh_size; -- } -- } /* for each section header */ -+ /* -+ * Read validate and process program headers if ET_DYN or ET_EXEC. -+ */ -+ if (RT_SUCCESS(rc) && (pModElf->Ehdr.e_type == ET_DYN || pModElf->Ehdr.e_type == ET_EXEC)) -+ rc = RTLDRELF_NAME(ValidateAndProcessDynamicInfo)(pModElf, cbRawImage, fFlags, pszLogName, pErrInfo); - - /* -- * Calculate the image base address if the image isn't relocatable. -+ * Massage the section headers. - */ -- if (RT_SUCCESS(rc) && pModElf->Ehdr.e_type != ET_REL) -+ if (RT_SUCCESS(rc)) - { -- pModElf->LinkAddress = ~(Elf_Addr)0; -- for (unsigned i = 0; i < pModElf->Ehdr.e_shnum; i++) -- if ( (paShdrs[i].sh_flags & SHF_ALLOC) -- && paShdrs[i].sh_addr < pModElf->LinkAddress) -- pModElf->LinkAddress = paShdrs[i].sh_addr; -- if (pModElf->LinkAddress == ~(Elf_Addr)0) -+ if (pModElf->Ehdr.e_type == ET_REL) - { -- AssertFailed(); -- rc = VERR_LDR_GENERAL_FAILURE; -- } -- if (pModElf->Ehdr.e_type == ET_DYN && pModElf->LinkAddress < 0x1000) -+ /* Do allocations and figure the image size: */ - pModElf->LinkAddress = 0; -+ for (unsigned i = 1; i < pModElf->Ehdr.e_shnum; i++) -+ if (paShdrs[i].sh_flags & SHF_ALLOC) -+ { -+ paShdrs[i].sh_addr = paShdrs[i].sh_addralign -+ ? RT_ALIGN_T(pModElf->cbImage, paShdrs[i].sh_addralign, Elf_Addr) -+ : (Elf_Addr)pModElf->cbImage; -+ Elf_Addr EndAddr = paShdrs[i].sh_addr + paShdrs[i].sh_size; -+ if (pModElf->cbImage < EndAddr) -+ { -+ pModElf->cbImage = (size_t)EndAddr; -+ AssertMsgBreakStmt(pModElf->cbImage == EndAddr, (FMT_ELF_ADDR "\n", EndAddr), rc = VERR_IMAGE_TOO_BIG); -+ } -+ Log2(("RTLdrElf: %s: Assigned " FMT_ELF_ADDR " to section #%d\n", pszLogName, paShdrs[i].sh_addr, i)); -+ } -+ } -+ else -+ { -+ /* Convert sh_addr to RVA: */ -+ Assert(pModElf->LinkAddress != ~(Elf_Addr)0); -+ for (unsigned i = 0 /*!*/; i < pModElf->Ehdr.e_shnum; i++) -+ if (paShdrs[i].sh_flags & SHF_ALLOC) -+ paShdrs[i].sh_addr -= pModElf->LinkAddress; -+ } - } - - /* -- * Perform allocations / RVA calculations, determine the image size. -+ * Check if the sections are in order by address, as that will simplify -+ * enumeration and address translation. - */ -- if (RT_SUCCESS(rc)) -- for (unsigned i = 0; i < pModElf->Ehdr.e_shnum; i++) -- if (paShdrs[i].sh_flags & SHF_ALLOC) -+ pModElf->fShdrInOrder = true; -+ Elf_Addr uEndAddr = 0; -+ for (unsigned i = pModElf->iFirstSect; i < pModElf->Ehdr.e_shnum; i++) -+ if (paShdrs[i].sh_flags & SHF_ALLOC) -+ { -+ if (uEndAddr <= paShdrs[i].sh_addr) -+ uEndAddr = paShdrs[i].sh_addr + paShdrs[i].sh_size; -+ else - { -- if (pModElf->Ehdr.e_type == ET_REL) -- paShdrs[i].sh_addr = paShdrs[i].sh_addralign -- ? RT_ALIGN_T(pModElf->cbImage, paShdrs[i].sh_addralign, Elf_Addr) -- : (Elf_Addr)pModElf->cbImage; -- else -- paShdrs[i].sh_addr -= pModElf->LinkAddress; -- Elf_Addr EndAddr = paShdrs[i].sh_addr + paShdrs[i].sh_size; -- if (pModElf->cbImage < EndAddr) -- { -- pModElf->cbImage = (size_t)EndAddr; -- AssertMsgBreakStmt(pModElf->cbImage == EndAddr, (FMT_ELF_ADDR "\n", EndAddr), rc = VERR_IMAGE_TOO_BIG); -- } -- Log2(("RTLdrElf: %s: Assigned " FMT_ELF_ADDR " to section #%d\n", pszLogName, paShdrs[i].sh_addr, i)); -+ pModElf->fShdrInOrder = false; -+ break; - } -+ } - -- Log2(("RTLdrElf: iSymSh=%u cSyms=%u iStrSh=%u cbStr=%u rc=%Rrc cbImage=%#zx LinkAddress=" FMT_ELF_ADDR "\n", -- pModElf->iSymSh, pModElf->cSyms, pModElf->iStrSh, pModElf->cbStr, rc, -- pModElf->cbImage, pModElf->LinkAddress)); -+ Log2(("RTLdrElf: iSymSh=%u cSyms=%u iStrSh=%u cbStr=%u rc=%Rrc cbImage=%#zx LinkAddress=" FMT_ELF_ADDR " fShdrInOrder=%RTbool\n", -+ pModElf->Rel.iSymSh, pModElf->Rel.cSyms, pModElf->Rel.iStrSh, pModElf->Rel.cbStr, rc, -+ pModElf->cbImage, pModElf->LinkAddress, pModElf->fShdrInOrder)); - if (RT_SUCCESS(rc)) - { - pModElf->Core.pOps = &RTLDRELF_MID(s_rtldrElf,Ops); -@@ -2077,6 +3018,7 @@ static int RTLDRELF_NAME(Open)(PRTLDRREA - #undef RTLDRELF_MID - - #undef FMT_ELF_ADDR -+#undef FMT_ELF_ADDR7 - #undef FMT_ELF_HALF - #undef FMT_ELF_SHALF - #undef FMT_ELF_OFF -@@ -2102,6 +3044,8 @@ static int RTLDRELF_NAME(Open)(PRTLDRREA - #undef Elf_Size - #undef Elf_Sword - #undef Elf_Word -+#undef Elf_Xword -+#undef Elf_Sxword - - #undef RTLDRMODELF - #undef PRTLDRMODELF ---- a/include/iprt/memobj.h -+++ b/include/iprt/memobj.h -@@ -127,7 +127,10 @@ RTR0DECL(int) RTR0MemObjFree(RTR0MEMOBJ - * @returns IPRT status code. - * @param pMemObj Where to store the ring-0 memory object handle. - * @param cb Number of bytes to allocate. This is rounded up to nearest page. -- * @param fExecutable Flag indicating whether it should be permitted to executed code in the memory object. -+ * @param fExecutable Flag indicating whether it should be permitted to -+ * executed code in the memory object. The user must -+ * use RTR0MemObjProtect after initialization the -+ * allocation to actually make it executable. - */ - #define RTR0MemObjAllocPage(pMemObj, cb, fExecutable) \ - RTR0MemObjAllocPageTag((pMemObj), (cb), (fExecutable), RTMEM_TAG) -@@ -140,7 +143,10 @@ RTR0DECL(int) RTR0MemObjFree(RTR0MEMOBJ - * @returns IPRT status code. - * @param pMemObj Where to store the ring-0 memory object handle. - * @param cb Number of bytes to allocate. This is rounded up to nearest page. -- * @param fExecutable Flag indicating whether it should be permitted to executed code in the memory object. -+ * @param fExecutable Flag indicating whether it should be permitted to -+ * executed code in the memory object. The user must -+ * use RTR0MemObjProtect after initialization the -+ * allocation to actually make it executable. - * @param pszTag Allocation tag used for statistics and such. - */ - RTR0DECL(int) RTR0MemObjAllocPageTag(PRTR0MEMOBJ pMemObj, size_t cb, bool fExecutable, const char *pszTag); -@@ -154,7 +160,10 @@ RTR0DECL(int) RTR0MemObjAllocPageTag(PRT - * @returns IPRT status code. - * @param pMemObj Where to store the ring-0 memory object handle. - * @param cb Number of bytes to allocate. This is rounded up to nearest page. -- * @param fExecutable Flag indicating whether it should be permitted to executed code in the memory object. -+ * @param fExecutable Flag indicating whether it should be permitted to -+ * executed code in the memory object. The user must -+ * use RTR0MemObjProtect after initialization the -+ * allocation to actually make it executable. - */ - #define RTR0MemObjAllocLow(pMemObj, cb, fExecutable) \ - RTR0MemObjAllocLowTag((pMemObj), (cb), (fExecutable), RTMEM_TAG) -@@ -168,7 +177,10 @@ RTR0DECL(int) RTR0MemObjAllocPageTag(PRT - * @returns IPRT status code. - * @param pMemObj Where to store the ring-0 memory object handle. - * @param cb Number of bytes to allocate. This is rounded up to nearest page. -- * @param fExecutable Flag indicating whether it should be permitted to executed code in the memory object. -+ * @param fExecutable Flag indicating whether it should be permitted to -+ * executed code in the memory object. The user must -+ * use RTR0MemObjProtect after initialization the -+ * allocation to actually make it executable. - * @param pszTag Allocation tag used for statistics and such. - */ - RTR0DECL(int) RTR0MemObjAllocLowTag(PRTR0MEMOBJ pMemObj, size_t cb, bool fExecutable, const char *pszTag); -@@ -182,7 +194,10 @@ RTR0DECL(int) RTR0MemObjAllocLowTag(PRTR - * @returns IPRT status code. - * @param pMemObj Where to store the ring-0 memory object handle. - * @param cb Number of bytes to allocate. This is rounded up to nearest page. -- * @param fExecutable Flag indicating whether it should be permitted to executed code in the memory object. -+ * @param fExecutable Flag indicating whether it should be permitted to -+ * executed code in the memory object. The user must -+ * use RTR0MemObjProtect after initialization the -+ * allocation to actually make it executable. - */ - #define RTR0MemObjAllocCont(pMemObj, cb, fExecutable) \ - RTR0MemObjAllocContTag((pMemObj), (cb), (fExecutable), RTMEM_TAG) -@@ -196,7 +211,10 @@ RTR0DECL(int) RTR0MemObjAllocLowTag(PRTR - * @returns IPRT status code. - * @param pMemObj Where to store the ring-0 memory object handle. - * @param cb Number of bytes to allocate. This is rounded up to nearest page. -- * @param fExecutable Flag indicating whether it should be permitted to executed code in the memory object. -+ * @param fExecutable Flag indicating whether it should be permitted to -+ * executed code in the memory object. The user must -+ * use RTR0MemObjProtect after initialization the -+ * allocation to actually make it executable. - * @param pszTag Allocation tag used for statistics and such. - */ - RTR0DECL(int) RTR0MemObjAllocContTag(PRTR0MEMOBJ pMemObj, size_t cb, bool fExecutable, const char *pszTag); ---- a/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c -+++ b/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c -@@ -38,7 +38,7 @@ - - - #if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP) --# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - /** - * Starting with 2.6.23 we can use __get_vm_area and map_vm_area to allocate - * memory in the moduel range. This is preferrable to the exec heap below. ---- a/include/VBox/sup.h -+++ b/include/VBox/sup.h -@@ -1553,8 +1553,11 @@ SUPR3DECL(int) SUPR3GetSymbolR0(void *pv - * - * @returns VBox status code. - * @deprecated Use SUPR3LoadModule(pszFilename, "VMMR0.r0", &pvImageBase) -+ * @param pszFilename Full path to the VMMR0.r0 file (silly). -+ * @param pErrInfo Where to return extended error information. -+ * Optional. - */ --SUPR3DECL(int) SUPR3LoadVMM(const char *pszFilename); -+SUPR3DECL(int) SUPR3LoadVMM(const char *pszFilename, PRTERRINFO pErrInfo); - - /** - * Unloads R0 HC VMM code. ---- a/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp -+++ b/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp -@@ -846,7 +846,7 @@ extern "C" DECLEXPORT(int) TrustedMain(i - return 1; - } - -- rc = SUPR3LoadVMM(szAbsPath); -+ rc = SUPR3LoadVMM(szAbsPath, NULL); - if (RT_FAILURE(rc)) - { - RTPrintf("tstIntNet-1: SUPR3LoadVMM(\"%s\") -> %Rrc\n", szAbsPath, rc); ---- a/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp -+++ b/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp -@@ -259,7 +259,7 @@ int VBoxNetDhcpd::vmmInit() - if (RT_SUCCESS(rc)) - rc = RTPathAppend(szPathVMMR0, sizeof(szPathVMMR0), "VMMR0.r0"); - if (RT_SUCCESS(rc)) -- rc = SUPR3LoadVMM(szPathVMMR0); -+ rc = SUPR3LoadVMM(szPathVMMR0, NULL /*pErrInfo*/); - return rc; - } - ---- a/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp -+++ b/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp -@@ -383,7 +383,7 @@ int VBoxNetBaseService::tryGoOnline(void - return rc; - } - -- rc = SUPR3LoadVMM(strcat(szPath, "/VMMR0.r0")); -+ rc = SUPR3LoadVMM(strcat(szPath, "/VMMR0.r0"), NULL); - if (RT_FAILURE(rc)) - { - LogRel(("VBoxNetBaseService: SUPR3LoadVMM(\"%s\") -> %Rrc\n", szPath, rc)); ---- a/src/VBox/VMM/testcase/tstGlobalConfig.cpp -+++ b/src/VBox/VMM/testcase/tstGlobalConfig.cpp -@@ -102,7 +102,7 @@ extern "C" DECLEXPORT(int) TrustedMain(i - return 1; - } - -- rc = SUPR3LoadVMM("./VMMR0.r0"); -+ rc = SUPR3LoadVMM("./VMMR0.r0", NULL /*pErrInfo*/); - if (RT_SUCCESS(rc)) - { - Req.pSession = pSession; ---- a/src/VBox/HostDrivers/Support/SUPLibLdr.cpp -+++ b/src/VBox/HostDrivers/Support/SUPLibLdr.cpp -@@ -334,6 +334,372 @@ static DECLCALLBACK(int) supLoadModuleCr - } - - -+/** Argument package for supLoadModuleCompileSegmentsCB. */ -+typedef struct SUPLDRCOMPSEGTABARGS -+{ -+ uint32_t uStartRva; -+ uint32_t uEndRva; -+ uint32_t fProt; -+ uint32_t iSegs; -+ uint32_t cSegsAlloc; -+ PSUPLDRSEG paSegs; -+ PRTERRINFO pErrInfo; -+} SUPLDRCOMPSEGTABARGS, *PSUPLDRCOMPSEGTABARGS; -+ -+/** -+ * @callback_method_impl{FNRTLDRENUMSEGS, -+ * Compile list of segments with the same memory protection.} -+ */ -+static DECLCALLBACK(int) supLoadModuleCompileSegmentsCB(RTLDRMOD hLdrMod, PCRTLDRSEG pSeg, void *pvUser) -+{ -+ PSUPLDRCOMPSEGTABARGS pArgs = (PSUPLDRCOMPSEGTABARGS)pvUser; -+ AssertCompile(RTMEM_PROT_READ == SUPLDR_PROT_READ); -+ AssertCompile(RTMEM_PROT_WRITE == SUPLDR_PROT_WRITE); -+ AssertCompile(RTMEM_PROT_EXEC == SUPLDR_PROT_EXEC); -+ RT_NOREF(hLdrMod); -+ -+ Log2(("supLoadModuleCompileSegmentsCB: %RTptr/%RTptr LB %RTptr/%RTptr prot %#x %s\n", -+ pSeg->LinkAddress, pSeg->RVA, pSeg->cbMapped, pSeg->cb, pSeg->fProt, pSeg->pszName)); -+ -+ /* Ignore segments not part of the loaded image. */ -+ if (pSeg->RVA == NIL_RTLDRADDR || pSeg->cbMapped == 0) -+ { -+ Log2(("supLoadModuleCompileSegmentsCB: -> skipped\n")); -+ return VINF_SUCCESS; -+ } -+ -+ /* We currently ASSUME that all relevant segments are in ascending RVA order. */ -+ AssertReturn(pSeg->RVA >= pArgs->uEndRva, -+ RTERRINFO_LOG_REL_SET_F(pArgs->pErrInfo, VERR_BAD_EXE_FORMAT, "Out of order segment: %p LB %#zx #%.*s", -+ pSeg->RVA, pSeg->cb, pSeg->cchName, pSeg->pszName)); -+ -+ /* We ASSUME the cbMapped field is implemented. */ -+ AssertReturn(pSeg->cbMapped != NIL_RTLDRADDR, VERR_INTERNAL_ERROR_2); -+ AssertReturn(pSeg->cbMapped < _1G, VERR_INTERNAL_ERROR_4); -+ uint32_t cbMapped = (uint32_t)pSeg->cbMapped; -+ AssertReturn(pSeg->RVA < _1G, VERR_INTERNAL_ERROR_3); -+ uint32_t uRvaSeg = (uint32_t)pSeg->RVA; -+ -+ /* -+ * If the protection is the same as the previous segment, -+ * just update uEndRva and continue. -+ */ -+ uint32_t fProt = pSeg->fProt; -+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) -+ if (fProt & RTMEM_PROT_EXEC) -+ fProt |= fProt & RTMEM_PROT_READ; -+#endif -+ if (pSeg->fProt == pArgs->fProt) -+ { -+ pArgs->uEndRva = uRvaSeg + cbMapped; -+ Log2(("supLoadModuleCompileSegmentsCB: -> merged, end %#x\n", pArgs->uEndRva)); -+ return VINF_SUCCESS; -+ } -+ -+ /* -+ * The protection differs, so commit current segment and start a new one. -+ * However, if the new segment and old segment share a page, this becomes -+ * a little more complicated... -+ */ -+ if (pArgs->uStartRva < pArgs->uEndRva) -+ { -+ if (((pArgs->uEndRva - 1) >> PAGE_SHIFT) != (uRvaSeg >> PAGE_SHIFT)) -+ { -+ /* No common page, so make the new segment start on a page boundrary. */ -+ cbMapped += uRvaSeg & PAGE_OFFSET_MASK; -+ uRvaSeg &= ~(uint32_t)PAGE_OFFSET_MASK; -+ Assert(pArgs->uEndRva <= uRvaSeg); -+ Log2(("supLoadModuleCompileSegmentsCB: -> new, no common\n")); -+ } -+ else if ((fProt & pArgs->fProt) == fProt) -+ { -+ /* The current segment includes the memory protections of the -+ previous, so include the common page in it: */ -+ uint32_t const cbCommon = PAGE_SIZE - (uRvaSeg & PAGE_OFFSET_MASK); -+ if (cbCommon >= cbMapped) -+ { -+ pArgs->uEndRva = uRvaSeg + cbMapped; -+ Log2(("supLoadModuleCompileSegmentsCB: -> merge, %#x common, upgrading prot to %#x, end %#x\n", -+ cbCommon, pArgs->fProt, pArgs->uEndRva)); -+ return VINF_SUCCESS; /* New segment was smaller than a page. */ -+ } -+ cbMapped -= cbCommon; -+ uRvaSeg += cbCommon; -+ Assert(pArgs->uEndRva <= uRvaSeg); -+ Log2(("supLoadModuleCompileSegmentsCB: -> new, %#x common into previous\n", cbCommon)); -+ } -+ else if ((fProt & pArgs->fProt) == pArgs->fProt) -+ { -+ /* The new segment includes the memory protections of the -+ previous, so include the common page in it: */ -+ cbMapped += uRvaSeg & PAGE_OFFSET_MASK; -+ uRvaSeg &= ~(uint32_t)PAGE_OFFSET_MASK; -+ if (uRvaSeg == pArgs->uStartRva) -+ { -+ pArgs->fProt = fProt; -+ pArgs->uEndRva = uRvaSeg + cbMapped; -+ Log2(("supLoadModuleCompileSegmentsCB: -> upgrade current protection, end %#x\n", pArgs->uEndRva)); -+ return VINF_SUCCESS; /* Current segment was smaller than a page. */ -+ } -+ Log2(("supLoadModuleCompileSegmentsCB: -> new, %#x common into new\n", (uint32_t)(pSeg->RVA & PAGE_OFFSET_MASK))); -+ } -+ else -+ { -+ /* Create a new segment for the common page with the combined protection. */ -+ Log2(("supLoadModuleCompileSegmentsCB: -> it's complicated...\n")); -+ pArgs->uEndRva &= ~(uint32_t)PAGE_OFFSET_MASK; -+ if (pArgs->uEndRva > pArgs->uStartRva) -+ { -+ Log2(("supLoadModuleCompileSegmentsCB: SUP Seg #%u: %#x LB %#x prot %#x\n", -+ pArgs->iSegs, pArgs->uStartRva, pArgs->uEndRva - pArgs->uStartRva, pArgs->fProt)); -+ if (pArgs->paSegs) -+ { -+ AssertReturn(pArgs->iSegs < pArgs->cSegsAlloc, VERR_INTERNAL_ERROR_5); -+ pArgs->paSegs[pArgs->iSegs].off = pArgs->uStartRva; -+ pArgs->paSegs[pArgs->iSegs].cb = pArgs->uEndRva - pArgs->uStartRva; -+ pArgs->paSegs[pArgs->iSegs].fProt = pArgs->fProt; -+ pArgs->paSegs[pArgs->iSegs].fUnused = 0; -+ } -+ pArgs->iSegs++; -+ pArgs->uStartRva = pArgs->uEndRva; -+ } -+ pArgs->fProt |= fProt; -+ -+ uint32_t const cbCommon = PAGE_SIZE - (uRvaSeg & PAGE_OFFSET_MASK); -+ if (cbCommon >= cbMapped) -+ { -+ fProt |= pArgs->fProt; -+ pArgs->uEndRva = uRvaSeg + cbMapped; -+ return VINF_SUCCESS; /* New segment was smaller than a page. */ -+ } -+ cbMapped -= cbCommon; -+ uRvaSeg += cbCommon; -+ Assert(uRvaSeg - pArgs->uStartRva == PAGE_SIZE); -+ } -+ -+ /* The current segment should end where the new one starts, no gaps. */ -+ pArgs->uEndRva = uRvaSeg; -+ -+ /* Emit the current segment */ -+ Log2(("supLoadModuleCompileSegmentsCB: SUP Seg #%u: %#x LB %#x prot %#x\n", -+ pArgs->iSegs, pArgs->uStartRva, pArgs->uEndRva - pArgs->uStartRva, pArgs->fProt)); -+ if (pArgs->paSegs) -+ { -+ AssertReturn(pArgs->iSegs < pArgs->cSegsAlloc, VERR_INTERNAL_ERROR_5); -+ pArgs->paSegs[pArgs->iSegs].off = pArgs->uStartRva; -+ pArgs->paSegs[pArgs->iSegs].cb = pArgs->uEndRva - pArgs->uStartRva; -+ pArgs->paSegs[pArgs->iSegs].fProt = pArgs->fProt; -+ pArgs->paSegs[pArgs->iSegs].fUnused = 0; -+ } -+ pArgs->iSegs++; -+ } -+ /* else: current segment is empty */ -+ -+ /* Start the new segment. */ -+ Assert(!(uRvaSeg & PAGE_OFFSET_MASK)); -+ pArgs->fProt = fProt; -+ pArgs->uStartRva = uRvaSeg; -+ pArgs->uEndRva = uRvaSeg + cbMapped; -+ return VINF_SUCCESS; -+} -+ -+ -+/** -+ * Worker for supLoadModule(). -+ */ -+static int supLoadModuleInner(RTLDRMOD hLdrMod, PSUPLDRLOAD pLoadReq, uint32_t cbImageWithEverything, -+ RTR0PTR uImageBase, size_t cbImage, const char *pszModule, const char *pszFilename, -+ bool fNativeLoader, bool fIsVMMR0, const char *pszSrvReqHandler, -+ uint32_t offSymTab, uint32_t cSymbols, -+ uint32_t offStrTab, size_t cbStrTab, -+ uint32_t offSegTab, uint32_t cSegments, -+ PRTERRINFO pErrInfo) -+{ -+ /* -+ * Get the image bits. -+ */ -+ SUPLDRRESIMPARGS Args = { pszModule, pErrInfo }; -+ int rc = RTLdrGetBits(hLdrMod, &pLoadReq->u.In.abImage[0], uImageBase, supLoadModuleResolveImport, &Args); -+ if (RT_FAILURE(rc)) -+ { -+ LogRel(("SUP: RTLdrGetBits failed for %s (%s). rc=%Rrc\n", pszModule, pszFilename, rc)); -+ if (!RTErrInfoIsSet(pErrInfo)) -+ RTErrInfoSetF(pErrInfo, rc, "RTLdrGetBits failed"); -+ return rc; -+ } -+ -+ /* -+ * Get the entry points. -+ */ -+ RTUINTPTR VMMR0EntryFast = 0; -+ RTUINTPTR VMMR0EntryEx = 0; -+ RTUINTPTR SrvReqHandler = 0; -+ RTUINTPTR ModuleInit = 0; -+ RTUINTPTR ModuleTerm = 0; -+ const char *pszEp = NULL; -+ if (fIsVMMR0) -+ { -+ rc = RTLdrGetSymbolEx(hLdrMod, &pLoadReq->u.In.abImage[0], uImageBase, -+ UINT32_MAX, pszEp = "VMMR0EntryFast", &VMMR0EntryFast); -+ if (RT_SUCCESS(rc)) -+ rc = RTLdrGetSymbolEx(hLdrMod, &pLoadReq->u.In.abImage[0], uImageBase, -+ UINT32_MAX, pszEp = "VMMR0EntryEx", &VMMR0EntryEx); -+ } -+ else if (pszSrvReqHandler) -+ rc = RTLdrGetSymbolEx(hLdrMod, &pLoadReq->u.In.abImage[0], uImageBase, -+ UINT32_MAX, pszEp = pszSrvReqHandler, &SrvReqHandler); -+ if (RT_SUCCESS(rc)) -+ { -+ int rc2 = RTLdrGetSymbolEx(hLdrMod, &pLoadReq->u.In.abImage[0], uImageBase, -+ UINT32_MAX, pszEp = "ModuleInit", &ModuleInit); -+ if (RT_FAILURE(rc2)) -+ ModuleInit = 0; -+ -+ rc2 = RTLdrGetSymbolEx(hLdrMod, &pLoadReq->u.In.abImage[0], uImageBase, -+ UINT32_MAX, pszEp = "ModuleTerm", &ModuleTerm); -+ if (RT_FAILURE(rc2)) -+ ModuleTerm = 0; -+ } -+ if (RT_FAILURE(rc)) -+ { -+ LogRel(("SUP: Failed to get entry point '%s' for %s (%s) rc=%Rrc\n", pszEp, pszModule, pszFilename, rc)); -+ return RTErrInfoSetF(pErrInfo, rc, "Failed to resolve entry point '%s'", pszEp); -+ } -+ -+ /* -+ * Create the symbol and string tables. -+ */ -+ SUPLDRCREATETABSARGS CreateArgs; -+ CreateArgs.cbImage = cbImage; -+ CreateArgs.pSym = (PSUPLDRSYM)&pLoadReq->u.In.abImage[offSymTab]; -+ CreateArgs.pszBase = (char *)&pLoadReq->u.In.abImage[offStrTab]; -+ CreateArgs.psz = CreateArgs.pszBase; -+ rc = RTLdrEnumSymbols(hLdrMod, 0, NULL, 0, supLoadModuleCreateTabsCB, &CreateArgs); -+ if (RT_FAILURE(rc)) -+ { -+ LogRel(("SUP: RTLdrEnumSymbols failed for %s (%s) rc=%Rrc\n", pszModule, pszFilename, rc)); -+ return RTErrInfoSetF(pErrInfo, rc, "RTLdrEnumSymbols #2 failed"); -+ } -+ AssertRelease((size_t)(CreateArgs.psz - CreateArgs.pszBase) <= cbStrTab); -+ AssertRelease((size_t)(CreateArgs.pSym - (PSUPLDRSYM)&pLoadReq->u.In.abImage[offSymTab]) <= cSymbols); -+ -+ /* -+ * Create the segment table. -+ */ -+ SUPLDRCOMPSEGTABARGS SegArgs; -+ SegArgs.uStartRva = 0; -+ SegArgs.uEndRva = 0; -+ SegArgs.fProt = RTMEM_PROT_READ; -+ SegArgs.iSegs = 0; -+ SegArgs.cSegsAlloc = cSegments; -+ SegArgs.paSegs = (PSUPLDRSEG)&pLoadReq->u.In.abImage[offSegTab]; -+ SegArgs.pErrInfo = pErrInfo; -+ rc = RTLdrEnumSegments(hLdrMod, supLoadModuleCompileSegmentsCB, &SegArgs); -+ if (RT_FAILURE(rc)) -+ { -+ LogRel(("SUP: RTLdrEnumSegments failed for %s (%s) rc=%Rrc\n", pszModule, pszFilename, rc)); -+ return RTErrInfoSetF(pErrInfo, rc, "RTLdrEnumSegments #2 failed"); -+ } -+ SegArgs.uEndRva = (uint32_t)cbImage; -+ AssertReturn(SegArgs.uEndRva == cbImage, VERR_OUT_OF_RANGE); -+ if (SegArgs.uEndRva > SegArgs.uStartRva) -+ { -+ SegArgs.paSegs[SegArgs.iSegs].off = SegArgs.uStartRva; -+ SegArgs.paSegs[SegArgs.iSegs].cb = SegArgs.uEndRva - SegArgs.uStartRva; -+ SegArgs.paSegs[SegArgs.iSegs].fProt = SegArgs.fProt; -+ SegArgs.paSegs[SegArgs.iSegs].fUnused = 0; -+ SegArgs.iSegs++; -+ } -+ for (uint32_t i = 0; i < SegArgs.iSegs; i++) -+ LogRel(("SUP: seg #%u: %c%c%c %#010RX32 LB %#010RX32\n", i, /** @todo LogRel2 */ -+ SegArgs.paSegs[i].fProt & SUPLDR_PROT_READ ? 'R' : ' ', -+ SegArgs.paSegs[i].fProt & SUPLDR_PROT_WRITE ? 'W' : ' ', -+ SegArgs.paSegs[i].fProt & SUPLDR_PROT_EXEC ? 'X' : ' ', -+ SegArgs.paSegs[i].off, SegArgs.paSegs[i].cb)); -+ AssertRelease(SegArgs.iSegs == cSegments); -+ AssertRelease(SegArgs.cSegsAlloc == cSegments); -+ -+ /* -+ * Upload the image. -+ */ -+ pLoadReq->Hdr.u32Cookie = g_u32Cookie; -+ pLoadReq->Hdr.u32SessionCookie = g_u32SessionCookie; -+ pLoadReq->Hdr.cbIn = SUP_IOCTL_LDR_LOAD_SIZE_IN(cbImageWithEverything); -+ pLoadReq->Hdr.cbOut = SUP_IOCTL_LDR_LOAD_SIZE_OUT; -+ pLoadReq->Hdr.fFlags = SUPREQHDR_FLAGS_MAGIC | SUPREQHDR_FLAGS_EXTRA_IN; -+ pLoadReq->Hdr.rc = VERR_INTERNAL_ERROR; -+ -+ pLoadReq->u.In.pfnModuleInit = (RTR0PTR)ModuleInit; -+ pLoadReq->u.In.pfnModuleTerm = (RTR0PTR)ModuleTerm; -+ if (fIsVMMR0) -+ { -+ pLoadReq->u.In.eEPType = SUPLDRLOADEP_VMMR0; -+ pLoadReq->u.In.EP.VMMR0.pvVMMR0 = uImageBase; -+ pLoadReq->u.In.EP.VMMR0.pvVMMR0EntryFast= (RTR0PTR)VMMR0EntryFast; -+ pLoadReq->u.In.EP.VMMR0.pvVMMR0EntryEx = (RTR0PTR)VMMR0EntryEx; -+ } -+ else if (pszSrvReqHandler) -+ { -+ pLoadReq->u.In.eEPType = SUPLDRLOADEP_SERVICE; -+ pLoadReq->u.In.EP.Service.pfnServiceReq = (RTR0PTR)SrvReqHandler; -+ pLoadReq->u.In.EP.Service.apvReserved[0] = NIL_RTR0PTR; -+ pLoadReq->u.In.EP.Service.apvReserved[1] = NIL_RTR0PTR; -+ pLoadReq->u.In.EP.Service.apvReserved[2] = NIL_RTR0PTR; -+ } -+ else -+ pLoadReq->u.In.eEPType = SUPLDRLOADEP_NOTHING; -+ pLoadReq->u.In.offStrTab = offStrTab; -+ pLoadReq->u.In.cbStrTab = (uint32_t)cbStrTab; -+ AssertRelease(pLoadReq->u.In.cbStrTab == cbStrTab); -+ pLoadReq->u.In.cbImageBits = (uint32_t)cbImage; -+ pLoadReq->u.In.offSymbols = offSymTab; -+ pLoadReq->u.In.cSymbols = cSymbols; -+ pLoadReq->u.In.offSegments = offSegTab; -+ pLoadReq->u.In.cSegments = cSegments; -+ pLoadReq->u.In.cbImageWithEverything = cbImageWithEverything; -+ pLoadReq->u.In.pvImageBase = uImageBase; -+ if (!g_uSupFakeMode) -+ { -+ rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_LDR_LOAD, pLoadReq, SUP_IOCTL_LDR_LOAD_SIZE(cbImageWithEverything)); -+ if (RT_SUCCESS(rc)) -+ rc = pLoadReq->Hdr.rc; -+ else -+ LogRel(("SUP: SUP_IOCTL_LDR_LOAD ioctl for %s (%s) failed rc=%Rrc\n", pszModule, pszFilename, rc)); -+ } -+ else -+ rc = VINF_SUCCESS; -+ if ( RT_SUCCESS(rc) -+ || rc == VERR_ALREADY_LOADED /* A competing process. */ -+ ) -+ { -+ LogRel(("SUP: Loaded %s (%s) at %#RKv - ModuleInit at %RKv and ModuleTerm at %RKv%s\n", -+ pszModule, pszFilename, uImageBase, (RTR0PTR)ModuleInit, (RTR0PTR)ModuleTerm, -+ fNativeLoader ? " using the native ring-0 loader" : "")); -+ if (fIsVMMR0) -+ { -+ g_pvVMMR0 = uImageBase; -+ LogRel(("SUP: VMMR0EntryEx located at %RKv and VMMR0EntryFast at %RKv\n", (RTR0PTR)VMMR0EntryEx, (RTR0PTR)VMMR0EntryFast)); -+ } -+#ifdef RT_OS_WINDOWS -+ LogRel(("SUP: windbg> .reload /f %s=%#RKv\n", pszFilename, uImageBase)); -+#endif -+ return VINF_SUCCESS; -+ } -+ -+ /* -+ * Failed, bail out. -+ */ -+ LogRel(("SUP: Loading failed for %s (%s) rc=%Rrc\n", pszModule, pszFilename, rc)); -+ if ( pLoadReq->u.Out.uErrorMagic == SUPLDRLOAD_ERROR_MAGIC -+ && pLoadReq->u.Out.szError[0] != '\0') -+ { -+ LogRel(("SUP: %s\n", pLoadReq->u.Out.szError)); -+ return RTErrInfoSet(pErrInfo, rc, pLoadReq->u.Out.szError); -+ } -+ return RTErrInfoSet(pErrInfo, rc, "SUP_IOCTL_LDR_LOAD failed"); -+} -+ -+ - /** - * Worker for SUPR3LoadModule(). - * -@@ -356,6 +722,7 @@ static int supLoadModule(const char *psz - AssertPtrReturn(pszFilename, VERR_INVALID_PARAMETER); - AssertPtrReturn(pszModule, VERR_INVALID_PARAMETER); - AssertPtrReturn(ppvImageBase, VERR_INVALID_PARAMETER); -+ /** @todo abspath it right into SUPLDROPEN */ - AssertReturn(strlen(pszModule) < RT_SIZEOFMEMB(SUPLDROPEN, u.In.szName), VERR_FILENAME_TOO_LONG); - char szAbsFilename[RT_SIZEOFMEMB(SUPLDROPEN, u.In.szFilename)]; - rc = RTPathAbs(pszFilename, szAbsFilename, sizeof(szAbsFilename)); -@@ -371,8 +738,8 @@ static int supLoadModule(const char *psz - * Open image file and figure its size. - */ - RTLDRMOD hLdrMod; -- rc = RTLdrOpen(pszFilename, 0, RTLDRARCH_HOST, &hLdrMod); -- if (!RT_SUCCESS(rc)) -+ rc = RTLdrOpenEx(pszFilename, 0 /*fFlags*/, RTLDRARCH_HOST, &hLdrMod, pErrInfo); -+ if (RT_FAILURE(rc)) - { - LogRel(("SUP: RTLdrOpen failed for %s (%s) %Rrc\n", pszModule, pszFilename, rc)); - return rc; -@@ -385,230 +752,109 @@ static int supLoadModule(const char *psz - rc = RTLdrEnumSymbols(hLdrMod, 0, NULL, 0, supLoadModuleCalcSizeCB, &CalcArgs); - if (RT_SUCCESS(rc)) - { -- const uint32_t offSymTab = RT_ALIGN_32(CalcArgs.cbImage, 8); -- const uint32_t offStrTab = offSymTab + CalcArgs.cSymbols * sizeof(SUPLDRSYM); -- const uint32_t cbImageWithTabs = RT_ALIGN_32(offStrTab + CalcArgs.cbStrings, 8); -- - /* -- * Open the R0 image. -+ * Figure out the number of segments needed first. - */ -- SUPLDROPEN OpenReq; -- OpenReq.Hdr.u32Cookie = g_u32Cookie; -- OpenReq.Hdr.u32SessionCookie = g_u32SessionCookie; -- OpenReq.Hdr.cbIn = SUP_IOCTL_LDR_OPEN_SIZE_IN; -- OpenReq.Hdr.cbOut = SUP_IOCTL_LDR_OPEN_SIZE_OUT; -- OpenReq.Hdr.fFlags = SUPREQHDR_FLAGS_DEFAULT; -- OpenReq.Hdr.rc = VERR_INTERNAL_ERROR; -- OpenReq.u.In.cbImageWithTabs = cbImageWithTabs; -- OpenReq.u.In.cbImageBits = (uint32_t)CalcArgs.cbImage; -- strcpy(OpenReq.u.In.szName, pszModule); -- strcpy(OpenReq.u.In.szFilename, pszFilename); -- if (!g_uSupFakeMode) -- { -- rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_LDR_OPEN, &OpenReq, SUP_IOCTL_LDR_OPEN_SIZE); -- if (RT_SUCCESS(rc)) -- rc = OpenReq.Hdr.rc; -- } -- else -- { -- OpenReq.u.Out.fNeedsLoading = true; -- OpenReq.u.Out.pvImageBase = 0xef423420; -- } -- *ppvImageBase = (void *)OpenReq.u.Out.pvImageBase; -- if ( RT_SUCCESS(rc) -- && OpenReq.u.Out.fNeedsLoading) -+ SUPLDRCOMPSEGTABARGS SegArgs; -+ SegArgs.uStartRva = 0; -+ SegArgs.uEndRva = 0; -+ SegArgs.fProt = RTMEM_PROT_READ; -+ SegArgs.iSegs = 0; -+ SegArgs.cSegsAlloc = 0; -+ SegArgs.paSegs = NULL; -+ SegArgs.pErrInfo = pErrInfo; -+ rc = RTLdrEnumSegments(hLdrMod, supLoadModuleCompileSegmentsCB, &SegArgs); -+ if (RT_SUCCESS(rc)) - { -+ Assert(SegArgs.uEndRva <= RTLdrSize(hLdrMod)); -+ SegArgs.uEndRva = (uint32_t)CalcArgs.cbImage; /* overflow is checked later */ -+ if (SegArgs.uEndRva > SegArgs.uStartRva) -+ { -+ Log2(("supLoadModule: SUP Seg #%u: %#x LB %#x prot %#x\n", -+ SegArgs.iSegs, SegArgs.uStartRva, SegArgs.uEndRva - SegArgs.uStartRva, SegArgs.fProt)); -+ SegArgs.iSegs++; -+ } -+ -+ const uint32_t offSymTab = RT_ALIGN_32(CalcArgs.cbImage, 8); -+ const uint32_t offStrTab = offSymTab + CalcArgs.cSymbols * sizeof(SUPLDRSYM); -+ const uint32_t offSegTab = RT_ALIGN_32(offStrTab + CalcArgs.cbStrings, 8); -+ const uint32_t cbImageWithEverything = RT_ALIGN_32(offSegTab + sizeof(SUPLDRSEG) * SegArgs.iSegs, 8); -+ - /* -- * We need to load it. -- * Allocate memory for the image bits. -+ * Open the R0 image. - */ -- PSUPLDRLOAD pLoadReq = (PSUPLDRLOAD)RTMemTmpAlloc(SUP_IOCTL_LDR_LOAD_SIZE(cbImageWithTabs)); -- if (pLoadReq) -+ SUPLDROPEN OpenReq; -+ OpenReq.Hdr.u32Cookie = g_u32Cookie; -+ OpenReq.Hdr.u32SessionCookie = g_u32SessionCookie; -+ OpenReq.Hdr.cbIn = SUP_IOCTL_LDR_OPEN_SIZE_IN; -+ OpenReq.Hdr.cbOut = SUP_IOCTL_LDR_OPEN_SIZE_OUT; -+ OpenReq.Hdr.fFlags = SUPREQHDR_FLAGS_DEFAULT; -+ OpenReq.Hdr.rc = VERR_INTERNAL_ERROR; -+ OpenReq.u.In.cbImageWithEverything = cbImageWithEverything; -+ OpenReq.u.In.cbImageBits = (uint32_t)CalcArgs.cbImage; -+ strcpy(OpenReq.u.In.szName, pszModule); -+ strcpy(OpenReq.u.In.szFilename, pszFilename); -+ if (!g_uSupFakeMode) -+ { -+ rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_LDR_OPEN, &OpenReq, SUP_IOCTL_LDR_OPEN_SIZE); -+ if (RT_SUCCESS(rc)) -+ rc = OpenReq.Hdr.rc; -+ } -+ else -+ { -+ OpenReq.u.Out.fNeedsLoading = true; -+ OpenReq.u.Out.pvImageBase = 0xef423420; -+ } -+ *ppvImageBase = (void *)OpenReq.u.Out.pvImageBase; -+ if ( RT_SUCCESS(rc) -+ && OpenReq.u.Out.fNeedsLoading) - { - /* -- * Get the image bits. -+ * We need to load it. -+ * -+ * Allocate the request and pass it to an inner work function -+ * that populates it and sends it off to the driver. - */ -- -- SUPLDRRESIMPARGS Args = { pszModule, pErrInfo }; -- rc = RTLdrGetBits(hLdrMod, &pLoadReq->u.In.abImage[0], (uintptr_t)OpenReq.u.Out.pvImageBase, -- supLoadModuleResolveImport, &Args); -- -- if (RT_SUCCESS(rc)) -+ const uint32_t cbLoadReq = SUP_IOCTL_LDR_LOAD_SIZE(cbImageWithEverything); -+ PSUPLDRLOAD pLoadReq = (PSUPLDRLOAD)RTMemTmpAlloc(cbLoadReq); -+ if (pLoadReq) - { -- /* -- * Get the entry points. -- */ -- RTUINTPTR VMMR0EntryFast = 0; -- RTUINTPTR VMMR0EntryEx = 0; -- RTUINTPTR SrvReqHandler = 0; -- RTUINTPTR ModuleInit = 0; -- RTUINTPTR ModuleTerm = 0; -- const char *pszEp = NULL; -- if (fIsVMMR0) -- { -- rc = RTLdrGetSymbolEx(hLdrMod, &pLoadReq->u.In.abImage[0], (uintptr_t)OpenReq.u.Out.pvImageBase, -- UINT32_MAX, pszEp = "VMMR0EntryFast", &VMMR0EntryFast); -- if (RT_SUCCESS(rc)) -- rc = RTLdrGetSymbolEx(hLdrMod, &pLoadReq->u.In.abImage[0], (uintptr_t)OpenReq.u.Out.pvImageBase, -- UINT32_MAX, pszEp = "VMMR0EntryEx", &VMMR0EntryEx); -- } -- else if (pszSrvReqHandler) -- rc = RTLdrGetSymbolEx(hLdrMod, &pLoadReq->u.In.abImage[0], (uintptr_t)OpenReq.u.Out.pvImageBase, -- UINT32_MAX, pszEp = pszSrvReqHandler, &SrvReqHandler); -- if (RT_SUCCESS(rc)) -- { -- int rc2 = RTLdrGetSymbolEx(hLdrMod, &pLoadReq->u.In.abImage[0], (uintptr_t)OpenReq.u.Out.pvImageBase, -- UINT32_MAX, pszEp = "ModuleInit", &ModuleInit); -- if (RT_FAILURE(rc2)) -- ModuleInit = 0; -- -- rc2 = RTLdrGetSymbolEx(hLdrMod, &pLoadReq->u.In.abImage[0], (uintptr_t)OpenReq.u.Out.pvImageBase, -- UINT32_MAX, pszEp = "ModuleTerm", &ModuleTerm); -- if (RT_FAILURE(rc2)) -- ModuleTerm = 0; -- } -- if (RT_SUCCESS(rc)) -- { -- /* -- * Create the symbol and string tables. -- */ -- SUPLDRCREATETABSARGS CreateArgs; -- CreateArgs.cbImage = CalcArgs.cbImage; -- CreateArgs.pSym = (PSUPLDRSYM)&pLoadReq->u.In.abImage[offSymTab]; -- CreateArgs.pszBase = (char *)&pLoadReq->u.In.abImage[offStrTab]; -- CreateArgs.psz = CreateArgs.pszBase; -- rc = RTLdrEnumSymbols(hLdrMod, 0, NULL, 0, supLoadModuleCreateTabsCB, &CreateArgs); -- if (RT_SUCCESS(rc)) -- { -- AssertRelease((size_t)(CreateArgs.psz - CreateArgs.pszBase) <= CalcArgs.cbStrings); -- AssertRelease((size_t)(CreateArgs.pSym - (PSUPLDRSYM)&pLoadReq->u.In.abImage[offSymTab]) <= CalcArgs.cSymbols); -- -- /* -- * Upload the image. -- */ -- pLoadReq->Hdr.u32Cookie = g_u32Cookie; -- pLoadReq->Hdr.u32SessionCookie = g_u32SessionCookie; -- pLoadReq->Hdr.cbIn = SUP_IOCTL_LDR_LOAD_SIZE_IN(cbImageWithTabs); -- pLoadReq->Hdr.cbOut = SUP_IOCTL_LDR_LOAD_SIZE_OUT; -- pLoadReq->Hdr.fFlags = SUPREQHDR_FLAGS_MAGIC | SUPREQHDR_FLAGS_EXTRA_IN; -- pLoadReq->Hdr.rc = VERR_INTERNAL_ERROR; -- -- pLoadReq->u.In.pfnModuleInit = (RTR0PTR)ModuleInit; -- pLoadReq->u.In.pfnModuleTerm = (RTR0PTR)ModuleTerm; -- if (fIsVMMR0) -- { -- pLoadReq->u.In.eEPType = SUPLDRLOADEP_VMMR0; -- pLoadReq->u.In.EP.VMMR0.pvVMMR0 = OpenReq.u.Out.pvImageBase; -- pLoadReq->u.In.EP.VMMR0.pvVMMR0EntryFast= (RTR0PTR)VMMR0EntryFast; -- pLoadReq->u.In.EP.VMMR0.pvVMMR0EntryEx = (RTR0PTR)VMMR0EntryEx; -- } -- else if (pszSrvReqHandler) -- { -- pLoadReq->u.In.eEPType = SUPLDRLOADEP_SERVICE; -- pLoadReq->u.In.EP.Service.pfnServiceReq = (RTR0PTR)SrvReqHandler; -- pLoadReq->u.In.EP.Service.apvReserved[0] = NIL_RTR0PTR; -- pLoadReq->u.In.EP.Service.apvReserved[1] = NIL_RTR0PTR; -- pLoadReq->u.In.EP.Service.apvReserved[2] = NIL_RTR0PTR; -- } -- else -- pLoadReq->u.In.eEPType = SUPLDRLOADEP_NOTHING; -- pLoadReq->u.In.offStrTab = offStrTab; -- pLoadReq->u.In.cbStrTab = (uint32_t)CalcArgs.cbStrings; -- AssertRelease(pLoadReq->u.In.cbStrTab == CalcArgs.cbStrings); -- pLoadReq->u.In.cbImageBits = (uint32_t)CalcArgs.cbImage; -- pLoadReq->u.In.offSymbols = offSymTab; -- pLoadReq->u.In.cSymbols = CalcArgs.cSymbols; -- pLoadReq->u.In.cbImageWithTabs = cbImageWithTabs; -- pLoadReq->u.In.pvImageBase = OpenReq.u.Out.pvImageBase; -- if (!g_uSupFakeMode) -- { -- rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_LDR_LOAD, pLoadReq, SUP_IOCTL_LDR_LOAD_SIZE(cbImageWithTabs)); -- if (RT_SUCCESS(rc)) -- rc = pLoadReq->Hdr.rc; -- else -- LogRel(("SUP: SUP_IOCTL_LDR_LOAD ioctl for %s (%s) failed rc=%Rrc\n", pszModule, pszFilename, rc)); -- } -- else -- rc = VINF_SUCCESS; -- if ( RT_SUCCESS(rc) -- || rc == VERR_ALREADY_LOADED /* A competing process. */ -- ) -- { -- LogRel(("SUP: Loaded %s (%s) at %#RKv - ModuleInit at %RKv and ModuleTerm at %RKv%s\n", -- pszModule, pszFilename, OpenReq.u.Out.pvImageBase, (RTR0PTR)ModuleInit, (RTR0PTR)ModuleTerm, -- OpenReq.u.Out.fNativeLoader ? " using the native ring-0 loader" : "")); -- if (fIsVMMR0) -- { -- g_pvVMMR0 = OpenReq.u.Out.pvImageBase; -- LogRel(("SUP: VMMR0EntryEx located at %RKv and VMMR0EntryFast at %RKv\n", (RTR0PTR)VMMR0EntryEx, (RTR0PTR)VMMR0EntryFast)); -- } --#ifdef RT_OS_WINDOWS -- LogRel(("SUP: windbg> .reload /f %s=%#RKv\n", pszFilename, OpenReq.u.Out.pvImageBase)); --#endif -- -- RTMemTmpFree(pLoadReq); -- RTLdrClose(hLdrMod); -- return VINF_SUCCESS; -- } -- -- /* -- * Failed, bail out. -- */ -- LogRel(("SUP: Loading failed for %s (%s) rc=%Rrc\n", pszModule, pszFilename, rc)); -- if ( pLoadReq->u.Out.uErrorMagic == SUPLDRLOAD_ERROR_MAGIC -- && pLoadReq->u.Out.szError[0] != '\0') -- { -- LogRel(("SUP: %s\n", pLoadReq->u.Out.szError)); -- RTErrInfoSet(pErrInfo, rc, pLoadReq->u.Out.szError); -- } -- else -- RTErrInfoSet(pErrInfo, rc, "SUP_IOCTL_LDR_LOAD failed"); -- } -- else -- { -- LogRel(("SUP: RTLdrEnumSymbols failed for %s (%s) rc=%Rrc\n", pszModule, pszFilename, rc)); -- RTErrInfoSetF(pErrInfo, rc, "RTLdrEnumSymbols #2 failed"); -- } -- } -- else -- { -- LogRel(("SUP: Failed to get entry point '%s' for %s (%s) rc=%Rrc\n", pszEp, pszModule, pszFilename, rc)); -- RTErrInfoSetF(pErrInfo, rc, "Failed to resolve entry point '%s'", pszEp); -- } -+ rc = supLoadModuleInner(hLdrMod, pLoadReq, cbImageWithEverything, OpenReq.u.Out.pvImageBase, CalcArgs.cbImage, -+ pszModule, pszFilename, OpenReq.u.Out.fNativeLoader, fIsVMMR0, pszSrvReqHandler, -+ offSymTab, CalcArgs.cSymbols, -+ offStrTab, CalcArgs.cbStrings, -+ offSegTab, SegArgs.iSegs, -+ pErrInfo); -+ RTMemTmpFree(pLoadReq); - } - else - { -- LogRel(("SUP: RTLdrGetBits failed for %s (%s). rc=%Rrc\n", pszModule, pszFilename, rc)); -- if (!RTErrInfoIsSet(pErrInfo)) -- RTErrInfoSetF(pErrInfo, rc, "RTLdrGetBits failed"); -+ AssertMsgFailed(("failed to allocated %u bytes for SUPLDRLOAD_IN structure!\n", SUP_IOCTL_LDR_LOAD_SIZE(cbImageWithEverything))); -+ rc = RTErrInfoSetF(pErrInfo, VERR_NO_TMP_MEMORY, "Failed to allocate %u bytes for the load request", -+ SUP_IOCTL_LDR_LOAD_SIZE(cbImageWithEverything)); - } -- RTMemTmpFree(pLoadReq); - } -- else -+ /* -+ * Already loaded? -+ */ -+ else if (RT_SUCCESS(rc)) - { -- AssertMsgFailed(("failed to allocated %u bytes for SUPLDRLOAD_IN structure!\n", SUP_IOCTL_LDR_LOAD_SIZE(cbImageWithTabs))); -- rc = VERR_NO_TMP_MEMORY; -- RTErrInfoSetF(pErrInfo, rc, "Failed to allocate %u bytes for the load request", SUP_IOCTL_LDR_LOAD_SIZE(cbImageWithTabs)); -- } -- } -- /* -- * Already loaded? -- */ -- else if (RT_SUCCESS(rc)) -- { -- if (fIsVMMR0) -- g_pvVMMR0 = OpenReq.u.Out.pvImageBase; -- LogRel(("SUP: Opened %s (%s) at %#RKv%s.\n", pszModule, pszFilename, OpenReq.u.Out.pvImageBase, -- OpenReq.u.Out.fNativeLoader ? " loaded by the native ring-0 loader" : "")); -+ if (fIsVMMR0) -+ g_pvVMMR0 = OpenReq.u.Out.pvImageBase; -+ LogRel(("SUP: Opened %s (%s) at %#RKv%s.\n", pszModule, pszFilename, OpenReq.u.Out.pvImageBase, -+ OpenReq.u.Out.fNativeLoader ? " loaded by the native ring-0 loader" : "")); - #ifdef RT_OS_WINDOWS -- LogRel(("SUP: windbg> .reload /f %s=%#RKv\n", pszFilename, OpenReq.u.Out.pvImageBase)); -+ LogRel(("SUP: windbg> .reload /f %s=%#RKv\n", pszFilename, OpenReq.u.Out.pvImageBase)); - #endif -+ } -+ /* -+ * No, failed. -+ */ -+ else -+ RTErrInfoSet(pErrInfo, rc, "SUP_IOCTL_LDR_OPEN failed"); - } -- /* -- * No, failed. -- */ -- else -- RTErrInfoSet(pErrInfo, rc, "SUP_IOCTL_LDR_OPEN failed"); -+ else if (!RTErrInfoIsSet(pErrInfo) && pErrInfo) -+ RTErrInfoSetF(pErrInfo, rc, "RTLdrEnumSegments #1 failed"); - } - else - RTErrInfoSetF(pErrInfo, rc, "RTLdrEnumSymbols #1 failed"); -@@ -682,10 +928,10 @@ SUPR3DECL(int) SUPR3GetSymbolR0(void *pv - } - - --SUPR3DECL(int) SUPR3LoadVMM(const char *pszFilename) -+SUPR3DECL(int) SUPR3LoadVMM(const char *pszFilename, PRTERRINFO pErrInfo) - { - void *pvImageBase; -- return SUPR3LoadModule(pszFilename, "VMMR0.r0", &pvImageBase, NULL /*pErrInfo*/); -+ return SUPR3LoadModule(pszFilename, "VMMR0.r0", &pvImageBase, pErrInfo); - } - - ---- a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp -+++ b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp -@@ -76,7 +76,8 @@ int main(int argc, char **argv) - /* - * Load VMM code. - */ -- rc = SUPR3LoadVMM(szAbsFile); -+ RTERRINFOSTATIC ErrInfo; -+ rc = SUPR3LoadVMM(szAbsFile, RTErrInfoInitStatic(&ErrInfo)); - if (RT_SUCCESS(rc)) - { - /* -@@ -208,7 +209,7 @@ int main(int argc, char **argv) - } - else - { -- RTPrintf("tstInt: SUPR3LoadVMM failed with rc=%Rrc\n", rc); -+ RTPrintf("tstInt: SUPR3LoadVMM failed with rc=%Rrc%#RTeim\n", rc, &ErrInfo.Core); - rcRet++; - } - ---- a/src/VBox/Devices/Makefile.kmk -+++ b/src/VBox/Devices/Makefile.kmk -@@ -52,7 +52,7 @@ if !defined(VBOX_ONLY_EXTPACKS) - if1of ($(KBUILD_TARGET_ARCH), $(VBOX_SUPPORTED_HOST_ARCHS)) - LIBRARIES += ServicesR0 - DLLS += VBoxDDU VBoxDD VBoxDD2 -- SYSMODS += VBoxDDR0 -+ $(if-expr defined(VBOX_WITH_VBOXR0_AS_DLL),DLLS,SYSMODS) += VBoxDDR0 - ifdef VBOX_WITH_RAW_MODE - SYSMODS += VBoxDDRC - endif -@@ -1370,7 +1370,7 @@ if defined(VBOX_WITH_EXTPACK) && defined - USB/DevXHCI.cpp - $(call VBOX_SET_VER_INFO_DLL,VBoxEhciR3,PUEL Extension Pack - EHCI Device) - -- SYSMODS += VBoxEhciR0 -+ $(if-expr defined(VBOX_WITH_VBOXR0_AS_DLL),DLLS,SYSMODS) += VBoxEhciR0 - VBoxEhciR0_TEMPLATE = VBoxR0ExtPackPuel - VBoxEhciR0_SOURCES = \ - USB/DevEHCI.cpp \ -@@ -1406,7 +1406,7 @@ if defined(VBOX_WITH_EXTPACK) && defined - VBoxPciRawDrv_SOURCES = Bus/DrvPciRaw.cpp - $(call VBOX_SET_VER_INFO_DLL,VBoxPciRawDrv,PUEL Extension Pack - PCI Passthrough Driver) - -- SYSMODS += VBoxPciRawR0 -+ $(if-expr defined(VBOX_WITH_VBOXR0_AS_DLL),DLLS,SYSMODS) += VBoxPciRawR0 - VBoxPciRawR0_TEMPLATE = VBoxR0ExtPackPuel - VBoxPciRawR0_SOURCES = Bus/DevPciRaw.cpp - $(call VBOX_SET_VER_INFO_R0,VBoxPciRawR0,PUEL Extension Pack - PCI Passthrough Driver$(COMMA) ring-0) -@@ -1424,7 +1424,7 @@ if defined(VBOX_WITH_EXTPACK) && defined - Storage/DevNVMe.cpp - $(call VBOX_SET_VER_INFO_DLL,VBoxNvmeR3,PUEL Extension Pack - NVMe Device) - -- SYSMODS += VBoxNvmeR0 -+ $(if-expr defined(VBOX_WITH_VBOXR0_AS_DLL),DLLS,SYSMODS) += VBoxNvmeR0 - VBoxNvmeR0_TEMPLATE = VBoxR0ExtPackPuel - VBoxNvmeR0_SOURCES = \ - Storage/DevNVMe.cpp ---- a/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk -+++ b/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk -@@ -242,7 +242,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) - # The ring-0 part of VBoxDTrace. - # - ifneq ($(KBUILD_TARGET),solaris) # disabled on solaris - neiter needed nor currently able to build it here. -- SYSMODS += VBoxDTraceR0 -+ $(if-expr defined(VBOX_WITH_VBOXR0_AS_DLL),DLLS,SYSMODS) += VBoxDTraceR0 - endif - VBoxDTraceR0_TEMPLATE = VBoxR0ExtPackDTrace - VBoxDTraceR0_DEFS = IN_VBOXDTRACE_R0 IN_RT_R0 ---- a/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk -+++ b/src/VBox/ExtPacks/BusMouseSample/Makefile.kmk -@@ -83,7 +83,7 @@ DLLS += VBoxBusMouseR3 - VBoxBusMouseR3_TEMPLATE = VBoxR3ExtPackBusMouse - VBoxBusMouseR3_SOURCES = DevBusMouse.cpp - --SYSMODS += VBoxBusMouseR0 -+$(if-expr defined(VBOX_WITH_VBOXR0_AS_DLL),DLLS,SYSMODS) += VBoxBusMouseR0 - VBoxBusMouseR0_TEMPLATE = VBoxR0ExtPackBusMouse - VBoxBusMouseR0_SOURCES = DevBusMouse.cpp - ---- a/src/VBox/Runtime/testcase/Makefile.kmk -+++ b/src/VBox/Runtime/testcase/Makefile.kmk -@@ -210,13 +210,13 @@ if1of ($(KBUILD_TARGET_ARCH), amd64 x86) - tstRTR0ThreadDriver - endif - if1of ($(KBUILD_TARGET_ARCH), $(VBOX_SUPPORTED_HOST_ARCHS)) -- SYSMODS += \ -+ $(if-expr defined(VBOX_WITH_VBOXR0_AS_DLL),DLLS,SYSMODS) += \ - tstLdrObjR0 - ifdef VBOX_WITH_RAW_MODE - SYSMODS += tstLdrObj - endif - endif -- SYSMODS += \ -+ $(if-expr defined(VBOX_WITH_VBOXR0_AS_DLL),DLLS,SYSMODS) += \ - tstRTR0MemUserKernel \ - tstRTR0SemMutex \ - tstRTR0Timer \ -@@ -224,7 +224,7 @@ if1of ($(KBUILD_TARGET_ARCH), amd64 x86) - tstRTR0Thread - if1of ($(KBUILD_TARGET), solaris darwin) - PROGRAMS += tstRTR0DbgKrnlInfoDriver -- SYSMODS += tstRTR0DbgKrnlInfo -+ $(if-expr defined(VBOX_WITH_VBOXR0_AS_DLL),DLLS,SYSMODS) += tstRTR0DbgKrnlInfo - endif # VBOX_SUPPORTED_HOST_ARCHS only - - endif ---- a/src/VBox/VMM/Makefile.kmk -+++ b/src/VBox/VMM/Makefile.kmk -@@ -435,7 +435,7 @@ ifndef VBOX_ONLY_EXTPACKS - # - # VMMR0.r0 - # --SYSMODS += VMMR0 -+$(if-expr defined(VBOX_WITH_VBOXR0_AS_DLL),DLLS,SYSMODS) += VMMR0 - VMMR0_TEMPLATE = VBoxR0 - VMMR0_SYSSUFF = .r0 - ---- a/src/VBox/ValidationKit/utils/misc/Makefile.kmk -+++ b/src/VBox/ValidationKit/utils/misc/Makefile.kmk -@@ -31,7 +31,7 @@ PROGRAMS += LoadGenerator - LoadGenerator_TEMPLATE = VBoxValidationKitR3Host - LoadGenerator_SOURCES = loadgenerator.cpp - --SYSMODS += loadgeneratorR0 -+$(if-expr defined(VBOX_WITH_VBOXR0_AS_DLL),DLLS,SYSMODS) += loadgeneratorR0 - loadgeneratorR0_TEMPLATE = VBoxValidationKitR0 - loadgeneratorR0_SOURCES = loadgeneratorR0.cpp - ---- a/src/VBox/HostDrivers/Support/SUPLib.cpp -+++ b/src/VBox/HostDrivers/Support/SUPLib.cpp -@@ -275,9 +275,9 @@ SUPR3DECL(int) SUPR3InitEx(bool fUnrestr - CookieReq.Hdr.rc = VERR_INTERNAL_ERROR; - strcpy(CookieReq.u.In.szMagic, SUPCOOKIE_MAGIC); - CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION; -- const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x002d0000 -+ const uint32_t uMinVersion = /*(SUPDRV_IOC_VERSION & 0xffff0000) == 0x002d0000 - ? 0x002d0001 -- : SUPDRV_IOC_VERSION & 0xffff0000; -+ :*/ SUPDRV_IOC_VERSION & 0xffff0000; - CookieReq.u.In.u32MinVersion = uMinVersion; - rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_COOKIE, &CookieReq, SUP_IOCTL_COOKIE_SIZE); - if ( RT_SUCCESS(rc) ---- a/src/VBox/HostDrivers/Support/SUPDrvIOC.h -+++ b/src/VBox/HostDrivers/Support/SUPDrvIOC.h -@@ -220,9 +220,10 @@ typedef SUPREQHDR *PSUPREQHDR; - * -# When increment the major number, execute all pending work. - * - * @todo Pending work on next major version change: -- * - Move SUP_IOCTL_FAST_DO_NOP and SUP_VMMR0_DO_NEM_RUN after NEM. -+ * - Nothing. -+ * @note 0x002f0000 is used by 6.0. The next version number must be 0x00300000. - */ --#define SUPDRV_IOC_VERSION 0x002d0001 -+#define SUPDRV_IOC_VERSION 0x002e0000 - - /** SUP_IOCTL_COOKIE. */ - typedef struct SUPCOOKIE -@@ -314,8 +315,8 @@ typedef struct SUPLDROPEN - { - struct - { -- /** Size of the image we'll be loading (including tables). */ -- uint32_t cbImageWithTabs; -+ /** Size of the image we'll be loading (including all tables). */ -+ uint32_t cbImageWithEverything; - /** The size of the image bits. (Less or equal to cbImageWithTabs.) */ - uint32_t cbImageBits; - /** Image name. -@@ -390,6 +391,29 @@ typedef SUPLDRSYM *PSUPLDRSYM; - /** Pointer to a const symbol table entry. */ - typedef SUPLDRSYM const *PCSUPLDRSYM; - -+#define SUPLDR_PROT_READ 1 /**< Grant read access (RTMEM_PROT_READ). */ -+#define SUPLDR_PROT_WRITE 2 /**< Grant write access (RTMEM_PROT_WRITE). */ -+#define SUPLDR_PROT_EXEC 4 /**< Grant execute access (RTMEM_PROT_EXEC). */ -+ -+/** -+ * A segment table entry - chiefly for conveying memory protection. -+ */ -+typedef struct SUPLDRSEG -+{ -+ /** The RVA of the segment. */ -+ uint32_t off; -+ /** The size of the segment. */ -+ uint32_t cb : 28; -+ /** The segment protection (SUPLDR_PROT_XXX). */ -+ uint32_t fProt : 3; -+ /** MBZ. */ -+ uint32_t fUnused; -+} SUPLDRSEG; -+/** Pointer to a segment table entry. */ -+typedef SUPLDRSEG *PSUPLDRSEG; -+/** Pointer to a const segment table entry. */ -+typedef SUPLDRSEG const *PCSUPLDRSEG; -+ - /** - * SUPLDRLOAD::u::In::EP type. - */ -@@ -443,7 +467,7 @@ typedef struct SUPLDRLOAD - /** The size of the image bits (starting at offset 0 and - * approaching offSymbols). */ - uint32_t cbImageBits; -- /** The offset of the symbol table. */ -+ /** The offset of the symbol table (SUPLDRSYM array). */ - uint32_t offSymbols; - /** The number of entries in the symbol table. */ - uint32_t cSymbols; -@@ -451,8 +475,12 @@ typedef struct SUPLDRLOAD - uint32_t offStrTab; - /** Size of the string table. */ - uint32_t cbStrTab; -+ /** Offset to the segment table (SUPLDRSEG array). */ -+ uint32_t offSegments; -+ /** Number of segments. */ -+ uint32_t cSegments; - /** Size of image data in achImage. */ -- uint32_t cbImageWithTabs; -+ uint32_t cbImageWithEverything; - /** The image data. */ - uint8_t abImage[1]; - } In; ---- a/src/VBox/HostDrivers/Support/SUPDrvInternal.h -+++ b/src/VBox/HostDrivers/Support/SUPDrvInternal.h -@@ -145,6 +145,12 @@ - # define SUPDRV_USE_MUTEX_FOR_GIP - #endif - -+#if defined(RT_OS_LINUX) /** @todo make everyone do this */ -+/** Use the RTR0MemObj API rather than the RTMemExecAlloc for the images. -+ * This is a good idea in general, but a necessity for @bugref{9801}. */ -+# define SUPDRV_USE_MEMOBJ_FOR_LDR_IMAGE -+#endif -+ - - /** - * OS debug print macro. -@@ -326,15 +332,20 @@ typedef struct SUPDRVLDRIMAGE - struct SUPDRVLDRIMAGE * volatile pNext; - /** Pointer to the image. */ - void *pvImage; -+#ifdef SUPDRV_USE_MEMOBJ_FOR_LDR_IMAGE -+ /** The memory object for the module allocation. */ -+ RTR0MEMOBJ hMemObjImage; -+#else - /** Pointer to the allocated image buffer. - * pvImage is 32-byte aligned or it may governed by the native loader (this - * member is NULL then). */ - void *pvImageAlloc; -+#endif - /** Magic value (SUPDRVLDRIMAGE_MAGIC). */ - uint32_t uMagic; - /** Size of the image including the tables. This is mainly for verification - * of the load request. */ -- uint32_t cbImageWithTabs; -+ uint32_t cbImageWithEverything; - /** Size of the image. */ - uint32_t cbImageBits; - /** The number of entries in the symbol table. */ -@@ -345,6 +356,10 @@ typedef struct SUPDRVLDRIMAGE - char *pachStrTab; - /** Size of the string table. */ - uint32_t cbStrTab; -+ /** Number of segments. */ -+ uint32_t cSegments; -+ /** Segments (for memory protection). */ -+ PSUPLDRSEG paSegments; - /** Pointer to the optional module initialization callback. */ - PFNR0MODULEINIT pfnModuleInit; - /** Pointer to the optional module termination callback. */ ---- a/src/VBox/HostDrivers/Support/SUPDrv.cpp -+++ b/src/VBox/HostDrivers/Support/SUPDrv.cpp -@@ -1734,11 +1734,10 @@ static int supdrvIOCtlInnerUnrestricted( - /* validate */ - PSUPLDROPEN pReq = (PSUPLDROPEN)pReqHdr; - REQ_CHECK_SIZES(SUP_IOCTL_LDR_OPEN); -- REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, pReq->u.In.cbImageWithTabs > 0); -- REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, pReq->u.In.cbImageWithTabs < 16*_1M); -+ REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, pReq->u.In.cbImageWithEverything > 0); -+ REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, pReq->u.In.cbImageWithEverything < 16*_1M); - REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, pReq->u.In.cbImageBits > 0); -- REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, pReq->u.In.cbImageBits > 0); -- REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, pReq->u.In.cbImageBits < pReq->u.In.cbImageWithTabs); -+ REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, pReq->u.In.cbImageBits < pReq->u.In.cbImageWithEverything); - REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, pReq->u.In.szName[0]); - REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, RTStrEnd(pReq->u.In.szName, sizeof(pReq->u.In.szName))); - REQ_CHECK_EXPR(SUP_IOCTL_LDR_OPEN, supdrvIsLdrModuleNameValid(pReq->u.In.szName)); -@@ -1754,19 +1753,29 @@ static int supdrvIOCtlInnerUnrestricted( - /* validate */ - PSUPLDRLOAD pReq = (PSUPLDRLOAD)pReqHdr; - REQ_CHECK_EXPR(Name, pReq->Hdr.cbIn >= SUP_IOCTL_LDR_LOAD_SIZE_IN(32)); -- REQ_CHECK_SIZES_EX(SUP_IOCTL_LDR_LOAD, SUP_IOCTL_LDR_LOAD_SIZE_IN(pReq->u.In.cbImageWithTabs), SUP_IOCTL_LDR_LOAD_SIZE_OUT); -- REQ_CHECK_EXPR(SUP_IOCTL_LDR_LOAD, pReq->u.In.cSymbols <= 16384); -+ REQ_CHECK_SIZES_EX(SUP_IOCTL_LDR_LOAD, SUP_IOCTL_LDR_LOAD_SIZE_IN(pReq->u.In.cbImageWithEverything), SUP_IOCTL_LDR_LOAD_SIZE_OUT); - REQ_CHECK_EXPR_FMT( !pReq->u.In.cSymbols -- || ( pReq->u.In.offSymbols < pReq->u.In.cbImageWithTabs -- && pReq->u.In.offSymbols + pReq->u.In.cSymbols * sizeof(SUPLDRSYM) <= pReq->u.In.cbImageWithTabs), -- ("SUP_IOCTL_LDR_LOAD: offSymbols=%#lx cSymbols=%#lx cbImageWithTabs=%#lx\n", (long)pReq->u.In.offSymbols, -- (long)pReq->u.In.cSymbols, (long)pReq->u.In.cbImageWithTabs)); -+ || ( pReq->u.In.cSymbols <= 16384 -+ && pReq->u.In.offSymbols >= pReq->u.In.cbImageBits -+ && pReq->u.In.offSymbols < pReq->u.In.cbImageWithEverything -+ && pReq->u.In.offSymbols + pReq->u.In.cSymbols * sizeof(SUPLDRSYM) <= pReq->u.In.cbImageWithEverything), -+ ("SUP_IOCTL_LDR_LOAD: offSymbols=%#lx cSymbols=%#lx cbImageWithEverything=%#lx\n", (long)pReq->u.In.offSymbols, -+ (long)pReq->u.In.cSymbols, (long)pReq->u.In.cbImageWithEverything)); - REQ_CHECK_EXPR_FMT( !pReq->u.In.cbStrTab -- || ( pReq->u.In.offStrTab < pReq->u.In.cbImageWithTabs -- && pReq->u.In.offStrTab + pReq->u.In.cbStrTab <= pReq->u.In.cbImageWithTabs -- && pReq->u.In.cbStrTab <= pReq->u.In.cbImageWithTabs), -- ("SUP_IOCTL_LDR_LOAD: offStrTab=%#lx cbStrTab=%#lx cbImageWithTabs=%#lx\n", (long)pReq->u.In.offStrTab, -- (long)pReq->u.In.cbStrTab, (long)pReq->u.In.cbImageWithTabs)); -+ || ( pReq->u.In.offStrTab < pReq->u.In.cbImageWithEverything -+ && pReq->u.In.offStrTab >= pReq->u.In.cbImageBits -+ && pReq->u.In.offStrTab + pReq->u.In.cbStrTab <= pReq->u.In.cbImageWithEverything -+ && pReq->u.In.cbStrTab <= pReq->u.In.cbImageWithEverything), -+ ("SUP_IOCTL_LDR_LOAD: offStrTab=%#lx cbStrTab=%#lx cbImageWithEverything=%#lx\n", (long)pReq->u.In.offStrTab, -+ (long)pReq->u.In.cbStrTab, (long)pReq->u.In.cbImageWithEverything)); -+ REQ_CHECK_EXPR_FMT( pReq->u.In.cSegments >= 1 -+ && pReq->u.In.cSegments <= 128 -+ && pReq->u.In.cSegments <= pReq->u.In.cbImageBits / PAGE_SIZE -+ && pReq->u.In.offSegments >= pReq->u.In.cbImageBits -+ && pReq->u.In.offSegments < pReq->u.In.cbImageWithEverything -+ && pReq->u.In.offSegments + pReq->u.In.cSegments * sizeof(SUPLDRSEG) <= pReq->u.In.cbImageWithEverything, -+ ("SUP_IOCTL_LDR_LOAD: offSegments=%#lx cSegments=%#lx cbImageWithEverything=%#lx\n", (long)pReq->u.In.offSegments, -+ (long)pReq->u.In.cSegments, (long)pReq->u.In.cbImageWithEverything)); - - if (pReq->u.In.cSymbols) - { -@@ -1774,15 +1783,37 @@ static int supdrvIOCtlInnerUnrestricted( - PSUPLDRSYM paSyms = (PSUPLDRSYM)&pReq->u.In.abImage[pReq->u.In.offSymbols]; - for (i = 0; i < pReq->u.In.cSymbols; i++) - { -- REQ_CHECK_EXPR_FMT(paSyms[i].offSymbol < pReq->u.In.cbImageWithTabs, -- ("SUP_IOCTL_LDR_LOAD: sym #%ld: symb off %#lx (max=%#lx)\n", (long)i, (long)paSyms[i].offSymbol, (long)pReq->u.In.cbImageWithTabs)); -+ REQ_CHECK_EXPR_FMT(paSyms[i].offSymbol < pReq->u.In.cbImageWithEverything, -+ ("SUP_IOCTL_LDR_LOAD: sym #%ld: symb off %#lx (max=%#lx)\n", (long)i, (long)paSyms[i].offSymbol, (long)pReq->u.In.cbImageWithEverything)); - REQ_CHECK_EXPR_FMT(paSyms[i].offName < pReq->u.In.cbStrTab, -- ("SUP_IOCTL_LDR_LOAD: sym #%ld: name off %#lx (max=%#lx)\n", (long)i, (long)paSyms[i].offName, (long)pReq->u.In.cbImageWithTabs)); -+ ("SUP_IOCTL_LDR_LOAD: sym #%ld: name off %#lx (max=%#lx)\n", (long)i, (long)paSyms[i].offName, (long)pReq->u.In.cbImageWithEverything)); - REQ_CHECK_EXPR_FMT(RTStrEnd((char const *)&pReq->u.In.abImage[pReq->u.In.offStrTab + paSyms[i].offName], - pReq->u.In.cbStrTab - paSyms[i].offName), -- ("SUP_IOCTL_LDR_LOAD: sym #%ld: unterminated name! (%#lx / %#lx)\n", (long)i, (long)paSyms[i].offName, (long)pReq->u.In.cbImageWithTabs)); -+ ("SUP_IOCTL_LDR_LOAD: sym #%ld: unterminated name! (%#lx / %#lx)\n", (long)i, (long)paSyms[i].offName, (long)pReq->u.In.cbImageWithEverything)); - } - } -+ { -+ uint32_t i; -+ uint32_t offPrevEnd = 0; -+ PSUPLDRSEG paSegs = (PSUPLDRSEG)&pReq->u.In.abImage[pReq->u.In.offSegments]; -+ for (i = 0; i < pReq->u.In.cSegments; i++) -+ { -+ REQ_CHECK_EXPR_FMT(paSegs[i].off < pReq->u.In.cbImageBits && !(paSegs[i].off & PAGE_OFFSET_MASK), -+ ("SUP_IOCTL_LDR_LOAD: seg #%ld: off %#lx (max=%#lx)\n", (long)i, (long)paSegs[i].off, (long)pReq->u.In.cbImageBits)); -+ REQ_CHECK_EXPR_FMT(paSegs[i].cb <= pReq->u.In.cbImageBits, -+ ("SUP_IOCTL_LDR_LOAD: seg #%ld: cb %#lx (max=%#lx)\n", (long)i, (long)paSegs[i].cb, (long)pReq->u.In.cbImageBits)); -+ REQ_CHECK_EXPR_FMT(paSegs[i].off + paSegs[i].cb <= pReq->u.In.cbImageBits, -+ ("SUP_IOCTL_LDR_LOAD: seg #%ld: off %#lx + cb %#lx = %#lx (max=%#lx)\n", (long)i, (long)paSegs[i].off, (long)paSegs[i].cb, (long)(paSegs[i].off + paSegs[i].cb), (long)pReq->u.In.cbImageBits)); -+ REQ_CHECK_EXPR_FMT(paSegs[i].fProt != 0, -+ ("SUP_IOCTL_LDR_LOAD: seg #%ld: off %#lx + cb %#lx\n", (long)i, (long)paSegs[i].off, (long)paSegs[i].cb)); -+ REQ_CHECK_EXPR_FMT(paSegs[i].fUnused == 0, ("SUP_IOCTL_LDR_LOAD: seg #%ld: fUnused=1\n", (long)i)); -+ REQ_CHECK_EXPR_FMT(offPrevEnd == paSegs[i].off, -+ ("SUP_IOCTL_LDR_LOAD: seg #%ld: off %#lx offPrevEnd %#lx\n", (long)i, (long)paSegs[i].off, (long)offPrevEnd)); -+ offPrevEnd = paSegs[i].off + paSegs[i].cb; -+ } -+ REQ_CHECK_EXPR_FMT(offPrevEnd == pReq->u.In.cbImageBits, -+ ("SUP_IOCTL_LDR_LOAD: offPrevEnd %#lx cbImageBits %#lx\n", (long)i, (long)offPrevEnd, (long)pReq->u.In.cbImageBits)); -+ } - - /* execute */ - pReq->Hdr.rc = supdrvIOCtl_LdrLoad(pDevExt, pSession, pReq); -@@ -5021,7 +5052,7 @@ static int supdrvIOCtl_LdrOpen(PSUPDRVDE - size_t cchName = strlen(pReq->u.In.szName); /* (caller checked < 32). */ - SUPDRV_CHECK_SMAP_SETUP(); - SUPDRV_CHECK_SMAP_CHECK(pDevExt, RT_NOTHING); -- LogFlow(("supdrvIOCtl_LdrOpen: szName=%s cbImageWithTabs=%d\n", pReq->u.In.szName, pReq->u.In.cbImageWithTabs)); -+ LogFlow(("supdrvIOCtl_LdrOpen: szName=%s cbImageWithEverything=%d\n", pReq->u.In.szName, pReq->u.In.cbImageWithEverything)); - - /* - * Check if we got an instance of the image already. -@@ -5035,7 +5066,8 @@ static int supdrvIOCtl_LdrOpen(PSUPDRVDE - { - if (RT_LIKELY(pImage->cUsage < UINT32_MAX / 2U)) - { -- /** @todo check cbImageBits and cbImageWithTabs here, if they differs that indicates that the images are different. */ -+ /** @todo check cbImageBits and cbImageWithEverything here, if they differs -+ * that indicates that the images are different. */ - pImage->cUsage++; - pReq->u.Out.pvImageBase = pImage->pvImage; - pReq->u.Out.fNeedsLoading = pImage->uState == SUP_IOCTL_LDR_OPEN; -@@ -5078,13 +5110,19 @@ static int supdrvIOCtl_LdrOpen(PSUPDRVDE - */ - pImage = (PSUPDRVLDRIMAGE)pv; - pImage->pvImage = NULL; -+#ifdef SUPDRV_USE_MEMOBJ_FOR_LDR_IMAGE -+ pImage->hMemObjImage = NIL_RTR0MEMOBJ; -+#else - pImage->pvImageAlloc = NULL; -- pImage->cbImageWithTabs = pReq->u.In.cbImageWithTabs; -+#endif -+ pImage->cbImageWithEverything = pReq->u.In.cbImageWithEverything; - pImage->cbImageBits = pReq->u.In.cbImageBits; - pImage->cSymbols = 0; - pImage->paSymbols = NULL; - pImage->pachStrTab = NULL; - pImage->cbStrTab = 0; -+ pImage->cSegments = 0; -+ pImage->paSegments = NULL; - pImage->pfnModuleInit = NULL; - pImage->pfnModuleTerm = NULL; - pImage->pfnServiceReqHandler = NULL; -@@ -5102,10 +5140,19 @@ static int supdrvIOCtl_LdrOpen(PSUPDRVDE - rc = supdrvOSLdrOpen(pDevExt, pImage, pReq->u.In.szFilename); - if (rc == VERR_NOT_SUPPORTED) - { -+#ifdef SUPDRV_USE_MEMOBJ_FOR_LDR_IMAGE -+ rc = RTR0MemObjAllocPage(&pImage->hMemObjImage, pImage->cbImageBits, true /*fExecutable*/); -+ if (RT_SUCCESS(rc)) -+ { -+ pImage->pvImage = RTR0MemObjAddress(pImage->hMemObjImage); -+ pImage->fNative = false; -+ } -+#else - pImage->pvImageAlloc = RTMemExecAlloc(pImage->cbImageBits + 31); - pImage->pvImage = RT_ALIGN_P(pImage->pvImageAlloc, 32); - pImage->fNative = false; - rc = pImage->pvImageAlloc ? VINF_SUCCESS : VERR_NO_EXEC_MEMORY; -+#endif - SUPDRV_CHECK_SMAP_CHECK(pDevExt, RT_NOTHING); - } - if (RT_FAILURE(rc)) -@@ -5138,41 +5185,90 @@ static int supdrvIOCtl_LdrOpen(PSUPDRVDE - - - /** -+ * Formats a load error message. -+ * -+ * @returns @a rc -+ * @param rc Return code. -+ * @param pReq The request. -+ * @param pszFormat The error message format string. -+ * @param ... Argument to the format string. -+ */ -+int VBOXCALL supdrvLdrLoadError(int rc, PSUPLDRLOAD pReq, const char *pszFormat, ...) -+{ -+ va_list va; -+ va_start(va, pszFormat); -+ pReq->u.Out.uErrorMagic = SUPLDRLOAD_ERROR_MAGIC; -+ RTStrPrintfV(pReq->u.Out.szError, sizeof(pReq->u.Out.szError), pszFormat, va); -+ va_end(va); -+ Log(("SUP_IOCTL_LDR_LOAD: %s [rc=%Rrc]\n", pReq->u.Out.szError, rc)); -+ return rc; -+} -+ -+ -+/** - * Worker that validates a pointer to an image entrypoint. - * -+ * Calls supdrvLdrLoadError on error. -+ * - * @returns IPRT status code. - * @param pDevExt The device globals. - * @param pImage The loader image. - * @param pv The pointer into the image. - * @param fMayBeNull Whether it may be NULL. -- * @param fCheckNative Whether to check with the native loaders. -- * @param pszSymbol The entrypoint name or log name. If the symbol -+ * @param pszSymbol The entrypoint name or log name. If the symbol is - * capitalized it signifies a specific symbol, otherwise it - * for logging. - * @param pbImageBits The image bits prepared by ring-3. -+ * @param pReq The request for passing to supdrvLdrLoadError. - * -- * @remarks Will leave the lock on failure. -+ * @note Will leave the loader lock on failure! - */ - static int supdrvLdrValidatePointer(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage, void *pv, bool fMayBeNull, -- bool fCheckNative, const uint8_t *pbImageBits, const char *pszSymbol) -+ const uint8_t *pbImageBits, const char *pszSymbol, PSUPLDRLOAD pReq) - { - if (!fMayBeNull || pv) - { -- if ((uintptr_t)pv - (uintptr_t)pImage->pvImage >= pImage->cbImageBits) -+ uint32_t iSeg; -+ -+ /* Must be within the image bits: */ -+ uintptr_t const uRva = (uintptr_t)pv - (uintptr_t)pImage->pvImage; -+ if (uRva >= pImage->cbImageBits) - { - supdrvLdrUnlock(pDevExt); -- Log(("Out of range (%p LB %#x): %s=%p\n", pImage->pvImage, pImage->cbImageBits, pszSymbol, pv)); -- return VERR_INVALID_PARAMETER; -+ return supdrvLdrLoadError(VERR_INVALID_PARAMETER, pReq, -+ "Invalid entry point address %p given for %s: RVA %#zx, image size %#zx", -+ pv, pszSymbol, uRva, pImage->cbImageBits); - } - -- if (pImage->fNative && fCheckNative) -+ /* Must be in an executable segment: */ -+ for (iSeg = 0; iSeg < pImage->cSegments; iSeg++) -+ if (uRva - pImage->paSegments[iSeg].off < (uintptr_t)pImage->paSegments[iSeg].cb) -+ { -+ if (pImage->paSegments[iSeg].fProt & SUPLDR_PROT_EXEC) -+ break; -+ supdrvLdrUnlock(pDevExt); -+ return supdrvLdrLoadError(VERR_INVALID_PARAMETER, pReq, -+ "Bad entry point %p given for %s: not executable (seg #%u: %#RX32 LB %#RX32 prot %#x)", -+ pv, pszSymbol, iSeg, pImage->paSegments[iSeg].off, pImage->paSegments[iSeg].cb, -+ pImage->paSegments[iSeg].fProt); -+ } -+ if (iSeg >= pImage->cSegments) - { -+ supdrvLdrUnlock(pDevExt); -+ return supdrvLdrLoadError(VERR_INVALID_PARAMETER, pReq, -+ "Bad entry point %p given for %s: no matching segment found (RVA %#zx)!", -+ pv, pszSymbol, uRva); -+ } -+ -+ if (pImage->fNative) -+ { -+ /** @todo pass pReq along to the native code. */ - int rc = supdrvOSLdrValidatePointer(pDevExt, pImage, pv, pbImageBits, pszSymbol); - if (RT_FAILURE(rc)) - { - supdrvLdrUnlock(pDevExt); -- Log(("Bad entry point address: %s=%p (rc=%Rrc)\n", pszSymbol, pv, rc)); -- return rc; -+ return supdrvLdrLoadError(VERR_INVALID_PARAMETER, pReq, -+ "Bad entry point address %p for %s: rc=%Rrc\n", pv, pszSymbol, rc); - } - } - } -@@ -5223,27 +5319,6 @@ int VBOXCALL supdrvLdrLoadError(int rc, - - - /** -- * Formats a load error message. -- * -- * @returns @a rc -- * @param rc Return code. -- * @param pReq The request. -- * @param pszFormat The error message format string. -- * @param ... Argument to the format string. -- */ --int VBOXCALL supdrvLdrLoadError(int rc, PSUPLDRLOAD pReq, const char *pszFormat, ...) --{ -- va_list va; -- va_start(va, pszFormat); -- pReq->u.Out.uErrorMagic = SUPLDRLOAD_ERROR_MAGIC; -- RTStrPrintfV(pReq->u.Out.szError, sizeof(pReq->u.Out.szError), pszFormat, va); -- va_end(va); -- Log(("SUP_IOCTL_LDR_LOAD: %s [rc=%Rrc]\n", pReq->u.Out.szError, rc)); -- return rc; --} -- -- --/** - * Loads the image bits. - * - * This is the 2nd step of the loading. -@@ -5259,7 +5334,7 @@ static int supdrvIOCtl_LdrLoad(PSUPDRVDE - PSUPDRVLDRIMAGE pImage; - int rc; - SUPDRV_CHECK_SMAP_SETUP(); -- LogFlow(("supdrvIOCtl_LdrLoad: pvImageBase=%p cbImageWithBits=%d\n", pReq->u.In.pvImageBase, pReq->u.In.cbImageWithTabs)); -+ LogFlow(("supdrvIOCtl_LdrLoad: pvImageBase=%p cbImageWithEverything=%d\n", pReq->u.In.pvImageBase, pReq->u.In.cbImageWithEverything)); - SUPDRV_CHECK_SMAP_CHECK(pDevExt, RT_NOTHING); - - /* -@@ -5281,12 +5356,12 @@ static int supdrvIOCtl_LdrLoad(PSUPDRVDE - /* - * Validate input. - */ -- if ( pImage->cbImageWithTabs != pReq->u.In.cbImageWithTabs -- || pImage->cbImageBits != pReq->u.In.cbImageBits) -+ if ( pImage->cbImageWithEverything != pReq->u.In.cbImageWithEverything -+ || pImage->cbImageBits != pReq->u.In.cbImageBits) - { - supdrvLdrUnlock(pDevExt); -- return supdrvLdrLoadError(VERR_INVALID_HANDLE, pReq, "Image size mismatch found: %d(prep) != %d(load) or %d != %d", -- pImage->cbImageWithTabs, pReq->u.In.cbImageWithTabs, pImage->cbImageBits, pReq->u.In.cbImageBits); -+ return supdrvLdrLoadError(VERR_INVALID_HANDLE, pReq, "Image size mismatch found: %u(prep) != %u(load) or %u != %u", -+ pImage->cbImageWithEverything, pReq->u.In.cbImageWithEverything, pImage->cbImageBits, pReq->u.In.cbImageBits); - } - - if (pImage->uState != SUP_IOCTL_LDR_OPEN) -@@ -5306,35 +5381,56 @@ static int supdrvIOCtl_LdrLoad(PSUPDRVDE - return supdrvLdrLoadError(VERR_PERMISSION_DENIED, pReq, "Loader is locked down"); - } - -+ /* -+ * Copy the segments before we start using supdrvLdrValidatePointer for entrypoint validation. -+ */ -+ pImage->cSegments = pReq->u.In.cSegments; -+ { -+ size_t cbSegments = pImage->cSegments * sizeof(SUPLDRSEG); -+ pImage->paSegments = (PSUPLDRSEG)RTMemDup(&pReq->u.In.abImage[pReq->u.In.offSegments], cbSegments); -+ if (pImage->paSegments) /* Align the last segment size to avoid upsetting RTR0MemObjProtect. */ /** @todo relax RTR0MemObjProtect */ -+ pImage->paSegments[pImage->cSegments - 1].cb = RT_ALIGN_32(pImage->paSegments[pImage->cSegments - 1].cb, PAGE_SIZE); -+ else -+ { -+ supdrvLdrUnlock(pDevExt); -+ return supdrvLdrLoadError(VERR_NO_MEMORY, pReq, "Out of memory for segment table: %#x", cbSegments); -+ } -+ SUPDRV_CHECK_SMAP_CHECK(pDevExt, RT_NOTHING); -+ } -+ -+ /* -+ * Validate entrypoints. -+ */ - switch (pReq->u.In.eEPType) - { - case SUPLDRLOADEP_NOTHING: - break; - - case SUPLDRLOADEP_VMMR0: -- rc = supdrvLdrValidatePointer( pDevExt, pImage, pReq->u.In.EP.VMMR0.pvVMMR0, false, false, pReq->u.In.abImage, "pvVMMR0"); -- if (RT_SUCCESS(rc)) -- rc = supdrvLdrValidatePointer(pDevExt, pImage, pReq->u.In.EP.VMMR0.pvVMMR0EntryFast, false, true, pReq->u.In.abImage, "VMMR0EntryFast"); -- if (RT_SUCCESS(rc)) -- rc = supdrvLdrValidatePointer(pDevExt, pImage, pReq->u.In.EP.VMMR0.pvVMMR0EntryEx, false, true, pReq->u.In.abImage, "VMMR0EntryEx"); -+ if (pReq->u.In.EP.VMMR0.pvVMMR0 != pImage->pvImage) -+ { -+ supdrvLdrUnlock(pDevExt); -+ return supdrvLdrLoadError(VERR_INVALID_PARAMETER, pReq, "Invalid pvVMMR0 pointer: %p, expected %p", pReq->u.In.EP.VMMR0.pvVMMR0, pImage->pvImage); -+ } -+ rc = supdrvLdrValidatePointer(pDevExt, pImage, pReq->u.In.EP.VMMR0.pvVMMR0EntryFast, false, pReq->u.In.abImage, "VMMR0EntryFast", pReq); -+ if (RT_FAILURE(rc)) -+ return rc; -+ rc = supdrvLdrValidatePointer(pDevExt, pImage, pReq->u.In.EP.VMMR0.pvVMMR0EntryEx, false, pReq->u.In.abImage, "VMMR0EntryEx", pReq); - if (RT_FAILURE(rc)) -- return supdrvLdrLoadError(rc, pReq, "Invalid VMMR0 pointer"); -+ return rc; - break; - - case SUPLDRLOADEP_SERVICE: -- rc = supdrvLdrValidatePointer(pDevExt, pImage, pReq->u.In.EP.Service.pfnServiceReq, false, true, pReq->u.In.abImage, "pfnServiceReq"); -+ rc = supdrvLdrValidatePointer(pDevExt, pImage, pReq->u.In.EP.Service.pfnServiceReq, false, pReq->u.In.abImage, "pfnServiceReq", pReq); - if (RT_FAILURE(rc)) -- return supdrvLdrLoadError(rc, pReq, "Invalid pfnServiceReq pointer: %p", pReq->u.In.EP.Service.pfnServiceReq); -+ return rc; - if ( pReq->u.In.EP.Service.apvReserved[0] != NIL_RTR0PTR - || pReq->u.In.EP.Service.apvReserved[1] != NIL_RTR0PTR - || pReq->u.In.EP.Service.apvReserved[2] != NIL_RTR0PTR) - { - supdrvLdrUnlock(pDevExt); -- return supdrvLdrLoadError(VERR_INVALID_PARAMETER, pReq, -- "Out of range (%p LB %#x): apvReserved={%p,%p,%p} MBZ!", -- pImage->pvImage, pReq->u.In.cbImageWithTabs, -- pReq->u.In.EP.Service.apvReserved[0], -- pReq->u.In.EP.Service.apvReserved[1], -+ return supdrvLdrLoadError(VERR_INVALID_PARAMETER, pReq, "apvReserved={%p,%p,%p} MBZ!", -+ pReq->u.In.EP.Service.apvReserved[0], pReq->u.In.EP.Service.apvReserved[1], - pReq->u.In.EP.Service.apvReserved[2]); - } - break; -@@ -5344,12 +5440,12 @@ static int supdrvIOCtl_LdrLoad(PSUPDRVDE - return supdrvLdrLoadError(VERR_INVALID_PARAMETER, pReq, "Invalid eEPType=%d", pReq->u.In.eEPType); - } - -- rc = supdrvLdrValidatePointer(pDevExt, pImage, pReq->u.In.pfnModuleInit, true, true, pReq->u.In.abImage, "ModuleInit"); -+ rc = supdrvLdrValidatePointer(pDevExt, pImage, pReq->u.In.pfnModuleInit, true, pReq->u.In.abImage, "ModuleInit", pReq); - if (RT_FAILURE(rc)) -- return supdrvLdrLoadError(rc, pReq, "Invalid pfnModuleInit pointer: %p", pReq->u.In.pfnModuleInit); -- rc = supdrvLdrValidatePointer(pDevExt, pImage, pReq->u.In.pfnModuleTerm, true, true, pReq->u.In.abImage, "ModuleTerm"); -+ return rc; -+ rc = supdrvLdrValidatePointer(pDevExt, pImage, pReq->u.In.pfnModuleTerm, true, pReq->u.In.abImage, "ModuleTerm", pReq); - if (RT_FAILURE(rc)) -- return supdrvLdrLoadError(rc, pReq, "Invalid pfnModuleTerm pointer: %p", pReq->u.In.pfnModuleTerm); -+ return rc; - SUPDRV_CHECK_SMAP_CHECK(pDevExt, RT_NOTHING); - - /* -@@ -5361,10 +5457,8 @@ static int supdrvIOCtl_LdrLoad(PSUPDRVDE - pImage->cbStrTab = pReq->u.In.cbStrTab; - if (pImage->cbStrTab) - { -- pImage->pachStrTab = (char *)RTMemAlloc(pImage->cbStrTab); -- if (pImage->pachStrTab) -- memcpy(pImage->pachStrTab, &pReq->u.In.abImage[pReq->u.In.offStrTab], pImage->cbStrTab); -- else -+ pImage->pachStrTab = (char *)RTMemDup(&pReq->u.In.abImage[pReq->u.In.offStrTab], pImage->cbStrTab); -+ if (!pImage->pachStrTab) - rc = supdrvLdrLoadError(VERR_NO_MEMORY, pReq, "Out of memory for string table: %#x", pImage->cbStrTab); - SUPDRV_CHECK_SMAP_CHECK(pDevExt, RT_NOTHING); - } -@@ -5373,17 +5467,15 @@ static int supdrvIOCtl_LdrLoad(PSUPDRVDE - if (RT_SUCCESS(rc) && pImage->cSymbols) - { - size_t cbSymbols = pImage->cSymbols * sizeof(SUPLDRSYM); -- pImage->paSymbols = (PSUPLDRSYM)RTMemAlloc(cbSymbols); -- if (pImage->paSymbols) -- memcpy(pImage->paSymbols, &pReq->u.In.abImage[pReq->u.In.offSymbols], cbSymbols); -- else -+ pImage->paSymbols = (PSUPLDRSYM)RTMemDup(&pReq->u.In.abImage[pReq->u.In.offSymbols], cbSymbols); -+ if (!pImage->paSymbols) - rc = supdrvLdrLoadError(VERR_NO_MEMORY, pReq, "Out of memory for symbol table: %#x", cbSymbols); - SUPDRV_CHECK_SMAP_CHECK(pDevExt, RT_NOTHING); - } - } - - /* -- * Copy the bits / complete native loading. -+ * Copy the bits and apply permissions / complete native loading. - */ - if (RT_SUCCESS(rc)) - { -@@ -5395,7 +5487,26 @@ static int supdrvIOCtl_LdrLoad(PSUPDRVDE - rc = supdrvOSLdrLoad(pDevExt, pImage, pReq->u.In.abImage, pReq); - else - { -+#ifdef SUPDRV_USE_MEMOBJ_FOR_LDR_IMAGE -+ uint32_t i; - memcpy(pImage->pvImage, &pReq->u.In.abImage[0], pImage->cbImageBits); -+ -+ for (i = 0; i < pImage->cSegments; i++) -+ { -+ rc = RTR0MemObjProtect(pImage->hMemObjImage, pImage->paSegments[i].off, pImage->paSegments[i].cb, -+ pImage->paSegments[i].fProt); -+ if (RT_SUCCESS(rc)) -+ continue; -+ if (rc == VERR_NOT_SUPPORTED) -+ rc = VINF_SUCCESS; -+ else -+ rc = supdrvLdrLoadError(rc, pReq, "RTR0MemObjProtect failed on seg#%u %#RX32 LB %#RX32 fProt=%#x", -+ i, pImage->paSegments[i].off, pImage->paSegments[i].cb, pImage->paSegments[i].fProt); -+ break; -+ } -+#else -+ memcpy(pImage->pvImage, &pReq->u.In.abImage[0], pImage->cbImageBits); -+#endif - Log(("vboxdrv: Loaded '%s' at %p\n", pImage->szName, pImage->pvImage)); - } - SUPDRV_CHECK_SMAP_CHECK(pDevExt, RT_NOTHING); -@@ -5990,12 +6101,20 @@ static void supdrvLdrFree(PSUPDRVDEVEXT - pImage->pDevExt = NULL; - pImage->pNext = NULL; - pImage->uState = SUP_IOCTL_LDR_FREE; -+#ifdef SUPDRV_USE_MEMOBJ_FOR_LDR_IMAGE -+ RTR0MemObjFree(pImage->hMemObjImage, true /*fMappings*/); -+ pImage->hMemObjImage = NIL_RTR0MEMOBJ; -+#else - RTMemExecFree(pImage->pvImageAlloc, pImage->cbImageBits + 31); - pImage->pvImageAlloc = NULL; -+#endif -+ pImage->pvImage = NULL; - RTMemFree(pImage->pachStrTab); - pImage->pachStrTab = NULL; - RTMemFree(pImage->paSymbols); - pImage->paSymbols = NULL; -+ RTMemFree(pImage->paSegments); -+ pImage->paSegments = NULL; - RTMemFree(pImage); - } - ---- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -@@ -176,6 +176,11 @@ - # include - #endif - -+/* for __flush_tlb_all() */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) && (defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)) -+# include -+#endif -+ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) - # include - #else diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb deleted file mode 100644 index 6c036d403..000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.12.bb +++ /dev/null @@ -1,83 +0,0 @@ -SUMMARY = "VirtualBox Linux Guest Drivers" -SECTION = "core" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" - -DEPENDS = "virtual/kernel" - -inherit module kernel-module-split - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" - -VBOX_NAME = "VirtualBox-${PV}" - -SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ - file://021-linux-5-8.patch \ - file://Makefile.utils \ -" -SRC_URI[md5sum] = "3c351f7fd6376e0bb3c8489505a9450c" -SRC_URI[sha256sum] = "05eff0321daa72f6d00fb121a6b4211f39964778823806fa0b7b751667dec362" - -S ?= "${WORKDIR}/vbox_module" -S_task-patch = "${WORKDIR}/${VBOX_NAME}" - -export BUILD_TARGET_ARCH="${ARCH}" -export BUILD_TARGET_ARCH_x86-64="amd64" - -EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1" - -# otherwise 5.2.22 builds just vboxguest -MAKE_TARGETS = "all" - -addtask export_sources after do_patch before do_configure - -do_export_sources() { - mkdir -p "${S}" - ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz - tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz - - # add a mount utility to use shared folder from VBox Addition Source Code - mkdir -p "${S}/utils" - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils - install ${S}/../Makefile.utils ${S}/utils/Makefile - -} - -do_configure_prepend() { - # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. - # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in /build, or the variable KERN_VER must be set. Stop. - mkdir -p ${WORKDIR}/${KERNEL_VERSION} - ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build -} - -# compile and install mount utility -do_compile() { - oe_runmake all - oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils - if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then - echo "ERROR: One of vbox*.ko modules wasn't built" - exit 1 - fi -} - -module_do_install() { - MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc - install -d $MODULE_DIR - install -m 644 vboxguest.ko $MODULE_DIR - install -m 644 vboxsf.ko $MODULE_DIR - install -m 644 vboxvideo.ko $MODULE_DIR -} - -do_install_append() { - install -d ${D}${base_sbindir} - install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} -} - -PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" -RRECOMMENDS_${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" - -FILES_${PN} = "${base_sbindir}" - -# autoload if installed -KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb new file mode 100644 index 000000000..35dc4953b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb @@ -0,0 +1,82 @@ +SUMMARY = "VirtualBox Linux Guest Drivers" +SECTION = "core" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" + +DEPENDS = "virtual/kernel" + +inherit module kernel-module-split + +COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" + +VBOX_NAME = "VirtualBox-${PV}" + +SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ + file://Makefile.utils \ +" +SRC_URI[md5sum] = "6e4313df24fd00b0dc0437c3746b940d" +SRC_URI[sha256sum] = "91fa05bcfce36316ca93e3927c9550ea66286fff4c5bec900b753fca278ce1a0" + +S ?= "${WORKDIR}/vbox_module" +S_task-patch = "${WORKDIR}/${VBOX_NAME}" + +export BUILD_TARGET_ARCH="${ARCH}" +export BUILD_TARGET_ARCH_x86-64="amd64" + +EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1" + +# otherwise 5.2.22 builds just vboxguest +MAKE_TARGETS = "all" + +addtask export_sources after do_patch before do_configure + +do_export_sources() { + mkdir -p "${S}" + ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz + tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz + + # add a mount utility to use shared folder from VBox Addition Source Code + mkdir -p "${S}/utils" + install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils + install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils + install ${S}/../Makefile.utils ${S}/utils/Makefile + +} + +do_configure_prepend() { + # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. + # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in /build, or the variable KERN_VER must be set. Stop. + mkdir -p ${WORKDIR}/${KERNEL_VERSION} + ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build +} + +# compile and install mount utility +do_compile() { + oe_runmake all + oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils + if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then + echo "ERROR: One of vbox*.ko modules wasn't built" + exit 1 + fi +} + +module_do_install() { + MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc + install -d $MODULE_DIR + install -m 644 vboxguest.ko $MODULE_DIR + install -m 644 vboxsf.ko $MODULE_DIR + install -m 644 vboxvideo.ko $MODULE_DIR +} + +do_install_append() { + install -d ${D}${base_sbindir} + install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} +} + +PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" +RRECOMMENDS_${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" + +FILES_${PN} = "${base_sbindir}" + +# autoload if installed +KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" diff --git a/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb b/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb new file mode 100644 index 000000000..5aee5ef93 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "cmocka is an elegant unit testing framework for C with support for mock \ +objects. It only requires the standard C library, works on a range of computing \ +platforms (including embedded) and with different compilers." +HOMEPAGE = "https://cmocka.org/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRCREV = "56eb3a183fc222120f86d0c54fd033992c30135e" +SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git \ + file://run-ptest \ + file://cmocka-uintptr_t.patch \ + " + +S = "${WORKDIR}/git" + +inherit cmake ptest + +EXTRA_OECMAKE = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}" + +do_install_append () { + install -d ${D}${datadir}/${BPN}/example + install -d ${D}${datadir}/${BPN}/example/mock/chef_wrap + install -d ${D}${datadir}/${BPN}/example/mock/uptime + + install -m 0755 ${B}/example/*_test ${D}/${datadir}/${BPN}/example + install -m 0755 ${B}/example/mock/chef_wrap/waiter_test_wrap ${D}/${datadir}/${BPN}/example/mock/chef_wrap + install -m 0755 ${B}/example/mock/uptime/uptime ${D}/${datadir}/${BPN}/example/mock/uptime + install -m 0755 ${B}/example/mock/uptime/test_uptime ${D}/${datadir}/${BPN}/example/mock/uptime +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/tests/test_* ${D}${PTEST_PATH}/tests +} + +PACKAGE_BEFORE_PN += "${PN}-examples" + +FILES_${PN}-examples = "${datadir}/${BPN}/example" diff --git a/meta-openembedded/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch b/meta-openembedded/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch new file mode 100644 index 000000000..8d3b73b63 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch @@ -0,0 +1,53 @@ +From 5bd7b5d04435bd593349825973ce32290f5f604d Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Wed, 25 Jul 2018 09:55:25 +0800 +Subject: [PATCH] samba: cmocka.h: fix musl libc conflicting types error + +Fix build on qemumips64(el) + +taken from: +[PATCH] libldb: fix musl libc conflicting types error + +/third_party/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t' + typedef unsigned int uintptr_t; + ^~~~~~~~~ +use __DEFINED_uintptr_t in alltypes.h to check if uintptr already defined + +Upstream-Status: Pending + +Signed-off-by: Changqing Li +Signed-off-by: Andrea Adami + +Taken from [PATCH] samba: cmocka.h: fix musl libc conflicting types error +https://git.openembedded.org/meta-openembedded/commit/meta-networking/recipes-connectivity/samba?id=b758150d30a5fbdc47c465d0e9dca3a7e6d71f3c + +Signed-off-by: Armin Kuster + +This fix is not in cmocka, so pending pending?? + + +Index: git/include/cmocka.h +=================================================================== +--- git.orig/include/cmocka.h ++++ git/include/cmocka.h +@@ -116,7 +116,7 @@ typedef uintmax_t LargestIntegralType; + ((LargestIntegralType)(value)) + + /* Smallest integral type capable of holding a pointer. */ +-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) ++#if !defined(__DEFINED_uintptr_t) + # if defined(_WIN32) + /* WIN32 is an ILP32 platform */ + typedef unsigned int uintptr_t; +@@ -140,9 +140,8 @@ typedef uintmax_t LargestIntegralType; + # endif /* __WORDSIZE */ + # endif /* _WIN32 */ + +-# define _UINTPTR_T +-# define _UINTPTR_T_DEFINED +-#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ ++# define __DEFINED_uintptr_t ++#endif /* !defined(__DEFINED_uintptr_t) */ + + /* Perform an unsigned cast to uintptr_t. */ + #define cast_to_pointer_integral_type(value) \ diff --git a/meta-openembedded/meta-oe/recipes-test/cmocka/files/run-ptest b/meta-openembedded/meta-oe/recipes-test/cmocka/files/run-ptest new file mode 100644 index 000000000..48b9cd9fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/cmocka/files/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh + +cd tests +for i in `ls *`; do + if [ ./$i ] ; then + echo "PASS: $i" + else + echo "FAIL: $i" + fi +done diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_3.2.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_3.2.0.bb deleted file mode 100644 index bdc110fb6..000000000 --- a/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_3.2.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "HTTP/2 State-Machine based protocol implementation" -HOMEPAGE = "https://github.com/python-hyper/hyper-h2" -LICENSE = "MIT" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=b6b2f6bbe76528af543242d606c14851" - -SRC_URI[md5sum] = "197a99c09f344a0dd987fab9801dc8d0" -SRC_URI[sha256sum] = "875f41ebd6f2c44781259005b157faed1a5031df3ae5aa7bcb4628a6c0782f14" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "${PYTHON_PN}-hpack ${PYTHON_PN}-hyperframe" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_4.0.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_4.0.0.bb new file mode 100644 index 000000000..ff1d20a89 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_4.0.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "HTTP/2 State-Machine based protocol implementation" +HOMEPAGE = "https://github.com/python-hyper/hyper-h2" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=aa3b9b4395563dd427be5f022ec321c1" + +SRC_URI[md5sum] = "d086f6a9746a5f4eeb63bb3d0a482e1f" +SRC_URI[sha256sum] = "bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "${PYTHON_PN}-hpack ${PYTHON_PN}-hyperframe" diff --git a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 61623ac98..0f032e65e 100644 --- a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -42,6 +42,7 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-alembic \ python3-ansi2html \ python3-ansicolors \ + python3-argcomplete \ python3-argexec \ python3-appdirs \ python3-apply-defaults \ @@ -227,7 +228,6 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-mccabe \ python3-kconfiglib \ python3-grpcio-tools \ - python3-jinja2 \ python3-jsmin \ python3-greenlet \ python3-idna \ @@ -261,6 +261,7 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-pyiface \ python3-pyjwt \ python3-pykwalify \ + python3-docopt \ python3-pylint \ python3-pynetlinux \ python3-pickleshare \ @@ -301,6 +302,7 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-sdnotify \ python3-pycodestyle \ python3-pytest \ + python3-iniconfig \ python3-speaklater \ python3-wtforms \ python3-speedtest-cli \ @@ -454,6 +456,8 @@ RDEPENDS_packagegroup-meta-python3-connectivity = "\ RDEPENDS_packagegroup-meta-python3-ptest = "\ python3-cryptography-ptest \ - " + python3-jinja2-ptest \ + python3-markupsafe-ptest \ +" EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-uploads.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-uploads.inc deleted file mode 100644 index cd7ac1aeb..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-uploads.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Flexible and efficient upload handling for Flask" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=b712ac634b39469660c9bdfb8d03421c" - -SRC_URI[md5sum] = "e5eee34aa92b64a4d22847672b3858a1" -SRC_URI[sha256sum] = "53ecbd6033667d50ae02b63adebbaa33c7fc56c09e5293025810cf9d841ecb02" - -PYPI_PACKAGE = "Flask-Uploads" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-flask \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto.inc deleted file mode 100644 index 232cdb711..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto.inc +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Cryptographic modules for Python." -HOMEPAGE = "http://www.pycrypto.org/" -LICENSE = "PSFv2" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=35f354d199e8cb7667b059a23578e63d" - -FILESEXTRAPATHS_prepend := "${THISDIR}/python-pycrypto:" - -DEPENDS += " gmp" - -inherit pypi autotools-brokensep - -SRC_URI += "file://cross-compiling.patch \ - file://CVE-2013-7459.patch \ - " - -SRC_URI[md5sum] = "55a61a054aa66812daf5161a0d5d7eda" -SRC_URI[sha256sum] = "f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c" - -do_compile[noexec] = "1" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/CVE-2013-7459.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/CVE-2013-7459.patch deleted file mode 100644 index 9006c5c35..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/CVE-2013-7459.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4 Mon Sep 17 00:00:00 2001 -From: Legrandin -Date: Sun, 22 Dec 2013 22:24:46 +0100 -Subject: [PATCH] Throw exception when IV is used with ECB or CTR - -The IV parameter is currently ignored when initializing -a cipher in ECB or CTR mode. - -For CTR mode, it is confusing: it takes some time to see -that a different parameter is needed (the counter). - -For ECB mode, it is outright dangerous. - -This patch forces an exception to be raised. - -Upstream-Status: Backport -[https://github.com/dlitz/pycrypto/commit/8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4] - -CVE: CVE-2013-7459 - -Signed-off-by: Yi Zhao ---- - lib/Crypto/SelfTest/Cipher/common.py | 31 +++++++++++++++++++++++-------- - src/block_template.c | 11 +++++++++++ - 2 files changed, 34 insertions(+), 8 deletions(-) - -diff --git a/lib/Crypto/SelfTest/Cipher/common.py b/lib/Crypto/SelfTest/Cipher/common.py -index 8bebed9..91ec743 100644 ---- a/lib/Crypto/SelfTest/Cipher/common.py -+++ b/lib/Crypto/SelfTest/Cipher/common.py -@@ -239,19 +239,34 @@ class RoundtripTest(unittest.TestCase): - return """%s .decrypt() output of .encrypt() should not be garbled""" % (self.module_name,) - - def runTest(self): -- for mode in (self.module.MODE_ECB, self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB, self.module.MODE_OPENPGP): -+ -+ ## ECB mode -+ mode = self.module.MODE_ECB -+ encryption_cipher = self.module.new(a2b_hex(self.key), mode) -+ ciphertext = encryption_cipher.encrypt(self.plaintext) -+ decryption_cipher = self.module.new(a2b_hex(self.key), mode) -+ decrypted_plaintext = decryption_cipher.decrypt(ciphertext) -+ self.assertEqual(self.plaintext, decrypted_plaintext) -+ -+ ## OPENPGP mode -+ mode = self.module.MODE_OPENPGP -+ encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) -+ eiv_ciphertext = encryption_cipher.encrypt(self.plaintext) -+ eiv = eiv_ciphertext[:self.module.block_size+2] -+ ciphertext = eiv_ciphertext[self.module.block_size+2:] -+ decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv) -+ decrypted_plaintext = decryption_cipher.decrypt(ciphertext) -+ self.assertEqual(self.plaintext, decrypted_plaintext) -+ -+ ## All other non-AEAD modes (but CTR) -+ for mode in (self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB): - encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) - ciphertext = encryption_cipher.encrypt(self.plaintext) -- -- if mode != self.module.MODE_OPENPGP: -- decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) -- else: -- eiv = ciphertext[:self.module.block_size+2] -- ciphertext = ciphertext[self.module.block_size+2:] -- decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv) -+ decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) - decrypted_plaintext = decryption_cipher.decrypt(ciphertext) - self.assertEqual(self.plaintext, decrypted_plaintext) - -+ - class PGPTest(unittest.TestCase): - def __init__(self, module, params): - unittest.TestCase.__init__(self) -diff --git a/src/block_template.c b/src/block_template.c -index c36b316..8746948 100644 ---- a/src/block_template.c -+++ b/src/block_template.c -@@ -170,6 +170,17 @@ ALGnew(PyObject *self, PyObject *args, PyObject *kwdict) - "Key cannot be the null string"); - return NULL; - } -+ if (IVlen != 0 && mode == MODE_ECB) -+ { -+ PyErr_Format(PyExc_ValueError, "ECB mode does not use IV"); -+ return NULL; -+ } -+ if (IVlen != 0 && mode == MODE_CTR) -+ { -+ PyErr_Format(PyExc_ValueError, -+ "CTR mode needs counter parameter, not IV"); -+ return NULL; -+ } - if (IVlen != BLOCK_SIZE && mode != MODE_ECB && mode != MODE_CTR) - { - PyErr_Format(PyExc_ValueError, --- -2.7.4 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/cross-compiling.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/cross-compiling.patch deleted file mode 100644 index 712f3e8dd..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/cross-compiling.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: pycrypto-2.6/setup.py -=================================================================== ---- pycrypto-2.6.orig/setup.py -+++ pycrypto-2.6/setup.py -@@ -271,7 +271,8 @@ class PCTBuildConfigure(Command): - if not os.path.exists("config.status"): - if os.system("chmod 0755 configure") != 0: - raise RuntimeError("chmod error") -- cmd = "sh configure" # we use "sh" here so that it'll work on mingw32 with standard python.org binaries -+ host = os.environ.get("HOST_SYS") -+ cmd = "ac_cv_func_malloc_0_nonnull=yes sh configure --host " + host # we use "sh" here so that it'll work on mingw32 with standard python.org binaries - if self.verbose < 1: - cmd += " -q" - if os.system(cmd) != 0: -@@ -370,7 +371,7 @@ kw = {'name':"pycrypto", - 'ext_modules': plat_ext + [ - # _fastmath (uses GNU mp library) - Extension("Crypto.PublicKey._fastmath", -- include_dirs=['src/','/usr/include/'], -+ include_dirs=['src/'], - libraries=['gmp'], - sources=["src/_fastmath.c"]), - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3339-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3339-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch deleted file mode 100644 index ce8ca0bc8..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3339-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2de281fdca88f223ace1eb6428a77b9903c69264 Mon Sep 17 00:00:00 2001 -From: Nicola Lunghi -Date: Thu, 14 Nov 2019 11:58:28 +0000 -Subject: [PATCH] setup.py: move pytest-runner to test_requirements - -This fixes an issue with yocto build. -pytest-runner is only needed when running tests. - -Upstream-Status: Pending ---- - setup.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 9a50767..e3b1c6e 100644 ---- a/setup.py -+++ b/setup.py -@@ -12,9 +12,9 @@ requirements = [ - 'six', - ] - --setup_requirements = ['pytest-runner', ] -+setup_requirements = [] - --test_requirements = ['pytest>=3', ] -+test_requirements = ['pytest>=3', 'pytest-runner'] - - setup( - author="Nicolas Aimetti", --- -2.20.1 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.1.bb new file mode 100644 index 000000000..c14a7eba1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_1.12.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "Argcomplete provides easy, extensible command line tab completion of arguments for your Python script." +HOMEPAGE = "https://github.com/kislyuk/argcomplete" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2ee41112a44fe7014dce33e26468ba93" + +SRC_URI[md5sum] = "2262d0466a40d42267b424bba5010a0b" +SRC_URI[sha256sum] = "849c2444c35bb2175aea74100ca5f644c29bf716429399c0f2203bb5d9a8e4e6" + +PYPI_PACKAGE = "argcomplete" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-core \ +" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.9.1.bb deleted file mode 100644 index 910de12f8..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.9.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Screen-scraping library" -HOMEPAGE = " https://www.crummy.com/software/BeautifulSoup/bs4" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=f2d38d8a40bf73fd4b3d16ca2e5882d1" - -SRC_URI[md5sum] = "57502b5b34ccfd97b180260071f5799a" -SRC_URI[sha256sum] = "73cc4d115b96f79c7d77c1c7f7a0a8d4c57860d1041df407dd1aae7f07a77fd7" - -inherit pypi setuptools3 - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-html5lib \ - ${PYTHON_PN}-lxml \ - ${PYTHON_PN}-soupsieve \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.9.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.9.3.bb new file mode 100644 index 000000000..5e03ad5e9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.9.3.bb @@ -0,0 +1,17 @@ +SUMMARY = "Screen-scraping library" +HOMEPAGE = " https://www.crummy.com/software/BeautifulSoup/bs4" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=f2d38d8a40bf73fd4b3d16ca2e5882d1" + +SRC_URI[md5sum] = "57fd468ae3eb055f6871106e8f7813e2" +SRC_URI[sha256sum] = "84729e322ad1d5b4d25f805bfa05b902dd96450f43842c4e99067d5e1369eb25" + +inherit pypi setuptools3 + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-html5lib \ + ${PYTHON_PN}-lxml \ + ${PYTHON_PN}-soupsieve \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.2.bb deleted file mode 100644 index c65be7226..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.1.2.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "An implementation of RFC 7049 - Concise Binary Object Representation (CBOR)." -DEPENDS +="${PYTHON_PN}-setuptools-scm-native" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -SRC_URI[sha256sum] = "91759bd0ee5ef0d4fa24144dfa551670730baeca8cf2fff1cc59f734ecd21de6" -SRC_URI[md5sum] = "693c1bd6635bee8a591a70ea924ad676" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-unixadmin \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-datetime \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.2.0.bb new file mode 100644 index 000000000..cc067c41a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.2.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "An implementation of RFC 7049 - Concise Binary Object Representation (CBOR)." +DEPENDS +="${PYTHON_PN}-setuptools-scm-native" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +SRC_URI[sha256sum] = "a33aa2e5534fd74401ac95686886e655e3b2ce6383b3f958199b6e70a87c94bf" +SRC_URI[md5sum] = "0940aa8bfd1a07f06a983bb6dc78f1ca" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unixadmin \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-datetime \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.11.bb new file mode 100644 index 000000000..3b2aa5b74 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.11.bb @@ -0,0 +1,20 @@ +SUMMARY = "Extra features for standard library's cmd module" +HOMEPAGE = "https://github.com/python-cmd2/cmd2" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9791cd24ca7d1807388ccd55cd066def" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +SRC_URI[md5sum] = "7e3dbe0aefa331e80f515d3c41cc3b8c" +SRC_URI[sha256sum] = "826a288ee6d9c4ec1184e64e9566c09d3b73be8f4283c1898fa4332f1daf8dbf" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-colorama \ + ${PYTHON_PN}-pyperclip \ + ${PYTHON_PN}-wcwidth \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.9.bb deleted file mode 100644 index e677a6962..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.3.9.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Extra features for standard library's cmd module" -HOMEPAGE = "https://github.com/python-cmd2/cmd2" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9791cd24ca7d1807388ccd55cd066def" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -SRC_URI[md5sum] = "f5fbd528e7b5977ad71466947af61f99" -SRC_URI[sha256sum] = "7f8035faafda15d26098bf2ffe16aaba1c78511ce13e0815d2efe58ba392b501" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-attrs \ - ${PYTHON_PN}-colorama \ - ${PYTHON_PN}-pyperclip \ - ${PYTHON_PN}-wcwidth \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.2.1.bb deleted file mode 100644 index a4aaa3cb6..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.2.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "A colored formatter for the python logging module" -HOMEPAGE = "https://github.com/borntyping/python-colorlog" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.md;md5=05592f7a5b83bfc756f62dbd70a9b9b5" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "colorlog" - -SRC_URI[md5sum] = "a01336efc6f54e58e3ed4f331d76c2f0" -SRC_URI[sha256sum] = "75e55822c3a3387d721579241e776de2cf089c9ef9528b1f09e8b04d403ad118" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.4.0.bb new file mode 100644 index 000000000..4a40ef38c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_4.4.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "A colored formatter for the python logging module" +HOMEPAGE = "https://github.com/borntyping/python-colorlog" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=85a1d478cd35d62763a1419e948bdde4" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "colorlog" + +SRC_URI[md5sum] = "0997566a87c6fdec0baa88055adc06c3" +SRC_URI[sha256sum] = "0272c537469ab1e63b9915535874d15b671963c9325db0c4891a2aeff97ce3d1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_5.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_5.0.0.bb deleted file mode 100644 index 6b2af125f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_5.0.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "This module provides the ConfigParser class which implements a basic configuration language which provides a structure similar to what's found in Microsoft Windows INI files." -SECTION = "devel/python" -HOMEPAGE = "https://docs.python.org/3/library/configparser.html" -LICENSE = "MIT" - -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=10;endline=10;md5=23f9ad5cad3d8cc0336e2a5d8a87e1fa" - -SRC_URI[md5sum] = "558114054aa5610365df1b34d3fea349" -SRC_URI[sha256sum] = "2ca44140ee259b5e3d8aaf47c79c36a7ab0d5e94d70bd4105c03ede7a20ea5a1" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native ${PYTHON_PN}-toml-native" -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_5.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_5.0.1.bb new file mode 100644 index 000000000..b78de5844 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_5.0.1.bb @@ -0,0 +1,14 @@ +SUMMARY = "This module provides the ConfigParser class which implements a basic configuration language which provides a structure similar to what's found in Microsoft Windows INI files." +SECTION = "devel/python" +HOMEPAGE = "https://docs.python.org/3/library/configparser.html" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=10;endline=10;md5=23f9ad5cad3d8cc0336e2a5d8a87e1fa" + +SRC_URI[md5sum] = "5faf185693cd21d83f6a3bc01b5733fa" +SRC_URI[sha256sum] = "005c3b102c96f4be9b8f40dafbd4997db003d07d1caa19f37808be8031475f2a" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native ${PYTHON_PN}-toml-native" +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.1.1.bb new file mode 100644 index 000000000..9486fe235 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.1.1.bb @@ -0,0 +1,20 @@ +SUMMARY = "Test vectors for the cryptography package." +HOMEPAGE = "https://cryptography.io/" +SECTION = "devel/python" +LICENSE = "Apache-2.0 | BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4" + +SRC_URI[md5sum] = "fbc43f8b155b52f9ed163d3555ea5e83" +SRC_URI[sha256sum] = "5529c516194122fec7db1682812e2314ddff4221fdf993169118f9c0d291e2f6" + +PYPI_PACKAGE = "cryptography_vectors" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-cryptography \ +" + +BBCLASSEXTEND = "native nativesdk" + +UPSTREAM_CHECK_REGEX = "" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.1.bb deleted file mode 100644 index 59347c94e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Test vectors for the cryptography package." -HOMEPAGE = "https://cryptography.io/" -SECTION = "devel/python" -LICENSE = "Apache-2.0 | BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4" - -SRC_URI[md5sum] = "1ba5b0743e2876e909f7cfc28b744f27" -SRC_URI[sha256sum] = "2660bc3a720d3955341803195ae5352a236c5f26e01a178c44fc5ee1f0ef1182" - -PYPI_PACKAGE = "cryptography_vectors" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-cryptography \ -" - -BBCLASSEXTEND = "native nativesdk" - -UPSTREAM_CHECK_REGEX = "" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.1.1.bb new file mode 100644 index 000000000..1d6a9b32e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.1.1.bb @@ -0,0 +1,66 @@ +SUMMARY = "Provides cryptographic recipes and primitives to python developers" +HOMEPAGE = "https://cryptography.io/" +SECTION = "devel/python" +LICENSE = "Apache-2.0 | BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=097f805837700cfac572ac274cd38124" + +LDSHARED += "-pthread" + +SRC_URI[md5sum] = "c3807891d36aa9de8187e9db8b2bb457" +SRC_URI[sha256sum] = "9d9fc6a16357965d282dd4ab6531013935425d0dc4950df2e0cf2a1b1ac1017d" + +SRC_URI += " \ + file://run-ptest \ + file://h-test.patch \ +" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-cffi \ + ${PYTHON_PN}-cffi-native \ + ${PYTHON_PN}-asn1crypto \ + ${PYTHON_PN}-six \ +" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-cffi \ + ${PYTHON_PN}-idna \ + ${PYTHON_PN}-asn1crypto \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-six \ +" + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-cffi \ + ${PYTHON_PN}-idna \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-asn1crypto \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-threading \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PN} \ + ${PYTHON_PN}-cryptography-vectors \ + ${PYTHON_PN}-iso8601 \ + ${PYTHON_PN}-pretend \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-pytz \ +" + +inherit ptest + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/hazmat + cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/ +} + +FILES_${PN}-dbg += " \ + ${libdir}/${PYTHON_PN}2.7/site-packages/${SRCNAME}/hazmat/bindings/.debug \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.1.bb deleted file mode 100644 index 9ac23cda4..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_3.1.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "Provides cryptographic recipes and primitives to python developers" -HOMEPAGE = "https://cryptography.io/" -SECTION = "devel/python" -LICENSE = "Apache-2.0 | BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=097f805837700cfac572ac274cd38124" - -LDSHARED += "-pthread" - -SRC_URI[md5sum] = "aa91e4974981b29e99b863c54034c361" -SRC_URI[sha256sum] = "26409a473cc6278e4c90f782cd5968ebad04d3911ed1c402fc86908c17633e08" - -SRC_URI += " \ - file://run-ptest \ - file://h-test.patch \ -" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-cffi-native \ - ${PYTHON_PN}-asn1crypto \ - ${PYTHON_PN}-six \ -" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-idna \ - ${PYTHON_PN}-asn1crypto \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ -" - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-idna \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-asn1crypto \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-threading \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PN} \ - ${PYTHON_PN}-cryptography-vectors \ - ${PYTHON_PN}-iso8601 \ - ${PYTHON_PN}-pretend \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytz \ -" - -inherit ptest - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - install -d ${D}${PTEST_PATH}/tests/hazmat - cp -rf ${S}/tests/hazmat/* ${D}${PTEST_PATH}/tests/hazmat/ -} - -FILES_${PN}-dbg += " \ - ${libdir}/${PYTHON_PN}2.7/site-packages/${SRCNAME}/hazmat/bindings/.debug \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.1.bb index fb7db162c..5326924e6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.1.bb @@ -22,4 +22,4 @@ RDEPENDS_${PN} = "\ ${PYTHON_PN}-stringold \ " -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.11.1.bb deleted file mode 100644 index 81f55ff9e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.11.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "djangorestframework" -DESCRIPTION = "pip3 install djangorestframework" -HOMEPAGE = "https://pypi.python.org/pypi/djangorestframework" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7879a5a716147a784f7e524c9cf103c1" - -SRC_URI[md5sum] = "c8ea3e4c3c0d705acf70184faeb2b696" -SRC_URI[sha256sum] = "6dd02d5a4bd2516fb93f80360673bf540c3b6641fec8766b1da2870a5aa00b32" -PYPI_PACKAGE = "djangorestframework" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-django \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.1.bb new file mode 100644 index 000000000..60bdbaa9e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.12.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "djangorestframework" +DESCRIPTION = "pip3 install djangorestframework" +HOMEPAGE = "https://pypi.python.org/pypi/djangorestframework" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7879a5a716147a784f7e524c9cf103c1" + +SRC_URI[md5sum] = "47d5ea46923a131c5fbefeb610c6ce2c" +SRC_URI[sha256sum] = "d54452aedebb4b650254ca092f9f4f5df947cb1de6ab245d817b08b4f4156249" +PYPI_PACKAGE = "djangorestframework" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-django \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-docopt_0.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-docopt_0.6.2.bb new file mode 100644 index 000000000..a2432068c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-docopt_0.6.2.bb @@ -0,0 +1,11 @@ +SUMMARY = "Pythonic argument parser, that will make you smile" +HOMEPAGE = "http://docopt.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=09b77fb74986791a3d4a0e746a37d88f" + +inherit setuptools3 pypi + +SRC_URI[md5sum] = "4bc74561b37fad5d3e7d037f82a4c3b1" +SRC_URI[sha256sum] = "49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb index 758c2acf7..e8d5b5f2f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb @@ -1,2 +1,14 @@ +DESCRIPTION = "Flexible and efficient upload handling for Flask" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=b712ac634b39469660c9bdfb8d03421c" + +SRC_URI[md5sum] = "e5eee34aa92b64a4d22847672b3858a1" +SRC_URI[sha256sum] = "53ecbd6033667d50ae02b63adebbaa33c7fc56c09e5293025810cf9d841ecb02" + +PYPI_PACKAGE = "Flask-Uploads" + inherit pypi setuptools3 -require python-flask-uploads.inc + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-flask \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_20.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_20.6.2.bb deleted file mode 100644 index dbeb3a60c..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_20.6.2.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "A coroutine-based Python networking library" -DESCRIPTION = "gevent is a coroutine-based Python networking library that uses greenlet to provide \ -a high-level synchronous API on top of the libevent event loop." -HOMEPAGE = "http://www.gevent.org" -LICENSE = "MIT & Python-2.0 & BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4de99aac27b470c29c6c309e0c279b65 \ - file://NOTICE;md5=18108df3583462cafd457f024b9b09b5 \ - file://deps/libev/LICENSE;md5=d6ad416afd040c90698edcdf1cbee347 \ - " -DEPENDS += "libevent" -DEPENDS += "${PYTHON_PN}-greenlet" -RDEPENDS_${PN} = "${PYTHON_PN}-greenlet \ - ${PYTHON_PN}-mime \ - ${PYTHON_PN}-pprint \ - " - -FILESEXTRAPATHS_prepend := "${THISDIR}/python-gevent:" - -SRC_URI_append = " \ - file://libev-conf.patch;patch=1;pnum=1 \ -" - -SRC_URI[md5sum] = "27b07fe9fdfff2d75e3d140e890489b1" -SRC_URI[sha256sum] = "a23c2abf08e851c988723f6a2996d495f513a2c0dc70f9956af03af8debdb5d1" - -# The python-gevent has no autoreconf ability -# and the logic for detecting a cross compile is flawed -# so always force a cross compile -do_configure_append() { - sed -i -e 's/^cross_compiling=no/cross_compiling=yes/' ${S}/deps/libev/configure - sed -i -e 's/^cross_compiling=no/cross_compiling=yes/' ${S}/deps/c-ares/configure -} - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_20.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_20.9.0.bb new file mode 100644 index 000000000..06c45f2ed --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_20.9.0.bb @@ -0,0 +1,34 @@ +SUMMARY = "A coroutine-based Python networking library" +DESCRIPTION = "gevent is a coroutine-based Python networking library that uses greenlet to provide \ +a high-level synchronous API on top of the libevent event loop." +HOMEPAGE = "http://www.gevent.org" +LICENSE = "MIT & Python-2.0 & BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4de99aac27b470c29c6c309e0c279b65 \ + file://NOTICE;md5=18108df3583462cafd457f024b9b09b5 \ + file://deps/libev/LICENSE;md5=d6ad416afd040c90698edcdf1cbee347 \ + " +DEPENDS += "libevent" +DEPENDS += "${PYTHON_PN}-greenlet" +RDEPENDS_${PN} = "${PYTHON_PN}-greenlet \ + ${PYTHON_PN}-mime \ + ${PYTHON_PN}-pprint \ + " + +FILESEXTRAPATHS_prepend := "${THISDIR}/python-gevent:" + +SRC_URI_append = " \ + file://libev-conf.patch;patch=1;pnum=1 \ +" + +SRC_URI[md5sum] = "9366ee7eebed48003f8a748568ef1f70" +SRC_URI[sha256sum] = "5f6d48051d336561ec08995431ee4d265ac723a64bba99cc58c3eb1a4d4f5c8d" + +# The python-gevent has no autoreconf ability +# and the logic for detecting a cross compile is flawed +# so always force a cross compile +do_configure_append() { + sed -i -e 's/^cross_compiling=no/cross_compiling=yes/' ${S}/deps/libev/configure + sed -i -e 's/^cross_compiling=no/cross_compiling=yes/' ${S}/deps/c-ares/configure +} + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.1.bb deleted file mode 100644 index d79ac3c39..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "The Google API Client for Python is a client library for accessing the Plus, Moderator, and many other Google APIs." -HOMEPAGE = "https://github.com/googleapis/google-api-python-client" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3" - -SRC_URI[md5sum] = "92106822131f76ca77b77009674e78e4" -SRC_URI[sha256sum] = "ddadc243ce627512c2a27e11d369f5ddf658ef80dbffb247787499486ef1ea98" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.3.bb new file mode 100644 index 000000000..cf6504462 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_1.12.3.bb @@ -0,0 +1,9 @@ +SUMMARY = "The Google API Client for Python is a client library for accessing the Plus, Moderator, and many other Google APIs." +HOMEPAGE = "https://github.com/googleapis/google-api-python-client" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3" + +SRC_URI[md5sum] = "24e87dbe11fbbe3d97f23c230f518531" +SRC_URI[sha256sum] = "844ef76bda585ea0ea2d5e7f8f9a0eb10d6e2eba66c4fea0210ec7843941cb1a" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.16.bb deleted file mode 100644 index 4556d499f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.16.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Python lightweight in-process concurrent programming" -LICENSE = "MIT & PSF" -LIC_FILES_CHKSUM = "file://LICENSE;md5=03143d7a1a9f5d8a0fee825f24ca9c36 \ - file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" - -SRC_URI[md5sum] = "9aebea08f7beb6b87143d0588578c984" -SRC_URI[sha256sum] = "6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c" - -inherit pypi distutils3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.17.bb new file mode 100644 index 000000000..744265e1f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.17.bb @@ -0,0 +1,9 @@ +SUMMARY = "Python lightweight in-process concurrent programming" +LICENSE = "MIT & PSF" +LIC_FILES_CHKSUM = "file://LICENSE;md5=03143d7a1a9f5d8a0fee825f24ca9c36 \ + file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" + +SRC_URI[md5sum] = "d964c95c2d2f0f02f36c75e158d8e3dc" +SRC_URI[sha256sum] = "41d8835c69a78de718e466dd0e6bfd4b46125f21a67c3ff6d76d8d8059868d6b" + +inherit pypi distutils3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_2.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_2.6.0.bb deleted file mode 100644 index de1e98574..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_2.6.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Python humanize utilities" -HOMEPAGE = "http://github.com/jmoiron/humanize" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" - -SRC_URI[md5sum] = "de3a507d9274912a3a177849a9349edb" -SRC_URI[sha256sum] = "8ee358ea6c23de896b9d1925ebe6a8504bb2ba7e98d5ccf4d07ab7f3b28f3819" - -inherit pypi setuptools3 - -DEPENDS += "\ - ${PYTHON_PN}-setuptools-scm-native \ -" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.0.1.bb new file mode 100644 index 000000000..92831bf13 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.0.1.bb @@ -0,0 +1,20 @@ +SUMMARY = "Python humanize utilities" +HOMEPAGE = "http://github.com/jmoiron/humanize" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" + +SRC_URI[md5sum] = "53faa88dedddba1227f9c41d65440c54" +SRC_URI[sha256sum] = "8ff8f292c9bf52bbefdc620410e7defd1c95e7eeb1a5cfc2859aaea4b1877ff5" + +inherit pypi setuptools3 + +DEPENDS += "\ + ${PYTHON_PN}-setuptools-scm-native \ +" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_1.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_1.7.0.bb deleted file mode 100644 index de0fc7836..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_1.7.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Read metadata from Python packages" -HOMEPAGE = "https://pypi.org/project/importlib-metadata/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e88ae122f3925d8bde8319060f2ddb8e" - -inherit pypi setuptools3 - -SRC_URI = "https://files.pythonhosted.org/packages/e2/ae/0b037584024c1557e537d25482c306cf6327b5a09b6c4b893579292c1c38/importlib_metadata-1.7.0.tar.gz" -S = "${WORKDIR}/importlib_metadata-${PV}" -SRC_URI[md5sum] = "4505ea85600cca1e693a4f8f5dd27ba8" -SRC_URI[sha256sum] = "90bb658cdbbf6d1735b6341ce708fc7024a3e14e99ffdc5783edea9f9b077f83" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -RDEPENDS_${PN} += "${PYTHON_PN}-zipp ${PYTHON_PN}-pathlib2" -RDEPENDS_${PN}_append_class-target = " python3-misc" -RDEPENDS_${PN}_append_class-nativesdk = " python3-misc" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_2.0.0.bb new file mode 100644 index 000000000..325a41c22 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_2.0.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Read metadata from Python packages" +HOMEPAGE = "https://pypi.org/project/importlib-metadata/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e88ae122f3925d8bde8319060f2ddb8e" + +inherit pypi setuptools3 + +SRC_URI = "https://files.pythonhosted.org/packages/56/1f/74c3e29389d34feea2d62ba3de1169efea2566eb22e9546d379756860525/importlib_metadata-2.0.0.tar.gz" +S = "${WORKDIR}/importlib_metadata-${PV}" +SRC_URI[md5sum] = "3dd91821c930a3c3633e99a7025aa9c2" +SRC_URI[sha256sum] = "77a540690e24b0305878c37ffd421785a6f7e53c8b5720d211b211de8d0e95da" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +RDEPENDS_${PN} += "${PYTHON_PN}-zipp ${PYTHON_PN}-pathlib2" +RDEPENDS_${PN}_append_class-target = " python3-misc" +RDEPENDS_${PN}_append_class-nativesdk = " python3-misc" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-iniconfig_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-iniconfig_1.0.1.bb new file mode 100644 index 000000000..9ed0e033b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-iniconfig_1.0.1.bb @@ -0,0 +1,8 @@ +SUMMARY = "A small and simple INI-file parser module" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9" + +SRC_URI[sha256sum] = "e5f92f89355a67de0595932a6c6c02ab4afddc6fcdc0bfc5becd0d60884d3f69" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.5.2.bb deleted file mode 100644 index 0d0415786..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.5.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "A Python utility / library to sort Python imports." -HOMEPAGE = "https://pypi.python.org/pypi/isort" -LICENSE = "MIT" -SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=8227180126797a0148f94f483f3e1489" - -SRC_URI[md5sum] = "844c49ad1bf16a957b490c27b3b9844f" -SRC_URI[sha256sum] = "171c5f365791073426b5ed3a156c2081a47f88c329161fd28228ff2da4c97ddb" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-shell \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.5.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.5.4.bb new file mode 100644 index 000000000..0c5842790 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.5.4.bb @@ -0,0 +1,17 @@ +SUMMARY = "A Python utility / library to sort Python imports." +HOMEPAGE = "https://pypi.python.org/pypi/isort" +LICENSE = "MIT" +SECTION = "devel/python" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=8227180126797a0148f94f483f3e1489" + +SRC_URI[md5sum] = "6b90dd55851a8ccb3a19fe2cb82cb82f" +SRC_URI[sha256sum] = "ba040c24d20aa302f78f4747df549573ae1eaf8e1084269199154da9c483f07f" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-shell \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2/run-ptest deleted file mode 100644 index 5cec71169..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -pytest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend b/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend new file mode 100644 index 000000000..91814e6cd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend @@ -0,0 +1,2 @@ +# Main recipe was moved to oe-core, but with ptest disabled +inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.11.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.11.2.bb deleted file mode 100644 index 681acf8f1..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.11.2.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "Python Jinja2: A small but fast and easy to use stand-alone template engine written in pure python." - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" - -SRC_URI[sha256sum] = "89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0" - -PYPI_PACKAGE = "Jinja2" - -CLEANBROKEN = "1" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-unixadmin \ -" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-asyncio \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-markupsafe \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers\ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-threading \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.52.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.52.bb deleted file mode 100644 index e6ccd7b54..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.52.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "langtable is used to guess reasonable defaults for locale,\ -keyboard, territory" -HOMEPAGE = "https://github.com/mike-fabian/langtable/" -LICENSE = "GPLv3+" -SECTION = "devel/python" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI[md5sum] = "240a62b84ed29f6530ceae60609f7eff" -SRC_URI[sha256sum] = "a2c499704c91c0a23e5db92e80ad1d45e51466b82ffaee478e5bb781460b3db5" - -inherit pypi setuptools3 python3native - -DISTUTILS_INSTALL_ARGS += " \ - --install-data=${datadir}/langtable" - -FILES_${PN} += "${datadir}/*" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-xml \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.53.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.53.bb new file mode 100644 index 000000000..27b690f1a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.53.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "langtable is used to guess reasonable defaults for locale,\ +keyboard, territory" +HOMEPAGE = "https://github.com/mike-fabian/langtable/" +LICENSE = "GPLv3+" +SECTION = "devel/python" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI[md5sum] = "d8f99adfb184f9def22539310f97ce80" +SRC_URI[sha256sum] = "fb17fd4d8e491c79159f81aa06ebacb18673fce59dac96f4e9d2d2db27a2e374" + +inherit pypi setuptools3 python3native + +DISTUTILS_INSTALL_ARGS += " \ + --install-data=${datadir}/langtable" + +FILES_${PN} += "${datadir}/*" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-doctest \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-xml \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.16.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.16.1.bb deleted file mode 100644 index 3428dbe9f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.16.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A component library to support SBC display drivers" -DESCRIPTION = "A component library to support SBC display drivers" -HOMEPAGE = "https://github.com/rm-hull/luma.core" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=eda804060ba2312e41fe96b6fa334fd7" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "de7bda49c4146ba242923a88c587cd7a" -SRC_URI[sha256sum] = "2181a60906fea3104dcfa3923f9654928502cd7541ff9b4d76c6ae29c6a9d9fc" - -CLEANBROKEN = "1" - -PYPI_PACKAGE = "luma.core" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-pillow \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-smbus2 \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.17.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.17.1.bb new file mode 100644 index 000000000..9246d1b3a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_1.17.1.bb @@ -0,0 +1,20 @@ +SUMMARY = "A component library to support SBC display drivers" +DESCRIPTION = "A component library to support SBC display drivers" +HOMEPAGE = "https://github.com/rm-hull/luma.core" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=eda804060ba2312e41fe96b6fa334fd7" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "dea76a83c7130f59b7e807c3b2f1b3b5" +SRC_URI[sha256sum] = "b4a9f934f4dbf9b1d5c74259f871b4187aaa754b139964153f7702badaaccffd" + +CLEANBROKEN = "1" + +PYPI_PACKAGE = "luma.core" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-pillow \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-smbus2 \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.5.0.bb deleted file mode 100644 index 39bc37fda..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.5.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A small library to drive an OLED device" -DESCRIPTION = "\ -A small library to drive an OLED device with either SSD1306 , SSD1309, SSD1322, \ -SSD1325, SSD1327, SSD1331, SSD1351 or SH1106 chipset" -HOMEPAGE = "https://github.com/rm-hull/luma.oled" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=c328c862c3335ad464e1c9a3ba574249" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "64436aaa7a05a205430b38d2f9a9bec7" -SRC_URI[sha256sum] = "ca62fd7337ee9780b32a8cdc10bcd69879f2cfd97720ab2e17e254a160f6c24f" - -CLEANBROKEN = "1" - -PYPI_PACKAGE = "luma.oled" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-luma-core \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.6.0.bb new file mode 100644 index 000000000..ae14aff36 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.6.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "A small library to drive an OLED device" +DESCRIPTION = "\ +A small library to drive an OLED device with either SSD1306 , SSD1309, SSD1322, \ +SSD1325, SSD1327, SSD1331, SSD1351 or SH1106 chipset" +HOMEPAGE = "https://github.com/rm-hull/luma.oled" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=c328c862c3335ad464e1c9a3ba574249" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "ff45a3067658434339da2586a97e526b" +SRC_URI[sha256sum] = "dbd8ebce1c0b10feabb725b321d4a7f9f7353fe16878c8145ca332a173c193c9" + +CLEANBROKEN = "1" + +PYPI_PACKAGE = "luma.oled" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-luma-core \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.2.2.bb deleted file mode 100644 index ce5dde63e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.2.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "A Python implementation of John Gruber's Markdown." -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=745aaad0c69c60039e638bff9ffc59ed" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "Markdown" -PYPI_SRC_URI = "https://files.pythonhosted.org/packages/44/30/cb4555416609a8f75525e34cbacfc721aa5b0044809968b2cf553fd879c7/Markdown-${PV}.tar.gz" -SRC_URI[md5sum] = "6e8daf1e566bf3572c137ada399fe40b" -SRC_URI[sha256sum] = "1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17" - -BBCLASSEXTEND = "native" - -RDEPENDS_${PN} += "${PYTHON_PN}-logging ${PYTHON_PN}-setuptools" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.bb new file mode 100644 index 000000000..db8311be5 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-markdown_3.3.bb @@ -0,0 +1,13 @@ +SUMMARY = "A Python implementation of John Gruber's Markdown." +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=745aaad0c69c60039e638bff9ffc59ed" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "Markdown" +SRC_URI[md5sum] = "76eb34a058bb8b637ccadc4ce384bae4" +SRC_URI[sha256sum] = "4f4172a4e989b97f96860fa434b89895069c576e2b537c4b4eed265266a7affc" + +BBCLASSEXTEND = "native" + +RDEPENDS_${PN} += "${PYTHON_PN}-logging ${PYTHON_PN}-setuptools" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe/run-ptest deleted file mode 100644 index 5cec71169..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -pytest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend b/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend new file mode 100644 index 000000000..91814e6cd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.%.bbappend @@ -0,0 +1,2 @@ +# Main recipe was moved to oe-core, but with ptest disabled +inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.1.1.bb deleted file mode 100644 index 7de57cbd6..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.1.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Implements a XML/HTML/XHTML Markup safe string for Python" -HOMEPAGE = "http://github.com/mitsuhiko/markupsafe" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" - -SRC_URI[md5sum] = "43fd756864fe42063068e092e220c57b" -SRC_URI[sha256sum] = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b" - -PYPI_PACKAGE = "MarkupSafe" -inherit pypi ptest setuptools3 - -RDEPENDS_${PN} += "${PYTHON_PN}-stringold" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -f ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_4.7.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_4.7.6.bb deleted file mode 100644 index 02c541b4c..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_4.7.6.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Multidicts are useful for working with HTTP headers, URL query args etc." -HOMEPAGE = "https://github.com/aio-libs/multidict/" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e74c98abe0de8f798ca609137f9cef4a" - -SRC_URI[md5sum] = "40b6ca77171ac8af55f7aa60049f3cdf" -SRC_URI[sha256sum] = "fbb77a75e529021e7c4a8d4e823d88ef4d23674a202be4f5addffc72cbb91430" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_5.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_5.0.0.bb new file mode 100644 index 000000000..676fbae7e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_5.0.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Multidicts are useful for working with HTTP headers, URL query args etc." +HOMEPAGE = "https://github.com/aio-libs/multidict/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e74c98abe0de8f798ca609137f9cef4a" + +SRC_URI[md5sum] = "c2c3311e25636a6f213e998cd1e80d72" +SRC_URI[sha256sum] = "1b324444299c3a49b601b1bf621fc21704e29066f6ac2b7d7e4034a4a18662a1" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.0.bb deleted file mode 100644 index dae1ebf30..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "A case-insensitive ordered dictionary for Python" -HOMEPAGE = "https://github.com/pywbem/nocasedict" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" - -SRC_URI[md5sum] = "14b405bf7ffe9d0f784aa9c3c39e277b" -SRC_URI[sha256sum] = "22840b434e40f20da6d2ccf0821baba54589e2476499b65420b6e4c2e669aa04" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.1.bb new file mode 100644 index 000000000..af5da52f6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_1.0.1.bb @@ -0,0 +1,9 @@ +SUMMARY = "A case-insensitive ordered dictionary for Python" +HOMEPAGE = "https://github.com/pywbem/nocasedict" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" + +SRC_URI[md5sum] = "93e7f19f73c7cd56c36cd7535b6b9ab1" +SRC_URI[sha256sum] = "6e5d5bd11de33f93d22545d9ed23a0b98f840f2cdac0d749d2faa4617adc7772" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.2.bb deleted file mode 100644 index 8509cd0c9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "A case-insensitive list for Python" -HOMEPAGE = "https://nocaselist.readthedocs.io/en/latest/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI[md5sum] = "10e58542c1225aff3f057e89e9ae4394" -SRC_URI[sha256sum] = "3cfe964c436991cd6bd9f2cf23375c484ec7cf0c7488471381eff13a4fdac902" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.3.bb new file mode 100644 index 000000000..1119c7f38 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_1.0.3.bb @@ -0,0 +1,9 @@ +SUMMARY = "A case-insensitive list for Python" +HOMEPAGE = "https://nocaselist.readthedocs.io/en/latest/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRC_URI[md5sum] = "42ba878fd70611cf345c61edd83f5fb0" +SRC_URI[sha256sum] = "7e6decb7d85563b9044913c9087ef4b691bc3da4d7ad1d88968cdea409553326" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.0.bb deleted file mode 100644 index 8bf80e601..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "MQTT version 3.1/3.1.1 client library" -LICENSE = "EPL-1.0 | EDL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eb48c6ee2cb9f5b8b9fe75e6f817bdfc \ - file://epl-v10;md5=8d383c379e91d20ba18a52c3e7d3a979 \ - file://edl-v10;md5=c09f121939f063aeb5235972be8c722c \ -" -SRCNAME = "paho-mqtt" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "45e80d9b8066a8d0ba1ecfffe271bd3d" -SRC_URI[sha256sum] = "e3d286198baaea195c8b3bc221941d25a3ab0e1507fc1779bdb7473806394be4" - -DEPENDS += "${PYTHON_PN}-pytest-runner-native" - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-threading \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.1.bb new file mode 100644 index 000000000..d93bc884e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.5.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "MQTT version 3.1/3.1.1 client library" +LICENSE = "EPL-1.0 | EDL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eb48c6ee2cb9f5b8b9fe75e6f817bdfc \ + file://epl-v10;md5=8d383c379e91d20ba18a52c3e7d3a979 \ + file://edl-v10;md5=c09f121939f063aeb5235972be8c722c \ +" +SRCNAME = "paho-mqtt" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "32f93c0ed92c7439f7a715ed258fd35d" +SRC_URI[sha256sum] = "9feb068e822be7b3a116324e01fb6028eb1d66412bf98595ae72698965cb1cae" + +DEPENDS += "${PYTHON_PN}-pytest-runner-native" + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-threading \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.2.bb deleted file mode 100644 index 1eade9884..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "pandas library for high-performance data analysis tools" -DESCRIPTION = "pandas is an open source, BSD-licensed library providing \ -high-performance, easy-to-use data structures and data analysis tools for \ -the Python programming language." -HOMEPAGE = "http://pandas.pydata.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c2a8f987b2ce77c368c6b3e1b5b10774" - -SRC_URI[md5sum] = "b4ce7c64f549ed48b47877fc64281031" -SRC_URI[sha256sum] = "b64ffd87a2cfd31b40acd4b92cb72ea9a52a48165aec4c140e78fd69c45d1444" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-numpy-native ${PYTHON_PN}-cython-native \ -" - -CFLAGS_append_toolchain-clang = " -Wno-error=deprecated-declarations" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-numpy \ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-pytz \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.3.bb new file mode 100644 index 000000000..da1ffd0b6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.1.3.bb @@ -0,0 +1,25 @@ +SUMMARY = "pandas library for high-performance data analysis tools" +DESCRIPTION = "pandas is an open source, BSD-licensed library providing \ +high-performance, easy-to-use data structures and data analysis tools for \ +the Python programming language." +HOMEPAGE = "http://pandas.pydata.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c2a8f987b2ce77c368c6b3e1b5b10774" + +SRC_URI[md5sum] = "f10372d83a1c55cae217e8c05bf9bc5d" +SRC_URI[sha256sum] = "babbeda2f83b0686c9ad38d93b10516e68cdcd5771007eb80a763e98aaf44613" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-numpy-native ${PYTHON_PN}-cython-native \ +" + +CFLAGS_append_toolchain-clang = " -Wno-error=deprecated-declarations" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-numpy \ + ${PYTHON_PN}-dateutil \ + ${PYTHON_PN}-pytz \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.16.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.16.1.bb new file mode 100644 index 000000000..d96659592 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.16.1.bb @@ -0,0 +1,36 @@ +SUMMARY = "Physical quantities module" +DESCRIPTION = "Physical quantities Python module" +HOMEPAGE = "https://github.com/hgrecco/pint" +SECTION = "devel/python" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bccf824202692270a1e0829a62e3f47b" + +PYPI_PACKAGE := "Pint" + +inherit pypi ptest setuptools3 + +SRC_URI[md5sum] = "d4a7bbdf505dee964eb1e5e6e7f80c34" +SRC_URI[sha256sum] = "d43a2e9ae003164978b60fdf8cd920d8581e1a5991df8dded29b00f4850ec83a" + +DEPENDS += "python3-setuptools-scm-native" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-packaging \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/testsuite + cp -rf ${S}/pint/testsuite/* ${D}${PTEST_PATH}/testsuite/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.16.bb deleted file mode 100644 index 7775d733a..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.16.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Physical quantities module" -DESCRIPTION = "Physical quantities Python module" -HOMEPAGE = "https://github.com/hgrecco/pint" -SECTION = "devel/python" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bccf824202692270a1e0829a62e3f47b" - -PYPI_PACKAGE := "Pint" - -inherit pypi ptest setuptools3 - -SRC_URI[md5sum] = "ec78e4e42512b93f80b9093416ad7417" -SRC_URI[sha256sum] = "e437420e65fa72a2805f4036f986669c48d54944eeb0e47c8ba16f98cbdcd599" - -DEPENDS += "python3-setuptools-scm-native" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-packaging \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/testsuite - cp -rf ${S}/pint/testsuite/* ${D}${PTEST_PATH}/testsuite/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_0.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_0.7.2.bb deleted file mode 100644 index 18f339061..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_0.7.2.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Python library for displaying tabular data in a ASCII table format" -HOMEPAGE = "http://code.google.com/p/prettytable" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=3e73500ffa52de5071cff65990055282" - -SRC_URI[md5sum] = "a6b80afeef286ce66733d54a0296b13b" -SRC_URI[sha256sum] = "2d5460dc9db74a32bcc8f9f67de68b2c4f4d2f01fa3bd518764c69156d9cacd9" - -do_install_append() { - perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "*.txt" -o -name "PKG-INFO"` - for f in $perm_files; do - chmod 644 "${f}" - done -} - -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/PrettyTable/" -UPSTREAM_CHECK_REGEX = "/PrettyTable/(?P(\d+[\.\-_]*)+)" - -BBCLASSEXTEND = "native nativesdk" -inherit pypi ptest setuptools3 - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-html \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - cp -f ${S}/prettytable_test.py ${D}${PTEST_PATH}/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_1.0.1.bb new file mode 100644 index 000000000..a065b6c47 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_1.0.1.bb @@ -0,0 +1,39 @@ +SUMMARY = "Python library for displaying tabular data in a ASCII table format" +HOMEPAGE = "http://code.google.com/p/prettytable" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=c9a6829fcd174d9535b46211917c7671" + +SRC_URI[md5sum] = "b5bd0acec56ae7ccf5ac22d3f671c3a7" +SRC_URI[sha256sum] = "6bb7f539903cb031fecb855b615cbcac8cd245ebc6fa51c6e23ab3386db89771" + +do_install_append() { + perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "*.txt" -o -name "PKG-INFO"` + for f in $perm_files; do + chmod 644 "${f}" + done +} + +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/PrettyTable/" +UPSTREAM_CHECK_REGEX = "/PrettyTable/(?P(\d+[\.\-_]*)+)" + +BBCLASSEXTEND = "native nativesdk" +inherit pypi ptest setuptools3 + +SRC_URI += " \ + file://run-ptest \ +" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-html \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + cp -f ${S}/prettytable_test.py ${D}${PTEST_PATH}/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb index 9674ec093..5d57590a1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.5.0.bb @@ -32,3 +32,5 @@ do_install() { distutils3_do_install cmake_do_install } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.3.0.bb deleted file mode 100644 index b444df05d..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.3.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." -HOMEPAGE = "https://github.com/balloob/pychromecast" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" - -SRC_URI[md5sum] = "7ab862743ff33dafc93206c1435abc5e" -SRC_URI[sha256sum] = "f594231efb34b86eeb463611662bca21a6962793885d3ad68195286940f7473d" - -PYPI_PACKAGE = "PyChromecast" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.5.0.bb new file mode 100644 index 000000000..adfdbb17b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_7.5.0.bb @@ -0,0 +1,11 @@ +SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." +HOMEPAGE = "https://github.com/balloob/pychromecast" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" + +SRC_URI[md5sum] = "d35c610f57cae909348ff6c60e5e9256" +SRC_URI[sha256sum] = "2f346a88ddc27a19cc68bc2d3e8929d89276298cb1c11871b82a87fbdafb95a8" + +PYPI_PACKAGE = "PyChromecast" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto/CVE-2013-7459.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto/CVE-2013-7459.patch new file mode 100644 index 000000000..9006c5c35 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto/CVE-2013-7459.patch @@ -0,0 +1,98 @@ +From 8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4 Mon Sep 17 00:00:00 2001 +From: Legrandin +Date: Sun, 22 Dec 2013 22:24:46 +0100 +Subject: [PATCH] Throw exception when IV is used with ECB or CTR + +The IV parameter is currently ignored when initializing +a cipher in ECB or CTR mode. + +For CTR mode, it is confusing: it takes some time to see +that a different parameter is needed (the counter). + +For ECB mode, it is outright dangerous. + +This patch forces an exception to be raised. + +Upstream-Status: Backport +[https://github.com/dlitz/pycrypto/commit/8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4] + +CVE: CVE-2013-7459 + +Signed-off-by: Yi Zhao +--- + lib/Crypto/SelfTest/Cipher/common.py | 31 +++++++++++++++++++++++-------- + src/block_template.c | 11 +++++++++++ + 2 files changed, 34 insertions(+), 8 deletions(-) + +diff --git a/lib/Crypto/SelfTest/Cipher/common.py b/lib/Crypto/SelfTest/Cipher/common.py +index 8bebed9..91ec743 100644 +--- a/lib/Crypto/SelfTest/Cipher/common.py ++++ b/lib/Crypto/SelfTest/Cipher/common.py +@@ -239,19 +239,34 @@ class RoundtripTest(unittest.TestCase): + return """%s .decrypt() output of .encrypt() should not be garbled""" % (self.module_name,) + + def runTest(self): +- for mode in (self.module.MODE_ECB, self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB, self.module.MODE_OPENPGP): ++ ++ ## ECB mode ++ mode = self.module.MODE_ECB ++ encryption_cipher = self.module.new(a2b_hex(self.key), mode) ++ ciphertext = encryption_cipher.encrypt(self.plaintext) ++ decryption_cipher = self.module.new(a2b_hex(self.key), mode) ++ decrypted_plaintext = decryption_cipher.decrypt(ciphertext) ++ self.assertEqual(self.plaintext, decrypted_plaintext) ++ ++ ## OPENPGP mode ++ mode = self.module.MODE_OPENPGP ++ encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) ++ eiv_ciphertext = encryption_cipher.encrypt(self.plaintext) ++ eiv = eiv_ciphertext[:self.module.block_size+2] ++ ciphertext = eiv_ciphertext[self.module.block_size+2:] ++ decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv) ++ decrypted_plaintext = decryption_cipher.decrypt(ciphertext) ++ self.assertEqual(self.plaintext, decrypted_plaintext) ++ ++ ## All other non-AEAD modes (but CTR) ++ for mode in (self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB): + encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) + ciphertext = encryption_cipher.encrypt(self.plaintext) +- +- if mode != self.module.MODE_OPENPGP: +- decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) +- else: +- eiv = ciphertext[:self.module.block_size+2] +- ciphertext = ciphertext[self.module.block_size+2:] +- decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv) ++ decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) + decrypted_plaintext = decryption_cipher.decrypt(ciphertext) + self.assertEqual(self.plaintext, decrypted_plaintext) + ++ + class PGPTest(unittest.TestCase): + def __init__(self, module, params): + unittest.TestCase.__init__(self) +diff --git a/src/block_template.c b/src/block_template.c +index c36b316..8746948 100644 +--- a/src/block_template.c ++++ b/src/block_template.c +@@ -170,6 +170,17 @@ ALGnew(PyObject *self, PyObject *args, PyObject *kwdict) + "Key cannot be the null string"); + return NULL; + } ++ if (IVlen != 0 && mode == MODE_ECB) ++ { ++ PyErr_Format(PyExc_ValueError, "ECB mode does not use IV"); ++ return NULL; ++ } ++ if (IVlen != 0 && mode == MODE_CTR) ++ { ++ PyErr_Format(PyExc_ValueError, ++ "CTR mode needs counter parameter, not IV"); ++ return NULL; ++ } + if (IVlen != BLOCK_SIZE && mode != MODE_ECB && mode != MODE_CTR) + { + PyErr_Format(PyExc_ValueError, +-- +2.7.4 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto/cross-compiling.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto/cross-compiling.patch new file mode 100644 index 000000000..712f3e8dd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto/cross-compiling.patch @@ -0,0 +1,23 @@ +Index: pycrypto-2.6/setup.py +=================================================================== +--- pycrypto-2.6.orig/setup.py ++++ pycrypto-2.6/setup.py +@@ -271,7 +271,8 @@ class PCTBuildConfigure(Command): + if not os.path.exists("config.status"): + if os.system("chmod 0755 configure") != 0: + raise RuntimeError("chmod error") +- cmd = "sh configure" # we use "sh" here so that it'll work on mingw32 with standard python.org binaries ++ host = os.environ.get("HOST_SYS") ++ cmd = "ac_cv_func_malloc_0_nonnull=yes sh configure --host " + host # we use "sh" here so that it'll work on mingw32 with standard python.org binaries + if self.verbose < 1: + cmd += " -q" + if os.system(cmd) != 0: +@@ -370,7 +371,7 @@ kw = {'name':"pycrypto", + 'ext_modules': plat_ext + [ + # _fastmath (uses GNU mp library) + Extension("Crypto.PublicKey._fastmath", +- include_dirs=['src/','/usr/include/'], ++ include_dirs=['src/'], + libraries=['gmp'], + sources=["src/_fastmath.c"]), + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb index a20eafec4..78a1ef2ac 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb @@ -1,7 +1,23 @@ -inherit distutils3 -require python-pycrypto.inc +DESCRIPTION = "Cryptographic modules for Python." +HOMEPAGE = "http://www.pycrypto.org/" +LICENSE = "PSFv2" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=35f354d199e8cb7667b059a23578e63d" -SRC_URI += "file://0001-Replace-time.clock-with-time.process_time.patch" +DEPENDS += " gmp" + +export HOST_SYS + +inherit pypi autotools-brokensep distutils3 + +SRC_URI += "file://cross-compiling.patch \ + file://CVE-2013-7459.patch \ + file://0001-Replace-time.clock-with-time.process_time.patch \ + " + +SRC_URI[md5sum] = "55a61a054aa66812daf5161a0d5d7eda" +SRC_URI[sha256sum] = "f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c" + +do_compile[noexec] = "1" # We explicitly call distutils_do_install, since we want it to run, but # *don't* want the autotools install to run, since this package doesn't @@ -9,3 +25,5 @@ SRC_URI += "file://0001-Replace-time.clock-with-time.process_time.patch" do_install() { distutils3_do_install } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify/0001-rule.py-fix-missing-comma.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify/0001-rule.py-fix-missing-comma.patch new file mode 100644 index 000000000..689355eea --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify/0001-rule.py-fix-missing-comma.patch @@ -0,0 +1,34 @@ +From f96b76efb810d7d559254d0ec58de628e09f525a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mart=C3=AD=20Bol=C3=ADvar?= +Date: Mon, 13 Jan 2020 08:42:05 -0800 +Subject: [PATCH] rule.py: fix missing comma +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +A line in the defined_keywords list is missing a comma. Add it. + +Signed-off-by: Martí Bolívar + +Upstream-Status: Backport [https://github.com/Grokzen/pykwalify.git] +Signed-off-by: Hongxu Jia +--- + pykwalify/rule.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pykwalify/rule.py b/pykwalify/rule.py +index 7ac2c9e..f044b69 100644 +--- a/pykwalify/rule.py ++++ b/pykwalify/rule.py +@@ -340,7 +340,7 @@ class Rule(object): + ('matching', 'matching'), + ('matching_rule', 'matching_rule'), + ('name', 'name'), +- ('nullable', 'nullable') ++ ('nullable', 'nullable'), + ('parent', 'parent'), + ('pattern', 'pattern'), + ('pattern_regexp', 'pattern_regexp'), +-- +2.18.2 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.7.0.bb index 5d029bd76..2df30aeab 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pykwalify_1.7.0.bb @@ -7,13 +7,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a72ea5159364a2cd7f45c6dcbee37872" SRC_URI[md5sum] = "58357f1d0f77de976e73dbd3660af75b" SRC_URI[sha256sum] = "7e8b39c5a3a10bc176682b3bd9a7422c39ca247482df198b402e8015defcceb2" +SRC_URI += "file://0001-rule.py-fix-missing-comma.patch" + PYPI_PACKAGE = "pykwalify" inherit setuptools3 pypi unset _PYTHON_SYSCONFIGDATA_NAME RDEPENDS_${PN} = "\ + ${PYTHON_PN}-docopt \ ${PYTHON_PN}-dateutil \ ${PYTHON_PN}-pyyaml \ " -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.0.bb deleted file mode 100644 index 8f331529a..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "A cross-platform clipboard module for Python. (only handles plain text for now)" -HOMEPAGE = "https://github.com/asweigart/pyperclip" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=d7dd4b0d1f7153322a546e89b5a0a632" - -SRC_URI[md5sum] = "c2564a74b909b6fc32401afd619de83d" -SRC_URI[sha256sum] = "b75b975160428d84608c26edba2dec146e7799566aea42c1fe1b32e72b6028f2" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += " \ - ${PYTHON_PN}-ctypes \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.1.bb new file mode 100644 index 000000000..211580b37 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A cross-platform clipboard module for Python. (only handles plain text for now)" +HOMEPAGE = "https://github.com/asweigart/pyperclip" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=d7dd4b0d1f7153322a546e89b5a0a632" + +SRC_URI[md5sum] = "0ac879899da5c2af755a834245ca6a0f" +SRC_URI[sha256sum] = "9abef1e79ce635eb62309ecae02dfb5a3eb952fa7d6dce09c1aef063f81424d3" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-ctypes \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.7.0.bb deleted file mode 100644 index 66f026cae..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.7.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Python bindings for interacting with systemd over DBus" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[md5sum] = "f493c3e54457e49fe3c160274b863bac" -SRC_URI[sha256sum] = "f5dc49d02995ab96335d9e94f9fe036673d89b8cc9907e7a0ac83c06665f2430" - -DEPENDS = "systemd" -REQUIRED_DISTRO_FEATURES = "systemd" - -inherit pypi setuptools3 features_check - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.8.0.bb new file mode 100644 index 000000000..e09b633f9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.8.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Python bindings for interacting with systemd over DBus" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[md5sum] = "f993739eca645749f18d4ccfd4a0fbf3" +SRC_URI[sha256sum] = "cac2e42043ab28d43adf33dab493c6a3cf8a99794f824ae8af6d9cd6458b9972" + +DEPENDS = "systemd" +REQUIRED_DISTRO_FEATURES = "systemd" + +inherit pypi setuptools3 features_check + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch index c29fb12de..8c5c17247 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch @@ -14,23 +14,26 @@ Upstream-Status: Inappropriate [oe specific] Signed-off-by: Derek Straka Signed-off-by: Yuan Chao + +Rebase for pytest 6.1.0. + +Signed-off-by: Kai Kang --- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index adbafb5..75fdd09 100644 ---- a/setup.py -+++ b/setup.py -@@ -19,7 +19,7 @@ INSTALL_REQUIRES = [ - def main(): - setup( - use_scm_version={"write_to": "src/_pytest/_version.py"}, -- setup_requires=["setuptools-scm", "setuptools>=40.0"], -+ setup_requires=["setuptools>=40.0"], - package_dir={"": "src"}, - extras_require={ - "testing": [ + setup.cfg | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.cfg b/setup.cfg +index 60f6564..c4d1471 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -55,7 +55,6 @@ package_dir = + =src + setup_requires = + setuptools>=40.0 +- setuptools-scm + zip_safe = no + + [options.entry_points] -- 2.17.1 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.4.3.bb deleted file mode 100644 index ca67223db..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.4.3.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Simple powerful testing with python" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b" - -SRC_URI[sha256sum] = "7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8" - -SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch " - -inherit update-alternatives pypi setuptools3 - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-attrs \ - ${PYTHON_PN}-debugger \ - ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pluggy \ - ${PYTHON_PN}-py \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-atomicwrites \ - ${PYTHON_PN}-importlib-metadata \ - ${PYTHON_PN}-pathlib2 \ - ${PYTHON_PN}-wcwidth \ - ${PYTHON_PN}-more-itertools \ - ${PYTHON_PN}-packaging \ -" - -ALTERNATIVE_${PN} += "py.test pytest" - -NATIVE_LINK_NAME[pytest] = "${bindir}/pytest" -ALTERNATIVE_TARGET[pytest] = "${bindir}/pytest" - -ALTERNATIVE_LINK_NAME[py.test] = "${bindir}/py.test" -ALTERNATIVE_TARGET[py.test] = "${bindir}/py.test" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_6.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_6.1.0.bb new file mode 100644 index 000000000..1da43c4f9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_6.1.0.bb @@ -0,0 +1,38 @@ +SUMMARY = "Simple powerful testing with python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=81eb9f71d006c6b268cf4388e3c98f7b" + +SRC_URI[sha256sum] = "d010e24666435b39a4cf48740b039885642b6c273a3f77be3e7e03554d2806b7" + +SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch " + +inherit update-alternatives pypi setuptools3 + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-debugger \ + ${PYTHON_PN}-doctest \ + ${PYTHON_PN}-iniconfig \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-pluggy \ + ${PYTHON_PN}-py \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-atomicwrites \ + ${PYTHON_PN}-importlib-metadata \ + ${PYTHON_PN}-pathlib2 \ + ${PYTHON_PN}-wcwidth \ + ${PYTHON_PN}-more-itertools \ + ${PYTHON_PN}-packaging \ +" + +ALTERNATIVE_${PN} += "py.test pytest" + +NATIVE_LINK_NAME[pytest] = "${bindir}/pytest" +ALTERNATIVE_TARGET[pytest] = "${bindir}/pytest" + +ALTERNATIVE_LINK_NAME[py.test] = "${bindir}/py.test" +ALTERNATIVE_TARGET[py.test] = "${bindir}/py.test" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.11.bb new file mode 100644 index 000000000..df2c00bba --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.10.11.bb @@ -0,0 +1,11 @@ +SUMMARY = "Alternative regular expression module, to replace re." +HOMEPAGE = "https://bitbucket.org/mrabarnett/mrab-regex/src" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=f0a3e4a2554ebb89c046c93d45d8e4bc" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "642c259122a3b578cec66d8bba5665e4" +SRC_URI[sha256sum] = "463e770c48da76a8da82b8d4a48a541f314e0df91cbb6d873a341dbe578efafd" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.7.14.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.7.14.bb deleted file mode 100644 index 5c608c989..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2020.7.14.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Alternative regular expression module, to replace re." -HOMEPAGE = "https://bitbucket.org/mrabarnett/mrab-regex/src" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=ee7987010dadc17745d623f406b500ec" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "c3a53929c3797289566368be4b6b964a" -SRC_URI[sha256sum] = "3a3af27a8d23143c49a3420efe5b3f8cf1a48c6fc8bc6856b03f638abc1833bb" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.1.bb deleted file mode 100644 index 1f5d91d3b..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "A pure python RFC3339 validator" -HOMEPAGE = "https://github.com/naimetti/rfc3339-validator" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a21b13b5a996f08f7e0b088aa38ce9c6" - -FILESEXTRAPATHS_prepend := "${THISDIR}/python-rfc3339-validator:" - -SRC_URI[md5sum] = "9d8899041d83f98180bddd8b62ee7e99" -SRC_URI[sha256sum] = "20a600d01fbb1f793cbb6f4ec4ebb2104f4c9e80d74d5f78350b63ecc6cccd08" - -PYPI_PACKAGE = "rfc3339_validator" - -inherit pypi setuptools3 - -SRC_URI_append = " \ - file://0001-setup.py-move-pytest-runner-to-test_requirements.patch \ -" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-six \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.2.bb new file mode 100644 index 000000000..e226e11b7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3339-validator_0.1.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "A pure python RFC3339 validator" +HOMEPAGE = "https://github.com/naimetti/rfc3339-validator" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a21b13b5a996f08f7e0b088aa38ce9c6" + +FILESEXTRAPATHS_prepend := "${THISDIR}/python-rfc3339-validator:" + +SRC_URI[md5sum] = "2c233007189d5ef21046cb2afac51a96" +SRC_URI[sha256sum] = "c9659c3183488a1875c4d327c9873d9e92c54cdcd69dfbfae7546ad8b27baf9a" + +PYPI_PACKAGE = "rfc3339_validator" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-six \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.17.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.17.5.bb deleted file mode 100644 index 5495fa0d3..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.17.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "The new Python SDK for Sentry.io" -DESCRIPTION = "This is the next line of the Python SDK \ -for Sentry, intended to replace the raven package on PyPI." -HOMEPAGE = "https://github.com/getsentry/sentry-python" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" - -SRC_URI[md5sum] = "dcdf0d4f84f4f6ea02ad3f15dfcff2d9" -SRC_URI[sha256sum] = "02f2a72698453f722b102562eb6430d2a82d6c6c40f2b991ed69e7628142de6a" - -PYPI_PACKAGE = "sentry-sdk" -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.18.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.18.0.bb new file mode 100644 index 000000000..e4ab9f33d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_0.18.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "The new Python SDK for Sentry.io" +DESCRIPTION = "This is the next line of the Python SDK \ +for Sentry, intended to replace the raven package on PyPI." +HOMEPAGE = "https://github.com/getsentry/sentry-python" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" + +SRC_URI[md5sum] = "d6a85d958aea9277c1728c77dcf063a1" +SRC_URI[sha256sum] = "1d91a0059d2d8bb980bec169578035c2f2d4b93cd8a4fb5b85c81904d33e221a" + +PYPI_PACKAGE = "sentry-sdk" +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.1.bb index 1be77393b..6b3364943 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.1.bb @@ -9,5 +9,5 @@ SRC_URI[sha256sum] = "ef8f77afc70e7dbfd1171bfeae87a8a7f10074829370ce8d9ccd585a01 DEPENDS += "i2c-tools" -S = "${WORKDIR}/i2c-tools-${PV}/py-smbus/" +S = "${WORKDIR}/i2c-tools-${PV}/py-smbus" inherit distutils3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.49.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.49.0.bb deleted file mode 100644 index 26eb1073d..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.49.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Fast, Extensible Progress Meter" -HOMEPAGE = "http://tqdm.github.io/" -SECTION = "devel/python" - -LICENSE = "MIT & MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENCE;md5=7ea57584e3f8bbde2ae3e1537551de25" - -SRC_URI[md5sum] = "c2afde3f1d5aa108376fdd0f4b20821d" -SRC_URI[sha256sum] = "faf9c671bd3fad5ebaeee366949d969dca2b2be32c872a7092a1e1a9048d105b" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.50.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.50.2.bb new file mode 100644 index 000000000..9c2d06ba9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.50.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "Fast, Extensible Progress Meter" +HOMEPAGE = "http://tqdm.github.io/" +SECTION = "devel/python" + +LICENSE = "MIT & MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENCE;md5=7ea57584e3f8bbde2ae3e1537551de25" + +SRC_URI[md5sum] = "2e56a15d28aa1fa06eeb31031c16c1f3" +SRC_URI[sha256sum] = "69dfa6714dee976e2425a9aab84b622675b7b1742873041e3db8a8e86132a4af" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.3.bb deleted file mode 100644 index e2a304437..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Python 2 and 3 compatibility library" -HOMEPAGE = "https://xlsxwriter.readthedocs.io" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0960d52d61b0801760f39463288c2672" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "XlsxWriter" - -SRC_URI[md5sum] = "7c7191afe3149e41dca0e17d535421fb" -SRC_URI[sha256sum] = "830cad0a88f0f95e5a8945ee082182aa68ab89e7d9725d0c32c196207634244b" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.6.bb new file mode 100644 index 000000000..f3314037f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.3.6.bb @@ -0,0 +1,14 @@ +SUMMARY = "Python 2 and 3 compatibility library" +HOMEPAGE = "https://xlsxwriter.readthedocs.io" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0960d52d61b0801760f39463288c2672" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "XlsxWriter" + +SRC_URI[md5sum] = "378642a3754fb233e418e3869cf051bb" +SRC_URI[sha256sum] = "b89002dea57bb3d4c8207f3e28ef8244bfd9e936b85d74e7dd1f97e11bb70313" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.5.1.bb deleted file mode 100644 index 40f0e4db0..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.5.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "The module provides handy URL class for url parsing and changing" -HOMEPAGE = "https://github.com/aio-libs/yarl/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b334fc90d45983db318f54fd5bf6c90b" - -SRC_URI[md5sum] = "a9b20bf0b8a6962e1101b28908a67bf8" -SRC_URI[sha256sum] = "c22c75b5f394f3d47105045ea551e08a3e804dc7e01b37800ca35b58f856c3d6" - -SRC_URI += " \ - file://run-ptest \ -" - -PYPI_PACKAGE = "yarl" - -inherit pypi ptest setuptools3 - -RDEPENDS_${PN} = "\ - ${PYTHON_PN}-multidict \ - ${PYTHON_PN}-idna \ -" - -RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.0.bb new file mode 100644 index 000000000..543acc51b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "The module provides handy URL class for url parsing and changing" +HOMEPAGE = "https://github.com/aio-libs/yarl/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b334fc90d45983db318f54fd5bf6c90b" + +SRC_URI[md5sum] = "802bb27ebdb260fbbaecbcc8168d6f28" +SRC_URI[sha256sum] = "61d3ea3c175fe45f1498af868879c6ffeb989d4143ac542163c45538ba5ec21b" + +SRC_URI += " \ + file://run-ptest \ +" + +PYPI_PACKAGE = "yarl" + +inherit pypi ptest setuptools3 + +RDEPENDS_${PN} = "\ + ${PYTHON_PN}-multidict \ + ${PYTHON_PN}-idna \ +" + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.1.0.bb deleted file mode 100644 index a29e2981f..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.1.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Backport of pathlib-compatible object wrapper for zip files" -HOMEPAGE = "https://github.com/jaraco/zipp" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" - -SRC_URI[md5sum] = "199da7385f080ec45da6c1942e2b5996" -SRC_URI[sha256sum] = "c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -inherit pypi setuptools3 - -DEPENDS += "${PYTHON_PN}-toml-native" - -RDEPENDS_${PN} += "${PYTHON_PN}-compression \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-more-itertools" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.3.0.bb new file mode 100644 index 000000000..746f9cea5 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_3.3.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Backport of pathlib-compatible object wrapper for zip files" +HOMEPAGE = "https://github.com/jaraco/zipp" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" + +SRC_URI[md5sum] = "87a53f0bf48671f6bf6d3e9938218509" +SRC_URI[sha256sum] = "64ad89efee774d1897a58607895d80789c59778ea02185dd846ac38394a8642b" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +inherit pypi setuptools3 + +DEPENDS += "${PYTHON_PN}-toml-native" + +RDEPENDS_${PN} += "${PYTHON_PN}-compression \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-more-itertools" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.0.2.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.0.2.bb deleted file mode 100644 index da731989d..000000000 --- a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.0.2.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "Python WBEM Client and Provider Interface" -DESCRIPTION = "\ -A Python library for making CIM (Common Information Model) operations over \ -HTTP using the WBEM CIM-XML protocol. It is based on the idea that a good \ -WBEM client should be easy to use and not necessarily require a large amount \ -of programming knowledge. It is suitable for a large range of tasks from \ -simply poking around to writing web and GUI applications. \ -\ -WBEM, or Web Based Enterprise Management is a manageability protocol, like \ -SNMP, standardised by the Distributed Management Task Force (DMTF) available \ -at http://www.dmtf.org/standards/wbem. \ -\ -It also provides a Python provider interface, and is the fastest and easiest \ -way to write providers on the planet." -HOMEPAGE = "http://pywbem.github.io" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" - -SRC_URI[md5sum] = "0f171e365e294554f8e7624ccf511067" -SRC_URI[sha256sum] = "66d8ec82d30f2b95d8b4bd51659429066c2879d3f46292561f5fdbc7fed10f3d" - -inherit pypi setuptools3 update-alternatives - -DEPENDS += " \ - ${PYTHON_PN}-ply-native \ - ${PYTHON_PN}-pyyaml-native \ - ${PYTHON_PN}-six-native \ -" - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-ply \ - ${PYTHON_PN}-pyyaml \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-unixadmin \ - ${PYTHON_PN}-xml \ -" - -ALTERNATIVE_${PN} = "mof_compiler" -ALTERNATIVE_TARGET[mof_compiler] = "${bindir}/mof_compiler" - -ALTERNATIVE_PRIORITY = "60" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.1.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.1.0.bb new file mode 100644 index 000000000..d68ae9abf --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.1.0.bb @@ -0,0 +1,48 @@ +SUMMARY = "Python WBEM Client and Provider Interface" +DESCRIPTION = "\ +A Python library for making CIM (Common Information Model) operations over \ +HTTP using the WBEM CIM-XML protocol. It is based on the idea that a good \ +WBEM client should be easy to use and not necessarily require a large amount \ +of programming knowledge. It is suitable for a large range of tasks from \ +simply poking around to writing web and GUI applications. \ +\ +WBEM, or Web Based Enterprise Management is a manageability protocol, like \ +SNMP, standardised by the Distributed Management Task Force (DMTF) available \ +at http://www.dmtf.org/standards/wbem. \ +\ +It also provides a Python provider interface, and is the fastest and easiest \ +way to write providers on the planet." +HOMEPAGE = "http://pywbem.github.io" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" + +SRC_URI[md5sum] = "6ade0cda6a997542d61f15713c2dd971" +SRC_URI[sha256sum] = "4e2baa4b4b88943cca32c7eb588fffff22ce86c748ba7544e01149f9638014fe" + +inherit pypi setuptools3 update-alternatives + +DEPENDS += " \ + ${PYTHON_PN}-ply-native \ + ${PYTHON_PN}-pyyaml-native \ + ${PYTHON_PN}-six-native \ +" + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-ply \ + ${PYTHON_PN}-pyyaml \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-stringold \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-unixadmin \ + ${PYTHON_PN}-xml \ +" + +ALTERNATIVE_${PN} = "mof_compiler" +ALTERNATIVE_TARGET[mof_compiler] = "${bindir}/mof_compiler" + +ALTERNATIVE_PRIORITY = "60" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.7.1.bb b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.7.1.bb deleted file mode 100644 index 05f77288e..000000000 --- a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.7.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "A set of tools using pywbem" -DESCRIPTION = "A set of tools using pywbem to communicate with WBEM servers" -HOMEPAGE = "https://pywbemtools.readthedocs.io/en/stable/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" - -SRC_URI[md5sum] = "a789da735c04ddc08ba828cd8022243e" -SRC_URI[sha256sum] = "d2fe776c78a740215142f4f033055093f2283fd9327440c59734716e51e19989" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-pyyaml-native \ - ${PYTHON_PN}-pywbem-native \ - ${PYTHON_PN}-six-native \ - ${PYTHON_PN}-click-native \ -" - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-ply \ - ${PYTHON_PN}-pyyaml \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-pywbem \ - ${PYTHON_PN}-click \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-prompt-toolkit \ - ${PYTHON_PN}-mock \ - ${PYTHON_PN}-packaging \ - ${PYTHON_PN}-nocasedict \ - ${PYTHON_PN}-yamlloader \ - ${PYTHON_PN}-click-repl \ - ${PYTHON_PN}-click-spinner \ - ${PYTHON_PN}-asciitree \ - ${PYTHON_PN}-tabulate \ - ${PYTHON_PN}-pydicti \ - ${PYTHON_PN}-nocaselist \ - ${PYTHON_PN}-custom-inherit \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.7.3.bb b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.7.3.bb new file mode 100644 index 000000000..8620057f5 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.7.3.bb @@ -0,0 +1,40 @@ +SUMMARY = "A set of tools using pywbem" +DESCRIPTION = "A set of tools using pywbem to communicate with WBEM servers" +HOMEPAGE = "https://pywbemtools.readthedocs.io/en/stable/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" + +SRC_URI[md5sum] = "e3f8cadb8d1253b1b51afabcce4c3461" +SRC_URI[sha256sum] = "b475da4389ac77901191c886f4348660f3c0fd59365feb18ede47a086442efff" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-pyyaml-native \ + ${PYTHON_PN}-pywbem-native \ + ${PYTHON_PN}-six-native \ + ${PYTHON_PN}-click-native \ +" + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-ply \ + ${PYTHON_PN}-pyyaml \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-pywbem \ + ${PYTHON_PN}-click \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-prompt-toolkit \ + ${PYTHON_PN}-mock \ + ${PYTHON_PN}-packaging \ + ${PYTHON_PN}-nocasedict \ + ${PYTHON_PN}-yamlloader \ + ${PYTHON_PN}-click-repl \ + ${PYTHON_PN}-click-spinner \ + ${PYTHON_PN}-asciitree \ + ${PYTHON_PN}-tabulate \ + ${PYTHON_PN}-pydicti \ + ${PYTHON_PN}-nocaselist \ + ${PYTHON_PN}-custom-inherit \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.1.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.1.bb deleted file mode 100644 index aed5ce4dc..000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Easily themable notification daemon with transparency effects" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = " \ - dbus \ - dbus-glib \ - libnotify \ - libxfce4util \ - libxfce4ui \ - xfconf \ - xfce4-panel \ -" - -inherit xfce-app - -SRC_URI[md5sum] = "58e70621d6b9e0e66399ed41ab402a47" -SRC_URI[sha256sum] = "9b5274999c89bf296a7de03b375e8233eef37940b7444502130b92dfb6a089b4" - -# Avoid trouble with other desktops e.g KDE which also ships dbus service named -# org.freedesktop.Notifications -EXTRA_OECONF = "--disable-dbus-start-daemon" - -do_compile_prepend() { - mkdir -p xfce4-notifyd xfce4-notifyd-config -} - -FILES_${PN} += " \ - ${systemd_user_unitdir} \ - ${datadir}/xfce4 \ - ${datadir}/themes \ - ${datadir}/dbus-1 \ - ${libdir}/xfce4 \ -" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb new file mode 100644 index 000000000..5476b20bd --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb @@ -0,0 +1,33 @@ +SUMMARY = "Easily themable notification daemon with transparency effects" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = " \ + dbus \ + dbus-glib \ + libnotify \ + libxfce4util \ + libxfce4ui \ + xfconf \ + xfce4-panel \ +" + +inherit xfce-app + +SRC_URI[sha256sum] = "19ab84c6665c7819998f2269322d53f462c30963ce26042df23ae525e7d16545" + +# Avoid trouble with other desktops e.g KDE which also ships dbus service named +# org.freedesktop.Notifications +EXTRA_OECONF = "--disable-dbus-start-daemon" + +do_compile_prepend() { + mkdir -p xfce4-notifyd xfce4-notifyd-config +} + +FILES_${PN} += " \ + ${systemd_user_unitdir} \ + ${datadir}/xfce4 \ + ${datadir}/themes \ + ${datadir}/dbus-1 \ + ${libdir}/xfce4 \ +" -- cgit v1.2.3