From 0f291cce3faf2fd387c0db8f04bd2f9f4187f6df Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 1 Sep 2019 15:16:57 -0400 Subject: meta-openembedded: subtree update:1e8bc46e55..6a5d6bc9ad MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Aaltonen Eero (1): Recipe for docopt.cpp option parsing library Aaron Chan (1): python3-pyatspi: Add Dbus ATSPI recipe Adrian Bunk (11): xmlsec1: Import from meta-security libgit2: Upgrade 0.27.9 -> 0.28.3 libenv-perl: Import from meta-security libgit2: Don't pass parameters with their default values to cmake Replace EXCLUDE_FROM_WORLD_libc-musl = "1" with COMPATIBLE_HOST_libc-musl = 'null' libwebsockets: Fix the build with -Os mimic: Fix the build with -Os Adapt to the lsb -> lsb-release change in OE-core meta-oe: Replace EXCLUDE_FROM_WORLD_libc-musl = "1" with COMPATIBLE_HOST_libc-musl = 'null' Remove LICENSE = "MIT" from packagegroups and images Remove bogus COMMON_LICENSE_DIR usage in LIC_FILES_CHKSUM Andreas Müller (4): cmark: initial add 0.29.0 libsigc++-2.0: upgrade 2.10.1 -> 2.10.2 glibmm: upgrade 2.58.1 -> 2.60.0 evolution-data-server: remove unused gconf dep and pythonnative dep Anuj Mittal (2): pugixml: add recipe vlc: don't look at host headers for live555 Bruce Ashfield (1): dnsmasq: fix build against 5.2 headers Callaghan, Dan (1): python3-pystemd: add new recipe Changqing Li (3): xfsprogs: support usrmerge ntfs-3g-ntfsprogs: support usrmerge grubby: support usrmerge Chris Laplante (1): breakpad: fix patch striplevel to avoid 'devtool modify breakpad' error Christophe PRIOUZEAU (1): python-script: update license md5sum Gianfranco Costamagna (2): libmodbus: update version to 3.1.6 ifmetric: add initial recipe based on Debian packaging and patches Hongxu Jia (4): libdevmapper/lvm2: force recipe libdevmapper to populate sysroot only multipath-tools: lvm2 to DEPENDS cryptsetup: add libdevmapper to RDEPENDS cryptsetup: add libdevmapper to RDEPENDS Kai Kang (1): xfce4-datetime-setter: fix compile error and requires distro feature x11 Khem Raj (14): libgpiod: nherit python3native unconditionally kernel-selftest: Warn conditionally about clang-native dependency docopt.cpp: Drop using gitpkgv libnss-nisplus: Fix build with glibc >= 2.30 bpftool.bb: Disable SECURITY_CFLAGS kernel-selftest: Explicitly disable stack protector ncmpc: Update to 0.34 websocketpp_0.8.1.bb: Fix build with asio from boost 1.70+ can-utils: Fix build with kernel headers >= 5.2 android-tools: update license md5sum for BSD-2-Clause can-isotp: Update to latest tip linux-atm: Fix build with kernel headers 5.2+ drbd: Upgrade to 9.0.19-1 ssiapi: Upgrade to 1.3.0 Klauer, Daniel (1): sjf2410-linux-native: Fix do_deploy sstate caching Oleksandr Kravchuk (1): nftables: update to 0.9.2 Piotr Tworek (18): libmxml: Use autotools bbclass and cleanup the recipe a bit. evolution-data-server: Update to version 3.32.4 evolution-data-server: Drop x11 as required distro feature. evolution-data-server: Inherit upstream-version-is-even bbclass. evolution-data-server: Add dedicated packages for libebook-contacts. evolution-data-server: Specify SYSCONF_INSTALL_DIR in EXTRA_OECMAKE. evolution-data-server: Drop bits related to autotools evolution-data-server: Add PACKAGECONFIGs for oauth2 and kerberos. evolution-data-server: Drop ENABLE_UOA from EXTRA_OECMAKE. evolution-data-server: Drop glade file references. evolution-data-server: Fix package gobject-introspection support. evolution-data-server: Add PACKAGECONFIG for vala bindings. evolution-data-server: Turn goa support into PACKAGECONFIG feature. evolution-data-server: Add weather PACKAGECONFIG feature. evolution-data-server: Add PACKAGECONFIG entry for phonenumber. evolution-data-server: Use SRC_URI provided by gnomebase. evolution-data-server: Remove unused FILES paterns. evolution-data-server: Don't use explicit version number for libebook Qi.Chen@windriver.com (1): libblockdev: fix PACKAGECONFIG regarding python Robert Yang (1): netcf: Fix Manifest not found issue Yi Zhao (1): samba: upgrade 4.10.6 -> 4.10.7 Yuan Chao (11): python-typing: upgrade 3.7.4 -> 3.7.4.1 python-twisted: upgrade 19.2.1 -> 19.7.0 python-jsonschema: upgrade 2.6.0 -> 3.0.2 kpatch: upgrade 0.7.1 -> 0.8.0 libtdb: upgrade 1.4.1 -> 1.4.2 python-paste: upgrade 3.1.0 -> 3.1.1 python-pip: upgrade 19.2.2 -> 19.2.3 python-pytest: upgrade 3.4.2 -> 5.1.1 python3-xxhash: upgrade 1.3.0 -> 1.4.1 python-pluggy: upgrade 0.6.0 -> 0.12.0 python-cmd2: upgrade 0.9.2 -> 0.9.16 Zang Ruochen (3): python-futures: upgrade 3.2.0 -> 3.3.0 python-pyyaml: upgrade 3.13 -> 5.1.2 python-alembic: upgrade 1.0.11 -> 1.1.0 Change-Id: I3b55c2efba09c26e31018ee2cbbc908f06630c7c Signed-off-by: Brad Bishop --- .../meta-python/recipes-devtools/python/python-pytest.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc') diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc index 4c32dfb04..49ef790f0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc @@ -1,13 +1,13 @@ SUMMARY = "Simple powerful teting with python" HOMEPAGE = "http://pytest.org" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c39b24965f4aef64222cb35de9d47cc4" +LIC_FILES_CHKSUM = "file://LICENSE;md5=640061b8cee64b308a4d2f9f556c12f2" -SRC_URI[md5sum] = "1b83a25d45fad893f430fc5031653c56" -SRC_URI[sha256sum] = "117bad36c1a787e1a8a659df35de53ba05f9f3398fb9e4ac17e80ad5903eb8c5" +SRC_URI[md5sum] = "662313b4f539f5b66d2fb77791458e82" +SRC_URI[sha256sum] = "c3d5020755f70c82eceda3feaf556af9a341334414a8eca521a18f463bcead88" SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch \ - file://pytest_version_fix.patch " + " inherit update-alternatives -- cgit v1.2.3 From c1d34338068e7d99e34db98597b2d8b3b58e6c2a Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 9 Sep 2019 14:56:00 -0400 Subject: meta-openembedded: subtree update:6a5d6bc9ad..3061ead8cf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Bunk (2): gpsd: gpscat no longer uses python-curses in 3.19 dejagnu: Remove, moved to oe-core Alex Kiernan (1): zstd: Upgrade 1.4.2 -> 1.4.3 Alistair Francis (2): python3-twine: Initial commit of 1.13.0 python3-pytest-asyncio: Initial commit of 0.10.0 Andreas Müller (4): fluidsynth: upgrade 2.0.5 -> 2.0.6 imsettings: upgrade 1.7.3 -> 1.8.1 and rework recipe xfce4-settings: upgrade 4.14.0 -> 4.14.1 xfce4-screenshooter: upgrade 1.9.5 -> 1.9.6 Andrej Valek (1): nodejs: 10.16.2 -> 10.16.3 Changqing Li (7): yail: update UPSTREAM_CHECK_GITTAGREGEX iscsi-initiator-utils: 2.0.876 -> 2.0.877 postgresql: 11.4 -> 11.5 satyr: upgrade 0.27 -> 0.28 freeradius: upgrade 3.0.17 -> 3.0.19 drbd-utils: switch to add patch from change source in do_configure xfsdump: support usrmerge Gianfranco Costamagna (2): grpc: don't use unexisting gettid function on glibc 2.29, it has been implemented only in 2.30 grpc: Change gettid patch with the upstream merged version Hongxu Jia (1): lvm2: fix blkdeactivate failed with command not found Kai Kang (4): lmbench: update script lmbench-run mariadb: fix file conflictions when multilib enabled php: sync with apache2's change apache2: fix multilib file conflicts Khem Raj (11): iperf2: Fix build with latest libc++ iscsi-initiator-utils: Inherit pkgconfig and override PKG_CONFIG klibc: Fix build with 5.2+ kernel headers samba: Fix configure tests to work with clang ltrace: Fix build on mips python-jinja2: Make asyncio specific to python3 module alone python3-cmd2: Add to blacklist nodejs: Mark incompatible with risc-v drbd,netkit-rusers: Blacklist packages vboxguestdrivers,can-isotp,bpftool: Add to Blacklist strongswan: Fix do_patch fuzz Li Zhou (1): tipcutils: ptts: Set recv buffer size to max to receive as many packets as possible Martin Jansa (1): python3-pyatspi: restrict with GTK2DISTROFEATURES Oleksandr Kravchuk (1): nano: update to 4.4 Qi.Chen@windriver.com (2): python-hyperlink: rdepend on python-idna python-jinja2: rdepend on asyncio module Robert Yang (1): netcf: Fix do_configure failed when multilib Scott Ellis (1): wireguard: Upgrade 20190702 to 20190905 Yuan Chao (10): strongswan: upgrade 5.8.0 -> 5.8.1 php: upgrade 7.3.8 -> 7.3.9 libtalloc: upgrade 2.2.0 -> 2.3.0 numactl: upgrade 2.0.12 -> 2.0.13 uhubctl: upgrade 2.0.0 -> 2.1.0 python-pytest: upgrade 5.1.1 -> 5.1.2 python-stevedore: upgrade 1.30.1 -> 1.31.0 python-dbus: upgrade 1.2.8 -> 1.2.10 python-pbr: upgrade 5.4.2 -> 5.4.3 python-pyasn1: upgrade 0.4.6 -> 0.4.7 Zang Ruochen (3): python-paste: upgrade 3.1.1 -> 3.2.0 libnet-dns-perl: upgrade 1.20 -> 1.21 hwdata: upgrade 0.326 -> 0.327 Zheng Ruoqin (1): python-cmd2: Add python3 version aehs29@gmail.com (1): remmina: Add recipe for the remmina remote desktop client Change-Id: I11f4319f53655ab389fcb7a0ce4f22b71f9a8da2 Signed-off-by: Brad Bishop --- .../files/0001-xfsdump-support-usrmerge.patch | 48 +++++ .../recipes-utils/xfsdump/xfsdump_3.1.8.bb | 1 + .../0001-Fix-missing-include-in-sys-mman.h.patch | 36 ++++ .../recipes-devtools/klibc/klibc.inc | 1 + .../recipes-multimedia/fluidsynth/fluidsynth.inc | 4 +- ...s-correct-version-number-of-libssl-defect.patch | 44 ---- ...radius-configure.ac-add-option-for-libcap.patch | 24 +-- ...ius-fix-issues-related-to-m4-include-path.patch | 186 ----------------- .../files/freeradius-libtool-detection.patch | 21 +- .../freeradius/freeradius_3.0.17.bb | 227 -------------------- .../freeradius/freeradius_3.0.19.bb | 230 +++++++++++++++++++++ ...-wscript-Avoid-generating-nested-main-fun.patch | 30 +++ ....c-Move-__thread-variable-to-global-scope.patch | 58 ++++++ .../recipes-connectivity/samba/samba_4.10.7.bb | 2 + .../packagegroups/packagegroup-meta-networking.bb | 4 +- .../0001-Make-iscsid-systemd-usage-optional.patch | 88 ++++++++ ...g-config-in-Makefiles-for-newer-libraries.patch | 92 +++++++++ .../iscsi-initiator-utils_2.0.876.bb | 114 ---------- .../iscsi-initiator-utils_2.0.877.bb | 119 +++++++++++ .../0001-Define-gettid-only-for-glibc-2.30.patch | 128 +++++++++--- .../wireguard/wireguard-module_0.0.20190702.bb | 31 --- .../wireguard/wireguard-module_0.0.20190905.bb | 31 +++ .../wireguard/wireguard-tools_0.0.20190702.bb | 27 --- .../wireguard/wireguard-tools_0.0.20190905.bb | 27 +++ .../recipes-kernel/wireguard/wireguard.inc | 4 +- .../netkit-rusers/netkit-rusers_0.17.bb | 1 + .../0001-drbd-utils-support-usrmerge.patch | 108 ++++++++++ .../recipes-support/drbd/drbd-utils_9.10.0.bb | 12 +- .../recipes-support/drbd/drbd_9.0.19-1.bb | 2 + .../recipes-support/libtalloc/libtalloc_2.2.0.bb | 54 ----- .../recipes-support/libtalloc/libtalloc_2.3.0.bb | 54 +++++ .../recipes-support/netcf/netcf_0.2.8.bb | 2 +- ...1-memory.h-Include-stdint.h-for-uintptr_t.patch | 8 +- .../recipes-support/strongswan/strongswan_5.8.0.bb | 133 ------------ .../recipes-support/strongswan/strongswan_5.8.1.bb | 133 ++++++++++++ ...-definition-considering-stdbool.h-being-p.patch | 58 ++++++ .../recipes-benchmark/iperf2/iperf2_2.0.13.bb | 4 +- .../recipes-benchmark/lmbench/lmbench/lmbench-run | 1 - .../recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 5 +- .../packagegroups/packagegroup-meta-oe.bb | 8 +- .../meta-oe/recipes-dbs/mysql/mariadb.inc | 4 +- .../recipes-dbs/postgresql/postgresql_11.4.bb | 12 -- .../recipes-dbs/postgresql/postgresql_11.5.bb | 12 ++ .../dejagnu/dejagnu/configure.patch | 45 ---- .../recipes-devtools/dejagnu/dejagnu_1.4.4.bb | 14 -- .../ltrace/ltrace/include_unistd_nr.patch | 30 +++ .../meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 1 + .../recipes-devtools/nodejs/nodejs_10.16.2.bb | 110 ---------- .../recipes-devtools/nodejs/nodejs_10.16.3.bb | 113 ++++++++++ .../meta-oe/recipes-devtools/php/php.inc | 6 +- .../meta-oe/recipes-devtools/php/php_7.3.8.bb | 27 --- .../meta-oe/recipes-devtools/php/php_7.3.9.bb | 27 +++ .../meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb | 2 + .../recipes-extended/socketcan/can-isotp_git.bb | 2 + ...et-recv-buffer-size-too-max-to-receive-as.patch | 66 ++++++ .../recipes-extended/tipcutils/tipcutils_git.bb | 1 + .../meta-oe/recipes-extended/zstd/zstd_1.4.2.bb | 35 ---- .../meta-oe/recipes-extended/zstd/zstd_1.4.3.bb | 35 ++++ .../meta-oe/recipes-kernel/bpftool/bpftool.bb | 1 + .../meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb | 1 - .../meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 +- ...-bin-findmnt-bin-lsblk-bin-sort-not-found.patch | 73 +++++++ .../meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb | 8 +- .../meta-oe/recipes-support/nano/nano_4.3.bb | 20 -- .../meta-oe/recipes-support/nano/nano_4.4.bb | 20 ++ .../numactl/0001-fix-NULL-pointer-problem.patch | 35 ---- .../meta-oe/recipes-support/numactl/numactl_git.bb | 5 +- .../recipes-support/remmina/remmina_1.3.6.bb | 33 +++ .../meta-oe/recipes-support/satyr/satyr_0.27.bb | 32 --- .../meta-oe/recipes-support/satyr/satyr_0.28.bb | 31 +++ .../recipes-support/uhubctl/uhubctl_2.0.0.bb | 21 -- .../recipes-support/uhubctl/uhubctl_2.1.0.bb | 21 ++ .../vboxguestdrivers/vboxguestdrivers_5.2.22.bb | 3 + .../recipes-perl/libnet/libnet-dns-perl_1.20.bb | 66 ------ .../recipes-perl/libnet/libnet-dns-perl_1.21.bb | 66 ++++++ .../recipes-devtools/python/python-cmd2.inc | 13 ++ .../recipes-devtools/python/python-cmd2_0.9.16.bb | 15 +- .../recipes-devtools/python/python-dbus_1.2.10.bb | 32 +++ .../recipes-devtools/python/python-dbus_1.2.8.bb | 32 --- .../recipes-devtools/python/python-hyperlink.inc | 2 +- .../recipes-devtools/python/python-paste_3.1.1.bb | 17 -- .../recipes-devtools/python/python-paste_3.2.0.bb | 17 ++ .../recipes-devtools/python/python-pbr_5.4.2.bb | 13 -- .../recipes-devtools/python/python-pbr_5.4.3.bb | 13 ++ .../recipes-devtools/python/python-pyasn1.inc | 4 +- .../recipes-devtools/python/python-pyasn1_0.4.6.bb | 6 - .../recipes-devtools/python/python-pyasn1_0.4.7.bb | 6 + .../python/python-pytest-asyncio.inc | 13 ++ .../recipes-devtools/python/python-pytest.inc | 4 +- .../recipes-devtools/python/python-pytest_5.1.1.bb | 9 - .../recipes-devtools/python/python-pytest_5.1.2.bb | 9 + .../recipes-devtools/python/python-stevedore.inc | 4 +- .../python/python-stevedore_1.30.1.bb | 2 - .../python/python-stevedore_1.31.0.bb | 2 + .../recipes-devtools/python/python-twine.inc | 11 + .../recipes-devtools/python/python3-cmd2_0.9.16.bb | 10 + .../python/python3-jinja2_2.10.1.bb | 2 + .../python/python3-pyasn1_0.4.6.bb | 2 - .../python/python3-pyasn1_0.4.7.bb | 2 + .../python/python3-pyatspi_2.32.1.bb | 4 + .../python/python3-pytest-asyncio_0.10.0.bb | 2 + .../python/python3-pytest_5.1.1.bb | 4 - .../python/python3-pytest_5.1.2.bb | 4 + .../python/python3-stevedore_1.30.1.bb | 2 - .../python/python3-stevedore_1.31.0.bb | 2 + .../python/python3-twine_1.13.0.bb | 2 + .../recipes-httpd/apache2/apache2_2.4.41.bb | 6 +- .../xfce4-screenshooter_1.9.5.bb | 22 -- .../xfce4-screenshooter_1.9.6.bb | 22 ++ .../imsettings/imsettings_1.7.3.bb | 31 --- .../imsettings/imsettings_1.8.1.bb | 33 +++ .../xfce4-settings/xfce4-settings_4.14.0.bb | 33 --- .../xfce4-settings/xfce4-settings_4.14.1.bb | 33 +++ 113 files changed, 2054 insertions(+), 1528 deletions(-) create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch create mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-freeradius-correct-version-number-of-libssl-defect.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.17.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-util_sec.c-Move-__thread-variable-to-global-scope.patch create mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Make-iscsid-systemd-usage-optional.patch create mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Use-pkg-config-in-Makefiles-for-newer-libraries.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.877.bb delete mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190702.bb create mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190905.bb delete mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190702.bb create mode 100644 meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190905.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.2.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/nano/nano_4.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/nano/nano_4.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.27.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.28.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.0.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.1.0.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.20.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.21.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-cmd2.inc create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.10.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.8.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pbr_5.4.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pbr_5.4.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1_0.4.6.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1_0.4.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pytest-asyncio.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-stevedore_1.30.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-stevedore_1.31.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-twine.inc create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.4.6.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.4.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.10.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_1.30.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_1.31.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twine_1.13.0.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.5.bb create mode 100644 meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.6.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb create mode 100644 meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.0.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.1.bb (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc') diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch new file mode 100644 index 000000000..04ec7b34a --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-support-usrmerge.patch @@ -0,0 +1,48 @@ +From 2da4cfe17b994d7f10017561ca8efe6b6bd5f3cf Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 5 Sep 2019 11:17:15 +0800 +Subject: [PATCH] xfsdump: support usrmerge + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Changqing Li +--- + dump/Makefile | 4 +--- + restore/Makefile | 4 +--- + 2 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/dump/Makefile b/dump/Makefile +index 97879fa..14da664 100644 +--- a/dump/Makefile ++++ b/dump/Makefile +@@ -97,10 +97,8 @@ default: depend $(LTCOMMAND) + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) + $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) +- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) ++ $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) + install-dev: + + .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) +diff --git a/restore/Makefile b/restore/Makefile +index c6f3f25..7835ecc 100644 +--- a/restore/Makefile ++++ b/restore/Makefile +@@ -107,10 +107,8 @@ default: depend $(LTCOMMAND) + include $(BUILDRULES) + + install: default +- $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR) +- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR) + $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) +- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND) ++ $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) + install-dev: + + .dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON) +-- +2.7.4 + diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb index 0421aa06d..9c5755862 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.8.bb @@ -13,6 +13,7 @@ DEPENDS = "xfsprogs attr" SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \ file://remove-install-as-user.patch \ file://work-with-new-version-of-xfsprogs.patch \ + ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-xfsdump-support-usrmerge.patch','',d)} \ " SRC_URI[md5sum] = "84d3bc287b4a2bb5d16b2320a47049a7" SRC_URI[sha256sum] = "ed14e67ae5b273c2698e767b43a46f033d361e540fe13feaaf9b110ee0edc585" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch new file mode 100644 index 000000000..4bedef805 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch @@ -0,0 +1,36 @@ +From 36360b16833400de7818151be5588b16ac4fd5bc Mon Sep 17 00:00:00 2001 +From: Barret Rhoden +Date: Thu, 14 Mar 2019 17:30:38 -0400 +Subject: [PATCH] Fix missing include in sys/mman.h + +Linux commit 746c9398f5ac ("arch: move common mmap flags to +linux/mman.h") moved a few mmap flags, particularly MAP_PRIVATE, from +asm/mman.h to linux/mman.h. This broke klibc's build, which uses +MAP_PRIVATE. + +linux/mman.h includes asm/mman.h, so this commit merely includes +linux/mman.h instead of asm/mman.h. + +Signed-off-by: Barret Rhoden +Signed-off-by: Ben Hutchings +--- +Upstream-Status: Backport [https://git.kernel.org/pub/scm/libs/klibc/klibc.git/commit/?id=d4853d030639cf3542ae39129c18b654d8d4f020] + usr/include/sys/mman.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usr/include/sys/mman.h b/usr/include/sys/mman.h +index 56f0b65c..3fd626e7 100644 +--- a/usr/include/sys/mman.h ++++ b/usr/include/sys/mman.h +@@ -7,7 +7,7 @@ + + #include + #include +-#include ++#include + + #define MAP_FAILED ((void *)-1) + +-- +2.23.0 + diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc index 86aae3340..26689f87e 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -23,6 +23,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git \ file://0001-klibc-add-getrandom-syscall.patch \ file://0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch \ file://0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch \ + file://0001-Fix-missing-include-in-sys-mman.h.patch \ " ARMPATCHES ?= "" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index 234be02ca..9e1c323fe 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -5,8 +5,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" SRC_URI = "git://github.com/FluidSynth/fluidsynth.git" -SRCREV = "7f11a9bf5c7304e04309a6ec9fc515ee815524bf" +SRCREV = "f78486a50bd785200412ea16434b38edc4a45a6c" S = "${WORKDIR}/git" -PV = "2.0.5" +PV = "2.0.6" inherit cmake pkgconfig lib_package diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-freeradius-correct-version-number-of-libssl-defect.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-freeradius-correct-version-number-of-libssl-defect.patch deleted file mode 100644 index 9e1f5b2ef..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-freeradius-correct-version-number-of-libssl-defect.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fecf974b63f72eeb12d3b43522e948ca2bc704d4 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 11 Oct 2018 09:45:52 +0800 -Subject: [PATCH] freeradius: correct version number of libssl defect - -Upstream-Status: Backport [https://github.com/FreeRADIUS/freeradius-server - /commit/ad039347beca4ded297813a1da6eabb61fcf2ddd] - -upstream have refactored this part code into -src/lib/tls/base.c, and problem also have fixed -by commit ad039347beca - -Signed-off-by: Changqing Li ---- - src/main/tls.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/main/tls.c b/src/main/tls.c -index acbfe79..d9c91f1 100644 ---- a/src/main/tls.c -+++ b/src/main/tls.c -@@ -72,15 +72,15 @@ typedef struct libssl_defect { - static libssl_defect_t libssl_defects[] = - { - { -- .low = 0x01010101f, /* 1.1.0a */ -- .high = 0x01010101f, /* 1.1.0a */ -+ .low = 0x01010001f, /* 1.1.0a */ -+ .high = 0x01010001f, /* 1.1.0a */ - .id = "CVE-2016-6309", - .name = "OCSP status request extension", - .comment = "For more information see https://www.openssl.org/news/secadv/20160926.txt" - }, - { -- .low = 0x01010100f, /* 1.1.0 */ -- .high = 0x01010100f, /* 1.1.0 */ -+ .low = 0x010100000f, /* 1.1.0 */ -+ .high = 0x01010000f, /* 1.1.0 */ - .id = "CVE-2016-6304", - .name = "OCSP status request extension", - .comment = "For more information see https://www.openssl.org/news/secadv/20160922.txt" --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch index 71b78090c..471935872 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch @@ -1,20 +1,21 @@ -From 74eed61dec8702c89f3e121d577ea9db25c961a4 Mon Sep 17 00:00:00 2001 -From: Jackie Huang -Date: Mon, 11 Jan 2016 02:52:16 -0500 -Subject: [PATCH] configure.ac: add option for libcap +From 98a9eff357959d1113e33a615c2178751d5b2054 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 22 Aug 2019 10:50:21 +0800 +Subject: [PATCH 2/2] configure.ac: add option for libcap Upstream-Status: Pending Signed-off-by: Jackie Huang +Signed-off-by: Changqing Li --- - configure.ac | 37 ++++++++++++++++++++++++++++--------- - 1 file changed, 28 insertions(+), 9 deletions(-) + configure.ac | 36 +++++++++++++++++++++++++++--------- + 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac -index 066d3d7..6e4266b 100644 +index 65db61e..6486aac 100644 --- a/configure.ac +++ b/configure.ac -@@ -948,6 +948,23 @@ fi +@@ -977,6 +977,22 @@ fi dnl Set by FR_SMART_CHECKLIB LIBS="${old_LIBS}" @@ -33,12 +34,11 @@ index 066d3d7..6e4266b 100644 + ;; + esac ] +) -+ + dnl Check for cap dnl extra argument: --with-cap-lib-dir=DIR cap_lib_dir= -@@ -981,15 +998,17 @@ AC_ARG_WITH(cap-include-dir, +@@ -1010,15 +1026,17 @@ AC_ARG_WITH(cap-include-dir, ;; esac]) @@ -64,7 +64,7 @@ index 066d3d7..6e4266b 100644 + fi fi - VL_LIB_READLINE + dnl # -- -1.9.1 +2.7.4 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch deleted file mode 100644 index 638d95076..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch +++ /dev/null @@ -1,186 +0,0 @@ -From 69cb6d4bb5dd56a48695c0581a7d853e427b0ea3 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Tue, 24 Jul 2018 14:54:41 +0800 -Subject: [PATCH] freeradius: Fixing issues related to m4 include path - -Upstream-Status: Submitted [1] - -[1]: https://github.com/FreeRADIUS/freeradius-server/pull/1428 - -Submmited by: Jorge Pereira - -Update to version 3.0.17 - -Signed-off-by: Changqing Li ---- - src/modules/rlm_example/config.h.in | 35 +++-------------------------------- - src/modules/rlm_pam/config.h.in | 3 +++ - src/modules/rlm_perl/config.h.in | 3 +++ - src/modules/rlm_perl/configure.ac | 2 +- - src/modules/rlm_radutmp/config.h.in | 3 +++ - src/modules/rlm_ruby/configure.ac | 8 ++++---- - src/modules/rlm_smsotp/config.h.in | 3 +++ - src/modules/rlm_unix/config.h.in | 3 +++ - 8 files changed, 23 insertions(+), 37 deletions(-) - -diff --git a/src/modules/rlm_example/config.h.in b/src/modules/rlm_example/config.h.in -index 2a81ef5..4dbb8f4 100644 ---- a/src/modules/rlm_example/config.h.in -+++ b/src/modules/rlm_example/config.h.in -@@ -1,37 +1,5 @@ - /* config.h.in. Generated from configure.ac by autoheader. */ - --/* Define to 1 if you have the header file. */ --#undef HAVE_INTTYPES_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_MEMORY_H -- --/* Define to 1 if you have the `printf' function. */ --#undef HAVE_PRINTF -- --/* Define to 1 if you have the header file. */ --#undef HAVE_STDINT_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_STDIO_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_STDLIB_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_STRINGS_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_STRING_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_STAT_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_TYPES_H -- --/* Define to 1 if you have the header file. */ --#undef HAVE_UNISTD_H - - /* Define to the address where bug reports for this package should be sent. */ - #undef PACKAGE_BUGREPORT -@@ -45,6 +13,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -diff --git a/src/modules/rlm_pam/config.h.in b/src/modules/rlm_pam/config.h.in -index 32ef6ff..1ad20c5 100644 ---- a/src/modules/rlm_pam/config.h.in -+++ b/src/modules/rlm_pam/config.h.in -@@ -45,6 +45,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -diff --git a/src/modules/rlm_perl/config.h.in b/src/modules/rlm_perl/config.h.in -index 989ed53..f80de9c 100644 ---- a/src/modules/rlm_perl/config.h.in -+++ b/src/modules/rlm_perl/config.h.in -@@ -12,5 +12,8 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION -diff --git a/src/modules/rlm_perl/configure.ac b/src/modules/rlm_perl/configure.ac -index 4b3ff42..69c79cb 100644 ---- a/src/modules/rlm_perl/configure.ac -+++ b/src/modules/rlm_perl/configure.ac -@@ -3,7 +3,7 @@ AC_INIT(rlm_perl.c) - AC_REVISION($Revision$) - AC_DEFUN(modname,[rlm_perl]) - --m4_include([ax_with_prog.m4]) -+m4_include([m4/ax_with_prog.m4]) - - if test x$with_[]modname != xno; then - AC_PROG_CC -diff --git a/src/modules/rlm_radutmp/config.h.in b/src/modules/rlm_radutmp/config.h.in -index 9a883cc..750b434 100644 ---- a/src/modules/rlm_radutmp/config.h.in -+++ b/src/modules/rlm_radutmp/config.h.in -@@ -42,6 +42,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -diff --git a/src/modules/rlm_ruby/configure.ac b/src/modules/rlm_ruby/configure.ac -index 9306382..ae86a14 100644 ---- a/src/modules/rlm_ruby/configure.ac -+++ b/src/modules/rlm_ruby/configure.ac -@@ -3,15 +3,15 @@ AC_INIT(rlm_ruby.c) - AC_REVISION($Revision: 1.9 $) - AC_DEFUN(modname,[rlm_ruby]) - --m4_include([ax_with_prog.m4]) -+m4_include([m4/ax_with_prog.m4]) - - AC_DEFUN([AX_WITH_RUBY],[ - AX_WITH_PROG([RUBY],[ruby],[not-found],[${PATH}:/usr/bin:/usr/local/bin]) - ]) - --m4_include([ax_compare_version.m4]) --m4_include([ax_prog_ruby_version.m4]) --m4_include([ax_ruby_devel.m4]) -+m4_include([m4/ax_compare_version.m4]) -+m4_include([m4/ax_prog_ruby_version.m4]) -+m4_include([m4/ax_ruby_devel.m4]) - - targetname=modname - mod_cflags= -diff --git a/src/modules/rlm_smsotp/config.h.in b/src/modules/rlm_smsotp/config.h.in -index 5feaf91..9e69f85 100644 ---- a/src/modules/rlm_smsotp/config.h.in -+++ b/src/modules/rlm_smsotp/config.h.in -@@ -42,6 +42,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -diff --git a/src/modules/rlm_unix/config.h.in b/src/modules/rlm_unix/config.h.in -index dcb9aa2..16107b8 100644 ---- a/src/modules/rlm_unix/config.h.in -+++ b/src/modules/rlm_unix/config.h.in -@@ -54,6 +54,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch index 4eb61ff2e..4265f9d0d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch @@ -1,7 +1,7 @@ -From 56ef434e454bcc82c162a83d9bcb076d4fc72b7f Mon Sep 17 00:00:00 2001 -From: Jackie Huang -Date: Thu, 9 Jan 2014 14:30:26 +0800 -Subject: [PATCH] Fix libtool detection +From bfe4d7ed72edc9d4ae1a0f0d2dd84367d6214886 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 22 Aug 2019 10:45:46 +0800 +Subject: [PATCH 1/2] Fix libtool detection Upstream-Status: pending @@ -16,18 +16,19 @@ Also patch autogen.sh so it uses autoreconf, which handles libtoolize better. Signed-off-by: Jesse Zhang Signed-off-by: Jackie Huang +Signed-off-by: Changqing Li --- autogen.sh | 5 +---- configure.ac | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh -index 3418673..e42c3d5 100755 +index a1d08a6..959182b 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -5,10 +5,7 @@ parentdir=`dirname $0` - cd $parentdir +@@ -6,10 +6,7 @@ cd $parentdir parentdir=`pwd` + m4include="-I$parentdir -I$parentdir/m4 -Im4" -libtoolize -f -c -#aclocal @@ -38,10 +39,10 @@ index 3418673..e42c3d5 100755 mysubdirs="$mysubdirs `find src/modules/ -name configure -print | sed 's%/configure%%'`" mysubdirs=`echo $mysubdirs` diff --git a/configure.ac b/configure.ac -index e73e4ad..066d3d7 100644 +index a7abf00..65db61e 100644 --- a/configure.ac +++ b/configure.ac -@@ -205,6 +205,42 @@ dnl # See if we have Git. +@@ -220,6 +220,42 @@ dnl # See if we have Git. dnl # AC_CHECK_PROG(GIT, git, yes, no) @@ -85,5 +86,5 @@ index e73e4ad..066d3d7 100644 dnl AC_ARG_WITH(disablemodulefoo, dnl [ --without-rlm_foo Disables module compilation. Module list:] -- -1.8.3 +2.7.4 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.17.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.17.bb deleted file mode 100644 index e0b04c110..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.17.bb +++ /dev/null @@ -1,227 +0,0 @@ -DESCRIPTION = "FreeRADIUS is an Internet authentication daemon, which implements the RADIUS \ -protocol, as defined in RFC 2865 (and others). It allows Network Access \ -Servers (NAS boxes) to perform authentication for dial-up users. There are \ -also RADIUS clients available for Web servers, firewalls, Unix logins, and \ -more. Using RADIUS allows authentication and authorization for a network to \ -be centralized, and minimizes the amount of re-configuration which has to be \ -done when adding or deleting new users." - -SUMMARY = "High-performance and highly configurable RADIUS server" -HOMEPAGE = "http://www.freeradius.org/" -SECTION = "System/Servers" -LICENSE = "GPLv2 & LGPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" -DEPENDS = "openssl-native openssl libidn libtool libpcap libtalloc" - -SRC_URI = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${PV}.tar.bz2 \ - file://freeradius \ - file://volatiles.58_radiusd \ - file://freeradius-enble-user-in-conf.patch \ - file://freeradius-configure.ac-allow-cross-compilation.patch \ - file://freeradius-fix-issues-related-to-m4-include-path.patch \ - file://freeradius-libtool-detection.patch \ - file://freeradius-configure.ac-add-option-for-libcap.patch \ - file://freeradius-avoid-searching-host-dirs.patch \ - file://freeradius-rlm_python-add-PY_INC_DIR.patch \ - file://freeradius-libtool-do-not-use-jlibtool.patch \ - file://freeradius-fix-quoting-for-BUILT_WITH.patch \ - file://freeradius-fix-error-for-expansion-of-macro.patch \ - file://0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ - file://radiusd.service \ - file://radiusd-volatiles.conf \ - file://0001-freeradius-correct-version-number-of-libssl-defect.patch \ -" -SRC_URI[md5sum] = "1f4ad38f32101a7d50d818afa6f17339" -SRC_URI[sha256sum] = "3f03404b6e4a4f410e1f15ea2ababfec7f8a7ae8a49836d8a0c137436d913b96" - -PARALLEL_MAKE = "" - -S = "${WORKDIR}/freeradius-server-${PV}" - -EXTRA_OECONF = " --enable-strict-dependencies \ - --with-docdir=${docdir}/freeradius-${PV} \ - --with-openssl-includes=${STAGING_INCDIR} \ - --with-openssl-libraries=${STAGING_LIBDIR} \ - --without-rlm_ippool \ - --without-rlm_cache_memcached \ - --without-rlm_counter \ - --without-rlm_couchbase \ - --without-rlm_dbm \ - --without-rlm_eap_tnc \ - --without-rlm_eap_ikev2 \ - --without-rlm_opendirectory \ - --without-rlm_redis \ - --without-rlm_rediswho \ - --without-rlm_sql_db2 \ - --without-rlm_sql_firebird \ - --without-rlm_sql_freetds \ - --without-rlm_sql_iodbc \ - --without-rlm_sql_oracle \ - --without-rlm_sql_sybase \ - --without-rlm_sqlhpwippool \ - ac_cv_path_PERL=${bindir}/perl \ - ax_cv_cc_builtin_choose_expr=no \ - ax_cv_cc_builtin_types_compatible_p=no \ - ax_cv_cc_builtin_bswap64=no \ - ax_cv_cc_bounded_attribute=no \ -" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - pcre libcap \ - openssl rlm-eap-fast rlm-eap-pwd \ -" - -PACKAGECONFIG[krb5] = "--with-rlm_krb5,--without-rlm_krb5,krb5" -PACKAGECONFIG[pam] = "--with-rlm_pam,--without-rlm_pam,libpam" -PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" -PACKAGECONFIG[ldap] = "--with-rlm_ldap,--without-rlm_ldap,openldap" -PACKAGECONFIG[mysql] = "--with-rlm_sql_mysql,--without-rlm_sql_mysql,mysql5" -PACKAGECONFIG[sqlite] = "--with-rlm_sql_sqlite,--without-rlm_sql_sqlite,sqlite3" -PACKAGECONFIG[unixodbc] = "--with-rlm_sql_unixodbc,--without-rlm_sql_unixodbc,unixodbc" -PACKAGECONFIG[postgresql] = "--with-rlm_sql_postgresql,--without-rlm_sql_postgresql,postgresql" -PACKAGECONFIG[pcre] = "--with-pcre,--without-pcre,libpcre" -PACKAGECONFIG[perl] = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl --with-rlm_perl,--without-rlm_perl,perl-native perl,perl" -PACKAGECONFIG[python] = "--with-rlm_python --with-rlm-python-bin=${STAGING_BINDIR_NATIVE}/python-native/python --with-rlm-python-include-dir=${STAGING_INCDIR}/${PYTHON_DIR},--without-rlm_python,python-native python" -PACKAGECONFIG[rest] = "--with-rlm_rest,--without-rlm_rest,curl json-c" -PACKAGECONFIG[ruby] = "--with-rlm_ruby,--without-rlm_ruby,ruby" -PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl" -PACKAGECONFIG[rlm-eap-fast] = "--with-rlm_eap_fast, --without-rlm_eap_fast" -PACKAGECONFIG[rlm-eap-pwd] = "--with-rlm_eap_pwd, --without-rlm_eap_pwd" - -inherit useradd autotools-brokensep update-rc.d systemd - -# This is not a cpan or python based package, but it needs some definitions -# from cpan-base and python-dir bbclasses for building rlm_perl and rlm_python -# correctly. -inherit cpan-base python-dir - -# The modules subdirs also need to be processed by autoreconf. Use autogen.sh -# in order to handle the subdirs correctly. -do_configure () { - ./autogen.sh - - # the configure of rlm_perl needs this to get correct - # mod_cflags and mod_ldflags - if ${@bb.utils.contains('PACKAGECONFIG', 'perl', 'true', 'false', d)}; then - export PERL5LIB="${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" - fi - - oe_runconf - - # we don't need dhcpclient - sed -i -e 's/dhcpclient.mk//' ${S}/src/modules/proto_dhcp/all.mk -} - -INITSCRIPT_NAME = "radiusd" - -SYSTEMD_SERVICE_${PN} = "radiusd.service" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --shell /bin/false --user-group radiusd" - -do_install() { - rm -rf ${D} - mkdir -p ${D}/${sysconfdir}/logrotate.d - mkdir -p ${D}/${sysconfdir}/pam.d - mkdir -p ${D}/${sysconfdir}/init.d - mkdir -p ${D}/${localstatedir}/lib/radiusd - mkdir -p ${D}${sysconfdir}/default/volatiles - - export LD_LIBRARY_PATH=${D}/${libdir} - oe_runmake install R=${D} INSTALLSTRIP="" - - # remove unsupported config files - rm -f ${D}/${sysconfdir}/raddb/experimental.conf - - # remove scripts that required Perl(DBI) - rm -rf ${D}/${bindir}/radsqlrelay - - cp -f ${WORKDIR}/freeradius ${D}/etc/init.d/radiusd - rm -f ${D}/${sbindir}/rc.radiusd - chmod +x ${D}/${sysconfdir}/init.d/radiusd - rm -rf ${D}/${localstatedir}/run/ - install -m 0644 ${WORKDIR}/volatiles.58_radiusd ${D}${sysconfdir}/default/volatiles/58_radiusd - - chown -R radiusd:radiusd ${D}/${sysconfdir}/raddb/ - chown -R radiusd:radiusd ${D}/${localstatedir}/lib/radiusd - - # For systemd - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/radiusd.service ${D}${systemd_unitdir}/system - sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ - -e 's,@SBINDIR@,${sbindir},g' \ - -e 's,@STATEDIR@,${localstatedir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - ${D}${systemd_unitdir}/system/radiusd.service - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 0644 ${WORKDIR}/radiusd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/ - fi -} - -# This is only needed when we install/update on a running target. -# -pkg_postinst_${PN} () { - if [ -z "$D" ]; then - if command -v systemd-tmpfiles >/dev/null; then - # create /var/log/radius, /var/run/radiusd - systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/radiusd-volatiles.conf - elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then - ${sysconfdir}/init.d/populate-volatile.sh update - fi - - # Fix ownership for /etc/raddb/*, /var/lib/radiusd - chown -R radiusd:radiusd ${sysconfdir}/raddb - chown -R radiusd:radiusd ${localstatedir}/lib/radiusd - fi -} - -# We really need the symlink :( -INSANE_SKIP_${PN} = "dev-so" -INSANE_SKIP_${PN}-krb5 = "dev-so" -INSANE_SKIP_${PN}-ldap = "dev-so" -INSANE_SKIP_${PN}-mysql = "dev-so" -INSANE_SKIP_${PN}-perl = "dev-so" -INSANE_SKIP_${PN}-postgresql = "dev-so" -INSANE_SKIP_${PN}-python = "dev-so" -INSANE_SKIP_${PN}-unixodbc = "dev-so" - -PACKAGES =+ "${PN}-utils ${PN}-ldap ${PN}-krb5 ${PN}-perl \ - ${PN}-python ${PN}-mysql ${PN}-postgresql ${PN}-unixodbc" - -FILES_${PN}-utils = "${bindir}/*" - -FILES_${PN}-ldap = "${libdir}/rlm_ldap.so* \ - ${sysconfdir}/raddb/mods-available/ldap \ -" - -FILES_${PN}-krb5 = "${libdir}/rlm_krb5.so* \ - ${sysconfdir}/raddb/mods-available/krb5 \ -" - -FILES_${PN}-perl = "${libdir}/rlm_perl.so* \ - ${sysconfdir}/raddb/mods-config/perl \ - ${sysconfdir}/raddb/mods-available/perl \ -" - -FILES_${PN}-python = "${libdir}/rlm_python.so* \ - ${sysconfdir}/raddb/mods-config/python \ - ${sysconfdir}/raddb/mods-available/python \ -" - -FILES_${PN}-mysql = "${libdir}/rlm_sql_mysql.so* \ - ${sysconfdir}/raddb/mods-config/sql/*/mysql \ - ${sysconfdir}/raddb/mods-available/sql \ -" - -FILES_${PN}-postgresql = "${libdir}/rlm_sql_postgresql.so* \ - ${sysconfdir}/raddb/mods-config/sql/*/postgresql \ -" - -FILES_${PN}-unixodbc = "${libdir}/rlm_sql_unixodbc.so*" - -FILES_${PN} =+ "${libdir}/rlm_*.so* ${libdir}/proto_*so*" - -RDEPENDS_${PN} += "perl" -RDEPENDS_${PN}-utils = "${PN} perl" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb new file mode 100644 index 000000000..ded1a67ff --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.19.bb @@ -0,0 +1,230 @@ +DESCRIPTION = "FreeRADIUS is an Internet authentication daemon, which implements the RADIUS \ +protocol, as defined in RFC 2865 (and others). It allows Network Access \ +Servers (NAS boxes) to perform authentication for dial-up users. There are \ +also RADIUS clients available for Web servers, firewalls, Unix logins, and \ +more. Using RADIUS allows authentication and authorization for a network to \ +be centralized, and minimizes the amount of re-configuration which has to be \ +done when adding or deleting new users." + +SUMMARY = "High-performance and highly configurable RADIUS server" +HOMEPAGE = "http://www.freeradius.org/" +SECTION = "System/Servers" +LICENSE = "GPLv2 & LGPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" +DEPENDS = "openssl-native openssl libidn libtool libpcap libtalloc" + +SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x; \ + file://freeradius \ + file://volatiles.58_radiusd \ + file://freeradius-enble-user-in-conf.patch \ + file://freeradius-configure.ac-allow-cross-compilation.patch \ + file://freeradius-libtool-detection.patch \ + file://freeradius-configure.ac-add-option-for-libcap.patch \ + file://freeradius-avoid-searching-host-dirs.patch \ + file://freeradius-rlm_python-add-PY_INC_DIR.patch \ + file://freeradius-libtool-do-not-use-jlibtool.patch \ + file://freeradius-fix-quoting-for-BUILT_WITH.patch \ + file://freeradius-fix-error-for-expansion-of-macro.patch \ + file://0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch \ + file://radiusd.service \ + file://radiusd-volatiles.conf \ +" + +SRCREV = "ab4c767099f263a7cd4109bcdca80ee74210a769" + +PARALLEL_MAKE = "" + +S = "${WORKDIR}/git" + +LDFLAGS_append_powerpc = " -latomic" +LDFLAGS_append_mipsarch = " -latomic" + +EXTRA_OECONF = " --enable-strict-dependencies \ + --with-docdir=${docdir}/freeradius-${PV} \ + --with-openssl-includes=${STAGING_INCDIR} \ + --with-openssl-libraries=${STAGING_LIBDIR} \ + --without-rlm_ippool \ + --without-rlm_cache_memcached \ + --without-rlm_counter \ + --without-rlm_couchbase \ + --without-rlm_dbm \ + --without-rlm_eap_tnc \ + --without-rlm_eap_ikev2 \ + --without-rlm_opendirectory \ + --without-rlm_redis \ + --without-rlm_rediswho \ + --without-rlm_sql_db2 \ + --without-rlm_sql_firebird \ + --without-rlm_sql_freetds \ + --without-rlm_sql_iodbc \ + --without-rlm_sql_oracle \ + --without-rlm_sql_sybase \ + --without-rlm_sqlhpwippool \ + --without-rlm_securid \ + --without-rlm_unbound \ + ac_cv_path_PERL=${bindir}/perl \ + ax_cv_cc_builtin_choose_expr=no \ + ax_cv_cc_builtin_types_compatible_p=no \ + ax_cv_cc_builtin_bswap64=no \ + ax_cv_cc_bounded_attribute=no \ +" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + pcre libcap \ + openssl rlm-eap-fast rlm-eap-pwd \ +" + +PACKAGECONFIG[krb5] = "--with-rlm_krb5,--without-rlm_krb5,krb5" +PACKAGECONFIG[pam] = "--with-rlm_pam,--without-rlm_pam,libpam" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[ldap] = "--with-rlm_ldap,--without-rlm_ldap,openldap" +PACKAGECONFIG[mysql] = "--with-rlm_sql_mysql,--without-rlm_sql_mysql,mysql5" +PACKAGECONFIG[sqlite] = "--with-rlm_sql_sqlite,--without-rlm_sql_sqlite,sqlite3" +PACKAGECONFIG[unixodbc] = "--with-rlm_sql_unixodbc,--without-rlm_sql_unixodbc,unixodbc" +PACKAGECONFIG[postgresql] = "--with-rlm_sql_postgresql,--without-rlm_sql_postgresql,postgresql" +PACKAGECONFIG[pcre] = "--with-pcre,--without-pcre,libpcre" +PACKAGECONFIG[perl] = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl --with-rlm_perl,--without-rlm_perl,perl-native perl,perl" +PACKAGECONFIG[python] = "--with-rlm_python --with-rlm-python-bin=${STAGING_BINDIR_NATIVE}/python-native/python --with-rlm-python-include-dir=${STAGING_INCDIR}/${PYTHON_DIR},--without-rlm_python,python-native python" +PACKAGECONFIG[rest] = "--with-rlm_rest,--without-rlm_rest,curl json-c" +PACKAGECONFIG[ruby] = "--with-rlm_ruby,--without-rlm_ruby,ruby" +PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl" +PACKAGECONFIG[rlm-eap-fast] = "--with-rlm_eap_fast, --without-rlm_eap_fast" +PACKAGECONFIG[rlm-eap-pwd] = "--with-rlm_eap_pwd, --without-rlm_eap_pwd" + +inherit useradd autotools-brokensep update-rc.d systemd + +# This is not a cpan or python based package, but it needs some definitions +# from cpan-base and python-dir bbclasses for building rlm_perl and rlm_python +# correctly. +inherit cpan-base python-dir + +# The modules subdirs also need to be processed by autoreconf. Use autogen.sh +# in order to handle the subdirs correctly. +do_configure () { + ./autogen.sh + + # the configure of rlm_perl needs this to get correct + # mod_cflags and mod_ldflags + if ${@bb.utils.contains('PACKAGECONFIG', 'perl', 'true', 'false', d)}; then + export PERL5LIB="${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" + fi + + oe_runconf + + # we don't need dhcpclient + sed -i -e 's/dhcpclient.mk//' ${S}/src/modules/proto_dhcp/all.mk +} + +INITSCRIPT_NAME = "radiusd" + +SYSTEMD_SERVICE_${PN} = "radiusd.service" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --no-create-home --shell /bin/false --user-group radiusd" + +do_install() { + rm -rf ${D} + mkdir -p ${D}/${sysconfdir}/logrotate.d + mkdir -p ${D}/${sysconfdir}/pam.d + mkdir -p ${D}/${sysconfdir}/init.d + mkdir -p ${D}/${localstatedir}/lib/radiusd + mkdir -p ${D}${sysconfdir}/default/volatiles + + export LD_LIBRARY_PATH=${D}/${libdir} + oe_runmake install R=${D} INSTALLSTRIP="" + + # remove unsupported config files + rm -f ${D}/${sysconfdir}/raddb/experimental.conf + + # remove scripts that required Perl(DBI) + rm -rf ${D}/${bindir}/radsqlrelay + + cp -f ${WORKDIR}/freeradius ${D}/etc/init.d/radiusd + rm -f ${D}/${sbindir}/rc.radiusd + chmod +x ${D}/${sysconfdir}/init.d/radiusd + rm -rf ${D}/${localstatedir}/run/ + install -m 0644 ${WORKDIR}/volatiles.58_radiusd ${D}${sysconfdir}/default/volatiles/58_radiusd + + chown -R radiusd:radiusd ${D}/${sysconfdir}/raddb/ + chown -R radiusd:radiusd ${D}/${localstatedir}/lib/radiusd + + # For systemd + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/radiusd.service ${D}${systemd_unitdir}/system + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@STATEDIR@,${localstatedir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${systemd_unitdir}/system/radiusd.service + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d/ + install -m 0644 ${WORKDIR}/radiusd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/ + fi +} + +# This is only needed when we install/update on a running target. +# +pkg_postinst_${PN} () { + if [ -z "$D" ]; then + if command -v systemd-tmpfiles >/dev/null; then + # create /var/log/radius, /var/run/radiusd + systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/radiusd-volatiles.conf + elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi + + # Fix ownership for /etc/raddb/*, /var/lib/radiusd + chown -R radiusd:radiusd ${sysconfdir}/raddb + chown -R radiusd:radiusd ${localstatedir}/lib/radiusd + fi +} + +# We really need the symlink :( +INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP_${PN}-krb5 = "dev-so" +INSANE_SKIP_${PN}-ldap = "dev-so" +INSANE_SKIP_${PN}-mysql = "dev-so" +INSANE_SKIP_${PN}-perl = "dev-so" +INSANE_SKIP_${PN}-postgresql = "dev-so" +INSANE_SKIP_${PN}-python = "dev-so" +INSANE_SKIP_${PN}-unixodbc = "dev-so" + +PACKAGES =+ "${PN}-utils ${PN}-ldap ${PN}-krb5 ${PN}-perl \ + ${PN}-python ${PN}-mysql ${PN}-postgresql ${PN}-unixodbc" + +FILES_${PN}-utils = "${bindir}/*" + +FILES_${PN}-ldap = "${libdir}/rlm_ldap.so* \ + ${sysconfdir}/raddb/mods-available/ldap \ +" + +FILES_${PN}-krb5 = "${libdir}/rlm_krb5.so* \ + ${sysconfdir}/raddb/mods-available/krb5 \ +" + +FILES_${PN}-perl = "${libdir}/rlm_perl.so* \ + ${sysconfdir}/raddb/mods-config/perl \ + ${sysconfdir}/raddb/mods-available/perl \ +" + +FILES_${PN}-python = "${libdir}/rlm_python.so* \ + ${sysconfdir}/raddb/mods-config/python \ + ${sysconfdir}/raddb/mods-available/python \ +" + +FILES_${PN}-mysql = "${libdir}/rlm_sql_mysql.so* \ + ${sysconfdir}/raddb/mods-config/sql/*/mysql \ + ${sysconfdir}/raddb/mods-available/sql \ +" + +FILES_${PN}-postgresql = "${libdir}/rlm_sql_postgresql.so* \ + ${sysconfdir}/raddb/mods-config/sql/*/postgresql \ +" + +FILES_${PN}-unixodbc = "${libdir}/rlm_sql_unixodbc.so*" + +FILES_${PN} =+ "${libdir}/rlm_*.so* ${libdir}/proto_*so*" + +RDEPENDS_${PN} += "perl" +RDEPENDS_${PN}-utils = "${PN} perl" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch new file mode 100644 index 000000000..de7f31183 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch @@ -0,0 +1,30 @@ +From 3a935c638605bfb392ca7780d22c08c1a0a71e71 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 5 Sep 2019 21:37:33 -0700 +Subject: [PATCH 1/2] lib/replace/wscript: Avoid generating nested main + function + +clang is not happy when it sees another main nested inside the main +function and fails the test for prctl syscall, therefore avoid adding +implicit main() here + +Signed-off-by: Khem Raj +--- + lib/replace/wscript | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/replace/wscript b/lib/replace/wscript +index a7fd25d..d6767fc 100644 +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -137,6 +137,7 @@ def configure(conf): + } + ''', + 'HAVE_PRCTL', ++ addmain=False, + headers='sys/prctl.h', + msg='Checking for prctl syscall') + +-- +2.23.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-util_sec.c-Move-__thread-variable-to-global-scope.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-util_sec.c-Move-__thread-variable-to-global-scope.patch new file mode 100644 index 000000000..6fc849337 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-util_sec.c-Move-__thread-variable-to-global-scope.patch @@ -0,0 +1,58 @@ +From c62a6f32ab965de2ec77a614f20f04568116835b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 5 Sep 2019 21:39:05 -0700 +Subject: [PATCH 2/2] util_sec.c: Move __thread variable to global scope + +Make clang happy otherwise it complains about variable scope + +fixes + +source3/./lib/util_sec.c:470:4: error: '__thread' variables must have global storage + } __thread cache; + ^ + +Signed-off-by: Khem Raj +--- + source3/lib/util_sec.c | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +diff --git a/source3/lib/util_sec.c b/source3/lib/util_sec.c +index 9408269..7390318 100644 +--- a/source3/lib/util_sec.c ++++ b/source3/lib/util_sec.c +@@ -444,6 +444,17 @@ void become_user_permanently(uid_t uid, gid_t gid) + assert_gid(gid, gid); + } + ++#ifdef HAVE___THREAD ++ struct cache_t { ++ bool active; ++ uid_t uid; ++ gid_t gid; ++ size_t setlen; ++ uintptr_t gidset; ++ }; ++ ++static __thread struct cache_t cache; ++#endif + /********************************************************** + Function to set thread specific credentials. Leave + saved-set uid/gid alone.Must be thread-safe code. +@@ -461,14 +472,6 @@ int set_thread_credentials(uid_t uid, + * available. + */ + #ifdef HAVE___THREAD +- static struct { +- bool active; +- uid_t uid; +- gid_t gid; +- size_t setlen; +- uintptr_t gidset; +- } __thread cache; +- + if (cache.active && + cache.uid == uid && + cache.gid == gid && +-- +2.23.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.7.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.7.bb index d13a6b4db..1b2bc087d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.7.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.7.bb @@ -24,6 +24,8 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ 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 \ " SRC_URI_append_libc-musl = " \ file://samba-pam.patch \ diff --git a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index 29ce51b23..f511d729e 100644 --- a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -78,7 +78,7 @@ RDEPENDS_packagegroup-meta-networking-kernel = "\ RDEPENDS_packagegroup-meta-networking-netkit = "\ netkit-rwho-client netkit-rwho-server netkit-rsh-client netkit-rsh-server \ netkit-telnet netkit-tftp-client netkit-tftp-server \ - netkit-ftp netkit-rusers-client netkit-rusers-server netkit-rpc \ + netkit-ftp netkit-rpc \ " RDEPENDS_packagegroup-meta-networking-protocols = "\ @@ -95,7 +95,7 @@ RDEPENDS_packagegroup-meta-networking-support = "\ phytool fwknop htpdate tcpreplay \ traceroute geoip-perl geoip geoipupdate esmtp \ libtdb netcf dnsmasq curlpp openipmi drbd-utils \ - drbd tunctl dovecot ipvsadm stunnel chrony spice-protocol \ + tunctl dovecot ipvsadm stunnel chrony spice-protocol \ usbredir ntop wireshark tnftp lksctp-tools \ cim-schema-docs cim-schema-final cim-schema-exper \ libmemcached smcroute libtevent ipcalc c-ares uftp \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Make-iscsid-systemd-usage-optional.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Make-iscsid-systemd-usage-optional.patch new file mode 100644 index 000000000..08248d358 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Make-iscsid-systemd-usage-optional.patch @@ -0,0 +1,88 @@ +From 365efb2fd3062065af4b6eb3dc1661b96557dae8 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Wed, 21 Aug 2019 16:37:53 +0800 +Subject: [PATCH] Make iscsid systemd usage optional + +Upstream-Status: Backport[https://github.com/open-iscsi/open-iscsi +/commit/f71581bd641dc26d330cb8b97e5ec272dd08f811] + +Signed-off-by: Changqing Li +--- + Makefile | 5 +++++ + usr/Makefile | 2 ++ + usr/iscsid.c | 6 ++++++ + 3 files changed, 13 insertions(+) + +diff --git a/Makefile b/Makefile +index c533e9d..1ef0921 100644 +--- a/Makefile ++++ b/Makefile +@@ -39,6 +39,11 @@ ifneq (,$(CFLAGS)) + export CFLAGS + endif + ++# export systemd disablement if set ++ifneq ($(NO_SYSTEMD),) ++export NO_SYSTEMD ++endif ++ + # Random comments: + # using '$(MAKE)' instead of just 'make' allows make to run in parallel + # over multiple makefile. +diff --git a/usr/Makefile b/usr/Makefile +index f9445ad..0203127 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -41,7 +41,9 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ + CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) + ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr + LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) ++ifneq ($(NO_SYSTEMD),) + LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) ++endif + PROGRAMS = iscsid iscsiadm iscsistart + + # libc compat files +diff --git a/usr/iscsid.c b/usr/iscsid.c +index 0c98440..164325e 100644 +--- a/usr/iscsid.c ++++ b/usr/iscsid.c +@@ -34,7 +34,9 @@ + #include + #include + #include ++#ifndef NO_SYSTEMD + #include ++#endif + + #include "iscsid.h" + #include "mgmt_ipc.h" +@@ -339,6 +341,7 @@ static void missing_iname_warn(char *initiatorname_file) + /* called right before we enter the event loop */ + static void set_state_to_ready(void) + { ++#ifndef NO_SYSTEMD + if (sessions_to_recover) + sd_notify(0, "READY=1\n" + "RELOADING=1\n" +@@ -346,14 +349,17 @@ static void set_state_to_ready(void) + else + sd_notify(0, "READY=1\n" + "STATUS=Ready to process requests\n"); ++#endif + } + + /* called when recovery process has been reaped */ + static void set_state_done_reloading(void) + { ++#ifndef NO_SYSTEMD + sessions_to_recover = 0; + sd_notifyf(0, "READY=1\n" + "STATUS=Ready to process requests\n"); ++#endif + } + + int main(int argc, char *argv[]) +-- +2.7.4 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Use-pkg-config-in-Makefiles-for-newer-libraries.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Use-pkg-config-in-Makefiles-for-newer-libraries.patch new file mode 100644 index 000000000..37b764e85 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Use-pkg-config-in-Makefiles-for-newer-libraries.patch @@ -0,0 +1,92 @@ +From e9b49664e969fd5cad1abef7b8b59e1fb8d02a47 Mon Sep 17 00:00:00 2001 +From: Lee Duncan +Date: Mon, 12 Nov 2018 13:10:04 -0800 +Subject: [PATCH] Use pkg-config in Makefiles for newer libraries. + +These two recently-added libraries can be in different +locations on different distros, so use pkg-config to +added the appropriate actions in the make files. + +Upstream-Status: Backport[https://github.com/open-iscsi/open-iscsi/commit/ +623a81123c494f5c69dc6616bd72e838862e2f1f#diff-c4bf6688222ad28c9719cfaf88c16329] + +Signed-off-by: Changqing Li +--- + libopeniscsiusr/Makefile | 8 +++++++- + usr/Makefile | 11 ++++++++--- + 2 files changed, 15 insertions(+), 4 deletions(-) + +diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile +index bf7c96c..a045a45 100644 +--- a/libopeniscsiusr/Makefile ++++ b/libopeniscsiusr/Makefile +@@ -23,6 +23,8 @@ endif + INCLUDE_DIR ?= $(prefix)/include + PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig + ++PKG_CONFIG = /usr/bin/pkg-config ++ + LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr + + LIBISCSI_USR_VERSION_MAJOR=0 +@@ -43,13 +45,17 @@ OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o + + CFLAGS ?= -O2 -g + CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC ++CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) ++ ++LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) + + LIBADD = + + all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc + + $(LIBS): $(OBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD) ++ @echo CFLAGS= $(CFLAGS) ++ $(CC) $(CFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LDFLAGS) $(LIBADD) + ln -sf $@ $(DEVLIB) + + $(LIBS_MAJOR): $(LIBS) +diff --git a/usr/Makefile b/usr/Makefile +index f9445ad..f1c35aa 100644 +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -32,11 +32,16 @@ IPC_OBJ=ioctl.o + endif + endif + ++PKG_CONFIG = /usr/bin/pkg-config ++ + CFLAGS ?= -O2 -g + WARNFLAGS ?= -Wall -Wstrict-prototypes + CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ + -I$(TOPDIR)/libopeniscsiusr ++CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) + ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr ++LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) ++LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) + PROGRAMS = iscsid iscsiadm iscsistart + + # libc compat files +@@ -60,14 +65,14 @@ all: $(PROGRAMS) + + iscsid: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(DISCOVERY_SRCS) \ + iscsid.o session_mgmt.o discoveryd.o mntcheck.o +- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(ISCSI_LIB) ++ $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lrt -lmount $(LDFLAGS) $(ISCSI_LIB) + + iscsiadm: $(ISCSI_LIB_SRCS) $(DISCOVERY_SRCS) iscsiadm.o session_mgmt.o mntcheck.o +- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(ISCSI_LIB) ++ $(CC) $(CFLAGS) $^ -o $@ -lisns -lcrypto -lmount $(LDFLAGS) $(ISCSI_LIB) + + iscsistart: $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) $(FW_BOOT_SRCS) \ + iscsistart.o statics.o +- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB) ++ $(CC) $(CFLAGS) $^ -o $@ -lrt $(LDFLAGS) $(ISCSI_LIB) + clean: + rm -f *.o $(PROGRAMS) .depend $(LIBSYS) + +-- +2.7.4 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb deleted file mode 100644 index 48b0783f6..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb +++ /dev/null @@ -1,114 +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" - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRCREV ?= "bd79e4ed1004a6035d2538a308c5930890421a22" - -SRC_URI = "git://github.com/open-iscsi/open-iscsi \ - file://0001-Fix-i586-build-issues-with-string-length-overflow.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" -B = "${WORKDIR}/build" - -PV .= "+git${SRCPV}" - -inherit update-rc.d systemd autotools - -EXTRA_OECONF = " \ - --target=${TARGET_SYS} \ - --host=${BUILD_SYS} \ -" - -EXTRA_OEMAKE = ' \ - OS="${TARGET_SYS}" \ - TARGET="${TARGET_OS}" \ - BASE="${prefix}" \ - MANDIR="${mandir}" \ -' - -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.0.877.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.877.bb new file mode 100644 index 000000000..3cef70f5e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.877.bb @@ -0,0 +1,119 @@ +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" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRCREV ?= "120ac127654c4644d46a74799fffe527ab1f4f42" + +SRC_URI = "git://github.com/open-iscsi/open-iscsi \ + file://0001-Fix-i586-build-issues-with-string-length-overflow.patch \ + file://initd.debian \ + file://99_iscsi-initiator-utils \ + file://iscsi-initiator \ + file://iscsi-initiator.service \ + file://iscsi-initiator-targets.service \ + file://set_initiatorname \ + file://0001-Use-pkg-config-in-Makefiles-for-newer-libraries.patch \ + file://0001-Make-iscsid-systemd-usage-optional.patch \ + " +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_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-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch index c6afff2d2..88b0af7f8 100644 --- a/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch +++ b/meta-openembedded/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch @@ -1,53 +1,115 @@ -From c27261a8bc1e45ff7d7a585c79b2b871d47217e4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 26 Jul 2019 18:56:26 -0700 -Subject: [PATCH] Define gettid() only for glibc < 2.30 +Upstream-Status: Backport -glibc 2.30 has added this API, so let us use that when possible +From de6255941a5e1c2fb2d50e57f84e38c09f45023d Mon Sep 17 00:00:00 2001 +From: Juanli Shen +Date: Fri, 23 Aug 2019 08:46:09 -0700 +Subject: [PATCH] Fix gettid() naming conflict -Upstream-Status: Pending -Signed-off-by: Khem Raj --- - src/core/lib/gpr/log_linux.cc | 4 ++++ - src/core/lib/iomgr/ev_epollex_linux.cc | 7 +++++-- - 2 files changed, 9 insertions(+), 2 deletions(-) + src/core/lib/gpr/log_linux.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc -index 561276f0c2..25a74864a1 100644 +index 561276f0c20..81026e5689b 100644 --- a/src/core/lib/gpr/log_linux.cc +++ b/src/core/lib/gpr/log_linux.cc -@@ -40,7 +40,11 @@ +@@ -40,7 +40,9 @@ #include #include -+#if defined(__GLIBC__) && (__GLIBC_MINOR__ >= 29) -+#include -+#else - static long gettid(void) { return syscall(__NR_gettid); } -+#endif +-static long gettid(void) { return syscall(__NR_gettid); } ++// Not naming it as gettid() to avoid duplicate declarations when complied with ++// GCC 9.1. ++static long local_gettid(void) { return syscall(__NR_gettid); } void gpr_log(const char* file, int line, gpr_log_severity severity, const char* format, ...) { +@@ -70,7 +72,7 @@ void gpr_default_log(gpr_log_func_args* args) { + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + struct tm tm; + static __thread long tid = 0; +- if (tid == 0) tid = gettid(); ++ if (tid == 0) tid = local_gettid(); + + timer = static_cast(now.tv_sec); + final_slash = strrchr(args->file, '/'); +From 57586a1ca7f17b1916aed3dea4ff8de872dbf853 Mon Sep 17 00:00:00 2001 +From: Benjamin Peterson +Date: Fri, 3 May 2019 08:11:00 -0700 +Subject: [PATCH] Rename gettid() functions. + +glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts. +--- + src/core/lib/gpr/log_linux.cc | 6 ++---- + src/core/lib/gpr/log_posix.cc | 4 ++-- + src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++-- + 3 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc +index 81026e5689b..8b597b4cf2f 100644 +--- a/src/core/lib/gpr/log_linux.cc ++++ b/src/core/lib/gpr/log_linux.cc +@@ -40,9 +40,7 @@ + #include + #include + +-// Not naming it as gettid() to avoid duplicate declarations when complied with +-// GCC 9.1. +-static long local_gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -72,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + struct tm tm; + static __thread long tid = 0; +- if (tid == 0) tid = local_gettid(); ++ if (tid == 0) tid = sys_gettid(); + + timer = static_cast(now.tv_sec); + final_slash = strrchr(args->file, '/'); +diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc +index b6edc14ab6b..2f7c6ce3760 100644 +--- a/src/core/lib/gpr/log_posix.cc ++++ b/src/core/lib/gpr/log_posix.cc +@@ -31,7 +31,7 @@ + #include + #include + +-static intptr_t gettid(void) { return (intptr_t)pthread_self(); } ++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { + char* prefix; + gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", + gpr_log_severity_string(args->severity), time_buffer, +- (int)(now.tv_nsec), gettid(), display_file, args->line); ++ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); + + fprintf(stderr, "%-70s %s\n", prefix, args->message); + gpr_free(prefix); diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc -index 08116b3ab5..d3d3025111 100644 +index c2d80c08ddb..4a83cb6c215 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc -@@ -1101,10 +1101,13 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, - gpr_atm_no_barrier_fetch_add(&pollset->worker_count, -1); +@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, } --#ifndef NDEBUG -+#if !defined(DEBUG) -+#if defined(__GLIBC__) && (__GLIBC_MINOR__ >= 29) -+#include -+#else - static long gettid(void) { return syscall(__NR_gettid); } + #ifndef NDEBUG +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } #endif -- -+#endif + /* pollset->mu lock must be held by the caller before calling this. - The function pollset_work() may temporarily release the lock (pollset->po.mu) - during the course of its execution but it will always re-acquire the lock and --- -2.22.0 - +@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, + #define WORKER_PTR (&worker) + #endif + #ifndef NDEBUG +- WORKER_PTR->originator = gettid(); ++ WORKER_PTR->originator = sys_gettid(); + #endif + if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { + gpr_log(GPR_INFO, diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190702.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190702.bb deleted file mode 100644 index badc97a97..000000000 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190702.bb +++ /dev/null @@ -1,31 +0,0 @@ -require wireguard.inc - -inherit module kernel-module-split - -DEPENDS = "virtual/kernel libmnl" - -# This module requires Linux 3.10 higher and several networking related -# configuration options. For exact kernel requirements visit: -# https://www.wireguard.io/install/#kernel-requirements - -EXTRA_OEMAKE_append = " \ - KERNELDIR=${STAGING_KERNEL_DIR} \ - " - -MAKE_TARGETS = "module" - -RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" -MODULE_NAME = "wireguard" - -# Kernel module packages MUST begin with 'kernel-module-', otherwise -# multilib image generation can fail. -# -# The following line is only necessary if the recipe name does not begin -# with kernel-module-. -PKG_${PN} = "kernel-module-${MODULE_NAME}" - -module_do_install() { - install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} - install -m 0644 ${MODULE_NAME}.ko \ - ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko -} diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190905.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190905.bb new file mode 100644 index 000000000..badc97a97 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20190905.bb @@ -0,0 +1,31 @@ +require wireguard.inc + +inherit module kernel-module-split + +DEPENDS = "virtual/kernel libmnl" + +# This module requires Linux 3.10 higher and several networking related +# configuration options. For exact kernel requirements visit: +# https://www.wireguard.io/install/#kernel-requirements + +EXTRA_OEMAKE_append = " \ + KERNELDIR=${STAGING_KERNEL_DIR} \ + " + +MAKE_TARGETS = "module" + +RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" +MODULE_NAME = "wireguard" + +# Kernel module packages MUST begin with 'kernel-module-', otherwise +# multilib image generation can fail. +# +# The following line is only necessary if the recipe name does not begin +# with kernel-module-. +PKG_${PN} = "kernel-module-${MODULE_NAME}" + +module_do_install() { + install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} + install -m 0644 ${MODULE_NAME}.ko \ + ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko +} diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190702.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190702.bb deleted file mode 100644 index c4ddbcb0e..000000000 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190702.bb +++ /dev/null @@ -1,27 +0,0 @@ -require wireguard.inc - -inherit bash-completion systemd pkgconfig - -DEPENDS = "wireguard-module libmnl" - -do_compile_prepend () { - cd ${S}/tools -} - -do_install () { - cd ${S}/tools - oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \ - SYSTEMDUNITDIR="${systemd_unitdir}" \ - WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \ - WITH_BASHCOMPLETION=yes \ - WITH_WGQUICK=yes \ - install -} - -FILES_${PN} = " \ - ${sysconfdir} \ - ${systemd_unitdir} \ - ${bindir} \ -" - -RDEPENDS_${PN} = "wireguard-module bash" diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190905.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190905.bb new file mode 100644 index 000000000..c4ddbcb0e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20190905.bb @@ -0,0 +1,27 @@ +require wireguard.inc + +inherit bash-completion systemd pkgconfig + +DEPENDS = "wireguard-module libmnl" + +do_compile_prepend () { + cd ${S}/tools +} + +do_install () { + cd ${S}/tools + oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \ + SYSTEMDUNITDIR="${systemd_unitdir}" \ + WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \ + WITH_BASHCOMPLETION=yes \ + WITH_WGQUICK=yes \ + install +} + +FILES_${PN} = " \ + ${sysconfdir} \ + ${systemd_unitdir} \ + ${bindir} \ +" + +RDEPENDS_${PN} = "wireguard-module bash" diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc index 12dd9c859..48487405b 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc @@ -11,7 +11,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz" -SRC_URI[md5sum] = "7410a52bacc5eb85e1634a20c07d3bed" -SRC_URI[sha256sum] = "1a1311bc71abd47a72c47d918be3bacc486b3de90734661858af75cc990dbaac" +SRC_URI[md5sum] = "97a8f781cb683f3a23ffa2f0cdb008cc" +SRC_URI[sha256sum] = "78767ceeb5286beaa851145f072d920a340a9f1b771a2943b8efd638cee1a8f6" S = "${WORKDIR}/WireGuard-${PV}/src/" diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb index 716794f44..ba1ad3f7f 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb @@ -69,3 +69,4 @@ RDEPENDS_${PN}-server += "tcp-wrappers xinetd rpcbind" # http://errors.yoctoproject.org/Errors/Details/186962/ COMPATIBLE_HOST_libc-musl = 'null' +PNBLACKLIST[netkit-rusers] = "Fails to build rup.c:51:10: fatal error: rstat.h: No such file or directory" diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch new file mode 100644 index 000000000..5e128727d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch @@ -0,0 +1,108 @@ +From 642b5823abeee27a0fdc2d12d0e1235461ace9ed Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 5 Sep 2019 18:57:39 +0800 +Subject: [PATCH] drbd-utils: support usrmerge + +Upstream-Status: Inappropriate[oe-specific] + +Signed-off-by: Changqing Li +--- + configure.ac | 2 +- + scripts/Makefile.in | 4 ++-- + user/v83/Makefile.in | 14 +++++++------- + user/v84/Makefile.in | 14 +++++++------- + 4 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4df1b4d..c4ef1bc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -176,7 +176,7 @@ AC_ARG_WITH(tmpfilesdir, + AC_SUBST(tmpfilesdir) + + # set default early +-default_udevdir=/lib/udev ++default_udevdir=${prefix}/lib/udev + if test x"$with_udev" = x || \ + test x"$with_udev" = xyes ; then + if test x"$PKG_CONFIG" != x; then +diff --git a/scripts/Makefile.in b/scripts/Makefile.in +index fbb0beb..da701a1 100644 +--- a/scripts/Makefile.in ++++ b/scripts/Makefile.in +@@ -75,8 +75,8 @@ endif + ifeq ($(subst both,systemd,$(initscripttype)),systemd) + install -d $(DESTDIR)$(systemdunitdir) + install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/ +- install -d $(DESTDIR)/lib/drbd/ +- install -m 755 drbd $(DESTDIR)/lib/drbd/ ++ install -d $(DESTDIR)/${nonarch_libdir}/drbd ++ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd + install -d $(DESTDIR)$(tmpfilesdir)/ + install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf + endif +diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in +index 27516de..b301376 100644 +--- a/user/v83/Makefile.in ++++ b/user/v83/Makefile.in +@@ -96,19 +96,19 @@ install: + ifeq ($(WITH_83_SUPPORT),yes) + install -d $(DESTDIR)$(localstatedir)/lib/drbd + install -d $(DESTDIR)$(localstatedir)/lock +- install -d $(DESTDIR)/lib/drbd/ ++ install -d $(DESTDIR)/${nonarch_libdir}/drbd/ + if getent group haclient > /dev/null 2> /dev/null ; then \ +- install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ +- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ ++ install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ ++ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ + else \ +- install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ +- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ ++ install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ ++ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ + fi + endif + + uninstall: +- rm -f $(DESTDIR)/lib/drbd/drbdsetup-83 +- rm -f $(DESTDIR)/lib/drbd/drbdadm-83 ++ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83 ++ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83 + + .PHONY: install uninstall clean distclean + ../../configure: +diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in +index 38977c6..05ef060 100644 +--- a/user/v84/Makefile.in ++++ b/user/v84/Makefile.in +@@ -109,19 +109,19 @@ ifeq ($(WITH_84_SUPPORT),yes) + install -d $(DESTDIR)$(localstatedir)/lib/drbd + install -d $(DESTDIR)$(localstatedir)/run/drbd + install -d $(DESTDIR)$(localstatedir)/lock +- install -d $(DESTDIR)/lib/drbd/ ++ install -d $(DESTDIR)/${nonarch_libdir}/drbd/ + if getent group haclient > /dev/null 2> /dev/null ; then \ +- install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \ +- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \ ++ install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ ++ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ + else \ +- install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \ +- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \ ++ install -m 755 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ ++ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ + fi + endif + + uninstall: +- rm -f $(DESTDIR)/lib/drbd/drbdsetup-84 +- rm -f $(DESTDIR)/lib/drbd/drbdadm-84 ++ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-84 ++ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-84 + + spell: + for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ +-- +2.7.4 + diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.10.0.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.10.0.bb index d708511d2..0e14ae73f 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.10.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.10.0.bb @@ -10,6 +10,7 @@ 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.10.0 SRCREV_drbd-utils = "859151b228d3b3aacefb09d06d515a2589c22e35" @@ -38,17 +39,6 @@ EXTRA_OECONF = " \ # If we have inherited reproducible_build, we want to use it. export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" -do_configure_prepend() { - # move the the file under folder /lib/drbd/ to /usr/lib/drbd when usrmerge enabled - if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then - for m_file in `find ${S} -name 'Makefile.in'`; do - sed -i -e "s;\$(DESTDIR)\/lib\/drbd;\$(DESTDIR)\${nonarch_libdir}\/drbd;g" $m_file - done - # move the the file under folder /lib/udev/ to /usr/lib/udev when usrmerge enabled - sed -i -e "s;default_udevdir=/lib/udev;default_udevdir=\${prefix}/lib/udev;g" ${S}/configure.ac - fi - -} do_install_append() { # don't install empty /var/lock and /var/run to avoid conflict with base-files rm -rf ${D}${localstatedir}/lock 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 index 6683781af..23fe2021b 100644 --- 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 @@ -21,3 +21,5 @@ 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/libtalloc/libtalloc_2.2.0.bb b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.2.0.bb deleted file mode 100644 index 88cdd30d0..000000000 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.2.0.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://talloc.samba.org" -SECTION = "libs" -LICENSE = "LGPL-3.0+ & GPL-3.0+" -LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6d5228bfa7825249 \ - file://pytalloc.h;beginline=1;endline=18;md5=2c498cc6f2263672483237b20f46b43d" - - -SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \ - file://options-2.2.0.patch \ - file://0001-waf-add-support-of-cross_compile.patch \ -" -SRC_URI[md5sum] = "b60781acc2fb42d7a1e08751e508d3df" -SRC_URI[sha256sum] = "5c6f6a45ef96b3fd0b28942673a68d0c6af5dcca9d676a2e4d57ce7e86c22ebc" - -inherit waf-samba - -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[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" - -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" - -S = "${WORKDIR}/talloc-${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=NONE \ - --builtin-libraries=replace \ - --disable-silent-rules \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - " - -PACKAGES += "pytalloc pytalloc-dev" - -RPROVIDES_${PN}-dbg += "pytalloc-dbg" - -FILES_pytalloc = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ - ${libdir}/libpytalloc-util.so.2 \ - ${libdir}/libpytalloc-util.so.2.1.1 \ - " -FILES_pytalloc-dev = "${libdir}/libpytalloc-util.so" -RDEPENDS_pytalloc = "python3" diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb new file mode 100644 index 000000000..9f8ebcc41 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.0.bb @@ -0,0 +1,54 @@ +SUMMARY = "Hierarchical, reference counted memory pool system with destructors" +HOMEPAGE = "http://talloc.samba.org" +SECTION = "libs" +LICENSE = "LGPL-3.0+ & GPL-3.0+" +LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6d5228bfa7825249 \ + file://pytalloc.h;beginline=1;endline=18;md5=2c498cc6f2263672483237b20f46b43d" + + +SRC_URI = "https://samba.org/ftp/talloc/talloc-${PV}.tar.gz \ + file://options-2.2.0.patch \ + file://0001-waf-add-support-of-cross_compile.patch \ +" +SRC_URI[md5sum] = "8416b153547add81cd1a4d24e598c890" +SRC_URI[sha256sum] = "75d5bcb34482545a82ffb06da8f6c797f963a0da450d0830c669267b14992fc6" + +inherit waf-samba + +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[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" + +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" + +S = "${WORKDIR}/talloc-${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=NONE \ + --builtin-libraries=replace \ + --disable-silent-rules \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " + +PACKAGES += "pytalloc pytalloc-dev" + +RPROVIDES_${PN}-dbg += "pytalloc-dbg" + +FILES_pytalloc = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ + ${libdir}/libpytalloc-util.so.2 \ + ${libdir}/libpytalloc-util.so.2.1.1 \ + " +FILES_pytalloc-dev = "${libdir}/libpytalloc-util.so" +RDEPENDS_pytalloc = "python3" diff --git a/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb b/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb index 0f49d6060..c57e7d471 100644 --- a/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb @@ -16,7 +16,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "release-(?P(\d+(\.\d+)+))" DEPENDS += "augeas libnl libxslt libxml2" -do_configure[depends] += "gnulib:do_populate_sysroot" +do_configure[depends] += "${MLPREFIX}gnulib:do_populate_sysroot" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch b/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch index 00178c84a..2d17507b1 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch @@ -9,13 +9,11 @@ Signed-off-by: Khem Raj src/libstrongswan/utils/utils/memory.h | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/src/libstrongswan/utils/utils/memory.h b/src/libstrongswan/utils/utils/memory.h -index e840330..8a356a8 100644 --- a/src/libstrongswan/utils/utils/memory.h +++ b/src/libstrongswan/utils/utils/memory.h -@@ -22,6 +22,8 @@ - #ifndef MEMORY_H_ - #define MEMORY_H_ +@@ -26,6 +26,8 @@ + #include + #endif +#include + diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.0.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.0.bb deleted file mode 100644 index fa1bd975c..000000000 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.0.bb +++ /dev/null @@ -1,133 +0,0 @@ -DESCRIPTION = "strongSwan is an OpenSource IPsec implementation for the \ -Linux operating system." -SUMMARY = "strongSwan is an OpenSource IPsec implementation" -HOMEPAGE = "http://www.strongswan.org" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -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 \ - " - -SRC_URI[md5sum] = "e05f2d16a7479a2a9591609c256d523a" -SRC_URI[sha256sum] = "15b1e10c7dd6253ab5d791fe9b9cb84624e24c118aecd9b90251b4e60daa0933" - -UPSTREAM_CHECK_REGEX = "strongswan-(?P\d+(\.\d+)+)\.tar" - -EXTRA_OECONF = " \ - --without-lib-prefix \ -" - -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" - -PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ldap', d)} \ -" -PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni" -PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl" -PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp" -PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap" -PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql" -PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,${PN}-plugin-openssl" -PACKAGECONFIG[scep] = "--enable-scepclient,--disable-scepclient," -PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-soup" -PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite" -PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke" -PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc" - -# requires swanctl -PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd," - -inherit autotools systemd pkgconfig - -RRECOMMENDS_${PN} = "kernel-module-ipsec" - -FILES_${PN} += "${libdir}/ipsec/lib*${SOLIBS}" -FILES_${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" -FILES_${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la" -FILES_${PN}-staticdev += "${libdir}/ipsec/*.a" - -CONFFILES_${PN} = "${sysconfdir}/*.conf ${sysconfdir}/ipsec.d/*.conf ${sysconfdir}/strongswan.d/*.conf" - -PACKAGES += "${PN}-plugins" -ALLOW_EMPTY_${PN}-plugins = "1" - -PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" -NOAUTOPACKAGEDEBUG = "1" - -python split_strongswan_plugins () { - sysconfdir = d.expand('${sysconfdir}/strongswan.d/charon') - libdir = d.expand('${libdir}/ipsec/plugins') - dbglibdir = os.path.join(libdir, '.debug') - - def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename): - dvar = d.getVar('PKGD') - oldfiles = d.getVar('CONFFILES_' + pkg) - newfile = '/' + os.path.relpath(f, dvar) - - if not oldfiles: - d.setVar('CONFFILES_' + pkg, newfile) - else: - d.setVar('CONFFILES_' + pkg, oldfiles + " " + newfile) - - split_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.so', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True) - do_split_packages(d, sysconfdir, '(.*)\.conf', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True, hook=add_plugin_conf) - - split_dbg_packages = do_split_packages(d, dbglibdir, 'libstrongswan-(.*)\.so', '${PN}-plugin-%s-dbg', 'strongSwan %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg') - split_dev_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.la', '${PN}-plugin-%s-dev', 'strongSwan %s plugin - Development files', prepend=True, extra_depends='${PN}-dev') - split_staticdev_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.a', '${PN}-plugin-%s-staticdev', 'strongSwan %s plugin - Development files (Static Libraries)', prepend=True, extra_depends='${PN}-staticdev') - - if split_packages: - pn = d.getVar('PN') - d.setVar('RRECOMMENDS_' + pn + '-plugins', ' '.join(split_packages)) - d.appendVar('RRECOMMENDS_' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) - d.appendVar('RRECOMMENDS_' + pn + '-dev', ' ' + ' '.join(split_dev_packages)) - d.appendVar('RRECOMMENDS_' + pn + '-staticdev', ' ' + ' '.join(split_staticdev_packages)) -} - -PACKAGESPLITFUNCS_prepend = "split_strongswan_plugins " - -# Install some default plugins based on default strongSwan ./configure options -# See https://wiki.strongswan.org/projects/strongswan/wiki/Pluginlist -RDEPENDS_${PN} += "\ - ${PN}-plugin-aes \ - ${PN}-plugin-attr \ - ${PN}-plugin-cmac \ - ${PN}-plugin-constraints \ - ${PN}-plugin-des \ - ${PN}-plugin-dnskey \ - ${PN}-plugin-hmac \ - ${PN}-plugin-kernel-netlink \ - ${PN}-plugin-md5 \ - ${PN}-plugin-nonce \ - ${PN}-plugin-pem \ - ${PN}-plugin-pgp \ - ${PN}-plugin-pkcs1 \ - ${PN}-plugin-pkcs7 \ - ${PN}-plugin-pkcs8 \ - ${PN}-plugin-pkcs12 \ - ${PN}-plugin-pubkey \ - ${PN}-plugin-random \ - ${PN}-plugin-rc2 \ - ${PN}-plugin-resolve \ - ${PN}-plugin-revocation \ - ${PN}-plugin-sha1 \ - ${PN}-plugin-sha2 \ - ${PN}-plugin-socket-default \ - ${PN}-plugin-sshkey \ - ${PN}-plugin-updown \ - ${PN}-plugin-vici \ - ${PN}-plugin-x509 \ - ${PN}-plugin-xauth-generic \ - ${PN}-plugin-xcbc \ - ${PN}-plugin-curve25519 \ - " - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} ${BPN}-starter.service" diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb new file mode 100644 index 000000000..9310a93fe --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb @@ -0,0 +1,133 @@ +DESCRIPTION = "strongSwan is an OpenSource IPsec implementation for the \ +Linux operating system." +SUMMARY = "strongSwan is an OpenSource IPsec implementation" +HOMEPAGE = "http://www.strongswan.org" +SECTION = "net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +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 \ + " + +SRC_URI[md5sum] = "5a6b9980cd1ac4fad3c24b55ed960ac9" +SRC_URI[sha256sum] = "d9af70acea5c054952ad1584916c1bf231b064eb6c8a9791dcb6ae90a769990c" + +UPSTREAM_CHECK_REGEX = "strongswan-(?P\d+(\.\d+)+)\.tar" + +EXTRA_OECONF = " \ + --without-lib-prefix \ +" + +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" + +PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ldap', d)} \ +" +PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni" +PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl" +PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp" +PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap" +PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql" +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,${PN}-plugin-openssl" +PACKAGECONFIG[scep] = "--enable-scepclient,--disable-scepclient," +PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-soup" +PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite" +PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke" +PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc" + +# requires swanctl +PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd," + +inherit autotools systemd pkgconfig + +RRECOMMENDS_${PN} = "kernel-module-ipsec" + +FILES_${PN} += "${libdir}/ipsec/lib*${SOLIBS}" +FILES_${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" +FILES_${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la" +FILES_${PN}-staticdev += "${libdir}/ipsec/*.a" + +CONFFILES_${PN} = "${sysconfdir}/*.conf ${sysconfdir}/ipsec.d/*.conf ${sysconfdir}/strongswan.d/*.conf" + +PACKAGES += "${PN}-plugins" +ALLOW_EMPTY_${PN}-plugins = "1" + +PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" +NOAUTOPACKAGEDEBUG = "1" + +python split_strongswan_plugins () { + sysconfdir = d.expand('${sysconfdir}/strongswan.d/charon') + libdir = d.expand('${libdir}/ipsec/plugins') + dbglibdir = os.path.join(libdir, '.debug') + + def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename): + dvar = d.getVar('PKGD') + oldfiles = d.getVar('CONFFILES_' + pkg) + newfile = '/' + os.path.relpath(f, dvar) + + if not oldfiles: + d.setVar('CONFFILES_' + pkg, newfile) + else: + d.setVar('CONFFILES_' + pkg, oldfiles + " " + newfile) + + split_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.so', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True) + do_split_packages(d, sysconfdir, '(.*)\.conf', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True, hook=add_plugin_conf) + + split_dbg_packages = do_split_packages(d, dbglibdir, 'libstrongswan-(.*)\.so', '${PN}-plugin-%s-dbg', 'strongSwan %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg') + split_dev_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.la', '${PN}-plugin-%s-dev', 'strongSwan %s plugin - Development files', prepend=True, extra_depends='${PN}-dev') + split_staticdev_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.a', '${PN}-plugin-%s-staticdev', 'strongSwan %s plugin - Development files (Static Libraries)', prepend=True, extra_depends='${PN}-staticdev') + + if split_packages: + pn = d.getVar('PN') + d.setVar('RRECOMMENDS_' + pn + '-plugins', ' '.join(split_packages)) + d.appendVar('RRECOMMENDS_' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) + d.appendVar('RRECOMMENDS_' + pn + '-dev', ' ' + ' '.join(split_dev_packages)) + d.appendVar('RRECOMMENDS_' + pn + '-staticdev', ' ' + ' '.join(split_staticdev_packages)) +} + +PACKAGESPLITFUNCS_prepend = "split_strongswan_plugins " + +# Install some default plugins based on default strongSwan ./configure options +# See https://wiki.strongswan.org/projects/strongswan/wiki/Pluginlist +RDEPENDS_${PN} += "\ + ${PN}-plugin-aes \ + ${PN}-plugin-attr \ + ${PN}-plugin-cmac \ + ${PN}-plugin-constraints \ + ${PN}-plugin-des \ + ${PN}-plugin-dnskey \ + ${PN}-plugin-hmac \ + ${PN}-plugin-kernel-netlink \ + ${PN}-plugin-md5 \ + ${PN}-plugin-nonce \ + ${PN}-plugin-pem \ + ${PN}-plugin-pgp \ + ${PN}-plugin-pkcs1 \ + ${PN}-plugin-pkcs7 \ + ${PN}-plugin-pkcs8 \ + ${PN}-plugin-pkcs12 \ + ${PN}-plugin-pubkey \ + ${PN}-plugin-random \ + ${PN}-plugin-rc2 \ + ${PN}-plugin-resolve \ + ${PN}-plugin-revocation \ + ${PN}-plugin-sha1 \ + ${PN}-plugin-sha2 \ + ${PN}-plugin-socket-default \ + ${PN}-plugin-sshkey \ + ${PN}-plugin-updown \ + ${PN}-plugin-vici \ + ${PN}-plugin-x509 \ + ${PN}-plugin-xauth-generic \ + ${PN}-plugin-xcbc \ + ${PN}-plugin-curve25519 \ + " + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} ${BPN}-starter.service" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch new file mode 100644 index 000000000..45c69ca06 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch @@ -0,0 +1,58 @@ +From 6df092a4153c6c37cfaddcabf2cd25a910a7f6e1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 2 Sep 2019 15:40:52 -0700 +Subject: [PATCH] Detect bool definition considering stdbool.h being present + +This helps in defining the value correctly on different platforms e.g. +clang/libc++ depends on the definition coming from stdbool.h +current builds fail to compile therefore + +TMPDIR/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/iperf2/2.0.13-r0/recipe-sysroot/usr/include/c++/v1/type_traits:742:29: error: redefinition of '__libcpp_is_integral' +template <> struct __libcpp_is_integral : public true_type {}; + ^~~~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj +--- + m4/dast.m4 | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/m4/dast.m4 ++++ b/m4/dast.m4 +@@ -11,7 +11,12 @@ AH_TEMPLATE([false]) + + AC_DEFUN(DAST_CHECK_BOOL, [ + +-AC_CHECK_SIZEOF(bool) ++if test "$ac_cv_header_stdbool_h" = yes; then ++ AC_CHECK_SIZEOF(bool,,[#include ]) ++else ++ AC_CHECK_SIZEOF(bool) ++fi ++ + if test "$ac_cv_sizeof_bool" = 0 ; then + AC_DEFINE(bool, int) + fi +--- a/configure.ac ++++ b/configure.ac +@@ -113,7 +113,7 @@ AC_SEARCH_LIBS([socket], [socket], [], + + dnl Checks for header files. + AC_HEADER_STDC +-AC_CHECK_HEADERS([arpa/inet.h libintl.h net/ethernet.h net/if.h linux/ip.h linux/udp.h linux/if_packet.h linux/filter.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h signal.h ifaddrs.h]) ++AC_CHECK_HEADERS([arpa/inet.h libintl.h net/ethernet.h net/if.h linux/ip.h linux/udp.h linux/if_packet.h linux/filter.h netdb.h netinet/in.h stdbool.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h signal.h ifaddrs.h]) + + dnl =================================================================== + dnl Checks for typedefs, structures +--- a/include/util.h ++++ b/include/util.h +@@ -56,7 +56,9 @@ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +- ++#ifdef HAVE_STDBOOL_H ++# include ++#endif + #ifdef __cplusplus + extern "C" { + #endif diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb index 2bd552d1d..4a520e3be 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb @@ -4,7 +4,9 @@ SECTION = "console/network" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e136a7b2560d80bcbf0d9b3e1356ecff" -SRC_URI = " ${SOURCEFORGE_MIRROR}/${BPN}/iperf-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/iperf-${PV}.tar.gz \ + file://0001-Detect-bool-definition-considering-stdbool.h-being-p.patch \ +" SRC_URI[md5sum] = "31ea1c6d5cbf80b16ff3abe4288dad5e" SRC_URI[sha256sum] = "c88adec966096a81136dda91b4bd19c27aae06df4d45a7f547a8e50d723778ad" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run index e904c75e4..2716bf935 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run @@ -4,7 +4,6 @@ # Javier Fernandez-Sanguino. # Distributed under the GPL SHAREDIR=/usr/share/lmbench/ -BINDIR=/usr/lib/lmbench/ SCRIPTSDIR=$SHAREDIR/scripts RESULTSDIR=$SHAREDIR/results CONFIG=/var/lib/lmbench/config/`$SCRIPTSDIR/config` diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 8e6e803a8..7e20b7da6 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -54,7 +54,7 @@ do_compile () { do_install () { install -d ${D}${sysconfdir}/default/volatiles \ - ${D}${bindir} ${D}${mandir} ${D}${libdir}/lmbench \ + ${D}${bindir} ${D}${mandir} \ ${D}${datadir}/lmbench/scripts echo "d root root 0755 ${localstatedir}/run/${BPN} none" \ @@ -71,7 +71,6 @@ do_install () { mv ${D}${bindir}/line ${D}${bindir}/lm_line install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${BPN},;' \ - -e 's,^BINDIR=.*$,BINDIR=${libdir}/${BPN},;' \ -e 's,^CONFIG=.*$,CONFIG=`$SCRIPTSDIR/config`,;' \ ${D}${bindir}/lmbench-run install -m 0755 ${S}/scripts/lmbench ${D}${bindir} @@ -89,4 +88,4 @@ pkg_postinst_${PN} () { } RDEPENDS_${PN} = "perl" -FILES_${PN} += "${datadir}/lmbench ${libdir}/lmbench" +FILES_${PN} += "${datadir}/lmbench" 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 c77a1e54e..5bb0beb7a 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 @@ -104,7 +104,7 @@ RDEPENDS_packagegroup-meta-oe-dbs ="\ RDEPENDS_packagegroup-meta-oe-devtools ="\ android-tools android-tools-conf bootchart breakpad \ capnproto cgdb cscope ctags \ - debootstrap dejagnu dmalloc flatbuffers \ + debootstrap dmalloc flatbuffers \ giflib icon-slicer iptraf-ng jq jsoncpp jsonrpc json-spirit \ kconfig-frontends lemon libedit libgee libsombok3 \ libubox log4cplus lshw ltrace lua mcpp memstat mercurial \ @@ -138,7 +138,7 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ p7zip p8platform libfile-fnmatch-perl \ rarpd redis rrdtool libfastjson librelp rsyslog sanlock \ sblim-cmpi-devel sblim-sfc-common sblim-sfcc \ - scsirastools sgpio smartmontools snappy can-isotp \ + scsirastools sgpio smartmontools snappy \ can-utils libsocketcan tipcutils tiptop \ tmux uml-utilities upm vlock volume-key wipe zlog zram \ ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "boinc-client", "", d)} \ @@ -181,10 +181,10 @@ RDEPENDS_packagegroup-meta-oe-graphics ="\ " RDEPENDS_packagegroup-meta-oe-kernel ="\ - agent-proxy bpftool broadcom-bt-firmware cpupower \ + agent-proxy broadcom-bt-firmware cpupower \ crash ipmitool minicoredumper oprofile \ " -RDEPENDS_packagegroup-meta-oe-kernel_remove_libc-musl = "bpftool crash minicoredumper" +RDEPENDS_packagegroup-meta-oe-kernel_remove_libc-musl = "crash minicoredumper" RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64 = "crash" RDEPENDS_packagegroup-meta-oe-kernel_remove_mips64el = "crash" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 9a398b308..9ddf2bee5 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -28,7 +28,9 @@ S = "${WORKDIR}/mariadb-${PV}" BINCONFIG_GLOB = "mysql_config" -inherit cmake gettext binconfig update-rc.d useradd systemd +inherit cmake gettext binconfig update-rc.d useradd systemd multilib_script + +MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mysql_install_db ${PN}-server:${bindir}/mysqld_safe" INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" INITSCRIPT_NAME_${PN}-server = "mysqld" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.4.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.4.bb deleted file mode 100644 index 0e7ddc801..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.4.bb +++ /dev/null @@ -1,12 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=87da2b84884860b71f5f24ab37e7da78" - -SRC_URI += "\ - file://not-check-libperl.patch \ - file://0001-Add-support-for-RISC-V.patch \ - file://0001-Improve-reproducibility.patch \ -" - -SRC_URI[md5sum] = "dab5eed8a5f9204bf2f03a209eead4c3" -SRC_URI[sha256sum] = "02802ddffd1590805beddd1e464dd28a46a41a5f1e1df04bab4f46663195cc8b" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb new file mode 100644 index 000000000..fd4200a73 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_11.5.bb @@ -0,0 +1,12 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=87da2b84884860b71f5f24ab37e7da78" + +SRC_URI += "\ + file://not-check-libperl.patch \ + file://0001-Add-support-for-RISC-V.patch \ + file://0001-Improve-reproducibility.patch \ +" + +SRC_URI[md5sum] = "580da94f6d85046ff2a228785ab2cc89" +SRC_URI[sha256sum] = "7fdf23060bfc715144cbf2696cf05b0fa284ad3eb21f0c378591c6bca99ad180" diff --git a/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch b/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch deleted file mode 100644 index 2eb8af713..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: dejagnu-1.4.4/configure.in -=================================================================== ---- dejagnu-1.4.4.orig/configure.in 2014-07-18 07:05:49.997481207 +0000 -+++ dejagnu-1.4.4/configure.in 2014-07-18 07:05:50.085481210 +0000 -@@ -1,10 +1,10 @@ - dnl Process this file with autoconf to produce a configure script. - AC_PREREQ(2.13) --AC_INIT(runtest.exp) -+AC_INIT(dejagnu, 1.4.4) - dnl AC_CONFIG_AUX_DIR(..) - - dnl These are required by automake --AM_INIT_AUTOMAKE(dejagnu, 1.4.4) -+AM_INIT_AUTOMAKE([foreign]) - AM_MAINTAINER_MODE - AC_PROG_MAKE_SET - -Index: dejagnu-1.4.4/example/calc/configure.in -=================================================================== ---- dejagnu-1.4.4.orig/example/calc/configure.in 2002-04-26 03:32:40.000000000 +0000 -+++ dejagnu-1.4.4/example/calc/configure.in 2014-07-18 07:11:59.085491266 +0000 -@@ -1,8 +1,8 @@ - dnl Process this file with autoconf to produce a configure script. - AC_PREREQ(2.5) --AC_INIT(calc.c) -+AC_INIT(calc, 1.1) - AM_CONFIG_HEADER(calc.h) --AM_INIT_AUTOMAKE(calc, 1.1) -+AM_INIT_AUTOMAKE([foreign]) - - AC_PROG_CC - AC_PROG_INSTALL -Index: dejagnu-1.4.4/example/hello/configure.in -=================================================================== ---- dejagnu-1.4.4.orig/example/hello/configure.in 2002-08-31 05:46:16.000000000 +0000 -+++ dejagnu-1.4.4/example/hello/configure.in 2014-07-18 07:12:23.721491937 +0000 -@@ -25,7 +25,7 @@ - # ------------------------------------------------------------------------ - - AC_INIT(helloworld, demo-version, philip.wilsey@ieee.org) --AM_INIT_AUTOMAKE(helloworld, demo-version) -+AM_INIT_AUTOMAKE([foreign]) - - #AC_CONFIG_SRCDIR([hello.cc]) - #AC_CONFIG_HEADER([config.h]) diff --git a/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb b/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb deleted file mode 100644 index 63726b232..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "GNU unit testing framework, written in Expect and Tcl" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" -SECTION = "devel" - -inherit autotools - -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ - file://configure.patch" - -SRC_URI[md5sum] = "053f18fd5d00873de365413cab17a666" -SRC_URI[sha256sum] = "d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch new file mode 100644 index 000000000..e4490bbb9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch @@ -0,0 +1,30 @@ +kernel headers have restructured mips syscall generation in kernel +in recent versions, however, ltrace still has logic to define the +syscall numbers based on old logic, this patch includes the legacy +UAPI headers to get these defines + +Fixes errors e.g. +../../../../git/sysdeps/linux-gnu/mips/trace.c:138:29: error: '__NR_O32_Linux' undeclared (first use in this function) + const int syscallbase[] = {__NR_O32_Linux, __NR_N32_Linux, + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/sysdeps/linux-gnu/mips/trace.c ++++ b/sysdeps/linux-gnu/mips/trace.c +@@ -34,6 +34,16 @@ + #include + #include + ++#ifndef __NR_O32_Linux ++#include ++#endif ++#ifndef __NR_N32_Linux ++#include ++#endif ++#ifndef __NR_N64_Linux ++#include ++#endif ++ + #include "backend.h" + #include "common.h" + #include "debug.h" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 3dc269c80..ead637cb7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -27,6 +27,7 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http file://0001-mips-plt.c-Delete-include-error.h.patch \ file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \ file://0001-hook-Do-not-append-int-to-std-string.patch \ + file://include_unistd_nr.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.2.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.2.bb deleted file mode 100644 index d464e9d8a..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.2.bb +++ /dev/null @@ -1,110 +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=be980eb7ccafe287cb438076a65e888c" - -DEPENDS = "openssl" -DEPENDS_append_class-target = " nodejs-native" - -inherit pkgconfig - -COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" -COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" -COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" - -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-Crypto-reduce-memory-usage-of-SignFinal.patch \ - file://0004-Make-compatibility-with-gcc-4.8.patch \ - file://0005-Link-atomic-library.patch \ - file://0006-Use-target-ldflags.patch \ - " -SRC_URI_append_class-target = " \ - file://0002-Using-native-torque.patch \ - " - -SRC_URI[md5sum] = "fa70b942c5e3379ce96219fe90f50c8f" -SRC_URI[sha256sum] = "6cbc17795e9259dce7a8f5fd5a2e46f9e6920fb48b7d9539c5b2faa5bb5db4d8" - -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 ??= "zlib icu" -PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" -PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" - -# 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 () { - rm -rf ${S}/deps/openssl - export LD="${CXX}" - GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES - # $TARGET_ARCH settings don't match --dest-cpu settings - ./configure --prefix=${prefix} --without-snapshot --shared-openssl \ - --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ - --dest-os=linux \ - ${ARCHFLAGS} \ - ${PACKAGECONFIG_CONFARGS} -} - -do_compile () { - export LD="${CXX}" - oe_runmake BUILDTYPE=Release -} - -do_install () { - oe_runmake install DESTDIR=${D} -} - -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 torque to provide it within sysroot for the target compilation - install -d ${D}${bindir} - install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque -} - -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 python-core python-shell python-datetime python-subprocess python-textutils \ - python-compiler python-misc python-multiprocessing" - -PACKAGES =+ "${PN}-systemtap" -FILES_${PN}-systemtap = "${datadir}/systemtap" - - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb new file mode 100644 index 000000000..a978eebe4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb @@ -0,0 +1,113 @@ +DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" +HOMEPAGE = "http://nodejs.org" +LICENSE = "MIT & BSD & Artistic-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=be980eb7ccafe287cb438076a65e888c" + +DEPENDS = "openssl" +DEPENDS_append_class-target = " nodejs-native" + +inherit pkgconfig + +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-Crypto-reduce-memory-usage-of-SignFinal.patch \ + file://0004-Make-compatibility-with-gcc-4.8.patch \ + file://0005-Link-atomic-library.patch \ + file://0006-Use-target-ldflags.patch \ + " +SRC_URI_append_class-target = " \ + file://0002-Using-native-torque.patch \ + " + +SRC_URI[md5sum] = "b41275a018e670947c1950b12f050a2f" +SRC_URI[sha256sum] = "7bf1123d7415964775b8f81fe6ec6dd5c3c08abb42bb71dfe4409dbeeba26bbd" + +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 ??= "zlib icu" +PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" +PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" + +# 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 () { + rm -rf ${S}/deps/openssl + export LD="${CXX}" + GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES + # $TARGET_ARCH settings don't match --dest-cpu settings + ./configure --prefix=${prefix} --without-snapshot --shared-openssl \ + --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ + --dest-os=linux \ + ${ARCHFLAGS} \ + ${PACKAGECONFIG_CONFARGS} +} + +do_compile () { + export LD="${CXX}" + oe_runmake BUILDTYPE=Release +} + +do_install () { + oe_runmake install DESTDIR=${D} +} + +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 torque to provide it within sysroot for the target compilation + install -d ${D}${bindir} + install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque +} + +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 python-core python-shell python-datetime python-subprocess python-textutils \ + python-compiler python-misc python-multiprocessing" + +PACKAGES =+ "${PN}-systemtap" +FILES_${PN}-systemtap = "${datadir}/systemtap" + + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc index 4c0617c49..d738d2d93 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc @@ -172,10 +172,8 @@ do_install_append_class-target() { done if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then - install -d ${D}${libdir}/apache2/modules install -d ${D}${sysconfdir}/apache2/modules.d install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} - install -m 755 libs/libphp${PHP_MAJOR_VERSION}.so ${D}${libdir}/apache2/modules install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d sed -i s,lib/,${libdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf cat ${S}/php.ini-production | \ @@ -211,7 +209,7 @@ INITSCRIPT_PACKAGES = "${PN}-fpm" inherit update-rc.d FILES_${PN}-dbg =+ "${bindir}/.debug \ - ${libdir}/apache2/modules/.debug" + ${libexecdir}/apache2/modules/.debug" FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc" FILES_${PN}-cli = "${bindir}/php" FILES_${PN}-phar = "${bindir}/phar*" @@ -237,7 +235,7 @@ FILES_${PN}-dev = "${includedir}/php ${PHP_LIBDIR}/build ${bindir}/phpize \ FILES_${PN}-staticdev += "${PHP_LIBDIR}/extensions/*/*.a" FILES_${PN}-opcache = "${PHP_LIBDIR}/extensions/*/opcache${SOLIBSDEV}" FILES_${PN} = "${PHP_LIBDIR}/php" -FILES_${PN} += "${bindir}" +FILES_${PN} += "${bindir} ${libexecdir}/apache2" SUMMARY_${PN}-modphp = "PHP module for the Apache HTTP server" FILES_${PN}-modphp = "${libdir}/apache2 ${sysconfdir}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.8.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.8.bb deleted file mode 100644 index 072d53a09..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.8.bb +++ /dev/null @@ -1,27 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=fb07bfc51f6d5e0c30b65d9701233b2e" - -SRC_URI += "file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ - file://0048-Use-pkg-config-for-FreeType2-detection.patch \ - file://0049-ext-intl-Use-pkg-config-to-detect-icu.patch \ - file://0001-Use-pkg-config-for-libxml2-detection.patch \ - file://debian-php-fixheader.patch \ - " -SRC_URI_append_class-target = " \ - file://pear-makefile.patch \ - file://phar-makefile.patch \ - file://0001-opcache-config.m4-enable-opcache.patch \ - file://xfail_two_bug_tests.patch \ - " - -SRC_URI[md5sum] = "4ffc06e803cd782a95483eb02213301e" -SRC_URI[sha256sum] = "d566c630175d9fa84a98d3c9170ec033069e9e20c8d23dea49ae2a976b6c76f5" - -PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ - --with-pdo-mysql=mysqlnd \ - ,--without-mysqli --without-pdo-mysql \ - ,mysql5" -PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" - -FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb new file mode 100644 index 000000000..4d656da0f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb @@ -0,0 +1,27 @@ +require php.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=fb07bfc51f6d5e0c30b65d9701233b2e" + +SRC_URI += "file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ + file://0048-Use-pkg-config-for-FreeType2-detection.patch \ + file://0049-ext-intl-Use-pkg-config-to-detect-icu.patch \ + file://0001-Use-pkg-config-for-libxml2-detection.patch \ + file://debian-php-fixheader.patch \ + " +SRC_URI_append_class-target = " \ + file://pear-makefile.patch \ + file://phar-makefile.patch \ + file://0001-opcache-config.m4-enable-opcache.patch \ + file://xfail_two_bug_tests.patch \ + " + +SRC_URI[md5sum] = "bcc37749815009c9201e4c126e1ab8ee" +SRC_URI[sha256sum] = "a39c9709a8c9eb7ea8ac4933ef7a78b92f7e5735a405c8b8e42ee39541d963c4" + +PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ + --with-pdo-mysql=mysqlnd \ + ,--without-mysqli --without-pdo-mysql \ + ,mysql5" +PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" + +FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default" diff --git a/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb b/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb index 8ced7b84f..e112a5e30 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb @@ -17,3 +17,5 @@ inherit cmake lib_package S = "${WORKDIR}/git" EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P1(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index 5df44f21f..e40e1cd26 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -10,3 +10,5 @@ S = "${WORKDIR}/git" inherit module EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}" + +PNBLACKLIST[can-isotp] = "Kernel module Needs forward porting to kernel 5.2+" diff --git a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch new file mode 100644 index 000000000..39f899cf1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch @@ -0,0 +1,66 @@ +From 4e4c8c7a1cca2125e2bf2a67cbab0bdbd78fdb86 Mon Sep 17 00:00:00 2001 +From: He Zhe +Date: Tue, 30 Jul 2019 13:24:22 +0800 +Subject: [PATCH] ptts: Set recv buffer size too max to receive as many + packets as possible + +Flooding multicast may make the rcv buffer overrun and is considered +premature messages later and thus cause the following error. + +"Ignoring premature msg 16, currently handling 12" + +This patch sets SO_RCVBUF the of socket to max int value to receive as many +packets as possible, and give a hint to user when possible overrun occurs. Note +that the value of SO_RCVBUF will be limited up to min(INT_MAX/2, +sysctl_rmem_max) in kernel. + +Signed-off-by: He Zhe + +Upstream-Status: Backport + +Signed-off-by: Li Zhou +--- + ptts/tipc_ts_server.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/ptts/tipc_ts_server.c b/ptts/tipc_ts_server.c +index a286daa..3a2f96f 100644 +--- a/ptts/tipc_ts_server.c ++++ b/ptts/tipc_ts_server.c +@@ -641,8 +641,9 @@ void server_mcast + if (rc < 0) + err("multicast message not received"); + if (msgno != *(int*) buf) { +- dbg1("Ignoring premature msg %u, currently handling %u\n", +- *(int*)buf, msgno); ++ dbg1("Ignoring premature msg %u, currently handling %u\n" ++ "You can enlarge /proc/sys/net/core/rmem_max and try again\n", ++ *(int*)buf, msgno); + continue; + } + rc = recvfrom(sd[i], buf, expected_szs[numSubTest], +@@ -687,8 +688,21 @@ void server_test_multicast(void) + FD_ZERO(&readfds); + + for (i = 0; i < TIPC_MCAST_SOCKETS; i++) { ++ int optval = (int)(~0U >> 1); ++ socklen_t optlen = sizeof(optval); ++ int rc = 0; ++ + sd[i] = createSocketTIPC (SOCK_RDM); + FD_SET(sd[i], &readfds); ++ ++ /* ++ * Flooding multicast may make the rcv buffer overrun and considered premature msg later. ++ * Set SO_RCVBUF to max int value to receive as many packets as possible. ++ * Note that it will be limited up to min(INT_MAX/2, sysctl_rmem_max) in kernel. ++ */ ++ rc = setsockopt(sd[i], SOL_SOCKET, SO_RCVBUF, (const char*)&optval, optlen); ++ if(rc != 0) ++ printf("Failed to set SO_RCVBUF of %d: %s\n", sd[i], strerror(errno)); + } + + server_bindMulticast( 0, 99, sd[0]); +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index 054e0acc8..637770af2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb @@ -6,6 +6,7 @@ SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils \ file://0001-include-sys-select.h-for-FD_-definitions.patch \ file://0002-replace-non-standard-uint-with-unsigned-int.patch \ file://0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch \ + file://0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch \ " SRCREV = "7ab2211b87414ba240b0b2e4af219c1057c9cf9a" PV = "2.2.0+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb deleted file mode 100644 index b5d95d940..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.2.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Zstandard - Fast real-time compression algorithm" -DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \ -real-time compression scenarios at zlib-level and better compression ratios. \ -It's backed by a very fast entropy stage, provided by Huff0 and FSE library." -HOMEPAGE = "http://www.zstd.net/" -SECTION = "console/utils" - -LICENSE = "BSD-3-Clause & GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ - file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" - -SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1" - -SRCREV = "ff304e9e65e7cde17a637eea190a874c26c48634" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" -PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" -PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib" - -# See programs/README.md for how to use this -ZSTD_LEGACY_SUPPORT ??= "4" - -do_compile () { - oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} -} - -do_install () { - oe_runmake install 'DESTDIR=${D}' -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb new file mode 100644 index 000000000..e97b4efb2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zstd/zstd_1.4.3.bb @@ -0,0 +1,35 @@ +SUMMARY = "Zstandard - Fast real-time compression algorithm" +DESCRIPTION = "Zstandard is a fast lossless compression algorithm, targeting \ +real-time compression scenarios at zlib-level and better compression ratios. \ +It's backed by a very fast entropy stage, provided by Huff0 and FSE library." +HOMEPAGE = "http://www.zstd.net/" +SECTION = "console/utils" + +LICENSE = "BSD-3-Clause & GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ + file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" + +SRC_URI = "git://github.com/facebook/zstd.git;nobranch=1" + +SRCREV = "a3d655d2255481333e09ecca9855f1b37f757c52" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4" +PACKAGECONFIG[lzma] = "HAVE_LZMA=1,HAVE_LZMA=0,xz" +PACKAGECONFIG[zlib] = "HAVE_ZLIB=1,HAVE_ZLIB=0,zlib" + +# See programs/README.md for how to use this +ZSTD_LEGACY_SUPPORT ??= "4" + +do_compile () { + oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} +} + +do_install () { + oe_runmake install 'DESTDIR=${D}' +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb b/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb index e58bdd493..6683eccf2 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb @@ -32,3 +32,4 @@ python do_package_prepend() { } B = "${WORKDIR}/${BPN}-${PV}" +PNBLACKLIST[bpftool] = "Needs forward porting to kernel 5.2+" diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb index 7b7f33520..a28d59dce 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb @@ -124,7 +124,6 @@ RDEPENDS_python-pygps = " \ python-io \ python-threading \ python-terminal \ - python-curses \ gpsd \ python-json" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb index 198a771bf..e66102064 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.326" -SRCREV = "dc8574c8e01ac758ba4dd23e7574492e261ad9ea" +PV = "0.327" +SRCREV = "874f7831c64de7ea2203cfcd1b3fc336bc27e468" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch new file mode 100644 index 000000000..16de8c0a1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch @@ -0,0 +1,73 @@ +From 27b56cb6b5dfc75ea8ddb395dc9ef41fb7a09c93 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Mon, 2 Sep 2019 23:04:50 -0400 +Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found + +In oe-core (util-linux and coreutils), the commands locates in +${bindir} rather than /bin, add BINDIR to configure it + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + configure.ac | 3 +++ + scripts/blkdeactivate.sh.in | 7 ++++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d1431e2..54e5a7b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1495,6 +1495,8 @@ fi + + SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))" + ++BINDIR="$(eval echo $(eval echo $bindir))" ++ + SBINDIR="$(eval echo $(eval echo $sbindir))" + LVM_PATH="$SBINDIR/lvm" + AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.]) +@@ -1721,6 +1723,7 @@ AC_SUBST(SACKPT_CFLAGS) + AC_SUBST(SACKPT_LIBS) + AC_SUBST(SALCK_CFLAGS) + AC_SUBST(SALCK_LIBS) ++AC_SUBST(BINDIR) + AC_SUBST(SBINDIR) + AC_SUBST(SELINUX_LIBS) + AC_SUBST(SELINUX_PC) +diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in +index a4b8a8f..3db4226 100644 +--- a/scripts/blkdeactivate.sh.in ++++ b/scripts/blkdeactivate.sh.in +@@ -41,13 +41,14 @@ UMOUNT="/bin/umount" + + sbindir="@SBINDIR@" + DMSETUP="$sbindir/dmsetup" ++bindir="@BINDIR@" + LVM="$sbindir/lvm" + + if "$UMOUNT" --help | grep -- "--all-targets" >"$DEV_DIR/null"; then + UMOUNT_OPTS="--all-targets " + else + UMOUNT_OPTS="" +- FINDMNT="/bin/findmnt -r --noheadings -u -o TARGET" ++ FINDMNT="$bindir/findmnt -r --noheadings -u -o TARGET" + FINDMNT_READ="read -r mnt" + fi + DMSETUP_OPTS="" +@@ -55,10 +56,10 @@ LVM_OPTS="" + MDADM_OPTS="" + MPATHD_OPTS="" + +-LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" ++LSBLK="$bindir/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" + LSBLK_VARS="local devtype local kname local name local mnt" + LSBLK_READ="read -r devtype kname name mnt" +-SORT_MNT="/bin/sort -r -u -k 4" ++SORT_MNT="$bindir/sort -r -u -k 4" + + # Do not show tool errors by default (only done/skipping summary + # message provided by this script) and no verbose mode by default. +-- +2.8.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb index 785c6960e..f42bd8ed2 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.02.bb @@ -4,6 +4,7 @@ SRCREV = "913c28917e62577a2ef67152b2e5159237503dda" SRC_URI += " \ file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \ + file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ " DEPENDS += "autoconf-archive-native" @@ -67,7 +68,12 @@ RDEPENDS_${PN}-udevrules = "libdevmapper" RDEPENDS_${PN}_append_class-target = " libdevmapper" RDEPENDS_${PN}_append_class-nativesdk = " libdevmapper" -RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) bash" +RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ + bash \ + util-linux-lsblk \ + util-linux-findmnt \ + coreutils \ +" RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_4.3.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_4.3.bb deleted file mode 100644 index aa773bf75..000000000 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_4.3.bb +++ /dev/null @@ -1,20 +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] = "23f4f7b5c0d1f04ad555960dc294f2b8" -SRC_URI[sha256sum] = "00d3ad1a287a85b4bf83e5f06cedd0a9f880413682bebd52b4b1e2af8cfc0d81" - -inherit autotools gettext pkgconfig - -PACKAGECONFIG[tiny] = "--enable-tiny," diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_4.4.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_4.4.bb new file mode 100644 index 000000000..18121be06 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_4.4.bb @@ -0,0 +1,20 @@ +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] = "9650dd3eb0adbab6aaa748a6f1398ccb" +SRC_URI[sha256sum] = "2af222e0354848ffaa3af31b5cd0a77917e9cb7742cd073d762f3c32f0f582c7" + +inherit autotools gettext pkgconfig + +PACKAGECONFIG[tiny] = "--enable-tiny," diff --git a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch deleted file mode 100644 index 0497613dd..000000000 --- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5c16beff9909b28f55f25f48ed7ddbf98d8b1d5c Mon Sep 17 00:00:00 2001 -From: Roy Li -Date: Wed, 18 Jul 2018 09:43:55 +0800 -Subject: [PATCH] fix NULL pointer problem - -return 0 if distance_table is NULL - -Upstream-Status: Pending - -read_distance_table() maybe return 0, but distance_table is not set, -if distance_table is used, and will lead to SEGFAULT - -Signed-off-by: Roy Li - -Signed-off-by: Changqing Li ---- - distance.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/distance.c b/distance.c -index 8d472af..6a6e886 100644 ---- a/distance.c -+++ b/distance.c -@@ -113,6 +113,8 @@ int numa_distance(int a, int b) - int err = read_distance_table(); - if (err < 0) - return 0; -+ if(!distance_table) -+ return 0; - } - if ((unsigned)a >= distance_numnodes || (unsigned)b >= distance_numnodes) - return 0; --- -2.7.4 - 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 279ac0415..f13b1795f 100644 --- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb @@ -10,11 +10,10 @@ inherit autotools-brokensep ptest LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e481299f3f677b21bb" -SRCREV = "841253d1313b01a968c380cae4f498f20c46e5aa" -PV = "2.0.12+git${SRCPV}" +SRCREV = "5d9f16722e3df49dc618a9f361bd482559695db7" +PV = "2.0.13+git${SRCPV}" SRC_URI = "git://github.com/numactl/numactl \ - file://0001-fix-NULL-pointer-problem.patch \ file://Fix-the-test-output-format.patch \ file://Makefile \ file://run-ptest \ diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb new file mode 100644 index 000000000..b95c400b2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb @@ -0,0 +1,33 @@ +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-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver spice spice-protocol libsecret" + +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[md5sum] = "6da599c3a5cab2df37a70f8fba2f5438" +SRC_URI[sha256sum] = "fbed745438bb0c21467b60cbd67c8148a9289b5ebc7482d06db443bea556af1a" + +S = "${WORKDIR}/Remmina-v${PV}" + +inherit cmake + +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 +} + +RDEPENDS_${PN} = "bash" + +FILES_${PN}_append = " ${datadir}/icons/hicolor/*" + +COMPATIBLE_HOST = '(x86_64|i.86).*-linux' diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.27.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.27.bb deleted file mode 100644 index cc07dcb06..000000000 --- a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.27.bb +++ /dev/null @@ -1,32 +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 = "dff1b877d42bf2153f8f090905d9cc8fb333bf1e" -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[python2] = "--with-python2, --without-python2,,python2" -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.28.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.28.bb new file mode 100644 index 000000000..fbf018d7f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.28.bb @@ -0,0 +1,31 @@ +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/uhubctl/uhubctl_2.0.0.bb b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.0.0.bb deleted file mode 100644 index 62028a96e..000000000 --- a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.0.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 = "6e05aee30e348ae2fd13ce8bfaa10f4f7d45d66f" -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.1.0.bb b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.1.0.bb new file mode 100644 index 000000000..b294d77ba --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.1.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 = "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/vboxguestdrivers/vboxguestdrivers_5.2.22.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.22.bb index e394f34c7..0f8d7af3f 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.22.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.22.bb @@ -78,3 +78,6 @@ FILES_${PN} = "${base_sbindir}" # autoload if installed KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" + +PNBLACKLIST[vboxguestdrivers] = "Needs forward porting to kernel 5.2+" + diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.20.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.20.bb deleted file mode 100644 index c37b40d7c..000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.20.bb +++ /dev/null @@ -1,66 +0,0 @@ -DESCRIPTION = "This package contains the DNS.pm module with friends." -HOMEPAGE = "http://www.net-dns.org/" -SECTION = "libs" -LICENSE = "MIT" - -LIC_FILES_CHKSUM = "file://README;beginline=252;endline=269;md5=27db37b42cd1a5173a53922d67072bcb" - -DEPENDS += "perl" - -SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" - -SRC_URI[md5sum] = "565d3ae163591f3da7e1a20827b73c28" -SRC_URI[sha256sum] = "7fd9692b687253baa8f2eb639f1dd7ff9c77fddd67167dc59b400bd25e4ce01b" - -UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P(\d+\.\d+))(?!_\d+).tar" - -S = "${WORKDIR}/Net-DNS-${PV}" - -EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" - -inherit cpan ptest-perl - -RDEPENDS_${PN} = " \ - libdigest-hmac-perl \ - perl-module-base \ - perl-module-constant \ - perl-module-digest-md5 \ - perl-module-digest-sha \ - perl-module-file-spec \ - perl-module-integer \ - perl-module-io-file \ - perl-module-io-select \ - perl-module-io-socket \ - perl-module-io-socket-ip \ - perl-module-mime-base64 \ - perl-module-scalar-util \ - perl-module-test-more \ - perl-module-time-local \ -" - -RRECOMMENDS_${PN} += " \ - libnet-dns-sec-perl \ -" - -RDEPENDS_${PN}-ptest += " \ - perl-module-encode \ - perl-module-encode-byte \ - perl-module-extutils-mm \ - perl-module-extutils-mm-unix \ - perl-module-overload \ -" - -python __anonymous () { - # rather than use "find" to determine libc-*.so, - # statically export the known paths for glibc and musl - import os - if d.getVar('TCLIBC') == "glibc": - os.environ["LIBC"] = "${STAGING_BASELIBDIR}/libc.so.6" - elif d.getVar('TCLIBC') == "musl": - os.environ["LIBC"] = "${STAGING_LIBDIR}/libc.so" - else: - raise bb.parse.SkipRecipe("incompatible with %s C library" % - d.getVar('TCLIBC')) -} - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.21.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.21.bb new file mode 100644 index 000000000..58b8eec66 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.21.bb @@ -0,0 +1,66 @@ +DESCRIPTION = "This package contains the DNS.pm module with friends." +HOMEPAGE = "http://www.net-dns.org/" +SECTION = "libs" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://README;beginline=252;endline=269;md5=27db37b42cd1a5173a53922d67072bcb" + +DEPENDS += "perl" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" + +SRC_URI[md5sum] = "91e8593eb6eed41995e6edc567fb6fec" +SRC_URI[sha256sum] = "ddefe13b28084ffcc8f10a96b3c13c59449dbf6fc371c006d129630ea0ce767a" + +UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P(\d+\.\d+))(?!_\d+).tar" + +S = "${WORKDIR}/Net-DNS-${PV}" + +EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" + +inherit cpan ptest-perl + +RDEPENDS_${PN} = " \ + libdigest-hmac-perl \ + perl-module-base \ + perl-module-constant \ + perl-module-digest-md5 \ + perl-module-digest-sha \ + perl-module-file-spec \ + perl-module-integer \ + perl-module-io-file \ + perl-module-io-select \ + perl-module-io-socket \ + perl-module-io-socket-ip \ + perl-module-mime-base64 \ + perl-module-scalar-util \ + perl-module-test-more \ + perl-module-time-local \ +" + +RRECOMMENDS_${PN} += " \ + libnet-dns-sec-perl \ +" + +RDEPENDS_${PN}-ptest += " \ + perl-module-encode \ + perl-module-encode-byte \ + perl-module-extutils-mm \ + perl-module-extutils-mm-unix \ + perl-module-overload \ +" + +python __anonymous () { + # rather than use "find" to determine libc-*.so, + # statically export the known paths for glibc and musl + import os + if d.getVar('TCLIBC') == "glibc": + os.environ["LIBC"] = "${STAGING_BASELIBDIR}/libc.so.6" + elif d.getVar('TCLIBC') == "musl": + os.environ["LIBC"] = "${STAGING_LIBDIR}/libc.so" + else: + raise bb.parse.SkipRecipe("incompatible with %s C library" % + d.getVar('TCLIBC')) +} + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2.inc new file mode 100644 index 000000000..1a0be778b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2.inc @@ -0,0 +1,13 @@ +SUMMARY = "Extra features for standard library's cmd module" +HOMEPAGE = "http://packages.python.org/cmd2/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=01aeabea7ae1529a8e4b674b7107d6bc" + +SRC_URI[md5sum] = "df35bb2dca8f5e1f6090e1f0aa02960a" +SRC_URI[sha256sum] = "4b78379d53aff811d1deac720bbe71661769822a5fb2d830cd730656d180fb3d" + +inherit pypi + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.16.bb index 94db37a2d..17b6ae285 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.16.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.9.16.bb @@ -1,14 +1,5 @@ -SUMMARY = "Extra features for standard library's cmd module" -HOMEPAGE = "http://packages.python.org/cmd2/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=01aeabea7ae1529a8e4b674b7107d6bc" - -SRC_URI[md5sum] = "df35bb2dca8f5e1f6090e1f0aa02960a" -SRC_URI[sha256sum] = "4b78379d53aff811d1deac720bbe71661769822a5fb2d830cd730656d180fb3d" - -inherit pypi setuptools - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +inherit setuptools +require python-cmd2.inc RDEPENDS_${PN} += "\ ${PYTHON_PN}-doctest \ @@ -21,5 +12,3 @@ RDEPENDS_${PN} += "\ ${PYTHON_PN}-threading \ ${PYTHON_PN}-textutils \ " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.10.bb new file mode 100644 index 000000000..9907ea953 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.10.bb @@ -0,0 +1,32 @@ +SUMMARY = "Python bindings for the DBus inter-process communication system" +SECTION = "devel/python" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +LICENSE = "MIT & AFL-2.1 | GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b03240518994df6d8c974675675e5ca4 \ + file://dbus-gmain/COPYING;md5=99fece6728a80737c8fd3e7c734c17c4 " +DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \ +" + +SRC_URI[md5sum] = "5d21d5ae6423f0e41caa3400af44edac" +SRC_URI[sha256sum] = "d4332bbd4a0054fa4010b259c293b84d461bbd9d7a8ef528157d151c0398d886" +S = "${WORKDIR}/dbus-python-${PV}" + +inherit distutils-base autotools pkgconfig + +# documentation needs python-sphinx, which is not in oe-core or meta-python for now +# change to use PACKAGECONFIG when python-sphinx is added to oe-core or meta-python +EXTRA_OECONF += "--disable-documentation" + +export STAGING_LIBDIR +export STAGING_INCDIR + +RDEPENDS_${PN} = "python-io python-logging python-stringold python-threading python-xml" + +FILES_${PN}-dev += "${libdir}/pkgconfig" + +do_install_append() { + # Remove files that clash with python3-dbus; their content is same + rm ${D}${includedir}/dbus-1.0/dbus/dbus-python.h ${D}${libdir}/pkgconfig/dbus-python.pc +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.8.bb deleted file mode 100644 index b3f724054..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.8.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Python bindings for the DBus inter-process communication system" -SECTION = "devel/python" -HOMEPAGE = "http://www.freedesktop.org/Software/dbus" -LICENSE = "MIT & AFL-2.1 | GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b03240518994df6d8c974675675e5ca4 \ - file://dbus-gmain/COPYING;md5=05c3eacd50f69bb1d58afec460baad57 " -DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native" - -SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "7379db774c10904f27e7e2743d90fb43" -SRC_URI[sha256sum] = "abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f" -S = "${WORKDIR}/dbus-python-${PV}" - -inherit distutils-base autotools pkgconfig - -# documentation needs python-sphinx, which is not in oe-core or meta-python for now -# change to use PACKAGECONFIG when python-sphinx is added to oe-core or meta-python -EXTRA_OECONF += "--disable-documentation" - -export STAGING_LIBDIR -export STAGING_INCDIR - -RDEPENDS_${PN} = "python-io python-logging python-stringold python-threading python-xml" - -FILES_${PN}-dev += "${libdir}/pkgconfig" - -do_install_append() { - # Remove files that clash with python3-dbus; their content is same - rm ${D}${includedir}/dbus-1.0/dbus/dbus-python.h ${D}${libdir}/pkgconfig/dbus-python.pc -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-hyperlink.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-hyperlink.inc index 25398541c..653170ca6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-hyperlink.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-hyperlink.inc @@ -8,7 +8,7 @@ SRC_URI[md5sum] = "4772fb4d87c26a1ab22a6161424e3cba" inherit pypi -RDEPENDS_${PN} += "${PYTHON_PN}-stringold ${PYTHON_PN}-netclient" +RDEPENDS_${PN} += "${PYTHON_PN}-stringold ${PYTHON_PN}-netclient ${PYTHON_PN}-idna" PACKAGES =. "${PN}-test " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.1.1.bb deleted file mode 100644 index 90e7970a5..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.1.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Tools for using a Web Server Gateway Interface stack" -HOMEPAGE = "http://pythonpaste.org/" -LICENSE = "MIT" -RDEPENDS_${PN} = "python-six" - -LIC_FILES_CHKSUM = "file://docs/license.txt;md5=1798f29d55080c60365e6283cb49779c" - -SRC_URI[md5sum] = "07132313bc62c7525402d31119161228" -SRC_URI[sha256sum] = "baca402a089594db0cf1e9aae5c98bcf91588bbbaf848527257e246b960eb72f" - -PYPI_PACKAGE = "Paste" -inherit pypi setuptools - -FILES_${PN} += "/usr/lib/*" - -DEPENDS += "${PYTHON_PN}-pytest-runner-native" - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.2.0.bb new file mode 100644 index 000000000..92a97d1e0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-paste_3.2.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Tools for using a Web Server Gateway Interface stack" +HOMEPAGE = "http://pythonpaste.org/" +LICENSE = "MIT" +RDEPENDS_${PN} = "python-six" + +LIC_FILES_CHKSUM = "file://docs/license.txt;md5=1798f29d55080c60365e6283cb49779c" + +SRC_URI[md5sum] = "9225991c1c37a81e0aaac2fb046f3602" +SRC_URI[sha256sum] = "2153da2f1b09a69bce7633d7e3f9aaa802572e85f9ac1ed09ad93ef8599d31b6" + +PYPI_PACKAGE = "Paste" +inherit pypi setuptools + +FILES_${PN} += "/usr/lib/*" + +DEPENDS += "${PYTHON_PN}-pytest-runner-native" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pbr_5.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pbr_5.4.2.bb deleted file mode 100644 index 1023b2031..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pbr_5.4.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -inherit setuptools -# The inc file is in oe-core -require recipes-devtools/python/python-pbr.inc - -SRC_URI[md5sum] = "ea90e1118a0132da752d45e68d10b2b8" -SRC_URI[sha256sum] = "9b321c204a88d8ab5082699469f52cc94c5da45c51f114113d01b3d993c24cdf" - -do_install_append() { - if [ -f ${D}${bindir}/pbr ]; then - mv ${D}${bindir}/pbr ${D}${bindir}/pbr-2 - fi -} - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pbr_5.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pbr_5.4.3.bb new file mode 100644 index 000000000..b21722fda --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pbr_5.4.3.bb @@ -0,0 +1,13 @@ +inherit setuptools +# The inc file is in oe-core +require recipes-devtools/python/python-pbr.inc + +SRC_URI[md5sum] = "477d2aa285ad97250a172b199f4060b7" +SRC_URI[sha256sum] = "2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8" + +do_install_append() { + if [ -f ${D}${bindir}/pbr ]; then + mv ${D}${bindir}/pbr ${D}${bindir}/pbr-2 + fi +} + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1.inc index 1086f30bf..014fcf9a3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://pyasn1.sourceforge.net/" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=a14482d15c2249de3b6f0e8a47e021fd" -SRC_URI[md5sum] = "67f1da0cf680761d29169e54e7d53159" -SRC_URI[sha256sum] = "b773d5c9196ffbc3a1e13bdf909d446cad80a039aa3340bcad72f395b76ebc86" +SRC_URI[md5sum] = "50290e833395016c49903f4f9c7e47e5" +SRC_URI[sha256sum] = "a9495356ca1d66ed197a0f72b41eb1823cf7ea8b5bd07191673e8147aecf8604" RDEPENDS_${PN}_class-target += " \ ${PYTHON_PN}-codecs \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1_0.4.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1_0.4.6.bb deleted file mode 100644 index a13c74dda..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1_0.4.6.bb +++ /dev/null @@ -1,6 +0,0 @@ -inherit pypi setuptools -require python-pyasn1.inc - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-lang \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1_0.4.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1_0.4.7.bb new file mode 100644 index 000000000..a13c74dda --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1_0.4.7.bb @@ -0,0 +1,6 @@ +inherit pypi setuptools +require python-pyasn1.inc + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-lang \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-asyncio.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-asyncio.inc new file mode 100644 index 000000000..9132c7452 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-asyncio.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "pytest-asyncio is an Apache2 licensed library, written in Python, for testing asyncio code with pytest" +HOMEPAGE = "https://github.com/pytest-dev/pytest-asyncio" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.rst;md5=ae62268d207c73b615fbefddaf91a881" + +SRC_URI[md5sum] = "247a7ec32f24a185341327c42a0f85bf" +SRC_URI[sha256sum] = "9fac5100fd716cbecf6ef89233e8590a4ad61d729d1732e0a96b84182df1daaf" + +inherit pypi + +DEPENDS += "${PYTHON_PN}-pytest-native" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc index 49ef790f0..b58cdea96 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://pytest.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=640061b8cee64b308a4d2f9f556c12f2" -SRC_URI[md5sum] = "662313b4f539f5b66d2fb77791458e82" -SRC_URI[sha256sum] = "c3d5020755f70c82eceda3feaf556af9a341334414a8eca521a18f463bcead88" +SRC_URI[md5sum] = "90fec5504fcebc5d1081bcd654df7cf0" +SRC_URI[sha256sum] = "b78fe2881323bd44fd9bd76e5317173d4316577e7b1cddebae9136a4495ec865" SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.1.bb deleted file mode 100644 index 39e50aca9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -inherit pypi setuptools -require python-pytest.inc - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-argparse \ - ${PYTHON_PN}-compiler \ - ${PYTHON_PN}-funcsigs \ -" -ALTERNATIVE_PRIORITY = "10" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.2.bb new file mode 100644 index 000000000..39e50aca9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.2.bb @@ -0,0 +1,9 @@ +inherit pypi setuptools +require python-pytest.inc + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-argparse \ + ${PYTHON_PN}-compiler \ + ${PYTHON_PN}-funcsigs \ +" +ALTERNATIVE_PRIORITY = "10" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-stevedore.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-stevedore.inc index 0aa0ef2fa..5aa9fb424 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-stevedore.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-stevedore.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/dreamhost/stevedore" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[md5sum] = "02c747c39f4634465aa2590ceefddf59" -SRC_URI[sha256sum] = "7be098ff53d87f23d798a7ce7ae5c31f094f3deb92ba18059b1aeb1ca9fec0a0" +SRC_URI[md5sum] = "42fa2bf0251c96b543765c5ce13f37c9" +SRC_URI[sha256sum] = "e0739f9739a681c7a1fda76a102b65295e96a144ccdb552f2ae03c5f0abe8a14" inherit pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-stevedore_1.30.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-stevedore_1.30.1.bb deleted file mode 100644 index 70a00c131..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-stevedore_1.30.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools -require python-stevedore.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-stevedore_1.31.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-stevedore_1.31.0.bb new file mode 100644 index 000000000..70a00c131 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-stevedore_1.31.0.bb @@ -0,0 +1,2 @@ +inherit setuptools +require python-stevedore.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-twine.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-twine.inc new file mode 100644 index 000000000..2bc778da2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-twine.inc @@ -0,0 +1,11 @@ +DESCRIPTION = "Six is a Python 2 and 3 compatibility library" +HOMEPAGE = "https://github.com/benjaminp/six" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://README.rst;md5=3963bdcee7562bedae1effa09e7542b2" + +SRC_URI[md5sum] = "6fb4da0c7d81ddfd48f619b8caa1493c" +SRC_URI[sha256sum] = "d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc" + +inherit pypi + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb new file mode 100644 index 000000000..594e93dca --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb @@ -0,0 +1,10 @@ +inherit setuptools3 +require python-cmd2.inc + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-pyperclip \ + ${PYTHON_PN}-colorama \ + ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-wcwidth \ + " +PNBLACKLIST[python3-cmd2] = "Nothing RPROVIDES 'python3-colorama' (but python3-cmd2_0.9.16.bb RDEPENDS on or otherwise requires it)" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.10.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.10.1.bb index 61156b630..284f5f588 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.10.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.10.1.bb @@ -1,2 +1,4 @@ inherit pypi setuptools3 require python-jinja2.inc + +RDEPENDS_${PN} += "${PYTHON_PN}-asyncio" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.4.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.4.6.bb deleted file mode 100644 index a5e2a7136..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.4.6.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-pyasn1.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.4.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.4.7.bb new file mode 100644 index 000000000..a5e2a7136 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.4.7.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-pyasn1.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.32.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.32.1.bb index 6d80c1091..c60d40e3a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.32.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.32.1.bb @@ -11,6 +11,10 @@ SRC_URI = "git://github.com/GNOME/pyatspi2.git;protocol=https;branch=gnome-3-32" SRCREV = "dc4565208fca00da06b972915a080ad3c63f640d" S = "${WORKDIR}/git" +# Same restriction as gtk+ +inherit distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + inherit pkgconfig autotools python3native FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/pyatspi/*" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.10.0.bb new file mode 100644 index 000000000..09f26f8d1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.10.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-pytest-asyncio.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.1.bb deleted file mode 100644 index eba6632a2..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -inherit pypi setuptools3 -require python-pytest.inc - -ALTERNATIVE_PRIORITY = "100" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.2.bb new file mode 100644 index 000000000..eba6632a2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.2.bb @@ -0,0 +1,4 @@ +inherit pypi setuptools3 +require python-pytest.inc + +ALTERNATIVE_PRIORITY = "100" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_1.30.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_1.30.1.bb deleted file mode 100644 index 3f557f2cb..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_1.30.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-stevedore.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_1.31.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_1.31.0.bb new file mode 100644 index 000000000..3f557f2cb --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_1.31.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-stevedore.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_1.13.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_1.13.0.bb new file mode 100644 index 000000000..0456ec92d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_1.13.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-twine.inc diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb index a8da7e227..a34734c20 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb @@ -53,7 +53,7 @@ EXTRA_OECONF_class-target = "\ --sysconfdir=${sysconfdir}/${BPN} \ --datadir=${datadir}/${BPN} \ --libdir=${libdir} \ - --libexecdir=${libdir}/${BPN}/modules \ + --libexecdir=${libexecdir}/${BPN}/modules \ --localstatedir=${localstatedir} \ --enable-ssl \ --with-dbm=sdbm \ @@ -78,7 +78,7 @@ EXTRA_OECONF_class-native = "\ " do_configure_prepend() { - sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libdir}/cgi-bin:g' ${S}/config.layout + sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout } do_install_append_class-target() { @@ -139,7 +139,7 @@ do_install_append_class-target() { install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 fi - rm -rf ${D}${localstatedir} + rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* chown -R root:root ${D} } diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.5.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.5.bb deleted file mode 100644 index 9f8f61a4a..000000000 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.5.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Application to take screenshots" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" - -inherit xfce-app - -SRC_URI[md5sum] = "0354811cd2622d3de92e342c7eaa184d" -SRC_URI[sha256sum] = "bf35b5432cb920987c6d7ff193600e5dd4d73422b6aa02b4ec5288744053b38c" - -do_compile_prepend() { - mkdir -p lib - mkdir -p src panel-plugin -} - -FILES_${PN} += " \ - ${datadir}/appdata \ - ${datadir}/xfce4/panel/plugins \ - ${libdir}/xfce4/panel/plugins \ -" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.6.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.6.bb new file mode 100644 index 000000000..7f6756fc9 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.6.bb @@ -0,0 +1,22 @@ +SUMMARY = "Application to take screenshots" +HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" +SECTION = "x11/application" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" + +inherit xfce-app + +SRC_URI[md5sum] = "9e4026d9ae7850b290992c9d2aea80dd" +SRC_URI[sha256sum] = "88c174ce687d1f7ba5470d6ab5784d33dc215f8f220211e892e268189dbea658" + +do_compile_prepend() { + mkdir -p lib + mkdir -p src panel-plugin +} + +FILES_${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/xfce4/panel/plugins \ + ${libdir}/xfce4/panel/plugins \ +" diff --git a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb deleted file mode 100644 index 8f622bf6f..000000000 --- a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb +++ /dev/null @@ -1,31 +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" - -inherit autotools gtk-doc gobject-introspection distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ - " - -SRC_URI[md5sum] = "c6c65a2b2654fe9dfe9ab2e8b80c079a" -SRC_URI[sha256sum] = "196d3a74cef254ff812c32682d1818d740e36a68b976fef9e99748d23a71a71a" - -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \ - --disable-static \ - " - -DEPENDS = "gtk+ gconf libnotify dbus-glib libgxim xfconf intltool-native" - -RDEPENDS_${PN} += "bash" - -FILES_${PN} += "${datadir}/dbus-1/* ${datadir}/gir-1.0/* ${libdir}/girepository-1.0/*" 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 new file mode 100644 index 000000000..5c94cb6bc --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.1.bb @@ -0,0 +1,33 @@ +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 distro_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-xfce/xfce4-settings/xfce4-settings_4.14.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.0.bb deleted file mode 100644 index 902e326de..000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Xfce4 settings" -SECTION = "x11/wm" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "exo exo-native garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower" - -inherit xfce distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " \ - file://0001-xsettings.xml-Set-default-themes.patch \ -" -SRC_URI[md5sum] = "dcbc673448e1a816b2c47a7ce0ca13aa" -SRC_URI[sha256sum] = "e03040d623abda0222ad04f226582277a1936507ddfa927ec8e87927debc113c" - -EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" - -PACKAGECONFIG ??= " \ - ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ -" -PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" -PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop" - -FILES_${PN} += " \ - ${libdir}/xfce4 \ - ${datadir}/xfce4 \ -" - -RRECOMMENDS_${PN} += "adwaita-icon-theme" -RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" -RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" -RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','xfce4-datetime-setter','',d)}" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.1.bb new file mode 100644 index 000000000..a24928cf6 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.14.1.bb @@ -0,0 +1,33 @@ +SUMMARY = "Xfce4 settings" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "exo exo-native garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower" + +inherit xfce distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI += " \ + file://0001-xsettings.xml-Set-default-themes.patch \ +" +SRC_URI[md5sum] = "2f4171c21db905d9ba0ca9bee3fc7a5b" +SRC_URI[sha256sum] = "e873e9f6b8e801fd9304ee100c4c76ed9987446c38429d02477c086431c0bf7a" + +EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ +" +PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" +PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop" + +FILES_${PN} += " \ + ${libdir}/xfce4 \ + ${datadir}/xfce4 \ +" + +RRECOMMENDS_${PN} += "adwaita-icon-theme" +RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" +RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" +RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','xfce4-datetime-setter','',d)}" -- cgit v1.2.3 From a891d150c6a7455ddbb797bdc472f45fd5f36008 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 13 Sep 2019 06:17:45 -0400 Subject: meta-openembedded: subtree update:ce51958eca..a2928764c2 Adrian Bunk (3): python3-cmd2: Remove PNBLACKLIST php: Remove no longer needed CFLAGS_append_aarch64 php: Move more into php.inc after php5 removal Alistair Francis (4): python3-requests-future: Initial commit of 0.9.5 python3-xmlrunner: Initial commit of 1.7.7 python3-fasteners: Initial commit of 0.15 python3-python-vlc: Initial commit of 3.0.7110 Anuj Mittal (3): python3-defusedxml: add recipe python-networkx: upgrade 2.1 -> 2.2 python3-networkx: add recipe Khem Raj (9): php: Turn PCRE JIT off for riscv redis: Fix build with clang/x86 android-tools: Recognise i686 for HOST_ARCH netdata: Update to 1.17.0 and fix build with clang/x86 safec: Define _GNU_SOURCE safec: Upgrade to 3.5 release openocd: Add --disable-werror always breakpad: Update dont-clobber-rsp patch to latest gparted: add to deps instead of overwriting Martin Jansa (3): remmina: add distro_features_check for GTK3DISTROFEATURES ceres-solver: fix the paths in .cmake files ceres-solver: add PACKAGECONFIG for suitesparse and lapack Naveen Saini (1): pm-graph: upgrade 5.3 -> 5.5 Oleksandr Kravchuk (1): analyze-suspend: update to 5.5 Peter Kjellerstedt (1): lvm2/libdevmapper: Make it build for native Randy MacLeod (1): poppler: update from 0.79.0 to 0.80.0 Slater, Joseph (1): openhpi: control snmp-bc ptest generation Stefan Agner (1): fuse3: add libfuse3 recipe Trevor Gamblin (1): gvfs: upgrade 1.40.2 -> 1.41.2 for CVE fixes Yi Zhao (2): php: fix module path in mod_php.conf apache-websocket: fix module path Yuan Chao (2): python-atomicwrites: new recipe python-pytest: fix runtime error Zang Ruochen (1): python-certifi: upgrade 2019.6.16 -> 2019.9.11 Change-Id: Iba065b25686a1ac22d647226d9ea0c61c5b4578f Signed-off-by: Brad Bishop --- .../recipes-support/fuse/fuse3_3.6.2.bb | 48 +++++++++++++ .../recipes-extended/gparted/gparted_0.33.0.bb | 2 +- .../meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb | 82 ---------------------- .../meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb | 82 ++++++++++++++++++++++ .../recipes-daemons/openhpi/openhpi_3.8.0.bb | 15 ++++ .../analyze-suspend/analyze-suspend_5.3.bb | 29 -------- .../analyze-suspend/analyze-suspend_5.5.bb | 29 ++++++++ ...emrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch | 30 ++++++++ .../meta-oe/recipes-core/safec/safec_3.4.bb | 15 ---- .../meta-oe/recipes-core/safec/safec_3.5.bb | 19 +++++ .../android-tools/android-tools_5.1.1.r37.bb | 2 +- .../breakpad/breakpad/dont-clobber-rsp.patch | 46 ++++++++++++ .../recipes-devtools/openocd/openocd_git.bb | 4 +- .../meta-oe/recipes-devtools/php/php.inc | 16 +++-- .../recipes-devtools/php/php/php-fpm-apache.conf | 4 +- .../meta-oe/recipes-devtools/php/php_7.3.9.bb | 8 --- .../redis/0001-src-Do-not-reset-FINAL_LIBS.patch | 32 +++++++++ .../meta-oe/recipes-extended/redis/redis_4.0.14.bb | 5 +- .../pm-graph/pm-graph/0001-bootgraph.py.patch | 32 --------- .../pm-graph/0001-sleepgraph.py-use-python3.patch | 39 ++++++++++ .../recipes-kernel/pm-graph/pm-graph_5.3.bb | 22 ------ .../recipes-kernel/pm-graph/pm-graph_5.5.bb | 22 ++++++ .../ceres-solver/ceres-solver_1.14.bb | 15 ++++ ...configure-Fix-setting-of-CLDFLAGS-default.patch | 78 ++++++++++++++++++++ .../meta-oe/recipes-support/lvm2/lvm2.inc | 1 + .../recipes-support/poppler/poppler_0.79.0.bb | 50 ------------- .../recipes-support/poppler/poppler_0.80.0.bb | 50 +++++++++++++ .../recipes-support/remmina/remmina_1.3.6.bb | 5 +- .../python/python-atomicwrites.inc | 7 ++ .../python/python-atomicwrites_1.3.0.bb | 2 + .../recipes-devtools/python/python-certifi.inc | 4 +- .../python/python-certifi_2019.6.16.bb | 2 - .../python/python-certifi_2019.9.11.bb | 2 + .../recipes-devtools/python/python-networkx.inc | 10 +++ .../recipes-devtools/python/python-networkx_2.1.bb | 12 ---- .../recipes-devtools/python/python-networkx_2.2.bb | 8 +++ .../recipes-devtools/python/python-pytest.inc | 1 + .../python/python3-atomicwrites_1.3.0.bb | 2 + .../python/python3-certifi_2019.6.16.bb | 2 - .../python/python3-certifi_2019.9.11.bb | 2 + .../recipes-devtools/python/python3-cmd2_0.9.16.bb | 1 - .../python/python3-defusedxml_0.6.0.bb | 11 +++ .../python/python3-fasteners_0.15.bb | 9 +++ .../python/python3-networkx_2.3.bb | 8 +++ .../python/python3-python-vlc_3.0.7110.bb | 9 +++ .../python/python3-requests-futures_0.9.5.bb | 14 ++++ .../python/python3-xmlrunner_1.7.7.bb | 9 +++ .../apache-mod/apache-websocket_git.bb | 8 +-- .../recipes-webadmin/netdata/netdata_git.bb | 7 +- 49 files changed, 634 insertions(+), 278 deletions(-) create mode 100644 meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.6.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch delete mode 100644 meta-openembedded/meta-oe/recipes-core/safec/safec_3.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch delete mode 100644 meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch create mode 100644 meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch delete mode 100644 meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.79.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.80.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites.inc create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites_1.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.6.16.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.9.11.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-networkx.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-atomicwrites_1.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.6.16.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.9.11.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-defusedxml_0.6.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.15.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.7110.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-requests-futures_0.9.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc') diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.6.2.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.6.2.bb new file mode 100644 index 000000000..e65eb08e2 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.6.2.bb @@ -0,0 +1,48 @@ +SUMMARY = "Implementation of a fully functional filesystem in a userspace program" +DESCRIPTION = "FUSE (Filesystem in Userspace) is a simple interface for userspace \ + programs to export a virtual filesystem to the Linux kernel. FUSE \ + also aims to provide a secure method for non privileged users to \ + create and mount their own filesystem implementations. \ + " +HOMEPAGE = "https://github.com/libfuse/libfuse" +SECTION = "libs" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LGPL2.txt;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE;md5=a55c12a2d7d742ecb41ca9ae0a6ddc66" + +SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \ +" +SRC_URI[md5sum] = "1798945aa69434286723b9999a141c7a" +SRC_URI[sha256sum] = "f45869427575e1e59ab743a67deb57addbf2cb8f9ce431199dbd40ddab71f281" + +S = "${WORKDIR}/fuse-${PV}" + +UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" +UPSTREAM_CHECK_REGEX = "fuse\-(?P3(\.\d+)+).tar.xz" + +inherit meson pkgconfig + +DEPENDS = "udev" + +PACKAGES =+ "fuse3-utils" + +RPROVIDES_${PN}-dbg += "fuse3-utils-dbg" + +RRECOMMENDS_${PN}_class-target = "kernel-module-fuse fuse3-utils" + +FILES_${PN} += "${libdir}/libfuse3.so.*" +FILES_${PN}-dev += "${libdir}/libfuse3*.la" + +EXTRA_OEMESON += " \ + -Dexamples=false \ +" + +# Forbid auto-renaming to libfuse3-utils +FILES_fuse3-utils = "${bindir} ${base_sbindir}" +DEBIAN_NOAUTONAME_fuse3-utils = "1" +DEBIAN_NOAUTONAME_${PN}-dbg = "1" + +do_install_append() { + rm -rf ${D}${base_prefix}/dev +} diff --git a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb index a9f6993fb..de143b9c8 100644 --- a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb +++ b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.33.0.bb @@ -15,7 +15,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "2f481ad34decb7021ca04ca305e79e7d" SRC_URI[sha256sum] = "5023b8c983f88a22e65bf6f09a12ea09369defc008981b52ee8b96a3879f81d6" -DEPENDS = "glib-2.0 glib-2.0-native gtkmm parted gnome-doc-utils intltool-native" +DEPENDS += "glib-2.0 glib-2.0-native gtkmm parted gnome-doc-utils intltool-native" do_install_append() { # Add a script which checks if polkit is installed. diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb deleted file mode 100644 index 4fca1076f..000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.40.2.bb +++ /dev/null @@ -1,82 +0,0 @@ -DESCRIPTION = "gvfs is a userspace virtual filesystem" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase bash-completion gettext upstream-version-is-even - -DEPENDS += "libsecret glib-2.0 glib-2.0-native gconf libgudev shadow-native" - -SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" - -SRC_URI[archive.md5sum] = "47db9bec616e089513b7f1386e5c7d5f" -SRC_URI[archive.sha256sum] = "bdefe8fec6a1097f0c126fa2a4533667c98a86e237ac640518000e16b363971e" - - -EXTRA_OEMESON = " \ - -Dbluray=false \ - -Dgoa=false \ - -Dgoogle=false \ - -Dnfs=false \ -" - -PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" - -FILES_${PN} += " \ - ${datadir}/glib-2.0 \ - ${datadir}/GConf \ - ${datadir}/dbus-1/services \ - ${libdir}/gio/modules/*.so \ - ${libdir}/tmpfiles.d \ - ${systemd_user_unitdir} \ -" - -FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" -FILES_${PN}-dev += "${libdir}/gio/modules/*.la" - -FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount" -FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount" -FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount" - -RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" - -PACKAGECONFIG ?= "libgphoto2 \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','polkit','udisks2','',d)} \ - ${@bb.utils.contains('DISTRO_FEATURES','polkit','admin','',d)} \ - " - -PACKAGECONFIG[udisks2] = "-Dudisks2=true, -Dudisks2=false, udisks2, udisks2" -PACKAGECONFIG[admin] = "-Dadmin=true, -Dadmin=false, libcap polkit" -PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" -PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" -PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" -PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" -PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-2.4" -PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp" -PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd" -PACKAGECONFIG[libgphoto2] = "-Dgphoto2=true, -Dgphoto2=false, libgphoto2" -PACKAGECONFIG[samba] = "-Dsmb=true, -Dsmb=false, samba" -PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd" - -# needs meta-filesystems -PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse" - -# libcdio-paranoia recipe doesn't exist yet -PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'true', 'false', d)}; then - # Fix up permissions on polkit rules.d to work with rpm4 constraints - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d - fi - - # After rebuilds (not from scracth) it can happen that the executables in - # libexec ar missing executable permission flag. Not sure but it came up - # during transition to meson. Looked into build files and logs but could - # not find suspicious - for exe in `find ${D}/${libexecdir}`; do - chmod +x $exe - done -} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb new file mode 100644 index 000000000..27e3f92cc --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.41.2.bb @@ -0,0 +1,82 @@ +DESCRIPTION = "gvfs is a userspace virtual filesystem" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase bash-completion gettext upstream-version-is-even + +DEPENDS += "libsecret glib-2.0 glib-2.0-native gconf libgudev shadow-native" + +SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" + +SRC_URI[archive.md5sum] = "9a9a97a63bb9e87258d48086a6bdacaa" +SRC_URI[archive.sha256sum] = "f311b7c5f855ebe259960c00c7d03c812e040928ecb0ec093b50a4f16b3bcf26" + + +EXTRA_OEMESON = " \ + -Dbluray=false \ + -Dgoa=false \ + -Dgoogle=false \ + -Dnfs=false \ +" + +PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" + +FILES_${PN} += " \ + ${datadir}/glib-2.0 \ + ${datadir}/GConf \ + ${datadir}/dbus-1/services \ + ${libdir}/gio/modules/*.so \ + ${libdir}/tmpfiles.d \ + ${systemd_user_unitdir} \ +" + +FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" +FILES_${PN}-dev += "${libdir}/gio/modules/*.la" + +FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount" +FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount" +FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount" + +RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" + +PACKAGECONFIG ?= "libgphoto2 \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','polkit','udisks2','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','polkit','admin','',d)} \ + " + +PACKAGECONFIG[udisks2] = "-Dudisks2=true, -Dudisks2=false, udisks2, udisks2" +PACKAGECONFIG[admin] = "-Dadmin=true, -Dadmin=false, libcap polkit" +PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" +PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" +PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" +PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" +PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-2.4" +PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp" +PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd" +PACKAGECONFIG[libgphoto2] = "-Dgphoto2=true, -Dgphoto2=false, libgphoto2" +PACKAGECONFIG[samba] = "-Dsmb=true, -Dsmb=false, samba" +PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd" + +# needs meta-filesystems +PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse" + +# libcdio-paranoia recipe doesn't exist yet +PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'true', 'false', d)}; then + # Fix up permissions on polkit rules.d to work with rpm4 constraints + chmod 700 ${D}/${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + fi + + # After rebuilds (not from scracth) it can happen that the executables in + # libexec ar missing executable permission flag. Not sure but it came up + # during transition to meson. Looked into build files and logs but could + # not find suspicious + for exe in `find ${D}/${libexecdir}`; do + chmod +x $exe + done +} diff --git a/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb b/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb index e3a0c2eb6..b47d59e2d 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb @@ -83,6 +83,21 @@ do_install_append () { } do_compile_ptest () { + for x in `find ${B} -name Makefile -exec grep -l buildtest-TESTS {} \;`; do + dir=`dirname ${x}` + case $dir in + *cpp/t) ;; + *snmp_bc/t) if ${@bb.utils.contains('PACKAGECONFIG','snmp-bc','true','false',d)} + then + oe_runmake -C ${dir} buildtest-TESTS + fi + ;; + *) oe_runmake -C ${dir} buildtest-TESTS ;; + esac + done +} + +ack_do_compile_ptest () { for x in `find ${B} -name Makefile -exec grep -l buildtest-TESTS {} \;`; do dir=`dirname ${x}` upper=`dirname ${dir}` diff --git a/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.3.bb b/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.3.bb deleted file mode 100644 index 451671dda..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.3.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Analyze Suspend" -DESCRIPTION = "analyze-suspend is a tool for system developers to visualize \ -the activity between suspend and resume, allowing them to identify \ -inefficiencies and bottlenecks." -HOMEPAGE = "https://01.org/suspendresume" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" - -# Apart from the listed RDEPENDS, analyze-suspend depends on some features -# provided by the kernel. These options are: -# - CONFIG_PM_DEBUG=y -# - CONFIG_PM_SLEEP_DEBUG=y -# - CONFIG_FTRACE=y -# - CONFIG_FUNCTION_TRACER=y -# - CONFIG_FUNCTION_GRAPH_TRACER=y - -RDEPENDS_${PN} += "python-core python-datetime python-stringold" - -SRC_URI = "git://github.com/01org/suspendresume.git;protocol=https" -SRCREV = "5be9a16547234cef5aca8bfaccd920490ea1cfa7" - -S = "${WORKDIR}/git" - -do_install() { - install -Dm 0755 analyze_suspend.py ${D}${bindir}/analyze_suspend.py - install -Dm 0644 README ${D}${docdir}/analyze-suspend/README -} - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb b/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb new file mode 100644 index 000000000..bb0aad341 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb @@ -0,0 +1,29 @@ +SUMMARY = "Analyze Suspend" +DESCRIPTION = "analyze-suspend is a tool for system developers to visualize \ +the activity between suspend and resume, allowing them to identify \ +inefficiencies and bottlenecks." +HOMEPAGE = "https://01.org/suspendresume" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" + +# Apart from the listed RDEPENDS, analyze-suspend depends on some features +# provided by the kernel. These options are: +# - CONFIG_PM_DEBUG=y +# - CONFIG_PM_SLEEP_DEBUG=y +# - CONFIG_FTRACE=y +# - CONFIG_FUNCTION_TRACER=y +# - CONFIG_FUNCTION_GRAPH_TRACER=y + +RDEPENDS_${PN} += "python-core python-datetime python-stringold" + +SRC_URI = "git://github.com/01org/suspendresume.git;protocol=https" +SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6" + +S = "${WORKDIR}/git" + +do_install() { + install -Dm 0755 analyze_suspend.py ${D}${bindir}/analyze_suspend.py + install -Dm 0644 README ${D}${docdir}/analyze-suspend/README +} + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch b/meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch new file mode 100644 index 000000000..8f18f4872 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch @@ -0,0 +1,30 @@ +From 57456b5d034c8965b11eceed1bf861c98a18c324 Mon Sep 17 00:00:00 2001 +From: "jenkins@kwaj" +Date: Wed, 11 Sep 2019 13:43:45 -0700 +Subject: [PATCH] memrchr: Use _ISOC11_SOURCE only with glibc + +this is a glibc feature test macro which is not available +on other libraries e.g. musl + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/extmem/memrchr_s.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/extmem/memrchr_s.c b/src/extmem/memrchr_s.c +index 8d10a7b9..e73d3579 100644 +--- a/src/extmem/memrchr_s.c ++++ b/src/extmem/memrchr_s.c +@@ -36,7 +36,7 @@ + #endif + + #ifdef HAVE_MEMRCHR +-#ifndef _ISOC11_SOURCE ++#if defined (__GLIBC__) && !defined(_ISOC11_SOURCE) + extern void *memrchr(const void *, int, size_t); + #endif + #endif +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.4.bb b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.4.bb deleted file mode 100644 index b4c125faf..000000000 --- a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Safe C Library" - -LICENSE = "safec" -LIC_FILES_CHKSUM = "file://COPYING;md5=6d0eb7dfc57806a006fcbc4e389cf164" -SECTION = "lib" - -inherit autotools pkgconfig - -S = "${WORKDIR}/git" -SRCREV = "62e6b2df55084316d027165d286e46beb40513dc" -SRC_URI = "git://github.com/rurban/safeclib.git" - -COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm).*-linux' - -RDEPENDS_${PN} = "perl" diff --git a/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.bb b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.bb new file mode 100644 index 000000000..c9ace3b0b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/safec/safec_3.5.bb @@ -0,0 +1,19 @@ +SUMMARY = "Safe C Library" + +LICENSE = "safec" +LIC_FILES_CHKSUM = "file://COPYING;md5=6d0eb7dfc57806a006fcbc4e389cf164" +SECTION = "lib" + +inherit autotools pkgconfig + +S = "${WORKDIR}/git" +SRCREV = "a99a052a56da409638c9fe7e096a5ae6661ca7cb" +SRC_URI = "git://github.com/rurban/safeclib.git \ + file://0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch \ +" + +CPPFLAGS_append_libc-musl = " -D_GNU_SOURCE" + +COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm).*-linux' + +RDEPENDS_${PN} = "perl" diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index 34b0b7a3b..c0d08db17 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -102,7 +102,7 @@ do_compile() { powerpc|powerpc64) export android_arch=linux-ppc ;; - i586|x86_64) + i586|i686|x86_64) export android_arch=linux-x86 ;; esac diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch index b1c37fc8e..edf903552 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/dont-clobber-rsp.patch @@ -1,3 +1,8 @@ +From d1d7b616219fd47736c804ff4c2f393d7184a75b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 23 Dec 2018 16:58:04 -0800 +Subject: [PATCH] chromium: stack pointer clobber + Do not add stack pointer to clobber list it was being ignored until gcc 9.0 became capable @@ -7,9 +12,23 @@ of flagging this silent ignoring via [1] Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160] Signed-off-by: Khem Raj +--- + src/third_party/lss/linux_syscall_support.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Index: b/src/third_party/lss/linux_syscall_support.h +=================================================================== --- a/src/third_party/lss/linux_syscall_support.h +++ b/src/third_party/lss/linux_syscall_support.h +@@ -1957,7 +1957,7 @@ struct kernel_statfs { + LSS_ENTRYPOINT \ + "pop %%ebx" \ + args \ +- : "esp", "memory"); \ ++ : "memory"); \ + LSS_RETURN(type,__res) + #undef _syscall0 + #define _syscall0(type,name) \ @@ -1966,7 +1966,7 @@ struct kernel_statfs { __asm__ volatile(LSS_ENTRYPOINT \ : "=a" (__res) \ @@ -19,6 +38,33 @@ Signed-off-by: Khem Raj LSS_RETURN(type,__res); \ } #undef _syscall1 +@@ -2014,7 +2014,7 @@ struct kernel_statfs { + : "i" (__NR_##name), "ri" ((long)(arg1)), \ + "c" ((long)(arg2)), "d" ((long)(arg3)), \ + "S" ((long)(arg4)), "D" ((long)(arg5)) \ +- : "esp", "memory"); \ ++ : "memory"); \ + LSS_RETURN(type,__res); \ + } + #undef _syscall6 +@@ -2036,7 +2036,7 @@ struct kernel_statfs { + : "i" (__NR_##name), "0" ((long)(&__s)), \ + "c" ((long)(arg2)), "d" ((long)(arg3)), \ + "S" ((long)(arg4)), "D" ((long)(arg5)) \ +- : "esp", "memory"); \ ++ : "memory"); \ + LSS_RETURN(type,__res); \ + } + LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack, +@@ -2122,7 +2122,7 @@ struct kernel_statfs { + : "0"(-EINVAL), "i"(__NR_clone), + "m"(fn), "m"(child_stack), "m"(flags), "m"(arg), + "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr) +- : "esp", "memory", "ecx", "edx", "esi", "edi"); ++ : "memory", "ecx", "edx", "esi", "edi"); + LSS_RETURN(int, __res); + } + @@ -2407,7 +2407,7 @@ struct kernel_statfs { "d"(LSS_SYSCALL_ARG(parent_tidptr)), "r"(LSS_SYSCALL_ARG(newtls)), 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 ab2fd7f72..241b4baa3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -26,8 +26,8 @@ inherit pkgconfig autotools-brokensep gettext BBCLASSEXTEND += "nativesdk" -EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html" -EXTRA_OECONF_append_toolchain-gcc = " --disable-werror " +EXTRA_OECONF = "--enable-ftdi --disable-doxygen-html --disable-werror" + do_configure() { ./bootstrap nosubmodule install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/jimtcl/autosetup diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc index d738d2d93..3d537e5b6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc @@ -56,6 +56,9 @@ EXTRA_OECONF = "--enable-mbstring \ ${COMMON_EXTRA_OECONF} \ " +EXTRA_OECONF_append_riscv64 = " --with-pcre-jit=no" +EXTRA_OECONF_append_riscv32 = " --with-pcre-jit=no" + CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=yes" EXTRA_OECONF_class-native = " \ @@ -71,10 +74,9 @@ PACKAGECONFIG_class-native = "" PACKAGECONFIG[zip] = "--enable-zip --with-libzip=${STAGING_EXECPREFIXDIR},,libzip" -PACKAGECONFIG[mysql] = "--with-mysql=${STAGING_DIR_TARGET}${prefix} \ - --with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ - --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ - ,--without-mysql --without-mysqli --without-pdo-mysql \ +PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ + --with-pdo-mysql=mysqlnd \ + ,--without-mysqli --without-pdo-mysql \ ,mysql5" PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \ @@ -92,11 +94,11 @@ PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache" PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" +PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2" -CFLAGS_append_aarch64 = " -O2" EXTRA_OEMAKE = "INSTALL_ROOT=${D}" @@ -175,7 +177,7 @@ do_install_append_class-target() { install -d ${D}${sysconfdir}/apache2/modules.d install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d - sed -i s,lib/,${libdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf + sed -i s,lib/,${libexecdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf cat ${S}/php.ini-production | \ sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ > ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}/php.ini @@ -214,7 +216,7 @@ FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc" FILES_${PN}-cli = "${bindir}/php" FILES_${PN}-phar = "${bindir}/phar*" FILES_${PN}-cgi = "${bindir}/php-cgi" -FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm ${systemd_unitdir}/system/php-fpm.service" +FILES_${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm ${systemd_unitdir}/system/php-fpm.service ${sysconfdir}/php-fpm.d/www.conf.default" FILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" CONFFILES_${PN}-fpm = "${sysconfdir}/php-fpm.conf" CONFFILES_${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf b/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf index ef79a0cc9..f7f46d205 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf @@ -1,6 +1,6 @@ # Taken from http://wiki.apache.org/httpd/PHP-FPM -LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so -LoadModule proxy_fcgi_module /usr/lib/apache2/modules/mod_proxy_fcgi.so +LoadModule proxy_module /usr/libexec/apache2/modules/mod_proxy.so +LoadModule proxy_fcgi_module /usr/libexec/apache2/modules/mod_proxy_fcgi.so ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/usr/share/apache2/htdocs/ diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb index 4d656da0f..23ab7ca8e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb @@ -17,11 +17,3 @@ SRC_URI_append_class-target = " \ SRC_URI[md5sum] = "bcc37749815009c9201e4c126e1ab8ee" SRC_URI[sha256sum] = "a39c9709a8c9eb7ea8ac4933ef7a78b92f7e5735a405c8b8e42ee39541d963c4" - -PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ - --with-pdo-mysql=mysqlnd \ - ,--without-mysqli --without-pdo-mysql \ - ,mysql5" -PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" - -FILES_${PN}-fpm += "${sysconfdir}/php-fpm.d/www.conf.default" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch new file mode 100644 index 000000000..04af15dd8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch @@ -0,0 +1,32 @@ +From 97584e1eb78dc18599534b47b6670c20c63f5ee2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 10 Sep 2019 20:04:26 -0700 +Subject: [PATCH] src: Do not reset FINAL_LIBS + +This helps case where additional libraries are needed to be passed from +environment to get it going + +e.g. -latomic is needed on clang/x86 to provide for 64bit atomics + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 7f7c625..c71dd3b 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -66,7 +66,7 @@ endif + + FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) + FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) +-FINAL_LIBS=-lm ++FINAL_LIBS+=-lm + DEBUG=-g -ggdb + + ifeq ($(uname_S),SunOS) +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb index 5df5312a0..45ea29b70 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_4.0.14.bb @@ -11,6 +11,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://lua-update-Makefile-to-use-environment-build-setting.patch \ file://oe-use-libc-malloc.patch \ file://Fixed-stack-trace-generation-on-aarch64.patch \ + file://0001-src-Do-not-reset-FINAL_LIBS.patch \ file://redis.conf \ file://init-redis-server \ file://redis.service \ @@ -25,11 +26,13 @@ SRC_URI[sha256sum] = "1e1e18420a86cfb285933123b04a82e1ebda20bfb0a289472745a08758 inherit autotools-brokensep update-rc.d systemd useradd +FINAL_LIBS_x86_toolchain-clang = "-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() { diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch deleted file mode 100644 index d49ce0138..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-bootgraph.py.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0c94e32b218c31f31a7988577fb9bec595034e7b Mon Sep 17 00:00:00 2001 -From: Todd Brandt -Date: Fri, 10 May 2019 15:10:35 -0700 -Subject: [PATCH] bootgraph.py: - handle boot time start grep better, the regex - needs more complexity - -Upstream-Status: Backport [https://github.com/intel/pm-graph/commit/0c94e32b218c31f31a7988577fb9bec595034e7b] - -Signed-off-by: Liwei Song ---- - bootgraph.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bootgraph.py b/bootgraph.py -index a2b1b1897307..d7f4bd152bf1 100755 ---- a/bootgraph.py -+++ b/bootgraph.py -@@ -333,9 +333,9 @@ def parseKernelLog(): - if(not sysvals.stamp['kernel']): - sysvals.stamp['kernel'] = sysvals.kernelVersion(msg) - continue -- m = re.match('.* setting system clock to (?P.*) UTC.*', msg) -+ m = re.match('.* setting system clock to (?P[0-9\-]*)[ A-Z](?P[0-9:]*) UTC.*', msg) - if(m): -- bt = datetime.strptime(m.group('t'), '%Y-%m-%d %H:%M:%S') -+ bt = datetime.strptime(m.group('d')+' '+m.group('t'), '%Y-%m-%d %H:%M:%S') - bt = bt - timedelta(seconds=int(ktime)) - data.boottime = bt.strftime('%Y-%m-%d_%H:%M:%S') - sysvals.stamp['time'] = bt.strftime('%B %d %Y, %I:%M:%S %p') --- -2.22.0 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch new file mode 100644 index 000000000..25c87093f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch @@ -0,0 +1,39 @@ +From 22ce65d997f99606a3bb9d2a660ead42eecc234a Mon Sep 17 00:00:00 2001 +From: Naveen Saini +Date: Wed, 11 Sep 2019 11:31:07 +0800 +Subject: [PATCH] sleepgraph.py: use python3 + +Already compatible with Python 3. +Same goes for bootgraph.py + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Naveen Saini +--- + bootgraph.py | 2 +- + sleepgraph.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bootgraph.py b/bootgraph.py +index d3b99a1..efb5714 100755 +--- a/bootgraph.py ++++ b/bootgraph.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + # SPDX-License-Identifier: GPL-2.0-only + # + # Tool for analyzing boot timing +diff --git a/sleepgraph.py b/sleepgraph.py +index 1794c79..cfed8e0 100755 +--- a/sleepgraph.py ++++ b/sleepgraph.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + # SPDX-License-Identifier: GPL-2.0-only + # + # Tool for analyzing suspend/resume timing +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb deleted file mode 100644 index a9f540ab8..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Timing analysis tools for suspend/resume/boot" -DESCRIPTION = "This tool suite is designed to assist kernel and OS developers \ -in optimizing their linux stack's suspend/resume & boot time." -HOMEPAGE = "https://01.org/pm-graph" -LICENSE = "GPL-2" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" - -SRCREV = "5be9a16547234cef5aca8bfaccd920490ea1cfa7" -SRC_URI = "git://github.com/intel/pm-graph.git \ - file://0001-Makefile-fix-multilib-build-failure.patch \ - file://0001-bootgraph.py.patch \ -" -S = "${WORKDIR}/git" - -COMPATIBLE_HOST='(i.86|x86_64).*' -EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} BASELIB=${baselib}" - -do_install() { - oe_runmake install -} - -RDEPENDS_${PN} += "python-core python-threading python-datetime python-subprocess python-compression" diff --git a/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb new file mode 100644 index 000000000..63a9fa88e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb @@ -0,0 +1,22 @@ +SUMMARY = "Timing analysis tools for suspend/resume/boot" +DESCRIPTION = "This tool suite is designed to assist kernel and OS developers \ +in optimizing their linux stack's suspend/resume & boot time." +HOMEPAGE = "https://01.org/pm-graph" +LICENSE = "GPL-2" +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" + +SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6" +SRC_URI = "git://github.com/intel/pm-graph.git \ + file://0001-Makefile-fix-multilib-build-failure.patch \ + file://0001-sleepgraph.py-use-python3.patch \ +" +S = "${WORKDIR}/git" + +COMPATIBLE_HOST='(i.86|x86_64).*' +EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} BASELIB=${baselib}" + +do_install() { + oe_runmake install +} + +RDEPENDS_${PN} += "python3-core python3-threading python3-datetime python3-compression" diff --git a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb index a62e5ef23..ac463038a 100644 --- a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb @@ -13,6 +13,21 @@ S = "${WORKDIR}/git" inherit cmake +# We don't want path to eigen3 in ceres-solver RSS to be +# used by components which use CeresConfig.cmake from their +# own RSS +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: set(Eigen3_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/share/eigen3/cmake) +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: list(APPEND EIGEN_INCLUDE_DIR_HINTS ceres-solver/1.14-r0/recipe-sysroot/usr/include/eigen3) +# ceres-solver/1.14-r0/packages-split/ceres-solver-dev/usr/lib/cmake/Ceres/CeresConfig.cmake: set(glog_DIR ceres-solver/1.14-r0/recipe-sysroot/usr/lib/cmake/glog) +SSTATE_SCAN_FILES += "*.cmake" + +PACKAGECONFIG ??= "" + +# suitesparse* recipes will be in meta-ros layer +PACKAGECONFIG[suitesparse] = "-DSUITESPARSE=ON,-DSUITESPARSE=OFF,suitesparse-config suitesparse-amd suitesparse-camd suitesparse-colamd suitesparse-ccolamd suitesparse-cholmod suitesparse-metis suitesparse-spqr" +PACKAGECONFIG[cxsparse] = "-DCXSPARSE=ON,-DCXSPARSE=OFF,suitesparse-cxsparse" +PACKAGECONFIG[lapack] = "-DLAPACK=ON,-DLAPACK=OFF,lapack" + # Only a static library and headers are created RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dev = "${PN}-staticdev" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch new file mode 100644 index 000000000..07cb88ffb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure-Fix-setting-of-CLDFLAGS-default.patch @@ -0,0 +1,78 @@ +From 4a3e707402032788e09282e0f54fdf82c8a0f8fc Mon Sep 17 00:00:00 2001 +From: Marian Csontos +Date: Mon, 19 Aug 2019 14:54:43 +0200 +Subject: [PATCH] configure: Fix setting of CLDFLAGS default + +--- + configure | 6 +++--- + configure.ac | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +Upstream-Status: Backport [https://sourceware.org/git/?p=lvm2.git;a=commit;h=4a3e707402032788e09282e0f54fdf82c8a0f8fc] +Signed-off-by: Peter Kjellerstedt + +diff --git a/configure b/configure +index ff3a59b6b..4c8476502 100755 +--- a/configure ++++ b/configure +@@ -3077,7 +3077,7 @@ if test -z "$CFLAGS"; then : + fi + case "$host_os" in + linux*) +- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" ++ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" + # equivalent to -rdynamic + ELDFLAGS="-Wl,--export-dynamic" + # FIXME Generate list and use --dynamic-list=.dlopen.sym +@@ -3098,7 +3098,7 @@ case "$host_os" in + ;; + darwin*) + CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" +- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" ++ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" + ELDFLAGS= + CLDWHOLEARCHIVE="-all_load" + CLDNOWHOLEARCHIVE= +@@ -3111,7 +3111,7 @@ case "$host_os" in + BLKDEACTIVATE=no + ;; + *) +- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" ++ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" + ;; + esac + +diff --git a/configure.ac b/configure.ac +index 5da694631..830edb8da 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,7 +30,7 @@ AC_CANONICAL_TARGET([]) + AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"]) + case "$host_os" in + linux*) +- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"} -Wl,--version-script,.export.sym" ++ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"} -Wl,--version-script,.export.sym" + # equivalent to -rdynamic + ELDFLAGS="-Wl,--export-dynamic" + # FIXME Generate list and use --dynamic-list=.dlopen.sym +@@ -51,7 +51,7 @@ case "$host_os" in + ;; + darwin*) + CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" +- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" ++ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" + ELDFLAGS= + CLDWHOLEARCHIVE="-all_load" + CLDNOWHOLEARCHIVE= +@@ -64,7 +64,7 @@ case "$host_os" in + BLKDEACTIVATE=no + ;; + *) +- CLDFLAGS="${CLDFLAGS:"$LDFLAGS"}" ++ CLDFLAGS="${CLDFLAGS-"$LDFLAGS"}" + ;; + esac + +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index f358663b0..6c95bfd02 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -15,6 +15,7 @@ SRC_URI = "https://sourceware.org/pub/lvm2/LVM2.${PV}.tgz \ 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 \ + file://0001-configure-Fix-setting-of-CLDFLAGS-default.patch \ " SRC_URI[md5sum] = "5fc07da5461a3794a751dcfc355827d5" SRC_URI[sha256sum] = "550ba750239fd75b7e52c9877565cabffef506bbf6d7f6f17b9700dee56c720f" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.79.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.79.0.bb deleted file mode 100644 index 903817f18..000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.79.0.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -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] = "0aac1fcb6466f8b7bdf51871264c7e83" -SRC_URI[sha256sum] = "f985a4608fe592d2546d9d37d4182e502ff6b4c42f8db4be0a021a1c369528c8" - -DEPENDS = "fontconfig zlib cairo lcms glib-2.0" - -inherit cmake pkgconfig gobject-introspection - -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" -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" - -# 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_0.80.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.80.0.bb new file mode 100644 index 000000000..338af1d87 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.80.0.bb @@ -0,0 +1,50 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +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] = "8ff9964d1fcc9c334a9c66f6f426ab9c" +SRC_URI[sha256sum] = "4d3ca6b79bc13b8e24092e34f83ef5f387f3bb0bbd7359a6c078e09c696d104f" + +DEPENDS = "fontconfig zlib cairo lcms glib-2.0" + +inherit cmake pkgconfig gobject-introspection + +PACKAGECONFIG ??= "jpeg openjpeg png tiff nss ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}" +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" + +# 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/remmina/remmina_1.3.6.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb index 126680c57..82b803a4d 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb @@ -18,7 +18,10 @@ SRC_URI[sha256sum] = "fbed745438bb0c21467b60cbd67c8148a9289b5ebc7482d06db443bea5 S = "${WORKDIR}/Remmina-v${PV}" -inherit cmake +inherit cmake distro_features_check + +# depends on avahi-ui with this restriction +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DWITH_SPICE=OFF" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites.inc new file mode 100644 index 000000000..773e9dd77 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites.inc @@ -0,0 +1,7 @@ +DESCRIPTION = "Powerful Python library for atomic file writes" +HOMEPAGE = "https://github.com/untitaker/python-atomicwrites" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=91cc36cfafeefb7863673bcfcb1d4da4" + +SRC_URI[md5sum] = "ce11f780a4ce0fce8a55d64494a88178" +SRC_URI[sha256sum] = "75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites_1.3.0.bb new file mode 100644 index 000000000..c7b41d603 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-atomicwrites_1.3.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-atomicwrites.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc index 23e18563a..de02d9a4a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc @@ -7,7 +7,7 @@ HOMEPAGE = " http://certifi.io/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=f77f61d14ee6feac4228d3ebd26cc1f1" -SRC_URI[md5sum] = "af8fea5f3df6f7f81e9c6cbc6dd7c1e8" -SRC_URI[sha256sum] = "945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695" +SRC_URI[md5sum] = "cadd4e373fc08f649fa39b82aed9ad96" +SRC_URI[sha256sum] = "e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.6.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.6.16.bb deleted file mode 100644 index adfe6238e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.6.16.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-certifi.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.9.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.9.11.bb new file mode 100644 index 000000000..adfe6238e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2019.9.11.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-certifi.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-networkx.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-networkx.inc new file mode 100644 index 000000000..a4c31b2b2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-networkx.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "Python package for creating and manipulating graphs and networks" +LICENSE = "BSD-3-Clause" + +inherit pypi + +PYPI_PACKAGE_EXT = "zip" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-decorator \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.1.bb deleted file mode 100644 index bc0c6863d..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Python package for creating and manipulating graphs and networks" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3376ff7c9c58048c62d91431f7f08cde" - -SRC_URI[md5sum] = "4a2c2a62dfc46ba7d594daca7c834995" -SRC_URI[sha256sum] = "64272ca418972b70a196cb15d9c85a5a6041f09a2f32e0d30c0255f25d458bb1" - -PYPI_PACKAGE_EXT = "zip" - -inherit pypi setuptools - -RDEPENDS_${PN} += "python-2to3" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.2.bb new file mode 100644 index 000000000..648f0312f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.2.bb @@ -0,0 +1,8 @@ +require python-networkx.inc + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3376ff7c9c58048c62d91431f7f08cde" + +SRC_URI[md5sum] = "82608a3686fb3e61f20cf13bfd3c1b4a" +SRC_URI[sha256sum] = "45e56f7ab6fe81652fb4bc9f44faddb0e9025f469f602df14e3b2551c2ea5c8b" + +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc index b58cdea96..7ef6092b5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc @@ -20,6 +20,7 @@ RDEPENDS_${PN}_class-target += " \ ${PYTHON_PN}-py \ ${PYTHON_PN}-setuptools \ ${PYTHON_PN}-six \ + ${PYTHON_PN}-atomicwrites \ " FILESEXTRAPATHS_prepend := "${THISDIR}/python-pytest:" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-atomicwrites_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-atomicwrites_1.3.0.bb new file mode 100644 index 000000000..9f306e60d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-atomicwrites_1.3.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-atomicwrites.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.6.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.6.16.bb deleted file mode 100644 index 70f674b22..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.6.16.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-certifi.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.9.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.9.11.bb new file mode 100644 index 000000000..70f674b22 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2019.9.11.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-certifi.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb index 594e93dca..f5c5c7e1a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_0.9.16.bb @@ -7,4 +7,3 @@ RDEPENDS_${PN} += "\ ${PYTHON_PN}-attrs \ ${PYTHON_PN}-wcwidth \ " -PNBLACKLIST[python3-cmd2] = "Nothing RPROVIDES 'python3-colorama' (but python3-cmd2_0.9.16.bb RDEPENDS on or otherwise requires it)" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-defusedxml_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-defusedxml_0.6.0.bb new file mode 100644 index 000000000..d041d0e6c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-defusedxml_0.6.0.bb @@ -0,0 +1,11 @@ +SUMMARY = "XML bomb protection for Python stdlib modules" +DESCRIPTION = "Python package with modified subclasses of all stdlib XML \ +parsers that prevent any potentially malicious operation." + +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://LICENSE;md5=056fea6a4b395a24d0d278bf5c80249e" + +SRC_URI[md5sum] = "a59741f675c4cba649de40a99f732897" +SRC_URI[sha256sum] = "f684034d135af4c6cbb949b8a4d2ed61634515257a67299e5f940fbaa34377f5" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.15.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.15.bb new file mode 100644 index 000000000..8786a1484 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.15.bb @@ -0,0 +1,9 @@ +SUMMARY = "A python package that provides useful locks." +HOMEPAGE = "https://github.com/harlowja/fasteners" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4476c4be31402271e101d9a4a3430d52" + +SRC_URI[md5sum] = "440f8ab461c8fed941355860d8669556" +SRC_URI[sha256sum] = "3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.3.bb new file mode 100644 index 000000000..8feb6daa3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.3.bb @@ -0,0 +1,8 @@ +require python-networkx.inc + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b68290ee1026b204170a23bbdb27a4fd" + +SRC_URI[md5sum] = "320d3f6c7872732baa63cedafddadea9" +SRC_URI[sha256sum] = "8311ddef63cf5c5c5e7c1d0212dd141d9a1fe3f474915281b73597ed5f1d4e3d" + +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.7110.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.7110.bb new file mode 100644 index 000000000..be63fed02 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.7110.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] = "e128abf7115d6513582bd460c0e74485" +SRC_URI[sha256sum] = "821bca0dbe08fbff97a65e56ff2318ad7d499330876579c39f01f3fb38c7b679" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-futures_0.9.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-futures_0.9.5.bb new file mode 100644 index 000000000..b94929d8c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-futures_0.9.5.bb @@ -0,0 +1,14 @@ +SUMMARY = "Small add-on for the python requests http library. Makes use of python 3.2’s concurrent.futures or the backport for prior versions of python." +HOMEPAGE = "https://github.com/ross/requests-futures" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e1e50798d0afe0e1f87594c6619a2fa5" + +SRC_URI[md5sum] = "e20dc6f063c70888a7f8225e349b6682" +SRC_URI[sha256sum] = "33aa8a3b7892850701707d7e094b1e1ce7c4f7a36ff2a1dcc2da4e01a1a00f7e" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + python3-requests \ +" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb new file mode 100644 index 000000000..7e7b5235e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlrunner_1.7.7.bb @@ -0,0 +1,9 @@ +SUMMARY = "unittest-based test runner with Ant/JUnit like XML reporting" +HOMEPAGE = "https://github.com/pycontribs/xmlrunner" +LICENSE = "LGPL-3.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=fa964f202b6ae067ed5828fe43c77c1a" + +SRC_URI[md5sum] = "7b0b152ed2d278516aedbc0cac22dfb3" +SRC_URI[sha256sum] = "5a6113d049eca7646111ee657266966e5bbfb0b5ceb2e83ee0772e16d7110f39" + +inherit pypi setuptools3 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 c44efb6cd..3cbab22c3 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 @@ -25,9 +25,9 @@ EXTRA_OECONF = "APACHECTL=${STAGING_DIR_TARGET}${sbindir}/apachectl \ LIBTOOL=${STAGING_DIR_TARGET}${bindir_crossscripts}/${HOST_SYS}-libtool" do_install() { - install -d ${D}${libdir}/apache2/modules - install -m 755 ${B}/.libs/mod_websocket.so ${D}${libdir}/apache2/modules + install -d ${D}${libexecdir}/apache2/modules + install -m 755 ${B}/.libs/mod_websocket.so ${D}${libexecdir}/apache2/modules } -FILES_${PN} += " ${libdir}/apache2/modules/* " -FILES_${PN}-dbg += " ${libdir}/apache2/modules/.debug/* " +FILES_${PN} += " ${libexecdir}/apache2/modules/* " +FILES_${PN}-dbg += " ${libexecdir}/apache2/modules/.debug/* " diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb index 811c2c522..d179e84e3 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" SRC_URI = "git://github.com/firehol/netdata.git;protocol=https \ file://0002-Makefiles-does-not-build-contrib-dir.patch \ " -SRCREV = "2c4146832061635273d153a5174c85fb1d967d57" -PV = "1.16.0+git${SRCPV}" +SRCREV = "588ce5a7b18999dfa66698cd3a2f005f7a3c31cf" +PV = "1.17.0" # patch to disable timeout because timeout are not available with actual version # of core-utils @@ -25,6 +25,9 @@ DEPENDS += "zlib util-linux" inherit pkgconfig autotools-brokensep useradd systemd +LIBS_toolchain-clang_x86 = "-latomic" +export LIBS + #systemd SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "netdata.service" -- cgit v1.2.3 From dec060e0fadb20cc708370ae192db4462283ee58 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 23 Sep 2019 08:01:31 -0400 Subject: meta-openembedded: subtree update:ef1b17f4ef..290ad988fb Alistair Francis (6): python3-padaos: Initial commit of version 0.1.10 python3-padatious: Initial commit of 0.4.7 python3-petact: Initial commit of version 0.1.2 python3-precise-runner: Initial commit of version 0.3.1 python3-pulsectl: Initial version of 18.12.5 python3-pychromecast: Initial commit of version 4.0.1 Bartosz Golaszewski (1): python-jsonschema: add python-setuptools-scm to RDEPENDS Daniel Ammann (1): dhex: Add new recipe Khem Raj (5): dfu-utils: Switch src_uri to sourceforge.net dfu-util-native: Dont build static binary live555: Switch SRC_URI where archives are kept for longer kernel-selftest: Exclude from world builds uim: Update to 1.8.8 Oleksandr Kravchuk (2): pcsc-lite: update to 1.8.25 xf86-video-nouveau: update to 1.0.16 Ricardo Salveti (2): python-pyrsistent: add recipe python-jsonschema: rdepends on attrs and pyrsistent S. Lockwood-Childs (1): wireshark: remove restriction to ARM ISA Slater, Joseph (1): live555: update to version 20190828 Vincent Prince (3): python*-psutil: Add native and nativesdk to BBCLASSEXTEND python3-cheetah: add recipe python3-regex: add recipe Yuan Chao (8): python-more-itertools: new recipe python-zipp: new recipe python-pathlib2: new recipe python-packaging: new recipe python-importlib-metadata: new recipe python-pytest: fix runtime error libtevent: upgrade 0.10.0 -> 0.10.1 cryptsetup: upgrade 2.2.0 -> 2.2.1 cjhasu (1): Remove "werkzeug-test" in RDEPENDS Change-Id: Ideadf7469c094d3f26382af6203403ac5c29c6ee Signed-off-by: Brad Bishop --- .../recipes-support/libtevent/libtevent_0.10.0.bb | 58 -------- .../recipes-support/libtevent/libtevent_0.10.1.bb | 58 ++++++++ .../recipes-support/wireshark/wireshark_3.0.3.bb | 2 - .../recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb | 92 ------------- .../recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb | 92 +++++++++++++ .../xorg-driver/xf86-video-nouveau_1.0.15.bb | 20 --- .../xorg-driver/xf86-video-nouveau_1.0.16.bb | 19 +++ .../kernel-selftest/kernel-selftest.bb | 4 + .../meta-oe/recipes-multimedia/live555/live555.inc | 4 +- .../recipes-multimedia/live555/live555_20190306.bb | 8 -- .../recipes-multimedia/live555/live555_20190828.bb | 11 ++ .../dfu-util/dfu-util-native_0.9.bb | 7 +- ...1-Revert-Makefile.am-Drop-static-dfu-util.patch | 68 ---------- .../recipes-support/dfu-util/dfu-util_0.9.bb | 10 +- .../meta-oe/recipes-support/dhex/dhex_0.69.bb | 24 ++++ .../recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb | 49 ------- .../recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb | 52 ++++++++ .../uim/uim/0001-Add-support-for-aarch64.patch | 80 ----------- .../uim/uim/0001-fix-bug-for-cross-compile.patch | 24 ++-- .../uim/uim/uim-module-manager.patch | 4 +- .../meta-oe/recipes-support/uim/uim_1.8.6.bb | 144 -------------------- .../meta-oe/recipes-support/uim/uim_1.8.8.bb | 147 +++++++++++++++++++++ .../recipes-devtools/python/python-flask.inc | 2 +- .../python/python-importlib-metadata.inc | 12 ++ .../python/python-importlib-metadata_0.23.bb | 2 + .../recipes-devtools/python/python-jsonschema.inc | 3 + .../python/python-more-itertools.inc | 9 ++ .../python/python-more-itertools_7.2.0.bb | 2 + .../recipes-devtools/python/python-packaging.inc | 10 ++ .../python/python-packaging_19.2.bb | 2 + .../recipes-devtools/python/python-pathlib2.inc | 9 ++ .../python/python-pathlib2_2.3.4.bb | 2 + .../recipes-devtools/python/python-psutil.inc | 2 + .../recipes-devtools/python/python-pyrsistent.inc | 13 ++ .../python/python-pyrsistent_0.15.4.bb | 2 + .../recipes-devtools/python/python-pytest.inc | 5 + .../recipes-devtools/python/python-zipp.inc | 10 ++ .../recipes-devtools/python/python-zipp_0.6.0.bb | 2 + .../python/python3-cheetah_3.2.3.bb | 15 +++ .../python/python3-importlib-metadata_0.23.bb | 2 + .../python/python3-more-itertools_7.2.0.bb | 2 + .../python/python3-packaging_19.2.bb | 2 + .../python/python3-padaos_0.1.10.bb | 9 ++ .../python/python3-padatious_0.4.7.bb | 9 ++ .../python/python3-pathlib2_2.3.4.bb | 2 + .../python/python3-petact_0.1.2.bb | 9 ++ .../python/python3-precise-runner_0.3.1.bb | 9 ++ .../python/python3-pulsectl_18.12.5.bb | 11 ++ .../python/python3-pychromecast_4.0.1.bb | 11 ++ .../python/python3-pyrsistent_0.15.4.bb | 2 + .../python/python3-regex_2019.08.19.bb | 12 ++ .../recipes-devtools/python/python3-zipp_0.6.0.bb | 2 + 52 files changed, 613 insertions(+), 548 deletions(-) delete mode 100644 meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190306.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190828.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util/0001-Revert-Makefile.am-Drop-static-dfu-util.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata.inc create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata_0.23.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools.inc create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-packaging.inc create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-packaging_19.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent.inc create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent_0.15.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-zipp.inc create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-zipp_0.6.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_0.23.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_19.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-padatious_0.4.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner_0.3.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_18.12.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_4.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.4.bb create mode 100755 meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2019.08.19.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_0.6.0.bb (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc') diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.0.bb b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.0.bb deleted file mode 100644 index a581d3abf..000000000 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.0.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://tevent.samba.org" -SECTION = "libs" -LICENSE = "LGPLv3+" - -DEPENDS += "libtalloc libtirpc" -RDEPENDS_python3-tevent = "python3" - -SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ - file://options-0.10.0.patch \ - file://0001-libtevent-fix-musl-libc-compile-error.patch \ - file://0001-waf-add-support-of-cross_compile.patch \ -" -LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b85a" - -SRC_URI[md5sum] = "97ea9861252e52c24adf6c45ab676a60" -SRC_URI[sha256sum] = "33f39612cd6d1ae6a737245784581494846f5bb07827983d2f41f942446aa4e6" - -inherit waf-samba - -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[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" - -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" - -S = "${WORKDIR}/tevent-${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 \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - --without-gettext \ - " -do_install_append() { - # add this link for cross check python module existence. eg: on x86-64 host, check python module - # under recipe-sysroot which is mips64. - cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s _tevent.*.so _tevent.so -} - -PACKAGES += "python3-tevent" - -RPROVIDES_${PN}-dbg += "python3-tevent-dbg" - -FILES_python3-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" - -INSANE_SKIP_${MLPREFIX}python3-tevent = "dev-so" diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.1.bb b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.1.bb new file mode 100644 index 000000000..f1b170daf --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.1.bb @@ -0,0 +1,58 @@ +SUMMARY = "Hierarchical, reference counted memory pool system with destructors" +HOMEPAGE = "http://tevent.samba.org" +SECTION = "libs" +LICENSE = "LGPLv3+" + +DEPENDS += "libtalloc libtirpc" +RDEPENDS_python3-tevent = "python3" + +SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ + file://options-0.10.0.patch \ + file://0001-libtevent-fix-musl-libc-compile-error.patch \ + file://0001-waf-add-support-of-cross_compile.patch \ +" +LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b85a" + +SRC_URI[md5sum] = "1060eb69d6994a847eecb73c4d391ced" +SRC_URI[sha256sum] = "79a4da68b38b86ac71d8ac824ee3605ab22a6a91cfa83033a7db73f3dd6910b6" + +inherit waf-samba + +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[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" + +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" + +S = "${WORKDIR}/tevent-${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 \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + --without-gettext \ + " +do_install_append() { + # add this link for cross check python module existence. eg: on x86-64 host, check python module + # under recipe-sysroot which is mips64. + cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s _tevent.*.so _tevent.so +} + +PACKAGES += "python3-tevent" + +RPROVIDES_${PN}-dbg += "python3-tevent-dbg" + +FILES_python3-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" + +INSANE_SKIP_${MLPREFIX}python3-tevent = "dev-so" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb index efcd5e42e..6de188da2 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb @@ -19,8 +19,6 @@ PE = "1" inherit cmake pkgconfig python3native perlnative upstream-version-is-even -ARM_INSTRUCTION_SET = "arm" - PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb deleted file mode 100644 index 07736711f..000000000 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.0.bb +++ /dev/null @@ -1,92 +0,0 @@ -SUMMARY = "Manage plain dm-crypt and LUKS encrypted volumes" -DESCRIPTION = "Cryptsetup is used to conveniently setup dm-crypt managed \ -device-mapper mappings. These include plain dm-crypt volumes and \ -LUKS volumes. The difference is that LUKS uses a metadata header \ -and can hence offer more features than plain dm-crypt. On the other \ -hand, the header is visible and vulnerable to damage." -HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup" -SECTION = "console" -LICENSE = "GPL-2.0-with-OpenSSL-exception" -LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" - -DEPENDS = " \ - json-c \ - libdevmapper \ - popt \ - util-linux \ -" - -RDEPENDS_${PN} = " \ - libdevmapper \ -" - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "f7818082056e5bc0be12e4c7fc20345a" -SRC_URI[sha256sum] = "9d8f8cac2836a1623c075b5cba96032271dc81a28b2aa27fbd8331e831416bb1" - -inherit autotools gettext pkgconfig - -# Use openssl because libgcrypt drops root privileges -# if libgcrypt is linked with libcap support -PACKAGECONFIG ??= " \ - keyring \ - cryptsetup \ - veritysetup \ - cryptsetup-reencrypt \ - integritysetup \ - ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ - kernel_crypto \ - internal-argon2 \ - blkid \ - luks-adjust-xts-keysize \ - openssl \ -" -PACKAGECONFIG_append_class-target = " \ - udev \ -" - -PACKAGECONFIG[keyring] = "--enable-keyring,--disable-keyring" -PACKAGECONFIG[fips] = "--enable-fips,--disable-fips" -PACKAGECONFIG[pwquality] = "--enable-pwquality,--disable-pwquality,libpwquality" -PACKAGECONFIG[passwdqc] = "--enable-passwdqc,--disable-passwdqc,passwdqc" -PACKAGECONFIG[cryptsetup] = "--enable-cryptsetup,--disable-cryptsetup" -PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup" -PACKAGECONFIG[cryptsetup-reencrypt] = "--enable-cryptsetup-reencrypt,--disable-cryptsetup-reencrypt" -PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup" -PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" -PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev" -PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto" -# gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't -# recognized. -PACKAGECONFIG[gcrypt-pbkdf2] = "--enable-gcrypt-pbkdf2" -PACKAGECONFIG[internal-argon2] = "--enable-internal-argon2,--disable-internal-argon2" -PACKAGECONFIG[internal-sse-argon2] = "--enable-internal-sse-argon2,--disable-internal-sse-argon2" -PACKAGECONFIG[blkid] = "--enable-blkid,--disable-blkid,util-linux" -PACKAGECONFIG[dev-random] = "--enable-dev-random,--disable-dev-random" -PACKAGECONFIG[luks-adjust-xts-keysize] = "--enable-luks-adjust-xts-keysize,--disable-luks-adjust-xts-keysize" -PACKAGECONFIG[openssl] = "--with-crypto_backend=openssl,,openssl" -PACKAGECONFIG[gcrypt] = "--with-crypto_backend=gcrypt,,libgcrypt" -PACKAGECONFIG[nss] = "--with-crypto_backend=nss,,nss" -PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel" -PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle" -PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1" - -RRECOMMENDS_${PN} = "kernel-module-aes-generic \ - kernel-module-dm-crypt \ - kernel-module-md5 \ - kernel-module-cbc \ - kernel-module-sha256-generic \ - kernel-module-xts \ -" - -EXTRA_OECONF = "--enable-static" -# Building without largefile is not supported by upstream -EXTRA_OECONF += "--enable-largefile" -# Requires a static popt library -EXTRA_OECONF += "--disable-static-cryptsetup" -# There's no recipe for libargon2 yet -EXTRA_OECONF += "--disable-libargon2" - -FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb new file mode 100644 index 000000000..ae5988b57 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.2.1.bb @@ -0,0 +1,92 @@ +SUMMARY = "Manage plain dm-crypt and LUKS encrypted volumes" +DESCRIPTION = "Cryptsetup is used to conveniently setup dm-crypt managed \ +device-mapper mappings. These include plain dm-crypt volumes and \ +LUKS volumes. The difference is that LUKS uses a metadata header \ +and can hence offer more features than plain dm-crypt. On the other \ +hand, the header is visible and vulnerable to damage." +HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup" +SECTION = "console" +LICENSE = "GPL-2.0-with-OpenSSL-exception" +LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" + +DEPENDS = " \ + json-c \ + libdevmapper \ + popt \ + util-linux \ +" + +RDEPENDS_${PN} = " \ + libdevmapper \ +" + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" +SRC_URI[md5sum] = "1654c8d2aa0dac51c8d1d755df61ae6c" +SRC_URI[sha256sum] = "94e79a31ed38bdb0acd9af7ccca1605a2ac62ca850ed640202876b1ee11c1c61" + +inherit autotools gettext pkgconfig + +# Use openssl because libgcrypt drops root privileges +# if libgcrypt is linked with libcap support +PACKAGECONFIG ??= " \ + keyring \ + cryptsetup \ + veritysetup \ + cryptsetup-reencrypt \ + integritysetup \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ + kernel_crypto \ + internal-argon2 \ + blkid \ + luks-adjust-xts-keysize \ + openssl \ +" +PACKAGECONFIG_append_class-target = " \ + udev \ +" + +PACKAGECONFIG[keyring] = "--enable-keyring,--disable-keyring" +PACKAGECONFIG[fips] = "--enable-fips,--disable-fips" +PACKAGECONFIG[pwquality] = "--enable-pwquality,--disable-pwquality,libpwquality" +PACKAGECONFIG[passwdqc] = "--enable-passwdqc,--disable-passwdqc,passwdqc" +PACKAGECONFIG[cryptsetup] = "--enable-cryptsetup,--disable-cryptsetup" +PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup" +PACKAGECONFIG[cryptsetup-reencrypt] = "--enable-cryptsetup-reencrypt,--disable-cryptsetup-reencrypt" +PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup" +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev" +PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto" +# gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't +# recognized. +PACKAGECONFIG[gcrypt-pbkdf2] = "--enable-gcrypt-pbkdf2" +PACKAGECONFIG[internal-argon2] = "--enable-internal-argon2,--disable-internal-argon2" +PACKAGECONFIG[internal-sse-argon2] = "--enable-internal-sse-argon2,--disable-internal-sse-argon2" +PACKAGECONFIG[blkid] = "--enable-blkid,--disable-blkid,util-linux" +PACKAGECONFIG[dev-random] = "--enable-dev-random,--disable-dev-random" +PACKAGECONFIG[luks-adjust-xts-keysize] = "--enable-luks-adjust-xts-keysize,--disable-luks-adjust-xts-keysize" +PACKAGECONFIG[openssl] = "--with-crypto_backend=openssl,,openssl" +PACKAGECONFIG[gcrypt] = "--with-crypto_backend=gcrypt,,libgcrypt" +PACKAGECONFIG[nss] = "--with-crypto_backend=nss,,nss" +PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel" +PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle" +PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1" + +RRECOMMENDS_${PN} = "kernel-module-aes-generic \ + kernel-module-dm-crypt \ + kernel-module-md5 \ + kernel-module-cbc \ + kernel-module-sha256-generic \ + kernel-module-xts \ +" + +EXTRA_OECONF = "--enable-static" +# Building without largefile is not supported by upstream +EXTRA_OECONF += "--enable-largefile" +# Requires a static popt library +EXTRA_OECONF += "--disable-static-cryptsetup" +# There's no recipe for libargon2 yet +EXTRA_OECONF += "--disable-libargon2" + +FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb deleted file mode 100644 index 2b1b87c4d..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb +++ /dev/null @@ -1,20 +0,0 @@ -require recipes-graphics/xorg-driver/xorg-driver-video.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94" - -SUMMARY = "X.Org X server -- nouveau video driver" - -DESCRIPTION = "Open-source X.org graphics driver for NVIDIA graphics" - -DEPENDS += "virtual/libx11 libxvmc drm xorgproto \ - virtual/libgl libpciaccess" -RDEPENDS_${PN} += "xserver-xorg-module-exa" - -inherit distro_features_check -REQUIRED_DISTRO_FEATURES += "opengl" - -COMPATIBLE_HOST = '(i.86|x86_64).*-linux' - -SRC_URI[md5sum] = "717203cb87029cddcbccf7398f9ad8c3" -SRC_URI[sha256sum] = "aede10fd395610a328697adca3434fb14e9afbd79911d6c8545cfa2c0e541d4c" - diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb new file mode 100644 index 000000000..3966867ee --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb @@ -0,0 +1,19 @@ +require recipes-graphics/xorg-driver/xorg-driver-video.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94" + +SUMMARY = "X.Org X server -- nouveau video driver" + +DESCRIPTION = "Open-source X.org graphics driver for NVIDIA graphics" + +DEPENDS += "virtual/libx11 libxvmc drm xorgproto \ + virtual/libgl libpciaccess" +RDEPENDS_${PN} += "xserver-xorg-module-exa" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES += "opengl" + +COMPATIBLE_HOST = '(i.86|x86_64).*-linux' + +SRC_URI[md5sum] = "ecd9be89d853301167e3d564c49f7a8e" +SRC_URI[sha256sum] = "304060806415579cdb5c1f71f1c54d11cacb431b5552b170decbc883ed43bf06" diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index fb4534dca..02359e782 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -117,3 +117,7 @@ INSANE_SKIP_${PN} += "ldflags" SECURITY_CFLAGS = "" COMPATIBLE_HOST_libc-musl = 'null' +# It has native clang/llvm dependency, poky distro is reluctant to include them as deps +# this helps with world builds on AB +EXCLUDE_FROM_WORLD = "1" + diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc index 4fe744c1a..cf4dc7f4f 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc @@ -8,10 +8,10 @@ LICENSE = "LGPLv3" SECTION = "devel" URLV = "${@d.getVar('PV')[0:4]}.${@d.getVar('PV')[4:6]}.${@d.getVar('PV')[6:8]}" -SRC_URI = "http://www.live555.com/live.${URLV}.tar.gz \ +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://distcache.FreeBSD.org/ports-distfiles/ \n" +MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" S = "${WORKDIR}/live" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190306.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190306.bb deleted file mode 100644 index fa6057dc2..000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190306.bb +++ /dev/null @@ -1,8 +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" - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190828.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190828.bb new file mode 100644 index 000000000..1da61c0cf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20190828.bb @@ -0,0 +1,11 @@ +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-support/dfu-util/dfu-util-native_0.9.bb b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb index aeca23bf2..76faefefb 100644 --- a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb @@ -4,12 +4,15 @@ inherit native deploy DEPENDS = "libusb1-native" -SRC_URI += "file://0001-Revert-Makefile.am-Drop-static-dfu-util.patch" +PACKAGECONFIG ??= "" + +PACKAGECONFIG[static] = "CFLAGS='${CFLAGS} -pthread -static',," do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" do_deploy() { - install -m 0755 src/dfu-util_static ${DEPLOYDIR}/dfu-util-${PV} + install -m 0755 src/dfu-util ${DEPLOYDIR}/dfu-util-${PV} rm -f ${DEPLOYDIR}/dfu-util ln -sf ./dfu-util-${PV} ${DEPLOYDIR}/dfu-util } + addtask deploy before do_package after do_install diff --git a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util/0001-Revert-Makefile.am-Drop-static-dfu-util.patch b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util/0001-Revert-Makefile.am-Drop-static-dfu-util.patch deleted file mode 100644 index 1c6ad0807..000000000 --- a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util/0001-Revert-Makefile.am-Drop-static-dfu-util.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c2aab3b9ae1febcb6b4c6561a59df1930a57b394 Mon Sep 17 00:00:00 2001 -From: Martin JaMa Jansa -Date: Thu, 11 Aug 2011 11:19:52 +0200 -Subject: [PATCH] Revert "Makefile.am: Drop static dfu-util" - -This reverts commit fe0426ddc04f503d148c5e5f931f16b8f674f071. - -Signed-off-by: Martin JaMa Jansa ---- - configure.ac | 2 +- - src/Makefile.am | 22 +++++++++++++++++++++- - 2 files changed, 22 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f5a43b8..6a3757e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,7 +21,7 @@ AS_IF([test x$native_libusb = xno], [ - AC_MSG_ERROR([*** Required libusb-1.0 >= 1.0.0 not installed ***])) - ]) - --LIBS="$LIBS $USB_LIBS" -+LIBS="$LIBS $USB_LIBS -lpthread" - CFLAGS="$CFLAGS $USB_CFLAGS" - - # Checks for header files. -diff --git a/src/Makefile.am b/src/Makefile.am -index 70179c4..e8736ee 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,6 +1,6 @@ - AM_CFLAGS = -Wall -Wextra - --bin_PROGRAMS = dfu-util dfu-suffix dfu-prefix -+bin_PROGRAMS = dfu-util dfu-util_static dfu-suffix dfu-prefix - dfu_util_SOURCES = main.c \ - portable.h \ - dfu_load.c \ -@@ -19,6 +19,26 @@ dfu_util_SOURCES = main.c \ - quirks.c \ - quirks.h - -+dfu_util_static_SOURCES = main.c \ -+ portable.h \ -+ dfu_load.c \ -+ dfu_load.h \ -+ dfu_util.c \ -+ dfu_util.h \ -+ dfuse.c \ -+ dfuse.h \ -+ dfuse_mem.c \ -+ dfuse_mem.h \ -+ dfu.c \ -+ dfu.h \ -+ usb_dfu.h \ -+ dfu_file.c \ -+ dfu_file.h \ -+ quirks.c \ -+ quirks.h -+ -+dfu_util_static_LDFLAGS = -static -+ - dfu_suffix_SOURCES = suffix.c \ - dfu_file.h \ - dfu_file.c --- -2.7.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb index 76e1552c0..8a2ac6934 100644 --- a/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb @@ -1,15 +1,13 @@ DESCRIPTION = "USB Device Firmware Upgrade utility" +AUTHOR = "Harald Welte " HOMEPAGE = "http://dfu-util.sourceforge.net" SECTION = "devel" -AUTHOR = "Harald Welte " LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI = "http://dfu-util.gnumonks.org/releases/${BP}.tar.gz" - -inherit autotools pkgconfig - DEPENDS = "libusb1" +SRC_URI = "http://dfu-util.sourceforge.net/releases/${BP}.tar.gz" SRC_URI[md5sum] = "233bb1e08ef4b405062445d84e28fde6" SRC_URI[sha256sum] = "36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb b/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb new file mode 100644 index 000000000..cfbb2caaf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb @@ -0,0 +1,24 @@ +SUMMARY = "dhex is a hex editor that includes a diff mode" +SECTION = "console/utils" + +DEPENDS = "ncurses" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://README.txt;beginline=229;endline=241;md5=6f252a421b65bcecf624382ba3c899da" + +SRC_URI = "http://www.dettus.net/dhex/dhex_0.69.tar.gz" +SRC_URI[md5sum] = "64d557437fe110c19f23ed3e9bbcdd54" +SRC_URI[sha256sum] = "52730bcd1cf16bd4dae0de42531be9a4057535ec61ca38c0804eb8246ea6c41b" + +S = "${WORKDIR}/dhex_${PV}" + +EXTRA_OEMAKE += "'CC=${CC}' 'LDFLAGS=${LDFLAGS}' 'CPPFLAGS=${CPPFLAGS}'" + +do_compile() { + oe_runmake +} + +do_install() { + install -m 0755 -d ${D}${bindir} + install -m 0755 ${S}/dhex ${D}${bindir}/ +} diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb deleted file mode 100644 index 10f724e6c..000000000 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb +++ /dev/null @@ -1,49 +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=f38b3d1c7ef7fc2c8b6d20cd38efdc29" -DEPENDS = "udev" - -SRC_URI = "https://pcsclite.apdu.fr/files/${BP}.tar.bz2" -SRC_URI[md5sum] = "0ec103b1ef298d0c58d6ef6b00b9cf17" -SRC_URI[sha256sum] = "6a358f61ed3b66a7f6e1f4e794a94c7be4c81b7a58ec360c33791e8d7d9bd405" - - -inherit autotools systemd pkgconfig - -EXTRA_OECONF = " \ - --disable-libusb \ - --enable-libudev \ - --enable-usbdropdir=${libdir}/pcsc/drivers \ -" - -S = "${WORKDIR}/pcsc-lite-${PV}" - -PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev" - -RRECOMMENDS_${PN} = "ccid" - -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 +="python" diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb new file mode 100644 index 000000000..a87c228a8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb @@ -0,0 +1,52 @@ +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" +DEPENDS = "udev" + +SRC_URI = "https://pcsclite.apdu.fr/files/${BP}.tar.bz2" +SRC_URI[md5sum] = "c20650a36062ab1689f37f3302c988f2" +SRC_URI[sha256sum] = "d76d79edc31cf76e782b9f697420d3defbcc91778c3c650658086a1b748e8792" + +inherit autotools systemd pkgconfig + +EXTRA_OECONF = " \ + --disable-libusb \ + --enable-libudev \ + --enable-usbdropdir=${libdir}/pcsc/drivers \ +" + +S = "${WORKDIR}/pcsc-lite-${PV}" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[systemd] = ",--disable-libsystemd,systemd," + +PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev" + +RRECOMMENDS_${PN} = "ccid" + +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 +="python" diff --git a/meta-openembedded/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch b/meta-openembedded/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch deleted file mode 100644 index 391b0e68b..000000000 --- a/meta-openembedded/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 82f44f53b9a9766c2ec816f237506beb953eb332 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -Date: Wed, 29 Oct 2014 14:18:28 +0100 -Subject: [PATCH] Add support for aarch64 - -* include/private/gcconfig.h: Add support for aarch64. - ---- - sigscheme/libgcroots/include/private/gcconfig.h | 37 +++++++++++++++++++++++++ - 1 file changed, 37 insertions(+) - -diff --git a/sigscheme/libgcroots/include/private/gcconfig.h b/sigscheme/libgcroots/include/private/gcconfig.h -index 4d42b03..0f13db6 100644 ---- a/sigscheme/libgcroots/include/private/gcconfig.h -+++ b/sigscheme/libgcroots/include/private/gcconfig.h -@@ -62,6 +62,13 @@ - # endif - - /* Determine the machine type: */ -+# if defined(__aarch64__) -+# define AARCH64 -+# if !defined(LINUX) -+# define NOSYS -+# define mach_type_known -+# endif -+# endif - # if defined(__arm__) || defined(__thumb__) - # define ARM32 - # if !defined(LINUX) && !defined(NETBSD) -@@ -231,6 +238,10 @@ - # define IA64 - # define mach_type_known - # endif -+# if defined(LINUX) && defined(__aarch64__) -+# define AARCH64 -+# define mach_type_known -+# endif - # if defined(LINUX) && defined(__arm__) - # define ARM32 - # define mach_type_known -@@ -504,6 +515,7 @@ - /* running Amdahl UTS4 */ - /* S390 ==> 390-like machine */ - /* running LINUX */ -+ /* AARCH64 ==> ARM AArch64 */ - /* ARM32 ==> Intel StrongARM */ - /* IA64 ==> Intel IPF */ - /* (e.g. Itanium) */ -@@ -1724,6 +1736,31 @@ - # endif - # endif - -+# ifdef AARCH64 -+# define CPP_WORDSZ 64 -+# define MACH_TYPE "AARCH64" -+# define ALIGNMENT 8 -+# ifndef HBLKSIZE -+# define HBLKSIZE 4096 -+# endif -+# ifdef LINUX -+# define OS_TYPE "LINUX" -+# define LINUX_STACKBOTTOM -+# define DYNAMIC_LOADING -+ extern int __data_start[]; -+# define DATASTART ((ptr_t)__data_start) -+ extern char _end[]; -+# define DATAEND ((ptr_t)(&_end)) -+# endif -+# ifdef NOSYS -+ /* __data_start is usually defined in the target linker script. */ -+ extern int __data_start[]; -+# define DATASTART ((ptr_t)__data_start) -+ extern void *__stack_base__; -+# define STACKBOTTOM ((ptr_t)__stack_base__) -+# endif -+# endif -+ - # ifdef ARM32 - # define CPP_WORDSZ 32 - # define MACH_TYPE "ARM32" diff --git a/meta-openembedded/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch b/meta-openembedded/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch index 0c8f02d6c..510a8c840 100644 --- a/meta-openembedded/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch +++ b/meta-openembedded/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch @@ -9,18 +9,16 @@ Signed-off-by: Lei Maohui configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac -index 9be879c..9249bfd 100644 --- a/configure.ac +++ b/configure.ac -@@ -1208,8 +1208,8 @@ AC_HELP_STRING([--with-libedit[=DIR], Enable libedit support - if test "x$use_libedit" != "xno"; then - saved_CPPFLAGS=$CPPFLAGS - saved_LDFLAGS=$LDFLAGS -- CPPFLAGS="${CPPFLAGS} -I$libedit_path/include" -- LDFLAGS="${LDFLAGS} -L$libedit_path/lib" -+ CPPFLAGS="${CPPFLAGS} " -+ LDFLAGS="${LDFLAGS} " - AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", - [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", - AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...") +@@ -1317,8 +1317,8 @@ if test "x$with_libedit" != xno; then + + saved_CPPFLAGS=$CPPFLAGS + saved_LDFLAGS=$LDFLAGS +- CPPFLAGS="${CPPFLAGS} -I$libedit_path/include" +- LDFLAGS="${LDFLAGS} -L$libedit_path/lib" ++ CPPFLAGS="${CPPFLAGS}" ++ LDFLAGS="${LDFLAGS}" + AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", + [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", + AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...") diff --git a/meta-openembedded/meta-oe/recipes-support/uim/uim/uim-module-manager.patch b/meta-openembedded/meta-oe/recipes-support/uim/uim/uim-module-manager.patch index 3078af058..0fafc8533 100644 --- a/meta-openembedded/meta-oe/recipes-support/uim/uim/uim-module-manager.patch +++ b/meta-openembedded/meta-oe/recipes-support/uim/uim/uim-module-manager.patch @@ -6,11 +6,9 @@ Date: Fri, 26 Jun 2015 12:57:48 +0900 scm/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/scm/Makefile.am b/scm/Makefile.am -index 14d9393..e8a1083 100644 --- a/scm/Makefile.am +++ b/scm/Makefile.am -@@ -119,7 +119,7 @@ if EXPAT +@@ -115,7 +115,7 @@ if EXPAT module_names += "yahoo-jp" endif diff --git a/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.6.bb b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.6.bb deleted file mode 100644 index 1c58d40b1..000000000 --- a/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.6.bb +++ /dev/null @@ -1,144 +0,0 @@ -DESCRIPTION = "A multilingual user input method library" -HOMEPAGE = "http://uim.freedesktop.org/" -LICENSE = "BSD-3-Clause & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=32463fd29aa303fb2360faeeae17256b" -SECTION = "inputmethods" - -SRC_URI = "https://github.com/uim/uim/releases/download/uim-${PV}/uim-${PV}.tar.bz2" - -SRC_URI_append_class-target = " file://uim-module-manager.patch \ - file://0001-fix-bug-for-cross-compile.patch \ - file://0001-Add-support-for-aarch64.patch \ -" -SRC_URI[md5sum] = "ecea4c597bab1fd4ba98ea84edcece59" -SRC_URI[sha256sum] = "7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f" - -DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool" -DEPENDS_append_class-target = " intltool-native gtk+ gtk+3 uim-native takao-fonts" - -RDEPENDS_uim = "libuim0 libedit" -RDEPENDS_uim-anthy = "takao-fonts anthy libanthy0" -RDEPENDS_uim-anthy_append_libc-glibc = " glibc-utils glibc-gconv-euc-jp" - -LEAD_SONAME = "libuim.so.1" - -inherit distro_features_check autotools pkgconfig gettext qemu gtk-immodules-cache - -REQUIRED_DISTRO_FEATURES = "x11" - -GTKIMMODULES_PACKAGES = "uim-gtk2.0 uim-gtk3" - -EXTRA_OECONF += "--disable-emacs \ - --without-scim \ - --without-m17nlib \ - --without-prime \ - --without-canna \ - --without-mana \ - --without-eb \ -" - -CONFIGUREOPTS_remove_class-target = "--disable-silent-rules" - -#Because m4 file's find maxdepth=2, so copy the m4 files of the deep depth. -do_configure_prepend () { - cp ${S}/sigscheme/m4/* ${S}/m4/ -} - -do_install_append() { - rm -rf ${D}/${datadir}/applications -} - -PACKAGES =+ "uim-xim uim-utils uim-skk uim-gtk2.0 uim-gtk3 uim-fep uim-anthy uim-common libuim0 libuim-dev" - -FILES_${PN} = "${bindir}/uim-help \ - ${libdir}/uim/plugin/libuim-* \ - ${libdir}/libuim-scm* \ - ${libdir}/libgcroots* \ - ${libdir}/uim/plugin/libuim-* \ -" - -FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ - ${libdir}/libuim-custom.so.* \ - ${datadir}/locale/ja/LC_MESSAGES/uim.mo \ - ${datadir}/locale/fr/LC_MESSAGES/uim.mo \ - ${datadir}/locale/ko/LC_MESSAGES/uim.mo \ - ${libdir}/libuim.so.* \ -" -FILES_libuim-dev = "${libdir}/libuim*.a \ - ${libdir}/libuim*.la \ - ${libdir}/libuim*.so \ - ${includedir}/uim \ - ${libdir}/pkgconfig/uim.pc \ -" -FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \ - ${datadir}/uim/anthy*.scm \ -" -FILES_${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" -FILES_${PN}-dev += "${libdir}/uim/plugin/*.la" - -FILES_uim-utils = "${bindir}/uim-sh \ - ${bindir}/uim-module-manager \ - ${libexecdir}/uim-helper-server \ -" -FILES_uim-xim = "${bindir}/uim-xim \ - ${libexecdir}/uim-candwin-*gtk \ - ${libexecdir}/uim-candwin-*gtk3 \ - ${datadir}/man/man1/uim-xim.1 \ - ${sysconfdir}/X11/xinit/xinput.d/uim* \ -" -FILES_uim-common = "${datadir}/uim/pixmaps/*.png \ - ${datadir}/uim \ -" -FILES_uim-fep = "${bindir}/uim-fep*" - -FILES_uim-gtk2.0 = "${libdir}/gtk-2.0 \ - ${bindir}/uim-toolbar-gtk \ - ${bindir}/uim-toolbar-gtk-systray \ - ${bindir}/uim-*-gtk \ - ${bindir}/uim-input-pad-ja \ - ${libdir}/uim/uim-*-gtk \ -" -FILES_uim-gtk3 = "${libdir}/gtk-3.0 \ - ${bindir}/uim-toolbar-gtk3 \ - ${bindir}/uim-toolbar-gtk3-systray \ - ${bindir}/uim-*-gtk3 \ - ${libdir}/uim/uim-*-gtk3 \ -" -FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ - ${datadir}/uim/skk*.scm \ -" - -PACKAGE_WRITE_DEPS += "qemu-native" -pkg_postinst_uim-anthy() { - if test -n "$D"; then - ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register anthy --path $D${datadir}/uim - else - uim-module-manager --register anthy --path ${datadir}/uim - fi -} - -pkg_prerm_uim-anthy() { - if test -n "$D"; then - ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister anthy - else - uim-module-manager --path ${datadir}/uim --unregister anthy - fi -} - -pkg_postinst_uim-skk() { - if test -n "$D"; then - ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register skk --path $D${datadir}/uim - else - uim-module-manager --register skk --path ${datadir}/uim - fi -} - -pkg_postrm_uim-skk() { - if test -n "$D"; then - ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister skk - else - uim-module-manager --path ${datadir}/uim --unregister skk - fi -} - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb new file mode 100644 index 000000000..cc28e6e8f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb @@ -0,0 +1,147 @@ +DESCRIPTION = "A multilingual user input method library" +HOMEPAGE = "http://uim.freedesktop.org/" +LICENSE = "BSD-3-Clause & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=ab2826b41ca0ff4030d38cc39791d1c8" +SECTION = "inputmethods" + +SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2" + +SRC_URI_append_class-target = "\ + file://uim-module-manager.patch \ + file://0001-fix-bug-for-cross-compile.patch \ +" +SRC_URI[md5sum] = "01c7bd5d0d4f3a9f6f5befe6f57a470b" +SRC_URI[sha256sum] = "34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc" + +DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool libedit" +DEPENDS_append_class-target = " intltool-native gtk+ gtk+3 uim-native takao-fonts" + +RDEPENDS_uim = "libuim0 libedit" +RDEPENDS_uim-anthy = "takao-fonts anthy libanthy0" +RDEPENDS_uim-anthy_append_libc-glibc = " glibc-utils glibc-gconv-euc-jp" + +LEAD_SONAME = "libuim.so.1" + +inherit distro_features_check autotools pkgconfig gettext qemu gtk-immodules-cache + +REQUIRED_DISTRO_FEATURES = "x11" + +GTKIMMODULES_PACKAGES = "uim-gtk2.0 uim-gtk3" + +EXTRA_OECONF += "--disable-emacs \ + --without-scim \ + --without-m17nlib \ + --without-prime \ + --without-canna \ + --without-mana \ + --without-eb \ +" + +CONFIGUREOPTS_remove_class-target = "--disable-silent-rules" + +# https://github.com/uim/uim/issues/44 +PARALLEL_MAKE = "" + +#Because m4 file's find maxdepth=2, so copy the m4 files of the deep depth. +do_configure_prepend () { + cp ${S}/sigscheme/m4/* ${S}/m4/ +} + +do_install_append() { + rm -rf ${D}/${datadir}/applications +} + +PACKAGES =+ "uim-xim uim-utils uim-skk uim-gtk2.0 uim-gtk3 uim-fep uim-anthy uim-common libuim0 libuim-dev" + +FILES_${PN} = "${bindir}/uim-help \ + ${libdir}/uim/plugin/libuim-* \ + ${libdir}/libuim-scm* \ + ${libdir}/libgcroots* \ + ${libdir}/uim/plugin/libuim-* \ +" + +FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ + ${libdir}/libuim-custom.so.* \ + ${datadir}/locale/ja/LC_MESSAGES/uim.mo \ + ${datadir}/locale/fr/LC_MESSAGES/uim.mo \ + ${datadir}/locale/ko/LC_MESSAGES/uim.mo \ + ${libdir}/libuim.so.* \ +" +FILES_libuim-dev = "${libdir}/libuim*.a \ + ${libdir}/libuim*.la \ + ${libdir}/libuim*.so \ + ${includedir}/uim \ + ${libdir}/pkgconfig/uim.pc \ +" +FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \ + ${datadir}/uim/anthy*.scm \ +" +FILES_${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" +FILES_${PN}-dev += "${libdir}/uim/plugin/*.la" + +FILES_uim-utils = "${bindir}/uim-sh \ + ${bindir}/uim-module-manager \ + ${libexecdir}/uim-helper-server \ +" +FILES_uim-xim = "${bindir}/uim-xim \ + ${libexecdir}/uim-candwin-*gtk \ + ${libexecdir}/uim-candwin-*gtk3 \ + ${datadir}/man/man1/uim-xim.1 \ + ${sysconfdir}/X11/xinit/xinput.d/uim* \ +" +FILES_uim-common = "${datadir}/uim/pixmaps/*.png \ + ${datadir}/uim \ +" +FILES_uim-fep = "${bindir}/uim-fep*" + +FILES_uim-gtk2.0 = "${libdir}/gtk-2.0 \ + ${bindir}/uim-toolbar-gtk \ + ${bindir}/uim-toolbar-gtk-systray \ + ${bindir}/uim-*-gtk \ + ${bindir}/uim-input-pad-ja \ + ${libdir}/uim/uim-*-gtk \ +" +FILES_uim-gtk3 = "${libdir}/gtk-3.0 \ + ${bindir}/uim-toolbar-gtk3 \ + ${bindir}/uim-toolbar-gtk3-systray \ + ${bindir}/uim-*-gtk3 \ + ${libdir}/uim/uim-*-gtk3 \ +" +FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ + ${datadir}/uim/skk*.scm \ +" + +PACKAGE_WRITE_DEPS += "qemu-native" +pkg_postinst_uim-anthy() { + if test -n "$D"; then + ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register anthy --path $D${datadir}/uim + else + uim-module-manager --register anthy --path ${datadir}/uim + fi +} + +pkg_prerm_uim-anthy() { + if test -n "$D"; then + ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister anthy + else + uim-module-manager --path ${datadir}/uim --unregister anthy + fi +} + +pkg_postinst_uim-skk() { + if test -n "$D"; then + ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register skk --path $D${datadir}/uim + else + uim-module-manager --register skk --path ${datadir}/uim + fi +} + +pkg_postrm_uim-skk() { + if test -n "$D"; then + ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister skk + else + uim-module-manager --path ${datadir}/uim --unregister skk + fi +} + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask.inc index 66ad1a6e7..ffd783f3d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask.inc @@ -13,4 +13,4 @@ CLEANBROKEN = "1" PYPI_PACKAGE = "Flask" -RDEPENDS_${PN} = "${PYTHON_PN}-werkzeug ${PYTHON_PN}-werkzeug-tests ${PYTHON_PN}-jinja2 ${PYTHON_PN}-itsdangerous ${PYTHON_PN}-click" +RDEPENDS_${PN} = "${PYTHON_PN}-werkzeug ${PYTHON_PN}-jinja2 ${PYTHON_PN}-itsdangerous ${PYTHON_PN}-click" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata.inc new file mode 100644 index 000000000..9eb5da954 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "Read metadata from Python packages" +HOMEPAGE = "https://pypi.org/project/importlib-metadata/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e88ae122f3925d8bde8319060f2ddb8e" + +SRC_URI = "https://files.pythonhosted.org/packages/5d/44/636bcd15697791943e2dedda0dbe098d8530a38d113b202817133e0b06c0/importlib_metadata-0.23.tar.gz" +S = "${WORKDIR}/importlib_metadata-${PV}" +SRC_URI[md5sum] = "80d677d744995336c9c22d21a85ddeb8" +SRC_URI[sha256sum] = "aa18d7378b00b40847790e7c27e11673d7fed219354109d0e7b9e5b25dc3ad26" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +RDEPENDS_${PN} += "${PYTHON_PN}-zipp ${PYTHON_PN}-pathlib2" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata_0.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata_0.23.bb new file mode 100644 index 000000000..5c213004c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-importlib-metadata_0.23.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-importlib-metadata.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc index 8f5bdaa58..c772e9eb5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc @@ -8,6 +8,7 @@ SRC_URI[sha256sum] = "8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a29 DEPENDS += "${PYTHON_PN}-vcversioner-native ${PYTHON_PN}-setuptools-scm-native" RDEPENDS_${PN} += " \ + ${PYTHON_PN}-attrs \ ${PYTHON_PN}-core \ ${PYTHON_PN}-io \ ${PYTHON_PN}-json \ @@ -15,10 +16,12 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-numbers \ ${PYTHON_PN}-pkgutil \ ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-pyrsistent \ ${PYTHON_PN}-rfc3987 \ ${PYTHON_PN}-shell \ ${PYTHON_PN}-strict-rfc3339 \ ${PYTHON_PN}-unittest \ + ${PYTHON_PN}-setuptools-scm \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools.inc new file mode 100644 index 000000000..41c334e8d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools.inc @@ -0,0 +1,9 @@ +DESCRIPTION = "More routines for operating on iterables, beyond itertools" +HOMEPAGE = "https://github.com/erikrose/more-itertools" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3396ea30f9d21389d7857719816f83b5" + +SRC_URI[md5sum] = "f647bfd27243a7bebe53b5ddb6a3b1c4" +SRC_URI[sha256sum] = "409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb new file mode 100644 index 000000000..0702aad4e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-more-itertools_7.2.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-more-itertools.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-packaging.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-packaging.inc new file mode 100644 index 000000000..c32caaa40 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-packaging.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "Core utilities for Python packages" +HOMEPAGE = "https://github.com/pypa/packaging" +LICENSE = "Apache-2.0 & BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" + +SRC_URI[md5sum] = "867ce70984dc7b89bbbc3cac2a72b171" +SRC_URI[sha256sum] = "28b924174df7a2fa32c1953825ff29c61e2f5e082343165438812f00d3a7fc47" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +RDEPENDS_${PN} += "${PYTHON_PN}-six ${PYTHON_PN}-pyparsing" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-packaging_19.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-packaging_19.2.bb new file mode 100644 index 000000000..55d0746bb --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-packaging_19.2.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-packaging.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc new file mode 100644 index 000000000..c25e5a080 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2.inc @@ -0,0 +1,9 @@ +DESCRIPTION = "Object-oriented filesystem paths" +HOMEPAGE = "https://github.com/mcmtroffaes/pathlib2" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=042856c23a3e903b33bf361ea1cbe29a" + +SRC_URI[md5sum] = "96da6398b3ea944417b84ccb25b171aa" +SRC_URI[sha256sum] = "446014523bb9be5c28128c4d2a10ad6bb60769e78bd85658fe44a450674e0ef8" + +RDEPENDS_${PN} += "${PYTHON_PN}-six" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.4.bb new file mode 100644 index 000000000..e4bf78913 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pathlib2_2.3.4.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-pathlib2.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-psutil.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-psutil.inc index e466c5cd4..0908c1c92 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-psutil.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-psutil.inc @@ -18,3 +18,5 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-threading \ ${PYTHON_PN}-xml \ " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent.inc new file mode 100644 index 000000000..2add037de --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent.inc @@ -0,0 +1,13 @@ +SUMMARY = "Persistent/Immutable/Functional data structures for Python" +HOMEPAGE = "https://github.com/tobgu/pyrsistent" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE.mit;md5=ca574f2891cf528b3e7a2ee570337e7c" + +SRC_URI[md5sum] = "0298efae86e009e24136d39dc8b2d33e" +SRC_URI[sha256sum] = "34b47fa169d6006b32e99d4b3c4031f155e6e68ebcc107d6454852e8e0ee6533" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-six \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent_0.15.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent_0.15.4.bb new file mode 100644 index 000000000..832eb8038 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrsistent_0.15.4.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-pyrsistent.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc index 7ef6092b5..5f3e60eef 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc @@ -21,6 +21,11 @@ RDEPENDS_${PN}_class-target += " \ ${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 \ " FILESEXTRAPATHS_prepend := "${THISDIR}/python-pytest:" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-zipp.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-zipp.inc new file mode 100644 index 000000000..ba18f7216 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-zipp.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "Backport of pathlib-compatible object wrapper for zip files" +HOMEPAGE = "https://github.com/jaraco/zipp" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a33f38bbf47d48c70fe0d40e5f77498e" + +SRC_URI[md5sum] = "d4451a749d8a7c3c392a9edd1864a937" +SRC_URI[sha256sum] = "3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +RDEPENDS_${PN} += "${PYTHON_PN}-more-itertools" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-zipp_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-zipp_0.6.0.bb new file mode 100644 index 000000000..85949a2a6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-zipp_0.6.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-zipp.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.3.bb new file mode 100644 index 000000000..52e8576ee --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.3.bb @@ -0,0 +1,15 @@ +SUMMARY = "Python template engine and code generation tool" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=15e13a4ed0e5880e3e55ec88b0921181" + +PYPI_PACKAGE = "Cheetah3" +inherit pypi setuptools3 + +RDEPENDS_${PN} = "python3-pickle python3-pprint" +RDEPENDS_${PN}_class-native = "" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI[md5sum] = "5629445e7fef9659da2b49e36aacdbff" +SRC_URI[sha256sum] = "7c450bce04a82d34cf6d48992c736c2048246cbc00f7b4903a39cf9a8ea3990c" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_0.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_0.23.bb new file mode 100644 index 000000000..d71c45b5f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_0.23.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-importlib-metadata.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb new file mode 100644 index 000000000..28ddf88fb --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-more-itertools_7.2.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-more-itertools.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_19.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_19.2.bb new file mode 100644 index 000000000..aa20fb26f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-packaging_19.2.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-packaging.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb new file mode 100644 index 000000000..f506a7863 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-padaos_0.1.10.bb @@ -0,0 +1,9 @@ +SUMMARY = "A rigid, lightweight, dead-simple intent parser" +HOMEPAGE = "https://github.com/MycroftAI/padaos" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://README.md;md5=b51c3e8e53a7cd95c13c5aab6cbc8e67" + +SRC_URI[md5sum] = "dbf852015ef87a6694549779fb475b52" +SRC_URI[sha256sum] = "2ac05fcbc826873c574568aa5ce09945d6ea987bee10399e766eb8f7c6356d72" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-padatious_0.4.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-padatious_0.4.7.bb new file mode 100644 index 000000000..4abe7c747 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-padatious_0.4.7.bb @@ -0,0 +1,9 @@ +SUMMARY = "An efficient and agile neural network intent parser. Padatious is a core component of Mycroft AI." +HOMEPAGE = "https://github.com/MycroftAI/padatious" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.md;md5=77baec496a458dd0e0fc4ca64cd305bc" + +SRC_URI[md5sum] = "1f53967a1633baa8fd48f11139808a33" +SRC_URI[sha256sum] = "3c235942ff4151a3c36536fd776bd8a6d4d57c97046723d2fa80a89b34faac1f" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.4.bb new file mode 100644 index 000000000..66f71e57a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.4.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-pathlib2.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb new file mode 100644 index 000000000..58cd05e22 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-petact_0.1.2.bb @@ -0,0 +1,9 @@ +SUMMARY = "Petact is a library used for installing and updating compressed tar files" +HOMEPAGE = "https://github.com/matthewscholefield/petact" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://README.md;md5=c8533d4ba77519398cdae0173db799a1" + +SRC_URI[md5sum] = "47e9a6abc91b4022953e4007ddae9e68" +SRC_URI[sha256sum] = "5dcb0d44f86a601e41a2def9770993cd0ea45c76d37eb3f35e3dd61aa50350e6" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner_0.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner_0.3.1.bb new file mode 100644 index 000000000..98b62d899 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner_0.3.1.bb @@ -0,0 +1,9 @@ +SUMMARY = "A lightweight, simple-to-use, RNN wake word listener." +HOMEPAGE = "https://github.com/MycroftAI/mycroft-precise" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.md;md5=2ad29e930f3107d52d2a55728bf62116" + +SRC_URI[md5sum] = "a2434be110444192e804f4dada0ccecf" +SRC_URI[sha256sum] = "1a464209fb4bf0a3f5d5a428310cb2a70487a01a6bc3a960d1dda90af896b80d" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_18.12.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_18.12.5.bb new file mode 100644 index 000000000..9882ea6a8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_18.12.5.bb @@ -0,0 +1,11 @@ +SUMMARY = "Python (3.x and 2.x) high-level interface and ctypes-based bindings for PulseAudio (libpulse), mostly focused on mixer-like controls and introspection-related operations (as opposed to e.g. submitting sound samples to play, player-like client)." +HOMEPAGE = "https://github.com/mk-fg/python-pulse-control" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=f1d10048469ff90123263eb5e214061d" + +SRC_URI[md5sum] = "8e79ef002856c1858058ca0b08bf1a01" +SRC_URI[sha256sum] = "41db4dd19e7cd28e2609baf2b551f34991f1890024be119b6075a286abfb65d3" + +RDEPENDS_${PN} += "pulseaudio" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_4.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_4.0.1.bb new file mode 100644 index 000000000..1b9301f96 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_4.0.1.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] = "d6f96d478fd768696a0e440cb0ea903b" +SRC_URI[sha256sum] = "d98df28f340bb14a07236846518daad7107b66581512c33da921663df61ac819" + +PYPI_PACKAGE = "PyChromecast" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.4.bb new file mode 100644 index 000000000..2e567e9f9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.15.4.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-pyrsistent.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2019.08.19.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2019.08.19.bb new file mode 100755 index 000000000..80194d60f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2019.08.19.bb @@ -0,0 +1,12 @@ +SUMMARY = "" +HOMEPAGE = "http://pythonhosted.org/regex" +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=51cb124129fa4d157b4aebb77df73629" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "d31ec392ab75b894404d8db76dacd191" +SRC_URI[sha256sum] = "587b62d48ca359d2d4f02d486f1f0aa9a20fbaf23a9d4198c4bed72ab2f6c849" + + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_0.6.0.bb new file mode 100644 index 000000000..b78663fd6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zipp_0.6.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-zipp.inc -- cgit v1.2.3 From 0a921264358918903d9d4d3e6f96a0e7671d1c7a Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 24 Sep 2019 07:40:45 -0400 Subject: meta-openembedded: subtree update:290ad988fb..b315c1a024 Alex Kiernan (1): ostree: Add recipe Bartosz Golaszewski (3): python3-ruamel-yaml: new package sshfs-fuse: upgrade 2.10 -> 3.5.2 python3-dtschema: new package Hongzhi.Song (1): numactl: fix a error about lib32-numactl Jens Rehsack (1): libstatgrab: add recipe for libstatgrab-0.92 Leon Anavi (1): mosquitto: update to 1.6.6 Naveen Saini (1): rrdtool: suppress appending of installation to perllocal.pod Oleksandr Kravchuk (1): jasper: update to 2.0.16 Peiran Hong (1): nmap: Update to 7.80 Randy MacLeod (1): rsyslog: update from 8.1907.0 to 8.1908.0 Vincent Prince (1): mongodb: bump to version 4.2.0+git18ce5c9 Yi Zhao (1): phpmyadmin: upgrade 4.9.0.1 -> 4.9.1 Zang Ruochen (5): python-alembic: upgrade 1.1.0 -> 1.2.0 python-msgpack: upgrade 0.6.1 -> 0.6.2 python-pysocks: upgrade 1.7.0 -> 1.7.1 python-pytest: upgrade 5.1.2 -> 5.1.3 python-urllib3: upgrade 1.25.3 -> 1.25.5 Change-Id: I247e7d6f6ce9fcba0f345e9f9e72cf9a52f98340 Signed-off-by: Brad Bishop --- .../sshfs-fuse/sshfs-fuse_2.10.bb | 16 -- .../sshfs-fuse/sshfs-fuse_3.5.2.bb | 13 ++ .../mosquitto/mosquitto_1.6.5.bb | 98 ------------ .../mosquitto/mosquitto_1.6.6.bb | 98 ++++++++++++ ...FPMathLib20U1-Check-for-__DEFINED_wchar_t.patch | 22 +-- ...001-Support-deprecated-resolver-functions.patch | 10 +- ...to-use-build-settings-from-environment-va.patch | 46 +++--- ...__-to-control-use-of-gnu_get_libc_version.patch | 29 ++-- .../0001-Use-long-long-instead-of-int64_t.patch | 26 +-- ...001-asio-Dont-use-experimental-with-clang.patch | 29 ++-- ...finition-for-the-macro-__ELF_NATIVE_CLASS.patch | 10 +- .../0002-Fix-default-stack-size-to-256K.patch | 12 +- .../mongodb/0003-Fix-unknown-prefix-env.patch | 19 +++ .../mongodb/mongodb/0003-fix-musl-strerror_r.patch | 30 ++++ .../0004-wiredtiger-Disable-strtouq-on-musl.patch | 15 +- .../mongodb/mongodb/arm64-support.patch | 57 ++++--- .../meta-oe/recipes-dbs/mongodb/mongodb_git.bb | 22 +-- .../libstatgrab/libstatgrab_0.92.bb | 27 ++++ ...001-Always-enable-trivial-httpd-for-tests.patch | 59 +++++++ ...01-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch | 40 +++++ ...e-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch | 51 ++++++ .../recipes-extended/ostree/ostree_2019.3.bb | 157 +++++++++++++++++++ .../recipes-extended/rrdtool/rrdtool_1.7.2.bb | 2 +- .../recipes-extended/rsyslog/rsyslog_8.1907.0.bb | 173 -------------------- .../recipes-extended/rsyslog/rsyslog_8.1908.0.bb | 174 +++++++++++++++++++++ .../recipes-graphics/jasper/jasper_1.900.1.bb | 18 --- .../recipes-graphics/jasper/jasper_2.0.16.bb | 24 +++ ...e-time.h-header-to-pass-clang-compilation.patch | 73 +++++++++ ...lude-time.h-for-time-structure-definition.patch | 78 --------- .../meta-oe/recipes-security/nmap/nmap_7.70.bb | 52 ------ .../meta-oe/recipes-security/nmap/nmap_7.80.bb | 52 ++++++ .../0001-numademo-fix-error-on-32bit-system.patch | 100 ++++++++++++ .../meta-oe/recipes-support/numactl/numactl_git.bb | 1 + .../recipes-devtools/python/python-alembic.inc | 4 +- .../python/python-alembic_1.1.0.bb | 2 - .../python/python-alembic_1.2.0.bb | 2 + .../recipes-devtools/python/python-msgpack.inc | 4 +- .../python/python-msgpack_0.6.1.bb | 2 - .../python/python-msgpack_0.6.2.bb | 2 + .../recipes-devtools/python/python-pysocks.inc | 4 +- .../python/python-pysocks_1.7.0.bb | 2 - .../python/python-pysocks_1.7.1.bb | 2 + .../recipes-devtools/python/python-pytest.inc | 4 +- .../recipes-devtools/python/python-pytest_5.1.2.bb | 9 -- .../recipes-devtools/python/python-pytest_5.1.3.bb | 9 ++ .../recipes-devtools/python/python-urllib3.inc | 4 +- .../python/python-urllib3_1.25.3.bb | 2 - .../python/python-urllib3_1.25.5.bb | 2 + .../python/python3-alembic_1.1.0.bb | 2 - .../python/python3-alembic_1.2.0.bb | 2 + .../python/python3-dt-schema_git.bb | 15 ++ .../python/python3-msgpack_0.6.1.bb | 2 - .../python/python3-msgpack_0.6.2.bb | 2 + .../python/python3-pysocks_1.7.0.bb | 6 - .../python/python3-pysocks_1.7.1.bb | 6 + .../python/python3-pytest_5.1.2.bb | 4 - .../python/python3-pytest_5.1.3.bb | 4 + .../python/python3-ruamel-yaml_0.16.5.bb | 16 ++ .../python/python3-urllib3_1.25.3.bb | 2 - .../python/python3-urllib3_1.25.5.bb | 2 + .../recipes-php/phpmyadmin/phpmyadmin_4.9.0.1.bb | 41 ----- .../recipes-php/phpmyadmin/phpmyadmin_4.9.1.bb | 41 +++++ 62 files changed, 1181 insertions(+), 651 deletions(-) delete mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.10.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.5.2.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.5.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1907.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.16.bb create mode 100644 meta-openembedded/meta-oe/recipes-security/nmap/files/0001-Include-time.h-header-to-pass-clang-compilation.patch delete mode 100644 meta-openembedded/meta-oe/recipes-security/nmap/files/0001-include-time.h-for-time-structure-definition.patch delete mode 100644 meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.70.bb create mode 100644 meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-msgpack_0.6.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-msgpack_0.6.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.7.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.7.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dt-schema_git.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.6.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.6.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.7.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.7.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.16.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.5.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.9.0.1.bb create mode 100644 meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.9.1.bb (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc') diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.10.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.10.bb deleted file mode 100644 index 582e21846..000000000 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.10.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE" -AUTHOR = "Miklos Szeredi " -HOMEPAGE = "http://fuse.sourceforge.net/sshfs.html" -SECTION = "console/network" -LICENSE = "GPLv2" -DEPENDS = "glib-2.0 fuse" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "git://github.com/libfuse/sshfs;branch=sshfs_2.x \ -" -SRCREV = "42dfaf9a5bdc1ee429c7718e8788ca37a5763e0d" -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -FILES_${PN} += "${libdir}/sshnodelay.so" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.5.2.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.5.2.bb new file mode 100644 index 000000000..b10c5c5ff --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.5.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "This is a filesystem client based on the SSH File Transfer Protocol using FUSE" +AUTHOR = "Miklos Szeredi " +HOMEPAGE = "https://github.com/libfuse/sshfs" +SECTION = "console/network" +LICENSE = "GPLv2" +DEPENDS = "glib-2.0 fuse3" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/libfuse/sshfs" +SRCREV = "695cd8916f0e78d28009de3ffe112b9d1a1c9e5e" +S = "${WORKDIR}/git" + +inherit meson diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.5.bb deleted file mode 100644 index 4bb0720ca..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.5.bb +++ /dev/null @@ -1,98 +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 \ -" - -SRC_URI[md5sum] = "12a1bd274d5ec454649a06c1bf65d802" -SRC_URI[sha256sum] = "bc71b38b5a26fc7cc772853e5607c657868db9f9a6d2b15e2b677649a0f85d20" - -inherit systemd update-rc.d useradd - -PACKAGECONFIG ??= "ssl uuid \ - ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ - " - -PACKAGECONFIG[dns-srv] = "WITH_SRV=yes,WITH_SRV=no,c-ares" -PACKAGECONFIG[ssl] = "WITH_TLS=yes WITH_TLS_PSK=yes,WITH_TLS=no WITH_TLS_PSK=no,openssl" -PACKAGECONFIG[uuid] = "WITH_UUID=yes,WITH_UUID=no,util-linux" -PACKAGECONFIG[systemd] = "WITH_SYSTEMD=yes,WITH_SYSTEMD=no,systemd" -PACKAGECONFIG[websockets] = "WITH_WEBSOCKETS=yes,WITH_WEBSOCKETS=no,libwebsockets" - -EXTRA_OEMAKE = " \ - prefix=${prefix} \ - mandir=${mandir} \ - localedir=${localedir} \ - ${PACKAGECONFIG_CONFARGS} \ - STRIP=/bin/true \ - WITH_DOCS=no \ - WITH_BUNDLED_DEPS=no \ -" - -export LIB_SUFFIX = "${@d.getVar('baselib').replace('lib', '')}" - -do_install() { - oe_runmake 'DESTDIR=${D}' install - - 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}/mosquitto - install -m 0644 ${D}${sysconfdir}/mosquitto/mosquitto.conf.example \ - ${D}${sysconfdir}/mosquitto/mosquitto.conf - - 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.1" - -FILES_libmosquittopp1 = "${libdir}/libmosquittopp.so.1" - -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" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.6.bb new file mode 100644 index 000000000..1f2e0c602 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.6.6.bb @@ -0,0 +1,98 @@ +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 \ +" + +SRC_URI[md5sum] = "529b6de33bac18363c2db46194d8d91c" +SRC_URI[sha256sum] = "82676bf4201ff102be1511b56b041a9450fbbfeda40b21aa28be0fee56e8de17" + +inherit systemd update-rc.d useradd + +PACKAGECONFIG ??= "ssl uuid \ + ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ + " + +PACKAGECONFIG[dns-srv] = "WITH_SRV=yes,WITH_SRV=no,c-ares" +PACKAGECONFIG[ssl] = "WITH_TLS=yes WITH_TLS_PSK=yes,WITH_TLS=no WITH_TLS_PSK=no,openssl" +PACKAGECONFIG[uuid] = "WITH_UUID=yes,WITH_UUID=no,util-linux" +PACKAGECONFIG[systemd] = "WITH_SYSTEMD=yes,WITH_SYSTEMD=no,systemd" +PACKAGECONFIG[websockets] = "WITH_WEBSOCKETS=yes,WITH_WEBSOCKETS=no,libwebsockets" + +EXTRA_OEMAKE = " \ + prefix=${prefix} \ + mandir=${mandir} \ + localedir=${localedir} \ + ${PACKAGECONFIG_CONFARGS} \ + STRIP=/bin/true \ + WITH_DOCS=no \ + WITH_BUNDLED_DEPS=no \ +" + +export LIB_SUFFIX = "${@d.getVar('baselib').replace('lib', '')}" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + + 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}/mosquitto + install -m 0644 ${D}${sysconfdir}/mosquitto/mosquitto.conf.example \ + ${D}${sysconfdir}/mosquitto/mosquitto.conf + + 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.1" + +FILES_libmosquittopp1 = "${libdir}/libmosquittopp.so.1" + +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" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch index 4d7ac3aa5..e636adc55 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch @@ -1,7 +1,7 @@ -From fbfceebce2121831904f2f7115252dd03b413a6d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 19 Sep 2017 18:52:53 -0700 -Subject: [PATCH] IntelRDFPMathLib20U1: Check for __DEFINED_wchar_t +From 97914aeab52b4d0ea0ab9e5ff985a1c5cddb0fa1 Mon Sep 17 00:00:00 2001 +From: Vincent Prince +Date: Mon, 16 Sep 2019 13:41:39 +0200 +Subject: [PATCH 06/10] IntelRDFPMathLib20U1: Check for __DEFINED_wchar_t This is defined by musl if wchar_t is already defined @@ -12,16 +12,15 @@ src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h:46:15: error: t typedef int wchar_t; Signed-off-by: Khem Raj +Signed-off-by: Vincent Prince --- -Upstream-Status: Pending - src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: git/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h -=================================================================== ---- git.orig/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h -+++ git/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h +diff --git a/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h b/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h +index 56775bc..be96a85 100755 +--- a/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h ++++ b/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h @@ -43,7 +43,7 @@ #if 0 // MongoDB Modification -- just `#include ` @@ -31,3 +30,6 @@ Index: git/src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h typedef int wchar_t; #endif #else +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch index 070411ab9..3d949c873 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Support-deprecated-resolver-functions.patch @@ -1,7 +1,7 @@ -From 5994023a03634dfc0318976c293e7391fe6aa060 Mon Sep 17 00:00:00 2001 +From 8d035e84c2edb44461ef4df9cdef0a6dfce0a1d7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 24 Aug 2018 12:56:22 -0700 -Subject: [PATCH 1/2] Support deprecated resolver functions +Subject: [PATCH 07/10] Support deprecated resolver functions Needed for musl libc @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj 1 file changed, 6 insertions(+) diff --git a/src/mongo/util/dns_query_posix-impl.h b/src/mongo/util/dns_query_posix-impl.h -index d19958010c..bbca3309ed 100644 +index a5e3629..fb29d2d 100644 --- a/src/mongo/util/dns_query_posix-impl.h +++ b/src/mongo/util/dns_query_posix-impl.h -@@ -53,6 +53,12 @@ +@@ -54,6 +54,12 @@ #include @@ -29,5 +29,5 @@ index d19958010c..bbca3309ed 100644 namespace dns { // The anonymous namespace is safe, in this header, as it is not really a header. It is only used -- -2.18.0 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch index a6d721ac5..190884624 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch @@ -1,19 +1,20 @@ -From 53368d3f4adc09dd84234a9af31771bcd8ca2757 Mon Sep 17 00:00:00 2001 -From: Sven Ebenfeld -Date: Fri, 15 Jan 2016 22:41:28 +0100 -Subject: [PATCH] Tell scons to use build settings from environment variables +From 1b2e24e14ee72e54e466be2512c78272f62d60b4 Mon Sep 17 00:00:00 2001 +From: Vincent Prince +Date: Mon, 16 Sep 2019 13:21:44 +0200 +Subject: [PATCH 01/10] Tell scons to use build settings from environment + variables Signed-off-by: Sven Ebenfeld +Signed-off-by: Vincent Prince --- SConstruct | 8 ++++++-- - src/mongo/util/SConscript | 2 ++ - 2 files changed, 8 insertions(+), 2 deletions(-) + 1 files changed, 8 insertions(+), 2 deletions(-) -Index: git/SConstruct -=================================================================== ---- git.orig/SConstruct -+++ git/SConstruct -@@ -564,6 +564,7 @@ def variable_arch_converter(val): +diff --git a/SConstruct b/SConstruct +index 7ebbcbc..e63cf15 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -608,6 +608,7 @@ def variable_arch_converter(val): 'amd64': 'x86_64', 'emt64': 'x86_64', 'x86': 'i386', @@ -21,7 +22,7 @@ Index: git/SConstruct } val = val.lower() -@@ -652,7 +653,8 @@ env_vars.Add( +@@ -695,7 +696,8 @@ env_vars.Add( ) env_vars.Add('CC', @@ -31,7 +32,7 @@ Index: git/SConstruct env_vars.Add('CCFLAGS', help='Sets flags for the C and C++ compiler', -@@ -672,7 +674,8 @@ env_vars.Add('CPPPATH', +@@ -715,7 +717,8 @@ env_vars.Add('CPPPATH', converter=variable_shlex_converter) env_vars.Add('CXX', @@ -41,24 +42,15 @@ Index: git/SConstruct env_vars.Add('CXXFLAGS', help='Sets flags for the C++ compiler', -@@ -961,6 +964,7 @@ envDict = dict(BUILD_ROOT=buildDir, +@@ -1018,6 +1021,7 @@ envDict = dict(BUILD_ROOT=buildDir, ) env = Environment(variables=env_vars, **envDict) +env.PrependENVPath('PATH', os.getenv('PATH')) del envDict - env.AddMethod(mongo_platform.env_os_is_wrapper, 'TargetOSIs') -Index: git/src/mongo/util/SConscript -=================================================================== ---- git.orig/src/mongo/util/SConscript -+++ git/src/mongo/util/SConscript -@@ -329,6 +329,8 @@ if env['MONGO_ALLOCATOR'] == 'tcmalloc': - 'MONGO_HAVE_GPERFTOOLS_SIZE_CLASS_STATS' - ] - ) -+ if not use_system_version_of_library('valgrind'): -+ tcmspEnv.InjectThirdPartyIncludePaths('valgrind') + for var in ['CC', 'CXX']: - if not use_system_version_of_library('valgrind'): - # Include valgrind since tcmalloc disables itself while running under valgrind +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch index c17ebf1e7..d98fa56cb 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch @@ -1,18 +1,18 @@ -From 3eed8388b49d5d3cbc2db74fee1b017eb4b40d0a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 2 Sep 2017 10:06:24 -0700 -Subject: [PATCH] Use __GLIBC__ to control use of gnu_get_libc_version +From d701ceeb15662038435b80ba556a80c17f76d2dc Mon Sep 17 00:00:00 2001 +From: Vincent Prince +Date: Mon, 16 Sep 2019 13:30:13 +0200 +Subject: [PATCH 03/10] Use __GLIBC__ to control use of gnu_get_libc_version Signed-off-by: Khem Raj +Signed-off-by: Vincent Prince --- -Upstream-Status: Pending - src/mongo/util/processinfo_linux.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) + src/mongo/util/processinfo_linux.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) -Index: git/src/mongo/util/processinfo_linux.cpp -=================================================================== ---- git.orig/src/mongo/util/processinfo_linux.cpp -+++ git/src/mongo/util/processinfo_linux.cpp +diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp +index cccb91c..45c4b7d 100644 +--- a/src/mongo/util/processinfo_linux.cpp ++++ b/src/mongo/util/processinfo_linux.cpp @@ -44,10 +44,10 @@ #include #ifdef __BIONIC__ @@ -27,8 +27,8 @@ Index: git/src/mongo/util/processinfo_linux.cpp #endif #include -@@ -503,7 +503,7 @@ void ProcessInfo::SystemInfo::collectSys - stringstream ss; +@@ -546,7 +546,7 @@ void ProcessInfo::SystemInfo::collectSystemInfo() { + std::stringstream ss; ss << "uClibc-" << __UCLIBC_MAJOR__ << "." << __UCLIBC_MINOR__ << "." << __UCLIBC_SUBLEVEL__; bExtra.append("libcVersion", ss.str()); -#else @@ -36,3 +36,6 @@ Index: git/src/mongo/util/processinfo_linux.cpp bExtra.append("libcVersion", gnu_get_libc_version()); #endif if (!verSig.empty()) +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch index 99edad3c4..b9c670407 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch @@ -1,7 +1,7 @@ -From a4951489d649c2b609cbb80f6cfb49fdcad8bd43 Mon Sep 17 00:00:00 2001 +From 20fcbf2a05ee6542aba942f6006d149db70fb9ce Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Sep 2017 10:03:37 -0700 -Subject: [PATCH] Use long long instead of int64_t +Subject: [PATCH 02/10] Use long long instead of int64_t Fixes error: call to member function 'appendNumber' is ambiguous @@ -9,15 +9,14 @@ since this function expects long long as parameter and not int64_t Signed-off-by: Khem Raj --- -Upstream-Status: Pending src/mongo/util/procparser.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -Index: git/src/mongo/util/procparser.cpp -=================================================================== ---- git.orig/src/mongo/util/procparser.cpp -+++ git/src/mongo/util/procparser.cpp -@@ -260,7 +260,7 @@ Status parseProcStat(const std::vector& keys, StringData stringValue((*partIt).begin(), (*partIt).end() - (*partIt).begin()); @@ -26,7 +25,7 @@ Index: git/src/mongo/util/procparser.cpp if (!parseNumberFromString(stringValue, &value).isOK()) { value = 0; -@@ -272,7 +272,7 @@ Status parseProcStat(const std::vector& keys, } else { StringData stringValue((*partIt).begin(), (*partIt).end() - (*partIt).begin()); @@ -35,7 +34,7 @@ Index: git/src/mongo/util/procparser.cpp if (!parseNumberFromString(stringValue, &value).isOK()) { value = 0; -@@ -365,7 +365,7 @@ Status parseProcMemInfo(const std::vecto +@@ -366,7 +366,7 @@ Status parseProcMemInfo(const std::vector& keys, StringData stringValue((*partIt).begin(), (*partIt).end()); @@ -44,7 +43,7 @@ Index: git/src/mongo/util/procparser.cpp if (!parseNumberFromString(stringValue, &value).isOK()) { value = 0; -@@ -522,7 +522,7 @@ Status parseProcDiskStats(const std::vec +@@ -522,7 +522,7 @@ Status parseProcDiskStats(const std::vector& disks, StringData data, BSONObjBuilder* builder) { bool foundKeys = false; @@ -53,7 +52,7 @@ Index: git/src/mongo/util/procparser.cpp stats.reserve(kDiskFieldCount); using string_split_iterator = boost::split_iterator; -@@ -597,7 +597,7 @@ Status parseProcDiskStats(const std::vec +@@ -597,7 +597,7 @@ Status parseProcDiskStats(const std::vector& disks, StringData stringValue((*partIt).begin(), (*partIt).end()); @@ -62,3 +61,6 @@ Index: git/src/mongo/util/procparser.cpp if (!parseNumberFromString(stringValue, &value).isOK()) { value = 0; +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch index b597422e4..e726933f5 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-asio-Dont-use-experimental-with-clang.patch @@ -1,28 +1,29 @@ -From 31ca5c563f1d9a3f70258be3dd2b1e547a65a550 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 5 Feb 2019 00:21:12 -0800 -Subject: [PATCH] asio: Dont use experimental with clang +From 097e8a66930cfa28ac8bfa35f62d0a9ee3b74488 Mon Sep 17 00:00:00 2001 +From: Vincent Prince +Date: Mon, 16 Sep 2019 13:46:52 +0200 +Subject: [PATCH 10/10] asio: Dont use experimental with clang Signed-off-by: Khem Raj +Signed-off-by: Vincent Prince --- - .../asio-master/asio/include/asio/detail/string_view.hpp | 4 ++-- + src/third_party/asio-master/asio/include/asio/detail/string_view.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp b/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp -index 222c02186d..3bf7494529 100644 +index f09cebc..fa307b5 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp -@@ -28,8 +28,8 @@ - namespace asio { - - #if defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW) +@@ -33,8 +33,8 @@ namespace asio { + using std::basic_string_view; + using std::string_view; + #elif defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW) -using std::experimental::basic_string_view; -using std::experimental::string_view; +using std::basic_string_view; +using std::string_view; - #else // defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW) - using std::basic_string_view; - using std::string_view; + #endif // defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW) + + } // namespace asio -- -2.20.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch index 098306f50..869d2849d 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch @@ -1,7 +1,7 @@ -From df7ef16afcc6ab55daa686e4f15c16e3d1280337 Mon Sep 17 00:00:00 2001 +From 73c6374ceb0c062e91210cc9ef3e0e9fa30ee514 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Sep 2017 12:42:30 -0700 -Subject: [PATCH 2/4] Add a definition for the macro __ELF_NATIVE_CLASS +Subject: [PATCH 04/10] Add a definition for the macro __ELF_NATIVE_CLASS It depends on the native arch's word size. @@ -11,10 +11,10 @@ Signed-off-by: Khem Raj 1 file changed, 9 insertions(+) diff --git a/src/mongo/util/stacktrace_posix.cpp b/src/mongo/util/stacktrace_posix.cpp -index 53ab85f56f..7c458e7ef2 100644 +index 1d7b3d7..f81e329 100644 --- a/src/mongo/util/stacktrace_posix.cpp +++ b/src/mongo/util/stacktrace_posix.cpp -@@ -37,6 +37,15 @@ +@@ -39,6 +39,15 @@ #include #include @@ -31,5 +31,5 @@ index 53ab85f56f..7c458e7ef2 100644 #include "mongo/config.h" #include "mongo/db/jsobj.h" -- -2.14.1 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch index 085fa50d9..59066b260 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-Fix-default-stack-size-to-256K.patch @@ -1,7 +1,7 @@ -From 98543889f7ba38c02eb7cd9822f45e27d619edd6 Mon Sep 17 00:00:00 2001 +From ffe6045b190b735601cd209d3e7ac121604c5a4e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 24 Aug 2018 13:07:01 -0700 -Subject: [PATCH 2/2] Fix default stack size to 256K +Subject: [PATCH 08/10] Fix default stack size to 256K On musl default stack size is ~80K which is too low for mongodb @@ -10,14 +10,14 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- - .../platform/stack_locator_pthread_getattr_np.cpp | 10 ++++++++++ + src/mongo/platform/stack_locator_pthread_getattr_np.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/mongo/platform/stack_locator_pthread_getattr_np.cpp b/src/mongo/platform/stack_locator_pthread_getattr_np.cpp -index 648d26a41c..6e398f00c9 100644 +index 4f3044c..68e47e3 100644 --- a/src/mongo/platform/stack_locator_pthread_getattr_np.cpp +++ b/src/mongo/platform/stack_locator_pthread_getattr_np.cpp -@@ -35,6 +35,16 @@ +@@ -36,6 +36,16 @@ #include "mongo/util/assert_util.h" #include "mongo/util/scopeguard.h" @@ -35,5 +35,5 @@ index 648d26a41c..6e398f00c9 100644 StackLocator::StackLocator() { -- -2.18.0 +2.7.4 diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch new file mode 100644 index 000000000..3a27aacfe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-Fix-unknown-prefix-env.patch @@ -0,0 +1,19 @@ +Index: git/SConstruct +=================================================================== +--- git.orig/SConstruct ++++ git/SConstruct +@@ -884,6 +884,14 @@ env_vars.Add('WINDOWS_OPENSSL_BIN', + help='Sets the path to the openssl binaries for packaging', + default='c:/openssl/bin') + ++env_vars.Add('PREFIX', ++ help='installation prefix') ++ ++env_vars.Add('prefix', ++ help='installation prefix') ++ ++ ++ + # -- Validate user provided options -- + + # A dummy environment that should *only* have the variables we have set. In practice it has diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch new file mode 100644 index 000000000..c6035894e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-fix-musl-strerror_r.patch @@ -0,0 +1,30 @@ +Index: git/src/mongo/util/errno_util.cpp +=================================================================== +--- git.orig/src/mongo/util/errno_util.cpp ++++ git/src/mongo/util/errno_util.cpp +@@ -49,6 +49,16 @@ const char kUnknownMsg[] = "Unknown erro + const int kBuflen = 256; // strerror strings in non-English locales can be large. + } // namespace + ++inline char const * strerror_r_helper( char const * r, char const * ) ++{ ++ return r; ++} ++ ++inline char const * strerror_r_helper( int r, char const * buffer ) ++{ ++ return r == 0? buffer: "Unknown error"; ++} ++ + std::string errnoWithDescription(int errNumber) { + #if defined(_WIN32) + if (errNumber == -1) +@@ -63,7 +73,7 @@ std::string errnoWithDescription(int err + + #if defined(__GNUC__) && defined(_GNU_SOURCE) && \ + (!defined(__ANDROID_API__) || !(__ANDROID_API__ <= 22)) && !defined(EMSCRIPTEN) +- msg = strerror_r(errNumber, buf, kBuflen); ++ msg = strerror_r_helper(strerror_r(errNumber, buf, kBuflen)); + #elif defined(_WIN32) + + LPWSTR errorText = nullptr; diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch index a2e1f795b..2cea9bc31 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch @@ -1,17 +1,17 @@ -From a1c77702926eb8546ff96b00b5b994f7478dabae Mon Sep 17 00:00:00 2001 +From cc95a8878fa581b164dee8fb1f07b05b9d919ef0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Sep 2017 13:13:15 -0700 -Subject: [PATCH 4/4] wiredtiger: Disable strtouq on musl +Subject: [PATCH 09/10] wiredtiger: Disable strtouq on musl Signed-off-by: Khem Raj --- src/third_party/wiredtiger/build_linux/wiredtiger_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: git/src/third_party/wiredtiger/build_linux/wiredtiger_config.h -=================================================================== ---- git.orig/src/third_party/wiredtiger/build_linux/wiredtiger_config.h -+++ git/src/third_party/wiredtiger/build_linux/wiredtiger_config.h +diff --git a/src/third_party/wiredtiger/build_linux/wiredtiger_config.h b/src/third_party/wiredtiger/build_linux/wiredtiger_config.h +index 82e9994..0399a67 100644 +--- a/src/third_party/wiredtiger/build_linux/wiredtiger_config.h ++++ b/src/third_party/wiredtiger/build_linux/wiredtiger_config.h @@ -104,7 +104,7 @@ #define HAVE_STRING_H 1 @@ -21,3 +21,6 @@ Index: git/src/third_party/wiredtiger/build_linux/wiredtiger_config.h /* Define to 1 if you have the `sync_file_range' function. */ /* #undef HAVE_SYNC_FILE_RANGE */ +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch index c06898758..15bd7da70 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch @@ -1,25 +1,33 @@ -Add alises for arm64 which is same as aarch64 +From c9fc9e9a44b0fb764ce86a5e57f17d3c5bbfd8cd Mon Sep 17 00:00:00 2001 +From: Vincent Prince +Date: Mon, 16 Sep 2019 13:37:10 +0200 +Subject: [PATCH 05/10] Add alises for arm64 which is same as aarch64 Signed-off-by: Khem Raj -Upstream-Status: Pending +Signed-off-by: Vincent Prince +--- + SConstruct | 1 + + src/third_party/IntelRDFPMathLib20U1/SConscript | 2 +- + src/third_party/wiredtiger/SConscript | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) -Index: git/SConstruct -=================================================================== ---- git.orig/SConstruct -+++ git/SConstruct -@@ -1055,6 +1055,7 @@ elif endian == "big": +diff --git a/SConstruct b/SConstruct +index e63cf15..5593c78 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1129,6 +1129,7 @@ elif endian == "big": processor_macros = { - 'arm' : { 'endian': 'little', 'defines': ('__arm__',) }, - 'aarch64' : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')}, -+ 'arm64' : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')}, - 'i386' : { 'endian': 'little', 'defines': ('__i386', '_M_IX86')}, - 'ppc64le' : { 'endian': 'little', 'defines': ('__powerpc64__',)}, - 's390x' : { 'endian': 'big', 'defines': ('__s390x__',)}, -Index: git/src/third_party/IntelRDFPMathLib20U1/SConscript -=================================================================== ---- git.orig/src/third_party/IntelRDFPMathLib20U1/SConscript -+++ git/src/third_party/IntelRDFPMathLib20U1/SConscript -@@ -308,7 +308,7 @@ if processor == 'i386': + 'arm' : { 'endian': 'little', 'defines': ('__arm__',) }, + 'aarch64' : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')}, ++ 'arm64' : { 'endian': 'little', 'defines': ('__arm64__', '__aarch64__')}, + 'i386' : { 'endian': 'little', 'defines': ('__i386', '_M_IX86')}, + 'ppc64le' : { 'endian': 'little', 'defines': ('__powerpc64__',)}, + 's390x' : { 'endian': 'big', 'defines': ('__s390x__',)}, +diff --git a/src/third_party/IntelRDFPMathLib20U1/SConscript b/src/third_party/IntelRDFPMathLib20U1/SConscript +index f23c071..fb82cd6 100644 +--- a/src/third_party/IntelRDFPMathLib20U1/SConscript ++++ b/src/third_party/IntelRDFPMathLib20U1/SConscript +@@ -308,7 +308,7 @@ if processor == 'i386' or processor == 'emscripten': elif processor == 'arm': cpp_defines['IA32'] = '1' cpp_defines['ia32'] = '1' @@ -28,11 +36,11 @@ Index: git/src/third_party/IntelRDFPMathLib20U1/SConscript cpp_defines['efi2'] = '1' cpp_defines['EFI2'] = '1' # Using 64 bit little endian -Index: git/src/third_party/wiredtiger/SConscript -=================================================================== ---- git.orig/src/third_party/wiredtiger/SConscript -+++ git/src/third_party/wiredtiger/SConscript -@@ -151,7 +151,7 @@ condition_map = { +diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript +index cdd090b..97a1b3b 100644 +--- a/src/third_party/wiredtiger/SConscript ++++ b/src/third_party/wiredtiger/SConscript +@@ -152,7 +152,7 @@ condition_map = { 'POSIX_HOST' : not env.TargetOSIs('windows'), 'WINDOWS_HOST' : env.TargetOSIs('windows'), @@ -41,3 +49,6 @@ Index: git/src/third_party/wiredtiger/SConscript 'POWERPC_HOST' : env['TARGET_ARCH'] == 'ppc64le', 'X86_HOST' : env['TARGET_ARCH'] == 'x86_64', 'ZSERIES_HOST' : env['TARGET_ARCH'] == 's390x', +-- +2.7.4 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb index ed0551736..d3c19d6c4 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb @@ -3,17 +3,18 @@ LICENSE = "SSPL-1 & Apache-2.0 & Zlib" LIC_FILES_CHKSUM = "file://LICENSE-Community.txt;md5=3a865f27f11f43ecbe542d9ea387dcf1 \ file://APACHE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -DEPENDS = "openssl libpcre libpcap zlib boost curl python \ - python-setuptools-native python-typing-native \ - python-pyyaml-native python-cheetah-native \ +DEPENDS = "openssl libpcre libpcap zlib boost curl python3 \ + python3-setuptools-native \ + python3-pyyaml-native python3-cheetah-native \ + python3-psutil-native python3-regex-native \ " -inherit scons dos2unix siteinfo pythonnative +inherit scons dos2unix siteinfo python3native -PV = "4.0.6+git${SRCPV}" -#v4.0.6 -SRCREV = "caa42a1f75a56c7643d0b68d3880444375ec42e3" -SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.0 \ +PV = "4.2.0+git${SRCPV}" +#v4.2.0 +SRCREV = "18ce5c9f56a01f2c933a720d64707f3456f81c8b" +SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.2 \ file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ file://0001-Use-long-long-instead-of-int64_t.patch \ file://0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch \ @@ -21,9 +22,11 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.0 \ file://arm64-support.patch \ file://0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch \ file://0001-Support-deprecated-resolver-functions.patch \ + file://0003-Fix-unknown-prefix-env.patch \ " SRC_URI_append_libc-musl ="\ file://0002-Fix-default-stack-size-to-256K.patch \ + file://0003-fix-musl-strerror_r.patch \ file://0004-wiredtiger-Disable-strtouq-on-musl.patch \ " @@ -37,6 +40,7 @@ COMPATIBLE_HOST ?= '(x86_64|i.86|powerpc64|arm|aarch64).*-linux' COMPATIBLE_HOST_arm = "null" COMPATIBLE_HOST_libc-musl_x86 = "null" +COMPATIBLE_HOST_toolchain-clang_x86 = "null" PACKAGECONFIG ??= "tcmalloc" # gperftools compilation fails for arm below v7 because of missing support of @@ -75,5 +79,3 @@ scons_do_install() { ${STAGING_BINDIR_NATIVE}/scons install ${EXTRA_OESCONS}|| \ die "scons install execution failed." } - -PNBLACKLIST[mongodb] = "Since bbclass scons convert to python3, build mongodb failed" diff --git a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb new file mode 100644 index 000000000..4ede3c8c6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Utilities to collect and visualise system statistics" +HOMEPAGE = "http://www.i-scream.org/libstatgrab/" + +LICENSE = "GPL-2.0+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "ncurses" + +PACKAGES_prepend = "statgrab statgrab-dbg saidar saidar-dbg ${PN}-mrtg " + +# don't use the git tag unless docbooc2x is available to build the manpages +SRC_URI = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATGRAB_0_92/libstatgrab-0.92.tar.gz \ + " +SRC_URI[md5sum] = "5362b2ddbec54b3901e7d70c22cda249" +SRC_URI[sha256sum] = "5bf1906aff9ffc3eeacf32567270f4d819055d8386d98b9c8c05519012d5a196" + +# Perl5 is for tests only +EXTRA_OECONF = "--without-perl5 --with-mnttab=/proc/mounts" + +inherit autotools pkgconfig + +FILES_statgrab = "${bindir}/statgrab" +FILES_statgrab-dbg = "${bindir}/.debug/statgrab" +FILES_saidar = "${bindir}/saidar" +FILES_saidar-dbg = "${bindir}/.debug/saidar" +FILES_${PN}-mrtg = "${bindir}/statgrab-make-mrtg-config ${bindir}/statgrab-make-mrtg-index" +RDEPENDS_${PN}-mrtg_append = "perl statgrab" diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch new file mode 100644 index 000000000..c9e1306af --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-Always-enable-trivial-httpd-for-tests.patch @@ -0,0 +1,59 @@ +From 44e0647230b22cd136ae2fb252ce90eed4751970 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Wed, 4 Sep 2019 17:29:15 +0100 +Subject: [PATCH 1/2] Always enable trivial-httpd for tests + +When running tests we always need ostree-trivial-httpd, so enable it +unconditionally + +Signed-off-by: Alex Kiernan +Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912] +--- + Makefile.am | 1 + + ci/build.sh | 5 +++++ + ci/travis-build.sh | 1 + + 3 files changed, 7 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index cd04a055045a..673dbf88de55 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -39,6 +39,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS += \ + --enable-gtk-doc \ + --enable-man \ + --disable-maintainer-mode \ ++ --enable-trivial-httpd-cmdline \ + $(NULL) + + GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make +diff --git a/ci/build.sh b/ci/build.sh +index 0901507498f2..806af050b780 100755 +--- a/ci/build.sh ++++ b/ci/build.sh +@@ -22,6 +22,11 @@ case "${CONFIGOPTS:-}" in + fi + ;; + esac ++# unless libsoup is disabled, enable trivial-httpd for the tests ++case "${CONFIGOPTS:-}" in ++ *--without-soup*) ;; ++ *) CONFIGOPTS="${CONFIGOPTS:-} --enable-trivial-httpd-cmdline" ;; ++esac + + # always fail on warnings; https://github.com/ostreedev/ostree/pull/971 + # NB: this disables the default set of flags from configure.ac +diff --git a/ci/travis-build.sh b/ci/travis-build.sh +index 3fd969bdced6..7c85313a2d32 100755 +--- a/ci/travis-build.sh ++++ b/ci/travis-build.sh +@@ -85,6 +85,7 @@ make="make -j${ci_parallel} V=1 VERBOSE=1" + + ../configure \ + --enable-always-build-tests \ ++ --enable-trivial-httpd-cmdline \ + ${ci_configopts} + "$@" + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch new file mode 100644 index 000000000..d8c044cb9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch @@ -0,0 +1,40 @@ +From 5a4f2ddb0a6c656b425a3caa41f5af766ed5f44b Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Mon, 9 Sep 2019 14:19:18 +0100 +Subject: [PATCH] macros: Add TEMP_FAILURE_RETRY for musl + +TEMP_FAILURE_RETRY is glibc specific, add a definition for musl. + +See https://github.com/ostreedev/ostree/issues/731 + +Signed-off-by: Leon Woestenberg +Signed-off-by: Alex Kiernan +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libglnx/commit/15c06468804014fc49f6f340132930703f919b19] +--- + glnx-macros.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libglnx.glnx-macros.h b/libglnx/glnx-macros.h +index 6d8aca93f8a3..700fc75ceed0 100644 +--- a/libglnx.glnx-macros.h ++++ b/libglnx/glnx-macros.h +@@ -31,6 +31,16 @@ G_BEGIN_DECLS + /* All of these are for C only. */ + #ifndef __GI_SCANNER__ + ++/* fixes builds against musl, taken from glibc unistd.h */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + /* Taken from https://github.com/systemd/systemd/src/basic/string-util.h + * at revision v228-666-gcf6c8c4 + */ +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch new file mode 100644 index 000000000..362b2f36a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree/0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch @@ -0,0 +1,51 @@ +From 2629328b39ae117876f4854409c2231220a30b9c Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Thu, 5 Sep 2019 13:22:15 +0100 +Subject: [PATCH 2/2] Gate ostree-trivial-httpd on BUILDOPT_TRIVIAL_HTTPD + +When building without --enable-trivial-httpd-cmdline, don't build or install +the ostree-trivial-httpd binary. + +Signed-off-by: Alex Kiernan +Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912] +--- + Makefile-ostree.am | 3 ++- + configure.ac | 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Makefile-ostree.am b/Makefile-ostree.am +index 76f39cad4b74..7b53cb148960 100644 +--- a/Makefile-ostree.am ++++ b/Makefile-ostree.am +@@ -143,12 +143,13 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c + endif + + if USE_LIBSOUP +-# Eventually once we stop things from using this, we should support disabling this ++if BUILDOPT_TRIVIAL_HTTPD + ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c + pkglibexec_PROGRAMS += ostree-trivial-httpd + ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c + ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS) + ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS) ++endif + + if !USE_CURL + # This is necessary for the cookie jar bits +diff --git a/configure.ac b/configure.ac +index 069bab01752e..ffc67980d507 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -192,6 +192,9 @@ AC_ARG_ENABLE(trivial-httpd-cmdline, + [Continue to support "ostree trivial-httpd" [default=no]])],, + enable_trivial_httpd_cmdline=no) + AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes) ++AS_IF([test x$with_soup = xno && test x$enable_trivial_httpd_cmdline = xyes], [ ++ AC_MSG_ERROR([trivial-httpd enabled, but libsoup is not; libsoup is needed for trivial-httpd]) ++]) + AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, + [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] + ) +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.3.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.3.bb new file mode 100644 index 000000000..1fe7dcf21 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2019.3.bb @@ -0,0 +1,157 @@ +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 \ + gpgme \ + 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://0001-macros-Add-TEMP_FAILURE_RETRY-for-musl.patch \ + file://0001-Always-enable-trivial-httpd-for-tests.patch \ + file://0002-Gate-ostree-trivial-httpd-on-BUILDOPT_TRIVIAL_HTTPD.patch \ +" +SRCREV = "5c1697da78ebf6250a7130b8b9e6cbfbeaa34296" + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+\.\d+)" + +S = "${WORKDIR}/git" + +inherit autotools bash-completion gobject-introspection gtk-doc pkgconfig 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)} \ + 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)} \ + soup \ +" + +PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" +PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" +PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" +PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls" +PACKAGECONFIG[libarchive] = "--with-libarchive, --without-libarchive, libarchive" +PACKAGECONFIG[libmount] = "--with-libmount, --without-libmount, util-linux" +PACKAGECONFIG[man] = "--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 = " \ + --with-builtin-grub2-mkconfig \ + --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" +} + +PACKAGES += " \ + ${PN}-dracut \ + ${PN}-grub \ + ${PN}-mkinitcpio \ + ${PN}-switchroot \ +" + +FILES_${PN} = " \ + ${bindir}/ostree \ + ${bindir}/rofiles-fuse \ + ${datadir}/${BPN} \ + ${datadir}/gir-1.0 \ + ${libdir}/${BPN}/ostree-remount \ + ${libdir}/girepository-1.0 \ + ${libdir}/lib*${SOLIBS} \ + ${libdir}/tmpfiles.d/ostree-tmpfiles.conf \ + ${libexecdir}/libostree/ostree-trivial-httpd \ + ${sysconfdir}/ostree/remotes.d \ + ${systemd_unitdir}/system-generators/ostree-system-generator \ + ${systemd_unitdir}/system/ostree-finalize-staged.path \ + ${systemd_unitdir}/system/ostree-finalize-staged.service \ + ${systemd_unitdir}/system/ostree-remount.service \ +" +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 = " \ + ${libdir}/ostree/ostree-prepare-root \ + ${systemd_unitdir}/system/ostree-prepare-root.service \ +" + +RDEPENDS_${PN}-dracut = "bash" +RDEPENDS_${PN}-mkinitcpio = "bash" +RDEPENDS_${PN}_class-target = " \ + gnupg \ + ${PN}-switchroot \ +" + +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/rrdtool/rrdtool_1.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb index 1962a2dd4..b39ceda80 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb @@ -32,7 +32,7 @@ am_cv_python_pyexecdir=${STAGING_LIBDIR}/python${PYTHON_BASEVERSION}/site-packag --disable-python,python," PACKAGECONFIG[perl] = \ -"--enable-perl=yes --with-perl-options='INSTALLDIRS="vendor" CCFLAGS="${CFLAGS}" NO_PACKLIST=1' \ +"--enable-perl=yes --with-perl-options='INSTALLDIRS="vendor" CCFLAGS="${CFLAGS}" NO_PACKLIST=1 NO_PERLLOCAL=1' \ ac_cv_path_PERL_CC='${CC}', \ --disable-perl,perl," diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1907.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1907.0.bb deleted file mode 100644 index 4092833fc..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1907.0.bb +++ /dev/null @@ -1,173 +0,0 @@ -SUMMARY = "Rsyslog is an enhanced multi-threaded syslogd" -DESCRIPTION = "\ -Rsyslog is an enhanced syslogd supporting, among others, MySQL,\ - PostgreSQL, failover log destinations, syslog/tcp, fine grain\ - output format control, high precision timestamps, queued operations\ - and the ability to filter on any message part. It is quite\ - compatible to stock sysklogd and can be used as a drop-in replacement.\ - Its advanced features make it suitable for enterprise-class,\ - encryption protected syslog relay chains while at the same time being\ - very easy to setup for the novice user." - -DEPENDS = "zlib libestr libfastjson bison-native flex-native liblogging" -HOMEPAGE = "http://www.rsyslog.com/" -LICENSE = "GPLv3 & LGPLv3 & Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \ - file://COPYING.LESSER;md5=cb7903f1e5c39ae838209e130dca270a \ - file://COPYING.ASL20;md5=052f8a09206615ab07326ff8ce2d9d32\ -" - -SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.tar.gz \ - file://initscript \ - file://rsyslog.conf \ - file://rsyslog.logrotate \ - file://use-pkgconfig-to-check-libgcrypt.patch \ - file://run-ptest \ -" - -SRC_URI_append_libc-musl = " \ - file://0001-Include-sys-time-h.patch \ -" - -SRC_URI[md5sum] = "97682af2b1d87f903458cfb41725fba6" -SRC_URI[sha256sum] = "eb27535ece93174ef6b551c88467d2c9cd826b62479625bb881a53d50b079fb5" - -UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)" - -inherit autotools pkgconfig systemd update-rc.d ptest - -EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes" - -# first line is default yes in configure -PACKAGECONFIG ??= " \ - rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ - fmhttp imdiag gnutls imfile \ - ${@bb.utils.filter('DISTRO_FEATURES', 'snmp systemd', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench relp ${VALGRIND}', '', d)} \ -" - -# default yes in configure -PACKAGECONFIG[relp] = "--enable-relp,--disable-relp,librelp," -PACKAGECONFIG[rsyslogd] = "--enable-rsyslogd,--disable-rsyslogd,," -PACKAGECONFIG[rsyslogrt] = "--enable-rsyslogrt,--disable-rsyslogrt,," -PACKAGECONFIG[fmhttp] = "--enable-fmhttp,--disable-fmhttp,curl," -PACKAGECONFIG[inet] = "--enable-inet,--disable-inet,," -PACKAGECONFIG[klog] = "--enable-klog,--disable-klog,," -PACKAGECONFIG[regexp] = "--enable-regexp,--disable-regexp,," -PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux," -PACKAGECONFIG[libgcrypt] = "--enable-libgcrypt,--disable-libgcrypt,libgcrypt," -PACKAGECONFIG[testbench] = "--enable-testbench --enable-omstdout,--disable-testbench --disable-omstdout,," - -# default no in configure -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," -PACKAGECONFIG[imdiag] = "--enable-imdiag,--disable-imdiag,," -PACKAGECONFIG[imfile] = "--enable-imfile,--disable-imfile,," -PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," -PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," -PACKAGECONFIG[imjournal] = "--enable-imjournal,--disable-imjournal," -PACKAGECONFIG[mmjsonparse] = "--enable-mmjsonparse,--disable-mmjsonparse," -PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," -PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," -PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," -PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,," -PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," - -TESTDIR = "tests" -do_compile_ptest() { - echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${TESTDIR}/Makefile - oe_runmake -C ${TESTDIR} buildtest-TESTS -} - -do_install_ptest() { - # install the tests - cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH} - cp -rf ${B}/${TESTDIR} ${D}${PTEST_PATH} - - # do NOT need to rebuild Makefile itself - sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - # do NOT need to rebuild $(check_PROGRAMS) - sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - - # fix the srcdir, top_srcdir - sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - # fix the abs_top_builddir - sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - - # valgrind is not compatible with arm and mips, - # so remove related test cases if there is no valgrind. - if [ x${VALGRIND} = x ]; then - sed -i '/udp-msgreduc-/d' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - fi - - # install test-driver - install -m 644 ${S}/test-driver ${D}${PTEST_PATH} - - # install necessary links - install -d ${D}${PTEST_PATH}/tools - ln -sf ${sbindir}/rsyslogd ${D}${PTEST_PATH}/tools/rsyslogd - - install -d ${D}${PTEST_PATH}/runtime - install -d ${D}${PTEST_PATH}/runtime/.libs - ( - cd ${D}/${libdir}/rsyslog - allso="*.so" - for i in $allso; do - ln -sf ${libdir}/rsyslog/$i ${D}${PTEST_PATH}/runtime/.libs/$i - done - ) - - # fix the module load path with runtime/.libs - find ${D}${PTEST_PATH}/${TESTDIR} -name "*.conf" -o -name "*.sh" -o -name "*.c" | xargs \ - sed -i -e 's:../plugins/.*/.libs/:../runtime/.libs/:g' -} - -do_install_append() { - install -d "${D}${sysconfdir}/init.d" - install -d "${D}${sysconfdir}/logrotate.d" - install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog - install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf - install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog - sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog - - if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then - install -d 0755 ${D}${sysconfdir}/rsyslog.d - echo '$ModLoad imjournal' >> ${D}${sysconfdir}/rsyslog.d/imjournal.conf - fi - if ${@bb.utils.contains('PACKAGECONFIG', 'mmjsonparse', 'true', 'false', d)}; then - install -d 0755 ${D}${sysconfdir}/rsyslog.d - echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf - fi -} - -FILES_${PN} += "${bindir}" - -INITSCRIPT_NAME = "syslog" -INITSCRIPT_PARAMS = "defaults" - -CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf" - -RCONFLICTS_${PN} = "busybox-syslog sysklogd syslog-ng" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${BPN}.service" - -RDEPENDS_${PN} += "logrotate" - -# for rsyslog-ptest -VALGRIND = "valgrind" -VALGRIND_mips = "" -VALGRIND_mips64 = "" -VALGRIND_mips64n32 = "" -VALGRIND_arm = "" -VALGRIND_aarch64 = "" -VALGRIND_riscv64 = "" -RDEPENDS_${PN}-ptest += "\ - make diffutils gzip bash gawk coreutils procps \ - libgcc python-core python-io \ - " -RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb new file mode 100644 index 000000000..bbb4b119a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.1908.0.bb @@ -0,0 +1,174 @@ +SUMMARY = "Rsyslog is an enhanced multi-threaded syslogd" +DESCRIPTION = "\ +Rsyslog is an enhanced syslogd supporting, among others, MySQL,\ + PostgreSQL, failover log destinations, syslog/tcp, fine grain\ + output format control, high precision timestamps, queued operations\ + and the ability to filter on any message part. It is quite\ + compatible to stock sysklogd and can be used as a drop-in replacement.\ + Its advanced features make it suitable for enterprise-class,\ + encryption protected syslog relay chains while at the same time being\ + very easy to setup for the novice user." + +DEPENDS = "zlib libestr libfastjson bison-native flex-native liblogging" +HOMEPAGE = "http://www.rsyslog.com/" +LICENSE = "GPLv3 & LGPLv3 & Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \ + file://COPYING.LESSER;md5=cb7903f1e5c39ae838209e130dca270a \ + file://COPYING.ASL20;md5=052f8a09206615ab07326ff8ce2d9d32\ +" + +SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.tar.gz \ + file://initscript \ + file://rsyslog.conf \ + file://rsyslog.logrotate \ + file://use-pkgconfig-to-check-libgcrypt.patch \ + file://run-ptest \ +" + +SRC_URI_append_libc-musl = " \ + file://0001-Include-sys-time-h.patch \ +" + +SRC_URI[md5sum] = "6e9aa4ef4cad8ae49affa0a786cc9e2f" +SRC_URI[sha256sum] = "f8c8e53b651e03a011667c60bd2d4dba7a7cb6ec04b247c8ea8514115527863b" + +UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)" + +inherit autotools pkgconfig systemd update-rc.d ptest + +EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes" +EXTRA_OECONF += "--enable-imfile-tests" + +# first line is default yes in configure +PACKAGECONFIG ??= " \ + rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ + fmhttp imdiag gnutls imfile \ + ${@bb.utils.filter('DISTRO_FEATURES', 'snmp systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench relp ${VALGRIND}', '', d)} \ +" + +# default yes in configure +PACKAGECONFIG[relp] = "--enable-relp,--disable-relp,librelp," +PACKAGECONFIG[rsyslogd] = "--enable-rsyslogd,--disable-rsyslogd,," +PACKAGECONFIG[rsyslogrt] = "--enable-rsyslogrt,--disable-rsyslogrt,," +PACKAGECONFIG[fmhttp] = "--enable-fmhttp,--disable-fmhttp,curl," +PACKAGECONFIG[inet] = "--enable-inet,--disable-inet,," +PACKAGECONFIG[klog] = "--enable-klog,--disable-klog,," +PACKAGECONFIG[regexp] = "--enable-regexp,--disable-regexp,," +PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux," +PACKAGECONFIG[libgcrypt] = "--enable-libgcrypt,--disable-libgcrypt,libgcrypt," +PACKAGECONFIG[testbench] = "--enable-testbench --enable-omstdout,--disable-testbench --disable-omstdout,," + +# default no in configure +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," +PACKAGECONFIG[imdiag] = "--enable-imdiag,--disable-imdiag,," +PACKAGECONFIG[imfile] = "--enable-imfile,--disable-imfile,," +PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," +PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," +PACKAGECONFIG[imjournal] = "--enable-imjournal,--disable-imjournal," +PACKAGECONFIG[mmjsonparse] = "--enable-mmjsonparse,--disable-mmjsonparse," +PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," +PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," +PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," +PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,," +PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," + +TESTDIR = "tests" +do_compile_ptest() { + echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${TESTDIR}/Makefile + oe_runmake -C ${TESTDIR} buildtest-TESTS +} + +do_install_ptest() { + # install the tests + cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH} + cp -rf ${B}/${TESTDIR} ${D}${PTEST_PATH} + + # do NOT need to rebuild Makefile itself + sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + # do NOT need to rebuild $(check_PROGRAMS) + sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + + # fix the srcdir, top_srcdir + sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + # fix the abs_top_builddir + sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + + # valgrind is not compatible with arm and mips, + # so remove related test cases if there is no valgrind. + if [ x${VALGRIND} = x ]; then + sed -i '/udp-msgreduc-/d' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + fi + + # install test-driver + install -m 644 ${S}/test-driver ${D}${PTEST_PATH} + + # install necessary links + install -d ${D}${PTEST_PATH}/tools + ln -sf ${sbindir}/rsyslogd ${D}${PTEST_PATH}/tools/rsyslogd + + install -d ${D}${PTEST_PATH}/runtime + install -d ${D}${PTEST_PATH}/runtime/.libs + ( + cd ${D}/${libdir}/rsyslog + allso="*.so" + for i in $allso; do + ln -sf ${libdir}/rsyslog/$i ${D}${PTEST_PATH}/runtime/.libs/$i + done + ) + + # fix the module load path with runtime/.libs + find ${D}${PTEST_PATH}/${TESTDIR} -name "*.conf" -o -name "*.sh" -o -name "*.c" | xargs \ + sed -i -e 's:../plugins/.*/.libs/:../runtime/.libs/:g' +} + +do_install_append() { + install -d "${D}${sysconfdir}/init.d" + install -d "${D}${sysconfdir}/logrotate.d" + install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog + install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf + install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog + sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog + + if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then + install -d 0755 ${D}${sysconfdir}/rsyslog.d + echo '$ModLoad imjournal' >> ${D}${sysconfdir}/rsyslog.d/imjournal.conf + fi + if ${@bb.utils.contains('PACKAGECONFIG', 'mmjsonparse', 'true', 'false', d)}; then + install -d 0755 ${D}${sysconfdir}/rsyslog.d + echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf + fi +} + +FILES_${PN} += "${bindir}" + +INITSCRIPT_NAME = "syslog" +INITSCRIPT_PARAMS = "defaults" + +CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf" + +RCONFLICTS_${PN} = "busybox-syslog sysklogd syslog-ng" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "${BPN}.service" + +RDEPENDS_${PN} += "logrotate" + +# for rsyslog-ptest +VALGRIND = "valgrind" +VALGRIND_mips = "" +VALGRIND_mips64 = "" +VALGRIND_mips64n32 = "" +VALGRIND_arm = "" +VALGRIND_aarch64 = "" +VALGRIND_riscv64 = "" +RDEPENDS_${PN}-ptest += "\ + make diffutils gzip bash gawk coreutils procps \ + libgcc python-core python-io \ + " +RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb deleted file mode 100644 index d2c7ffdab..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Jpeg 2000 implementation" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=baa697d7510288a9cdcce9bd7edaf9bc" - -PR = "r1" - -SRC_URI = "git://github.com/mdadams/jasper.git;protocol=https" -SRCREV = "b13b8c86be870107f83b0a9a4b77557cb2b65d69" - -S = "${WORKDIR}/git" - -inherit autotools lib_package - -PACKAGECONFIG ??= "" -PACKAGECONFIG[jpeg] = "--enable-libjpeg,--disable-libjpeg,jpeg" -PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,freeglut" - -EXTRA_OECONF = "--enable-shared" 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 new file mode 100644 index 000000000..1d5a29438 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.16.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 = "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-security/nmap/files/0001-Include-time.h-header-to-pass-clang-compilation.patch b/meta-openembedded/meta-oe/recipes-security/nmap/files/0001-Include-time.h-header-to-pass-clang-compilation.patch new file mode 100644 index 000000000..f93af2d79 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/nmap/files/0001-Include-time.h-header-to-pass-clang-compilation.patch @@ -0,0 +1,73 @@ +From a068952a20880fc864e8cb8b49f8a6b143a5ac30 Mon Sep 17 00:00:00 2001 +From: Peiran Hong +Date: Fri, 20 Sep 2019 15:02:45 -0400 +Subject: [PATCH] Include time.h header to pass clang compilation + +--- + nmap_error.cc | 11 +---------- + nping/EchoServer.cc | 1 + + osscan2.cc | 1 + + service_scan.cc | 1 + + 4 files changed, 4 insertions(+), 10 deletions(-) + +diff --git a/nmap_error.cc b/nmap_error.cc +index 588b13c33..254107ff5 100644 +--- a/nmap_error.cc ++++ b/nmap_error.cc +@@ -135,16 +135,7 @@ + #include "xml.h" + + #include +-#if TIME_WITH_SYS_TIME +-# include +-# include +-#else +-# if HAVE_SYS_TIME_H +-# include +-# else +-# include +-# endif +-#endif ++#include + + extern NmapOps o; + +diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc +index ccdcf9c2d..c403aeda5 100644 +--- a/nping/EchoServer.cc ++++ b/nping/EchoServer.cc +@@ -137,6 +137,7 @@ + #include "NpingOps.h" + #include "ProbeMode.h" + #include ++#include + + extern NpingOps o; + extern EchoServer es; +diff --git a/osscan2.cc b/osscan2.cc +index aa31feb12..89673e108 100644 +--- a/osscan2.cc ++++ b/osscan2.cc +@@ -147,6 +147,7 @@ + + #include + #include ++#include + + extern NmapOps o; + #ifdef WIN32 +diff --git a/service_scan.cc b/service_scan.cc +index 57a92ed28..ef277bb1f 100644 +--- a/service_scan.cc ++++ b/service_scan.cc +@@ -145,6 +145,7 @@ + #include "nmap_tty.h" + + #include ++#include + + #if HAVE_OPENSSL + /* OpenSSL 1.0.0 needs _WINSOCKAPI_ to be defined, otherwise it loads +-- +2.21.0 + diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/files/0001-include-time.h-for-time-structure-definition.patch b/meta-openembedded/meta-oe/recipes-security/nmap/files/0001-include-time.h-for-time-structure-definition.patch deleted file mode 100644 index 561c8c82c..000000000 --- a/meta-openembedded/meta-oe/recipes-security/nmap/files/0001-include-time.h-for-time-structure-definition.patch +++ /dev/null @@ -1,78 +0,0 @@ -From c774f2b129fd5acd5647d92c57a2079ae638a62b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 20 Jan 2019 23:07:39 -0800 -Subject: [PATCH] include time.h for time structure definition - -Exposed by musl/clang - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - nmap_error.cc | 1 + - nping/EchoServer.cc | 1 + - osscan.cc | 1 + - osscan2.cc | 1 + - service_scan.cc | 1 + - 5 files changed, 5 insertions(+) - -diff --git a/nmap_error.cc b/nmap_error.cc -index 19beafb..ea14e08 100644 ---- a/nmap_error.cc -+++ b/nmap_error.cc -@@ -135,6 +135,7 @@ - #include "xml.h" - - #include -+#include - - extern NmapOps o; - -diff --git a/nping/EchoServer.cc b/nping/EchoServer.cc -index 70f39b0..40cd4d6 100644 ---- a/nping/EchoServer.cc -+++ b/nping/EchoServer.cc -@@ -137,6 +137,7 @@ - #include "NpingOps.h" - #include "ProbeMode.h" - #include -+#include - - extern NpingOps o; - extern EchoServer es; -diff --git a/osscan.cc b/osscan.cc -index f851f60..6ae0c83 100644 ---- a/osscan.cc -+++ b/osscan.cc -@@ -149,6 +149,7 @@ - # include - # endif - #endif -+#include - - #include - #include -diff --git a/osscan2.cc b/osscan2.cc -index e341947..887fbd2 100644 ---- a/osscan2.cc -+++ b/osscan2.cc -@@ -147,6 +147,7 @@ - - #include - #include -+#include - - extern NmapOps o; - #ifdef WIN32 -diff --git a/service_scan.cc b/service_scan.cc -index 9780ae3..e07b940 100644 ---- a/service_scan.cc -+++ b/service_scan.cc -@@ -145,6 +145,7 @@ - #include "nmap_tty.h" - - #include -+#include - - #if HAVE_OPENSSL - /* OpenSSL 1.0.0 needs _WINSOCKAPI_ to be defined, otherwise it loads diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.70.bb b/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.70.bb deleted file mode 100644 index b1b150a7d..000000000 --- a/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.70.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "network auditing tool" -DESCRIPTION = "Nmap ("Network Mapper") is a free and open source (license) utility for network discovery and security auditing.\nGui support via appending to IMAGE_FEATURES x11-base in local.conf" -SECTION = "security" -LICENSE = "GPL-2.0" - -LIC_FILES_CHKSUM = "file://COPYING;beginline=7;endline=12;md5=1489288f46af415fadc4e8b6345ab9f4" - -SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \ - file://nmap-redefine-the-python-library-dir.patch \ - file://nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch \ - file://0001-include-time.h-for-time-structure-definition.patch \ - file://0002-Fix-building-with-libc.patch \ - " - -SRC_URI[md5sum] = "84eb6fbe788e0d4918c2b1e39421bf79" -SRC_URI[sha256sum] = "847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18" - -inherit autotools-brokensep pkgconfig pythonnative - -PACKAGECONFIG ?= "ncat nping ndiff pcap" - -PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap" -PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre" -PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl" -PACKAGECONFIG[ssh2] = "--with-openssh2=${STAGING_LIBDIR}/.., --without-openssh2, libssh2, libssh2" -PACKAGECONFIG[libz] = "--with-libz=${STAGING_LIBDIR}/.., --without-libz, zlib, zlib" - -#disable/enable packages -PACKAGECONFIG[nping] = ",--without-nping," -PACKAGECONFIG[ncat] = ",--without-ncat," -PACKAGECONFIG[ndiff] = ",--without-ndiff,python" -PACKAGECONFIG[update] = ",--without-nmap-update," - -EXTRA_OECONF = "--with-libdnet=included --with-liblinear=included --without-subversion --with-liblua=included" - -# zenmap needs python-pygtk which has been removed -# it also only works with python2 -# disable for now until py3 is supported -EXTRA_OECONF += "--without-zenmap" - -export PYTHON_SITEPACKAGES_DIR - -do_configure() { - autoconf - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} - oe_runconf -} - -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}/ncat" - -RDEPENDS_${PN} = "python" diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb b/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb new file mode 100644 index 000000000..f24194da7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb @@ -0,0 +1,52 @@ +SUMMARY = "network auditing tool" +DESCRIPTION = "Nmap ("Network Mapper") is a free and open source (license) utility for network discovery and security auditing.\nGui support via appending to IMAGE_FEATURES x11-base in local.conf" +SECTION = "security" +LICENSE = "GPL-2.0" + +LIC_FILES_CHKSUM = "file://COPYING;beginline=7;endline=12;md5=66938a7e5b4c118eda78271de14874c2" + +SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \ + file://nmap-redefine-the-python-library-dir.patch \ + file://nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch \ + file://0001-Include-time.h-header-to-pass-clang-compilation.patch \ + file://0002-Fix-building-with-libc.patch \ + " + +SRC_URI[md5sum] = "d37b75b06d1d40f27b76d60db420a1f5" +SRC_URI[sha256sum] = "fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa" + +inherit autotools-brokensep pkgconfig pythonnative + +PACKAGECONFIG ?= "ncat nping ndiff pcap" + +PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap" +PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre" +PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl" +PACKAGECONFIG[ssh2] = "--with-openssh2=${STAGING_LIBDIR}/.., --without-openssh2, libssh2, libssh2" +PACKAGECONFIG[libz] = "--with-libz=${STAGING_LIBDIR}/.., --without-libz, zlib, zlib" + +#disable/enable packages +PACKAGECONFIG[nping] = ",--without-nping," +PACKAGECONFIG[ncat] = ",--without-ncat," +PACKAGECONFIG[ndiff] = ",--without-ndiff,python" +PACKAGECONFIG[update] = ",--without-nmap-update," + +EXTRA_OECONF = "--with-libdnet=included --with-liblinear=included --without-subversion --with-liblua=included" + +# zenmap needs python-pygtk which has been removed +# it also only works with python2 +# disable for now until py3 is supported +EXTRA_OECONF += "--without-zenmap" + +export PYTHON_SITEPACKAGES_DIR + +do_configure() { + autoconf + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + oe_runconf +} + +FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}/ncat" + +RDEPENDS_${PN} = "python" 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 new file mode 100644 index 000000000..506101711 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch @@ -0,0 +1,100 @@ +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 f13b1795f..20b7fed86 100644 --- a/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb @@ -18,6 +18,7 @@ SRC_URI = "git://github.com/numactl/numactl \ file://Makefile \ file://run-ptest \ file://0001-define-run-test-target.patch \ + file://0001-numademo-fix-error-on-32bit-system.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc index 7d11045ad..8c917e310 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc @@ -2,8 +2,8 @@ DESCRIPTION = "A database migration tool for SQLAlchemy" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=28aaf14a6592d14dbfb2f4abd597aa27" -SRC_URI[md5sum] = "69fb6b25923d4f1e3c392447b342e358" -SRC_URI[sha256sum] = "4a4811119efbdc5259d1f4c8f6de977b36ad3bcc919f59a29c2960c5ef9149e4" +SRC_URI[md5sum] = "7cdba960544ecb59fd74e6433d82036c" +SRC_URI[sha256sum] = "5609afbb2ab142a991b15ae436347c475f8a517f1610f2fd1b09cdca7c311f3f" PYPI_PACKAGE = "alembic" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.1.0.bb deleted file mode 100644 index efcb2b1de..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.1.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-alembic.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.2.0.bb new file mode 100644 index 000000000..efcb2b1de --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_1.2.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-alembic.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack.inc index 3a97042e0..adf5c3e9f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack.inc @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751" PYPI_PACKAGE = "msgpack" inherit pypi -SRC_URI[md5sum] = "1b96537be6f5186fed0d131aaa59ef26" -SRC_URI[sha256sum] = "4008c72f5ef2b7936447dcb83db41d97e9791c83221be13d5e19db0796df1972" +SRC_URI[md5sum] = "ba46fdee995565f40e332bd7eea882f1" +SRC_URI[sha256sum] = "ea3c2f859346fcd55fc46e96885301d9c2f7a36d453f5d8f2967840efa1e1830" RDEPENDS_${PN}_class-target += "\ ${PYTHON_PN}-io \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack_0.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack_0.6.1.bb deleted file mode 100644 index 2c2c8f2ad..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack_0.6.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-msgpack.inc -inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack_0.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack_0.6.2.bb new file mode 100644 index 000000000..2c2c8f2ad --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack_0.6.2.bb @@ -0,0 +1,2 @@ +require python-msgpack.inc +inherit setuptools diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc index 32cb50ce1..ceadcb20d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://python-requests.org" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=1d457bcffb9661b45f799d4efee72f16" -SRC_URI[md5sum] = "ffea8bdc4eee054df2f9f6a9c3752567" -SRC_URI[sha256sum] = "d9031ea45fdfacbe59a99273e9f0448ddb33c1580fe3831c1b09557c5718977c" +SRC_URI[md5sum] = "89b1a6865c61bae67a32417517612ee6" +SRC_URI[sha256sum] = "3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0" PYPI_PACKAGE = "PySocks" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.7.0.bb deleted file mode 100644 index 8a24e4c49..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.7.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-pysocks.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.7.1.bb new file mode 100644 index 000000000..8a24e4c49 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.7.1.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-pysocks.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc index 5f3e60eef..576361c41 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://pytest.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=640061b8cee64b308a4d2f9f556c12f2" -SRC_URI[md5sum] = "90fec5504fcebc5d1081bcd654df7cf0" -SRC_URI[sha256sum] = "b78fe2881323bd44fd9bd76e5317173d4316577e7b1cddebae9136a4495ec865" +SRC_URI[md5sum] = "79efe2708aa73dd5c618e5a89d80ce58" +SRC_URI[sha256sum] = "cc6620b96bc667a0c8d4fa592a8c9c94178a1bd6cc799dbb057dfd9286d31a31" SRC_URI_append = " file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.2.bb deleted file mode 100644 index 39e50aca9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -inherit pypi setuptools -require python-pytest.inc - -RDEPENDS_${PN}_class-target += " \ - ${PYTHON_PN}-argparse \ - ${PYTHON_PN}-compiler \ - ${PYTHON_PN}-funcsigs \ -" -ALTERNATIVE_PRIORITY = "10" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.3.bb new file mode 100644 index 000000000..39e50aca9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_5.1.3.bb @@ -0,0 +1,9 @@ +inherit pypi setuptools +require python-pytest.inc + +RDEPENDS_${PN}_class-target += " \ + ${PYTHON_PN}-argparse \ + ${PYTHON_PN}-compiler \ + ${PYTHON_PN}-funcsigs \ +" +ALTERNATIVE_PRIORITY = "10" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc index e8cb1ae6e..8825e2f4a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc @@ -3,8 +3,8 @@ HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=65715c2eb961313d71b297dd5a04f85e" -SRC_URI[md5sum] = "f09e95a5c42a7cc7ff7cb6a14c55fb69" -SRC_URI[sha256sum] = "dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232" +SRC_URI[md5sum] = "4dac6043f7603c5082ef6d629c6d81b3" +SRC_URI[sha256sum] = "2f3eadfea5d92bc7899e75b5968410b749a054b492d5a6379c1344a1481bc2cb" RDEPENDS_${PN} += "\ ${PYTHON_PN}-certifi \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.3.bb deleted file mode 100644 index 6c81f1db9..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-urllib3.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.5.bb new file mode 100644 index 000000000..6c81f1db9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.25.5.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-urllib3.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.1.0.bb deleted file mode 100644 index e248fe7ce..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.1.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-alembic.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.2.0.bb new file mode 100644 index 000000000..e248fe7ce --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.2.0.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-alembic.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dt-schema_git.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dt-schema_git.bb new file mode 100644 index 000000000..06a9012ca --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dt-schema_git.bb @@ -0,0 +1,15 @@ +SUMMARY = "Tooling for devicetree validation using YAML and jsonschema" +AUTHOR = "Rob Herring" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://setup.py;beginline=2;endline=3;md5=c795d4924c5f739424fa8d9b569c6659" + +inherit setuptools3 + +SRC_URI = "git://github.com/robherring/dt-schema.git" +SRCREV = "5009e47c1c76e48871f5988e08dad61f3c91196b" +PV = "0.1+git${SRCPV}" + +S = "${WORKDIR}/git" + +RDEPENDS_${PN} = "python3-jsonschema python3-ruamel-yaml" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.6.1.bb deleted file mode 100644 index 096d7ddcb..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.6.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -require python-msgpack.inc -inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.6.2.bb new file mode 100644 index 000000000..096d7ddcb --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.6.2.bb @@ -0,0 +1,2 @@ +require python-msgpack.inc +inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.7.0.bb deleted file mode 100644 index bbda05a51..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.7.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -inherit pypi setuptools3 -require python-pysocks.inc - -RDEPENDS_${PN}_class-target += "\ - ${PYTHON_PN}-netclient \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.7.1.bb new file mode 100644 index 000000000..bbda05a51 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.7.1.bb @@ -0,0 +1,6 @@ +inherit pypi setuptools3 +require python-pysocks.inc + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-netclient \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.2.bb deleted file mode 100644 index eba6632a2..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -inherit pypi setuptools3 -require python-pytest.inc - -ALTERNATIVE_PRIORITY = "100" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.3.bb new file mode 100644 index 000000000..eba6632a2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_5.1.3.bb @@ -0,0 +1,4 @@ +inherit pypi setuptools3 +require python-pytest.inc + +ALTERNATIVE_PRIORITY = "100" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.16.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.16.5.bb new file mode 100644 index 000000000..ba095648f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.16.5.bb @@ -0,0 +1,16 @@ +SUMMARY = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order." +AUTHOR = "Anthon van der Neut" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=caf8bd842440b537c044e131785a4666" + +PYPI_PACKAGE = "ruamel.yaml" + +inherit pypi setuptools3 + +SRC_URI[md5sum] = "7d5a5b0a7621a1247b081cc8e4978354" +SRC_URI[sha256sum] = "412a6f5cfdc0525dee6a27c08f5415c7fd832a7afcb7a0ed7319628aed23d408" + +do_install_prepend() { + export RUAMEL_NO_PIP_INSTALL_CHECK=1 +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.3.bb deleted file mode 100644 index 19eb7025b..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-urllib3.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.5.bb new file mode 100644 index 000000000..19eb7025b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.25.5.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-urllib3.inc diff --git a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.9.0.1.bb b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.9.0.1.bb deleted file mode 100644 index a2fbbefee..000000000 --- a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.9.0.1.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Web-based MySQL administration interface" -HOMEPAGE = "http://www.phpmyadmin.net" -# Main code is GPLv2, vendor/tecnickcom/tcpdf is under LGPLv3, js/jquery is under MIT -LICENSE = "GPLv2 & LGPLv3 & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=5c87b66a5358ebcc495b03e0afcd342c \ - file://js/vendor/jquery/MIT-LICENSE.txt;md5=e43aa437a6a1ba421653bd5034333bf9 \ -" - -SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ - file://apache.conf \ -" - -SRC_URI[md5sum] = "45629bb2ffe0f3501a0d3b8f73d6371c" -SRC_URI[sha256sum] = "e3de59f913c095433c8f6466f8826dfde09b097cfac78b665ddef9ddc03b0ed6" - -UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/" -UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P\d+(\.\d+)+)-all-languages.tar.xz" - -S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" - -inherit allarch - -do_install() { - install -d ${D}${datadir}/${BPN} - cp -R --no-dereference --preserve=mode,links -v * ${D}${datadir}/${BPN} - chown -R root:root ${D}${datadir}/${BPN} - # Don't install patches to target - rm -rf ${D}${datadir}/${BPN}/patches - - install -d ${D}${sysconfdir}/apache2/conf.d - install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf - - # Remove a few scripts that explicitly require bash (!) - rm -f ${D}${datadir}/phpmyadmin/libraries/transformations/*.sh -} - -FILES_${PN} = "${datadir}/${BPN} \ - ${sysconfdir}/apache2/conf.d" - -RDEPENDS_${PN} += "bash php-cli" diff --git a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.9.1.bb b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.9.1.bb new file mode 100644 index 000000000..3da2d9ba2 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.9.1.bb @@ -0,0 +1,41 @@ +SUMMARY = "Web-based MySQL administration interface" +HOMEPAGE = "http://www.phpmyadmin.net" +# Main code is GPLv2, vendor/tecnickcom/tcpdf is under LGPLv3, js/jquery is under MIT +LICENSE = "GPLv2 & LGPLv3 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=dd6470bbcd3436ca317f82d34abaf688 \ + file://js/vendor/jquery/MIT-LICENSE.txt;md5=e43aa437a6a1ba421653bd5034333bf9 \ +" + +SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ + file://apache.conf \ +" + +SRC_URI[md5sum] = "a165109629731f5311ec3171cce50972" +SRC_URI[sha256sum] = "8f89dd62e3fdddabca187b092eeb5af4a4fb956189564c56038970519d0496c5" + +UPSTREAM_CHECK_URI = "https://www.phpmyadmin.net/downloads/" +UPSTREAM_CHECK_REGEX = "phpMyAdmin-(?P\d+(\.\d+)+)-all-languages.tar.xz" + +S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" + +inherit allarch + +do_install() { + install -d ${D}${datadir}/${BPN} + cp -R --no-dereference --preserve=mode,links -v * ${D}${datadir}/${BPN} + chown -R root:root ${D}${datadir}/${BPN} + # Don't install patches to target + rm -rf ${D}${datadir}/${BPN}/patches + + install -d ${D}${sysconfdir}/apache2/conf.d + install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf + + # Remove a few scripts that explicitly require bash (!) + rm -f ${D}${datadir}/phpmyadmin/libraries/transformations/*.sh +} + +FILES_${PN} = "${datadir}/${BPN} \ + ${sysconfdir}/apache2/conf.d" + +RDEPENDS_${PN} += "bash php-cli" -- cgit v1.2.3