From 9aee50030142f0352e48fd0b14b3aab4e7efa158 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 30 Mar 2022 16:27:02 +0000 Subject: subtree updates march 30 2022 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit meta-raspberrypi: e39a0a570c..c06ae5eacf: Andrei Gherzan (7): linux-raspberrypi: linux-raspberrypi: Bump 5.10 to 5.10.95 linux-raspberrypi: linux-raspberrypi: Bump 5.15 revision raspberrypi-firmware.inc: Move to using tarballs from rpi deb repo rpi-base.inc: Cleanup redundant imgtyp variable sdcard_image-rpi.bbclass: Use processed list of device trees docs: Update www.raspberrypi.com documentation links linux-raspberrypi: Bump 5.15 recipe to 5.15.30 Khem Raj (10): python3-adafruit-circuitpython-register: Define PIP_INSTALL_PACKAGE python3-adafruit-pureio: Fix build with wheel python3-rtimu: Port to using setuptools and fix build with wheel python3-adafruit-platformdetect: Fix build with wheel linux-raspberrypi_5.15.bb: Upgrade to 5.15.25 rpi-gpio: Port to PEP-517 packaging linux-raspberrypi_5.15.bb: Update to 5.15.26 linux-raspberrypi: Update to 5.15.27 python: Unbolt wheel packaging PIP_INSTALL_PACKAGE band-aids linux-raspberrypi: Update to 5.15.28 Matthias Klein (1): u-boot: always set fdt_addr with firmware-provided FDT address meta-security: 6cc8dde794..da93339112: Akshay Bhat (1): meta-security-isafw: Fixes to work with oe-core master Armin Kuster (16): README.md: fix typo packagegroup-security-tpm: Fix QA Error apparmor: update to 3.0.4 layer.conf: enable apparmor for qemu machine parsec-service: Only enable TPM is layer and DISTRO_FEATURE is defined. python3-privacyidea: fix QA ERROR python3-privacyidea: update to 3.6.2 openscap-daemon: fix wheels and License issues. swtpm: update to 0.7.1 libtpm: update to 0.9.2 ima-evm-keys: don't use lnr tpm-tools: Fix pod2man race tpm2-tss: fix user perms python3-fail2ban: fix SPDX license. python3-privacyidea: drop old package ref. kas-security-alt: drop rust layer Ashish Sharma (1): Subject: [PATCH] Subject: python3-fail2ban: switch to legacy setuptools3 meta-openembedded: cf0ed42391..9a52bfc4a6: Adrian Freihofer (6): networkmanager: switch to meson networkmanager: new configure options libqrtr-glib: add new recipe libqmi: switch to meson and git modemmanager: update 1.16.8 -> 1.18.6 networkmanager: replace deprecated licenses Alejandro Enedino Hernandez Samaniego (1): meta-python: Clean up recipes and classes that were moved to oe-core Andreas Müller (3): vlc: upgrade 3.0.12 -> 3.0.17-1 to fix build with ffmpeg5 gnome-tweaks: Fix build on latest meson gnome-shell-extensions: Fix build with latest meson Andrej Valek (1): nodejs: add option to use openssl legacy providers again Anu Deepthika, Nandipati (2): usbguard: Add inital recipe usbguard: package simplification Armin Kuster (1): pw-am.sh: update to new patcwork system Carlos Rafael Giani (1): libopenmpt: Upgrade to version 0.6.2 Changqing Li (1): hstr: add new recipe Christian Eggers (3): libiio: update to version 0.23 boost-sml: 1.1.4+git --> 1.1.5 graphviz: don't clear PACKAGECONFIG for nativesdk Daniel Gomez (5): python3-flask-versioned: Fix PYPA_WHEEL name v4l-utils: Update 1.20.0 -> 1.22.1 opencl-icd-loader: Update 2020.12.18 -> v2022.01.04 opencl-headers: Update v2020.12.18 -> v2022.01.04 opencl-clhpp: Update 2.0.15 -> 2.0.16 Jeremy A. Puhlman (1): nspr-native: fix ubuntu 18.04 builds using system gcc. Jeremy Puhlman (1): nspr-native: build correclty with extended buildtools. Jiaqing Zhao (2): libesmtp: bump 1.0.6 -> 1.1.0 esmtp: fix libesmtp dependency check Julian Haller (1): nlohmann-json: Set CVE_PRODUCT according to NVD Justin Bronder (17): python3-crc32c: add 2.2.post0 python3-feedformatter: drop recipe python3-coloredlogs: fix location of coloredlogs.pth python3-bitarray: switch to setuptools python3-kivy: fix wheel build python3-astor: fix wheel build python3-crcmod: use setuptools instead of distutils python3-gcovr: fix wheel build python3-prctl: fix wheel build python3-ntplib: pull from PyPI python3-lrparsing: use setuptools instead of distutils python3-configshell-fb: set PIP_INSTALL_PACKAGE python3-pyscaffold: fix wheel build and license python3-pyserial-asyncio: add 0.6 python3-pymodbus: add 2.5.3 python3-asyncinotify: add 2.0.2 python3-pymodbus: add asyncio to package config Kai Kang (9): cairomm: correct SRC_URI networkmanager: fix installed-vs-shipped error python3-pydot: add recipe python3-blivet: use setuptools_legacy Revert "python3-ipy: drop recipe" wxwidgets: fix libdir for multilib wxwidgets: fix install errors graphviz: 2.44.1 -> 2.50.0 graphviz: add pkg_postinst script Kas User (1): netdata: added enable/disable cloud config. Khem Raj (131): python3-apt: Point PYPA_WHEEL to custom location python3-pycups: Inherit setuptools_build_meta python3-anyjson: Drop recipe Revert "python3-twofish: drop recipe" cxxtest: Define PIP_INSTALL_DIST_PATH sanlock: Fix build with wheels on guider: Set PYPA_WHEEL unattended-upgrades: Migrate to use wheels python3-scapy: Define custom PYPA_WHEEL python3-termcolor: Use setuptools instead of distutils cyrus-sasl: Fix ptest builds bluepy: Define custom PYPA_WHEEL ufw: Upgrade to 0.36.1 bugfix release catfish: Fix wheel build menulibre: Inherit distutils3 onboard: Inherit setuptools3-base instead of setuptools3 python3-xmodem: Move docs to /usr/share/doc python3-blivet: Upgrade to 3.4.3 python3-pytest-runner: Define PIP_INSTALL_PACKAGE python3-setuptools-rust-native: Define PIP_INSTALL_PACKAGE python3-dateutil: Define PIP_INSTALL_PACKAGE python3-poetry-core: Define PIP_INSTALL_PACKAGE python3-keras-applications: Define PIP_INSTALL_PACKAGE python3-pymetno: Define PIP_INSTALL_PACKAGE python3-cson: Define PIP_INSTALL_PACKAGE python3-dbussy: Define PIP_INSTALL_PACKAGE python3-txws: Define PIP_INSTALL_PACKAGE python3-aws-iot-device-sdk-python: Upgrade to 1.5.0 python3-blivetgui: Upgrade to 2.3.0 python3-blivet: Adjust install location for binaries and systemd units python3-slip-dbus: Fix build with wheel packaging xfce4-terminal: Add missing gtk-doc dependency recipes: Update LICENSE variable to use SPDX license identifiers recipes: Update LICENSE variable to use SPDX license identifiers recipes: Update LICENSE variable to use SPDX license identifiers recipes: Update LICENSE variable to use SPDX license identifiers recipes: Update LICENSE variable to use SPDX license identifiers recipes: Update LICENSE variable to use SPDX license identifiers recipes: Update LICENSE variable to use SPDX license identifiers recipes: Update LICENSE variable to use SPDX license identifiers recipes: Update LICENSE variable to use SPDX license identifiers recipes: Update LICENSE variable to use SPDX license identifiers unattended-upgrades: Inherit setuptools3_legacy menulibre: Inherit setuptools3_legacy libbpf: Enable builds for riscv64 pcp: Enable check for x11 distro feature gfbgraph: Check for x11 distro feature gedit: Fix REQUIRED_DISTRO_FEATURES to not overwrite x11 thunar-shares-plugin: Check for x11 in distro features tepl: Check for x11 in distro features geary: Check for x11 in distro features packagegroup-xfce-multimedia: Check for x11 distro feature fbida: Fix build when x11 is not enabled in distro features python3-crc32c: set target platform via setup.cfg python3-pyruvate: Fix build on riscv32 libdc1394: Change dependency from virtual/libgl to virtual/egl boinc-client: Depend on virtual/egl instead of virtual/libgl libsdl2-ttf: Change depenendency from virtual/libgl to virtual/egl Revert "python3-smbus: fix wheel build" catfish: Do not set PYPA_WHEEL libcereal: Disable Werror with ptests ttf-vlgothic: Specify accurate BSD license type pcp: Upgrade to 5.3.6 pcp: Do not search headers on build host during cross compile libcereal: Link libatomics on mips for ptests nodejs: Disable for powerpc gimp: Disable vector icons on ppc capnproto: Link in libatomic on ppc rocksdb: Use new atomic builtins on powerpc as well fwts: Upgrade to 22.01.00 fwts: Do not use --as-needed on ppc64 python3-poetry-core: Setting PIP_INSTALL_PACKAGE is no longer needed python3-grpcio, python3-grpcio-tools: Upgrade to 1.44.0 packagegroup-meta-python: Do not exclude python3-grpcio python3-grpcio-tools for ppc64 python3-pyrad: Change poetry bbclass inherit to match oe-core python3-bcrypt: Remove python3-psutil: Remove abseil: Upgrade to 20211102.0 LTS release python3-kiwisolver: Upgrade to 1.4.0 python3-pyruvate: Update libc to 0.2.120 python3-chardet: Remove python3-pytest-runner: Remove php: Fix build on rv32/musl recipes: Adjust for renaming flit_core -> python_flit_core libgphoto: Fix build with libtool 2.4.7 monit: Fix build with libtool 2.4.7 uim: Fix build with libtool 2.4.7 libbpf: Enable on ppc64 librdkafka: Use CMAKE_INSTALL_LIBDIR liburing: Define libdir based on environment variable http-parser: Define LIBDIR msgpack-cpp: Upgrade to 4.1.1 release weechat: Define LIBDIR json-schema-validator: Use GNUInstallDirs in cmake redis-plus-plus: Use GNUInstallDirs in cmake libiec61850: Use GNUInstallDirs in cmake paho-mqtt-cpp: Use CMAKE_INSTALL_LIBDIR in cmake sqlite-orm: Define cmake variable defaults duktape: Upgrade to 2.7.0 cockpit: Package missing nonarch_libdir unattended-upgrades: Package nonarch_libdir for systemd files fsverity-utils: Define LIBDIR luaposix: Fix INST_LIBDIR to honor libdir var uml-utilities: Define LIB_DIR to be libdir relative libsquish: Define LIBDIR knob io-compress-lzma-perl,io-compress-perl: Do not mark allarch luajit: Upgrade to latest on v2.1 branch libcppkafka: Use CMAKE_INSTALL_LIBDIR instead of hardcoding lib lvgl,lv-lib-png,lv-drivers: Pass libdir via LIB_INSTALL_DIR to cmake geany-plugins: Do not overwrite OE's pkg-config env io-compress-lzma-perl, io-compress-perl: Rename to use debian names projucer: Upgrade to 6.1.6 grpc: Enable cpp plugin for target version too sysdig: Upgrade to 0.28.0 libsquish: Fix build when libdir != 'lib' valijson: move out of hard dep on meta-networking mariadb: Add missing dependency on lzo mariadb: Enable openSSL and use as default SSL option mariadb: Align atomic ops to help clang on x86 folks: Upgrade to 0.15.5 geary: Fix build failures with latest vala netdata: Fix override separator syntax iniparser: Update to latest tip of trunk ndctl: Upgrade to v73 rocksdb: Exclude on ppc/musl gsl: Disable on musl/ppc a2jmidid: Fix build on ppc/musl abseil-cpp: Fix ppc/musl patch gperftools: Disable cpu profiles for ppc/musl pmdk: Fix build with newer ndctl duktape: Use baselib to construct LIBDIR Leon Anavi (10): python3-prettytable: Upgrade 2.4.0 -> 3.1.1 python3-transitions: Upgrade 0.8.10 -> 0.8.11 python3-charset-normalizer: Upgrade 2.0.10 -> 2.0.12 python3-semantic-version: Upgrade 2.8.5 -> 2.9.0 python3-networkx: Upgrade 2.6.3 -> 2.7 python3-h11: Upgrade 0.12.0 -> 0.13.0 python3-humanize: Upgrade 3.14.0 -> 4.0.0 python3-typed-ast: Upgrade 1.4.3 -> 1.5.2 python3-bandit: Upgrade 1.7.2 -> 1.7.4 xbindkeys: Add recipe Macpaul Lin (1): android-tools: adb: add u3 ss descriptor support Markus Volk (6): gjs: update; customize dependencies gnome-disk-utility: disable build of man pages evolution-data-server: update to v3.43.1 libvdpau: allow to build native and nativesdk crossguid: update blueman: update; add missing RDEPENDS Matthias Klein (1): python3-smbus: fix wheel build Mikko Rapeli (2): polkit: add patches for CVE-2021-4034 and CVE-2021-4115 polkit: switch from mozjs to duktape javascript engine Mingli Yu (4): gosu: add new recipe redis: remove fuzz warning libcereal: add ptest support mariadb: Upgrade to 10.7.3 Peter Bergin (1): wireplumber: backport fix for default device setting Peter Kjellerstedt (1): net-snmp: Avoid running `make clean` as it may fail Preeti Sachan (1): live555: Fix rdepends of live555-dev Radovan Scasny (1): proftpd: update to 1.3.7c Randy MacLeod (7): libyang: update from 2.0.7 to 2.0.164 iperf3: upgrade from 3.9 to 3.11 syslog-ng: update from 3.31.2 to 3.26.1 mcelog: update from 175 to 180 haveged: update from 1.9.14 to 1.9.17 pv: update from 1.6.6 to 1.6.20 edac-utils: update to latest git head Richard Hughes (1): fwupd: New release Robert Joslyn (2): hwdata: Update to 0.357 stunnel: Update to 5.63 Ross Burton (23): layer.conf: change layer priority to match oe-core ufw: port to setuptools, use setuptools_legacy unattended-upgrades: remove PYPA_WHEEL python3-blivetgui: use setuptools_legacy python3-meh: fix HOMEPAGE python3-meh: use setuptools_legacy python3-poetry-core: self-bootstrap poetry-core: clean up class python3-pystache: remove, unmaintained python3-configparser: remove, not needed for Python 3 python3-backports-functional-lru-cache: remove, not needed for Python 3 python3-pyzmq: clean up recipe python3-pycurl: fix DEPENDS python3-twisted: remove empty PN-src and PN-dbg python3-pylint: upgrade to 2.12.2 meta-python: migrate away from setuptool3 where possible packagegroup-meta-python: add poetry-core and unattended-upgrade meta-*: remove obsolete PYPA_WHEEL and PIP_INSTALL_PACKAGE assignments poetry_core: update for renamed class pip_install_wheel to python_pep517 sanlock: update patch status Update for setuptools_build_meta renamed to python_setuptools_build_meta python3-lz4: use system lz4 library python3-lz4: add ptest S. Lockwood-Childs (2): gyp: fix for compatibility with Python 3.10 (part 2) devmem2: patches have been upstreamed Samuli Piippo (3): python3-path: add recipe python3-antlr4-runtime: add recipe python3-qface: add recipe Scott Murray (13): python3-babel: Remove python3-certifi: Remove python3-ndg-httpsclient: Remove python3-pyasn1: Remove python3-pyopenssl: Remove python3-pysocks: Remove python3-requests: Remove python3-urllib3: Remove mpd: upgrade to 0.23.6 libmpdclient: upgrade to 2.20 mpc: upgrade to 0.34 ncmpc: upgrade to 0.46 polkit: Fix build with libtool 2.4.7 Stefan Herbrechtsmeier (4): grpc: Remove runtime dependency between grpc and protobuf-compiler spdlog: remove header-only leftover nginx: add gunzip PACKAGECONFIG openldap: correct slapd systemd service support Theodore A. Roth (1): python3-marshmallow: fix wheel build Tim Orling (40): python3-setuptools-rust-native: fix wheel build python3-cryptography: fix wheel build python3-pyruvate: fix wheel build python3-backcall: inherit flit_core python3-distutils-extra; merge inc, fix wheel build python3-ptyprocess: inherit flit_core python3-pyserial: also remove /usr/bin/__pycache__ python3-twisted: also ship Twisted-*.dist-info python3-pillow: fix wheel build python3-xlrd: fix wheel build python3-pykickstart: fix wheel build python3-twofish: drop recipe python3-monotonic: fix wheel build python3-geomet: fix wheel build python3-pako: remove duplicate LICENSE python3-configobj: backport patch for setuptools python3-systemd: patch to use setuptools python3-twofish: patch to use setuptools python3-sdnotify: patch to use setuptools python3-pynetlinux: patch to use setuptools python3-pyiface: upgrade to latest git python3-meh: patch to use setuptools distutils*.bbclass: move from oe-core python3-ipy: drop recipe python3-poetry-core: add v1.0.8 python3-dnspython: inherit poetry_core python3-pkgconfig: inherit poetry_core python3-iso8601: inherit poetry_core python3-rsa: inherit poetry_core python3-isort: inherit poetry_core python3-pymisp: inherit poetry_core python3-aiofiles: inherit poetry_core poetry_core: add helper class python3-iso8601: move to oe-core python3-ply: move to oe-core python3-poetry-core: move to oe-core python3-pretend: move to oe-core python3-pytest-subtests: move to oe-core python3-pytz: move to oe-core packagegroup-meta-python: drop recipes moved to core Tom Hochstein (1): python3-pybind11: Override pip install variables Trevor Gamblin (9): python3-django: upgrade 3.2.11 -> 3.2.12 python3-django: upgrade 4.0.1 -> 4.0.2 python3-pytest-lazy-fixture: add recipe python3-prettytable: add python3-pytest-lazy-fixture to ptest RDEPENDS packagegroup-meta-python: add python3-pytest-lazy-fixture grpc: upgrade 1.41.1 -> 1.45.0 python3-protobuf: upgrade 3.19.3 -> 3.19.4 python3-h5py: upgrade 3.5.0 -> 3.6.0 python3-paramiko: upgrade 2.9.2 -> 2.10.3 Vyacheslav Yurkov (1): sdbus-c++: disable code generation tools Wang Mingyu (81): python3-websockets: upgrade 10.1 -> 10.2 python3-websocket-client: upgrade 1.2.3 -> 1.3.1 python3-xlsxwriter: upgrade 3.0.2 -> 3.0.3 python3-socketio: upgrade 5.5.1 -> 5.5.2 python3-sentry-sdk: upgrade 1.5.3 -> 1.5.6 babl: upgrade 0.1.88 -> 0.1.90 gegl: upgrade 0.4.34 -> 0.4.36 cyrus-sasl: upgrade 2.1.27 -> 2.1.28 networkmanager: upgrade 1.34.0 -> 1.36.0 bats: upgrade 1.5.0 -> 1.6.0 cukinia: upgrade 0.5.1 -> 0.6.0 iwd: upgrade 1.24 -> 1.25 freerdp: upgrade 2.5.0 -> 2.6.0 openconnect: upgrade 8.10 -> 8.20 libcereal: upgrade 1.3.1 -> 1.3.2 poco: upgrade 1.11.0 -> 1.11.1 poppler: upgrade 22.02.0 -> 22.03.0 smartmontools: upgrade 7.2 -> 7.3 python3-autobahn: upgrade 22.1.1 -> 22.2.2 python3-cheetah: upgrade 3.2.6.post1 -> 3.2.6.post2 python3-django: upgrade 2.2.26 -> 2.2.27 python3-httplib2: upgrade 0.20.2- > 0.20.4 python3-icu: upgrade 2.8 -> 2.8.1 python3-jsonrpcserver: upgrade 5.0.3 -> 5.0.6 python3-lxml: upgrade 4.7.1 -> 4.8.0 python3-pyscaffold: upgrade 4.1.4 -> 4.1.5 python3-redis: upgrade 4.1.1 -> 4.1.4 python3-scrypt: upgrade 0.8.19 -> 0.8.20 python3-tqdm: upgrade 4.62.3 -> 4.63.0 python3-twisted: upgrade 22.1.0 -> 22.2.0 python3-waitress: upgrade 2.0.0 -> 2.1.0 python3-astroid: upgrade 2.9.3 -> 2.10.0 python3-bitarray: upgrade 2.3.7 -> 2.4.0 python3-aws-iot-device-sdk-python: upgrade 1.5.0-> 1.5.1 python3-imageio: upgrade 2.16.0 -> 2.16.1 python3-python-vlc: upgrade 3.0.12118 -> 3.0.16120 python3-pymisp: upgrade 2.4.152 -> 2.4.155.1 python3-networkx: upgrade 2.7 -> 2.7.1 python3-pychromecast: upgrade 10.2.3 -> 10.3.0 smbnetfs: upgrade 0.6.1 -> 0.6.3 python3-astroid: upgrade 2.10.0 -> 2.11.0 python3-bitstruct: upgrade 8.12.1 -> 8.13.0 python3-cppy: upgrade 1.1.0 -> 1.2.0 python3-dnspython: upgrade 2.2.0 -> 2.2.1 libiec61850: upgrade 1.5.0 -> 1.5.1 evince: upgrade 41.3 -> 41.4 networkmanager-openvpn: upgrade 1.8.16 -> 1.8.18 networkmanager: upgrade 1.36.0 -> 1.36.2 weechat: upgrade 3.4 -> 3.4.1 freerdp: upgrade 2.6.0 -> 2.6.1 libvdpau: upgrade 1.4 -> 1.5 python3-itsdangerous: upgrade 2.1.0 -> 2.1.1 python3-jsonrpcserver: upgrade 5.0.6 -> 5.0.7 gjs: upgrade 1.71.1 -> 1.72.0 gvfs: upgrade 1.49.1 -> 1.50.0 nautilus: upgrade 41.2 -> 42.0 gnome-disk-utility: upgrade 41.0 -> 42.0 gnome-photos: upgrade 40.0 -> 42.0 gnome-system-monitor: upgrade 41.0 -> 42.0 metacity: upgrade 3.42.0 -> 3.44.0 graphene: upgrade 1.10.6 -> 1.10.8 libpeas: upgrade 1.30.0 -> 1.32.0 php: upgrade 8.1.3 -> 8.1.4 iwd: upgrade 1.25 -> 1.26 libgsf: upgrade 1.14.48 -> 1.14.49 libjcat: upgrade 0.1.10 -> 0.1.11 libqb: upgrade 2.0.4 -> 2.0.6 libwacom: upgrade 2.1.0 -> 2.2.0 stm32flash: upgrade 0.6 -> 0.7 babl: upgrade 0.1.90 -> 0.1.92 libxmlb: upgrade 0.3.7 -> 0.3.8 monit: upgrade 5.31.0 -> 5.32.0 python3-astroid: upgrade 2.11.0 -> 2.11.2 python3-autobahn: upgrade 22.2.2 -> 22.3.2 python3-pylint: upgrade 2.12.2 -> 2.13.2 python3-pymisp: upgrade 2.4.155.1 -> 2.4.157 python3-redis: upgrade 4.1.4 -> 4.2.0 python3-robotframework: upgrade 4.1.3 -> 5.0 python3-tqdm: upgrade 4.63.0 -> 4.63.1 python3-watchdog: upgrade 2.1.6 -> 2.1.7 python3-pytest-metadata: upgrade 1.11.0 -> 2.0.1 Xu Huan (18): python3-lz4: upgrade 3.1.10 -> 4.0.0 python3-mccabe: upgrade 0.6.1 -> 0.7.0 python3-pillow: upgrade 9.0.0 -> 9.0.1 python3-snappy upgrade 0.6.0 -> 0.6.1 python3-twine: upgrade 3.7.1 -> 3.8.0 python3-xxhash: upgrade 2.0.2 -> 3.0.0 python3-txaio: upgrade 21.2.1 -> 22.2.1 python3-regex :upgrade 2021.11.10 -> 2022.3.2 python3-pywbemtools: upgrade 0.9.1 -> 1.0.0 python3-pymongo: upgrade 4.0.1 -> 4.0.2 python3-wrapt: upgrade 1.13.3 -> 1.14.0 python3-sqlalchemy: upgrade 1.4.31 -> 1.4.32 python3-sentry-sdk: upgrade 1.5.6 -> 1.5.7 python3-alembic: upgrade 1.7.6 -> 1.7.7 python3-arpeggio: upgrade 1.10.2 -> 2.0.0 python3-cachetools: upgrade 4.2.4 -> 5.0.0 python3-cantools: upgrade 37.0.1 -> 37.0.7 python3-intervals: upgrade 1.10.0.post1 -> 1.10.0 Yi Zhao (5): netplan: fix parallel build failure nftables: upgrade 1.0.1 -> 1.0.2 postfix: upgrade 3.6.4 -> 3.6.5 dhcp-relay: upgrade 4.4.2p1 -> 4.4.3 apache2: upgrade 2.4.52 -> 2.4.53 Zoltán Böszörményi (1): nodejs: Upgrade to 16.14.0 wangmy (3): python3-waitress: upgrade 2.1.0 -> 2.1.1 openvpn: upgrade 2.5.5 -> 2.5.6 rrdtool: upgrade 1.7.2 -> 1.8.0 poky: 49168f5d55..5fe3689f4f: Ahmad Fatoum (1): kernel-fitimage: allow overriding FIT configuration prefix Alejandro Hernandez Samaniego (1): initramfs-framework: Add overlayroot module Alexander Kanavin (36): sstate: do not add TARGET_ARCH to pkgarch for cross recipes. OELAYOUT_ABI: bump, avoid tmp/ breakage by removing old cross manifests libsndfile1: correct upstream version check libarchive: correct upstream version check glslang/spirv: synchronize with the rest of vulkan items rust: update 1.58.1 -> 1.59.0 librsvg: update 2.52.5 -> 2.52.6 xwayland: update 21.1.4 -> 22.1.0 apt: upgrade 2.2.4 -> 2.4.0 kea: upgrade 2.0.1 -> 2.0.2 python3-cython: upgrade 0.29.27 -> 0.29.28 diffoscope: upgrade 204 -> 206 harfbuzz: upgrade 3.4.0 -> 4.0.0 libsecret: upgrade 0.20.4 -> 0.20.5 vulkan: upgrade 1.3.204.0 -> 1.3.204.1 mmc-utils: upgrade to latest revision webkitgtk: upgrade 2.34.5 -> 2.34.6 openssh: update 8.8 -> 8.9 sysklogd: nobranch in SRC_URI is no longer necessary libuv: fix upstream version check bind: all even versions now get long term maintenance windows dbus-test: merge into main dbus recipe dbus: merge dbus.inc into the recipe dbus: update 1.12.22 -> 1.14.0 python3-semantic-version: fix upstream verison check python3-typing-extensions: fix upstream version check bind: update 9.16.26 -> 9.18.1 perl-cross: update 1.3.6 -> 1.3.7 perl: update 5.34.0 -> 5.34.1 diffoscope: upgrade 206 -> 207 gtk+3: upgrade 3.24.31 -> 3.24.33 squashfs-tools: correct upstream version check meson: upgrade 0.61.2 -> 0.61.3 mtools: upgrade 4.0.37 -> 4.0.38 sqlite3: upgrade 3.38.0 -> 3.38.1 python3-sphinx-rtd-theme: correct upstream version check Alexandre Belloni (1): scripts/patchreview: handle Inactive-Upstream status Andrew Jeffery (5): rust: Introduce arch_to_rust_arch() rust: Introduce RUST_BUILD_ARCH rust: Add snapshot checksums for powerpc64le ipk: Import re in manifest module ipk: Decode byte data to string in manifest handling Bill Pittman (1): wic: Use custom kernel path if provided Bruce Ashfield (19): linux-yocto/5.15: riscv64: drop MAXPHYSMEM_128GB linux-yocto/5.10: features/zram: remove CONFIG_ZRAM_DEF_COMP linux-yocto/5.15: update to v5.15.24 linux-yocto/5.10: update to v5.10.101 linux-yocto/5.10: Fix ramoops/ftrace linux-yocto/5.15: arm defconfig fixes linux-yocto/5.15: update to v5.15.26 linux-yocto/5.10: update to v5.10.103 linux-yocto/5.15: riscv32: drop MAXPHYSMEM_1GB linux-yocto: nohz_full boot arg fix linux-yocto/5.10: split vtpm for more granular inclusion linux-yocto/5.15: split vtpm for more granular inclusion linux-yocto/5.10: cfg/debug: add configs for kcsan linux-yocto/5.15: cfg/debug: add configs for kcsan linux-yocto/5.15: update to v5.15.27 linux-yocto-rt/5.15: update to -rt34 linux-yocto-rt/5.10: update to -rt61 linux-yocto/5.15: update to v5.15.30 linux-yocto/5.10: update to v5.10.107 Carlos Rafael Giani (1): libsdl2: Add libunwind-native to the libsdl2-native DEPENDS Changhyeok Bae (2): repo: upgrade 2.21 -> 2.22 mobile-broadband-provider-info: upgrade 20210805 -> 20220315 Chen Qi (1): multilib_global.bbclass: fix setting preferred version for canadian recipes Christian Eggers (7): license: expand_wildcard_licenses: add AGPL-3.0* wildcard ref-manual: INCOMPATIBLE_LICENSE: use new license wildcards glib-2.0: upgrade 2.70.4 -> 2.72.0 rust-common: override RUST_LIBC for crosssdk machine-sdk: clear ABIEXTENSION for class-crosssdk rust-crosssdk: use ${RUST_LIBC} in ${PN} librsvg: reenable nativesdk Claudius Heine (4): overlayfs: add systemd unit path prefix to FILES:${PN} array overlayfs-etc: add condition to package-management feature conflict files: overlayfs-etc: wrap long lines of preinit file files: overlayfs-etc: add overlay mount options to preinit Daniel Gomez (1): bitbake: contrib: Add Dockerfile for building PR service Daniel Wagenknecht (4): copy_buildsystem: allow more layer paths bitbake: fetch2: ssh: username and password are optional bitbake: fetch2: ssh: fix path handling bitbake: fetch2: ssh: support checkstatus David Reyna (4): bitbake: toaster: Add 'Kirkstone', 'Honister', and 'Hardknott'. Remove 'Dunfell' and 'Gatesgarth'. bitbake: toaster: automation to generate fixture files bitbake: toaster: detect when bitbake crashed bitbake: toaster: race condition for end-of-build Diego Sueiro (1): grub-efi: Add option to include all available modules Joe Slater (5): zip: modify when match.S is built weston: require wayland as a distro feature expect: modify fixline1 script weston: use same distro features for weston and westion-init libxml2: fix CVE-2022-23308 regression Jose Quaresma (18): icecc.bbclass: enable networking in all tasks buildhistory.bbclass: create the buildhistory directory when needed Revert "cmake.bbclass: Set CXXFLAGS and CFLAGS" sstate: inside the threadedpool don't write to the shared localdata gstreamer1.0-plugins-base: libgst is already defined on PACKAGES_DYNAMIC gstreamer1.0-plugins-packaging: rename variables gstreamer1.0-plugins-bad/ugly: use the GPL-2.0-or-later only when it is in use gstreamer1.0: upgrade 1.20.0 -> 1.20.1 gstreamer1.0-plugins-base: upgrade 1.20.0 -> 1.20.1 gstreamer1.0-plugins-good: upgrade 1.20.0 -> 1.20.1 gstreamer1.0-plugins-bad: upgrade 1.20.0 -> 1.20.1 gstreamer1.0-plugins-ugly: upgrade 1.20.0 -> 1.20.1 gstreamer1.0-libav: upgrade 1.20.0 -> 1.20.1 gstreamer1.0-omx: upgrade 1.20.0 -> 1.20.1 gstreamer1.0-vaapi: upgrade 1.20.0 -> 1.20.1 gstreamer1.0-rtsp-server: upgrade 1.20.0 -> 1.20.1 gstreamer1.0-python: upgrade 1.20.0 -> 1.20.1 gst-devtools: upgrade 1.20.0 -> 1.20.1 Kai Kang (1): python3-pyparsing: rdepends on python3-html Kamil Dziezyk (1): libacpi: Build libacpi also for 'aarch64' machines Khem Raj (42): musl: Update to latest master libical: Pass TOOLCHAIN_OPTIONS via CFLAGS libical: Do not set CC explicitly for gir compiler insane: Accomodate llvm-objdump systemtap: Enable for riscv64 packagegroup-core-tools-profile: Enable systemtap for riscv64 kmscube: Fix build when x11 is absent in distro features virglrenderer: Depend on virtual/egl zlib: Pass ldflags to configure tests using linking zip: Pass ldflags to configure tests using linking qemu: Fix build when x11 is not in distro features webkitgtk: Fix build when x11 is not in distro features unzip: Pass LDFLAGS to configure tests libtool: Recognise additional linker commandline options passed by clang m4: Fix build on musl/ppc gcompat: Update to latest powerpc32-linux: Remove libc cached variables ppc/siteinfo: Fix differences between musl and glibc gcompat: Do not use static-pie on ppc linux-yocto: Ignore textrels for ppc64 kernel binutils: Bump to latest 2.38 release branch erofs-utils: Use __SANE_USERSPACE_TYPES__ on ppc64 libstd-rs: Fix build on riscv64/musl qemu: Fix build on ppc64 qemuppc64.conf: Disable huge vmalloc qemuppc64: Use smp = 2 libucontext: Upgrade to 1.2 release python3-cryptography: Upgrade to 36.0.2 weston-init: Use pixman on riscv64 qemu openssh: Default to not using sandbox when cross compiling qemuriscv: Use virtio-tablet-pci for mouse weston-init: Use pixman rendering for qemuppc64 qemu: Fix build on systems without MAP_SYNC libsdl2: Depend on virtual/egl piglit: Remove virtual/libgl waffle: Use the right dependencies as needed webkitgtk: Depend on virtual/egl instead of virtual/libgl qemu: Depend on libepoxy instead of virtual/libgl musl: Update to latest master diffutils: Fix build on ppc/musl grep: Fix build on ppc/musl qemu: Disable for ppc32 Konrad Weihmann (2): pip_install_wheel: improve wheel handling setuptools_build_meta: remove python dependency Lee Chee Yang (1): poky.conf: update tested distro Luca Boccassi (3): mount-copybind: fix shellcheck warning mount-copybind: add MOUNT_COPYBIND_AVOID_OVERLAYFS env var to skip OverlayFS volatile-binds: add recipe variable to allow disabling OverlayFS Mark Hatle (2): insane.bbclass: Update insane.bbclass to work on FIPS enabled hosts bitbake: utils/ply: Change md5 usages to work on FIPS enabled hosts Markus Volk (9): libxslt: update to v1.1.35 x86-base.inc: replace intel i965 driver with crocus mesa: update to 22.0.0 gtk+3: remove deprecated option librsvg: inherit vala xf86-video-intel: add dependencies; remove dri1 mesa: align target- and native build libva: make buildable for native and nativesdk wayland: provide wayland-client-native and wayland-protocols-native Marta Rybczynska (3): bitbake: lib/bb: more verbose error message cve-check: add json format cve-check: add coverage statistics on recipes with/without CVEs Michael Halstead (2): releases: update to include 3.3.5 releases: update to include 3.1.15 Michael Olbrich (1): kernel.bbclass: avoid config changes based on the availability of pahole Michael Opdenacker (30): documentation: remove references to prelink support documentation/README: how to upgrade Sphinx packages documentation: individual release note files documentation: release notes for 3.4.2 bitbake: bitbake-user-manual: further override syntax updates bitbake: bitbake-user-manual: add "crate" fetcher bitbake: bitbake-user-manual: stop mentioning the Angstrom distribution bitbake: bitbake-user-manual: add note about the old syntax for OVERRIDES bitbake: bitbake-user-manual: yet another overrides syntax update bitbake: bitbake-user-manual: update allowed characters in overrides bitbake: bitbake-user-manual: add recent release manuals local.conf.sample: fix reference to extended configuration sample local.conf.sample: https and no newline for SSTATE_MIRRORS conf/machine: fix QEMU x86 sound options bitbake: doc: bitbake-user-manual: reorder variable definitions docs: overview-manual: formating fixes docs: migration-3.5.rst: fix "distutils" typo docs: update examples to add branch info to git URIs documentation/README: correct heading styles actually used in the YP manuals manuals: inclusive language updates dev-manual: details about using firewalls and limiting fetch threads docs: brief-yoctoprojectqs: update video tutorial docs: ref-system-requirements.rst: update list of supported distros ref-manual: sort list of variables in generated output ref-manual: reorder variable definitions doc: migration-3.5: move the distutils changes to the class changes section doc: migration-3.5: variable changes for inclusive language bitbake: doc: bitbake-user-manual: add branch parameter to git SRC_URI examples bitbake: doc: bitbake-user-manual: branch parameter now mandatory in git SRC_URIs bitbake: bitbake: bitbake-user-manual: punctuation fixes Ming Liu (5): image.bbclass: make sure do_rootfs run from a clean workspace weston-init: add use-pixman PACKAGECONFIG kernel-fitimage.bbclass: introduce get_fit_replacement_type function kernel-fitimage.bbclass: change 'echo' to 'bbnote' kernel-fitimage.bbclass: introduce FIT_SUPPORTED_INITRAMFS_FSTYPES Minjae Kim (2): gnu-config: update SRC_URI virglrenderer: update SRC_URI Nicholas Sielicki (1): dev-manual: note on using journald without syslog Olaf Mandel (1): bitbake: fetch2/git: stop generated tarballs from leaking info Oleksandr Ocheretnyi (1): kernel-devsrc: do not copy Module.symvers file during install Peter Kjellerstedt (24): license.py: Correct a comment gma500-gfx-check: Update LICENSE to use an SPDX license identifier default-distrovars.inc: Remove the empty default for WHITELIST_GPL-3.0 selftest: recipetool: Correct the URI for socat recipetool/create_buildsys_python: Add support for more known licenses recipetool: Use SPDX license identifiers meta, meta-selftest: Replace more non-SPDX license identifiers manuals: Update LICENSE vars in examples to use SPDX license identifiers bitbake: knotty.py: Improve the message while waiting for running tasks to finish bitbake: knotty.py: Correct the width of the progress bar for the real tasks bitbake: knotty.py: A little clean up of TerminalFilter::updateFooter() oe-pkgdata-util: Adapt to the new variable override syntax create-spdx.bbclass: Remove an unnecessary path from do_create_spdx[dirs] deploy.bbclass: Remove an unnecessary path from do_deploy[dirs] package.bbclass: Remove an unnecessary path from do_package[dirs] image.bbclass: Remove two unnecessary paths from do_rootfs[dirs] go: Remove three unnecessary paths from do_compile[dirs] selftest/incompatible_lic: Remove references to AVAILABLE_LICENSES create-spdx.bbclass: Simplify extraction of license text license.bbclass: Remove the available_licenses() function bitbake: server/process: Correct a typo in a comment glib-2.0: Remove a leftover comment libdnf: Add a dependency on util-linux python3: Add a dependency on ncurses Pgowda (1): binutils: Avoid Race condition in as.info Quentin Schulz (1): ref-manual: classes: provide command with ready-to-use password Ralph Siemsen (2): libxml2: move to gitlab.gnome.org libxml2: update to 2.9.13 Randy MacLeod (1): libarchive: upgrade 3.5.3 -> 3.6.0 Ricardo Salveti (1): libpam: use /run instead of /var/run in systemd tmpfiles Richard Neill (1): systemd: Update 250.3 -> 250.4 Richard Purdie (113): pip_install_wheel: Use BPN instead of PN to construct PYPI_PACKAGE default mutlilib: Handle WHITELIST_GPL-3.0 being unset recipetool/devtool: Further SPDX identifier cleanups license/insane: Show warning for obsolete license usage license: Rework INCOMPATIBLE_LICENSE wildcard handling libsndfile: Fix missing external library support python3-native: Drop opt-1 and opt-2 pyc files cmake-native: Remove help docs from the native sysroot python3-native: Remove all pyc files python3: Drop opt1 and opt2 pyc files from target Revert "libsdl2: Add libunwind-native to the libsdl2-native DEPENDS" Revert "libical: Pass TOOLCHAIN_OPTIONS via CFLAGS" layer.conf: Filter docs dependencies for efficiency layer.conf: Add libarchive-native e2fsprogs-native exclusion from sysroot python3: Reduce util-linux dependency to util-linux-libuuid layer.conf: Allow sysroot dependencies on perlcross-native to be skipped bitbake: knotty: Correctly handle multiple line items bitbake: knotty: Improve setscene task display expat: Upgrade 2.4.6 -> 2.4.7 build-appliance-image: Update to master head revision vim: Update to 8.2.4524 for further CVE fixes bitbake: server/xmlrpcserver: Add missing xmlrpcclient import bitbake: uievent: Fix import warning for python 3.10 bitbake: cooker: Fix environment history printing bitbake: toaster: Fix IMAGE_INSTALL issues with _append vs :append bitbake: toaster: move gen_fixtures to the correct path Revert "mesa: make sure GLES3 headers are installed" oeqa/runtime/ping: Improve failure message to include more detail scripts/runqemu: Fix memory limits for qemux86-64 shadow-native: Simplify and fix syslog disable patch bitbake: bitbake: Bump to version 2.0.0 poky: Bump to 4.0 in preparation for release python3-psutil/python3-bcrypt: Add missing HOMEPAGE py3o: Rename to python_py3o setuptools3_rust: Rename to python_setuptools3_rust poetry_core: Rename to python_poetry_core python3-cryptography: Add missing ptest tomli dependency python3-cryptography-vectors: Fix reproducibility perf-build-test/report: Drop phantomjs and html email reports support create-spdx: Use function rather than AVAILABLE_LICENSES sstate: Allow optimisation of do_create_spdx task dependencies license: Drop AVAILABLE_LICENSES libstd-rs: Extend to nativesdk rust-cross: Add rust-crosssdk variant for nativesdk use cargo: Add missing nativesdk support python3-cryptography: Fix ptest result handling python3-docutil: Extend to nativesdk bitbake: data_smart: Skip commonly accessed variables from variable data context lookup bitbake: data_smart: Avoid multiple getVarFlag calls bitbake: codeparser: Avoid log bufer overhead in cache case python3-snowballstemmer: Add new recipe python3-imagesize: Add new recipe python3-alabaster: Add new recipe python3-pyasn1: Add from meta-oe/meta-python ptest-packagelists.inc: Add python3-pyasn1 to fast ptests list python3-certifi: Add from meta-oe/meta-python python3-chardet: Add from meta-oe/meta-python python3-ndg-httpsclient: Add from meta-oe/meta-python python3-pyopenssl: Add from meta-oe/meta-python python3-pysocks: Add from meta-oe/meta-python python3-pytest-runner: Add from meta-oe/meta-python python3-requests: Add from meta-oe/meta-python python3-urllib3: Add from meta-oe/meta-python python3-babel: Add recipe from meta-oe/meta-python python3-sphinxcontrib-qthelp: Add new recipe python3-sphinxcontrib-devhelp: Add new recipe python3-sphinxcontrib-htmlhelp: Add new recipe python3-sphinxcontrib-serializinghtml: Add new recipe python3-sphinxcontrib-jsmath: Add new recipe python3-sphinxcontrib-applehelp: add new recipe python3-sphinx-rtd-theme: Add new recipe python3-sphinx: Add a new recipe python3-sphinx: Work around reproducibility issue python3: Add missing HOMEPAGE entries maintainers.inc: Add new python recipes Add buildtools-docs-tarball recipe buildtools-docs-tarball: Add test for building documentation using sphinx oeqa/selftest/tinfoil: Improve tinfoil event test debugging toaster: Fix broken overrides usage poky.yaml: Drop POKYVERSION and YOCTO_POKY references poky.yaml: Drop unused YOCTO_DOC_VERSION_MINUS_ONE Makefile/set_versions: Allow poky.yaml to be autogenerated conf.py/set_versions/poky.yaml: Set version in conf.py from poky.yaml set_versions: Add support for setting POKYVERSION found in older releases set_versions/switchers.js: Allow switchers.js version information to be autogenerated set_versions: Various improvements set_versions: Handle dev branch in switchers correctly set_versions/switchers: Drop versions shown to the active releases pseudo: Add patch to workaround paths with crazy lengths libtool: Upgrade 2.4.6 -> 2.4.7 bitbake: siggen: Improve ambiguous use of 'dependent' Revert "set_versions: Handle dev branch in switchers correctly" Revert "set_versions/switchers: Drop versions shown to the active releases" set_versions: Handle dev branch in switchers correctly set_versions: Correct devbranch comparision bitbake: utils: Fix lockfile path length issues sanity: Add warning for local hasheqiv server with remote sstate mirrors bitbake: tinfoil: Allow run_command not to wait on events bitbake: cooker/siggen: Support exit calls and use for hashserv client bitbake: siggen: Add missing reset handler to hashserv signature generator bitbake: server/process: Move threads left debug to after cooker shutdown bitbake: cooker: Fix inotify watches causing memory resident bitbake corruption perl: Add missing RDEPENDS oeqa/selftest/tinfoil: Fix intermittent event loss issue in test create-spdx: Avoid regex warning by quoting correctly bitbake: cooker: Fix exception handling in parsers bitbake: cooker: Fix main loop starvation when parsing bitbake: cooker: Improve exception handling in parsing process bitbake: cooker: Simplify parser init function handling bitbake: cooker/process: Fix signal handling lockups bitbake: cooker: Rework force parser shutdown bitbake: build: Add missing parameter to TaskInvalid poky: Drop PREMIRRORS entries for scms Robert Joslyn (1): curl: Update to 7.82.0 Robert P. J. Day (1): scripts: Various typo/grammar/punctuation fixes Robert Yang (4): coreutils: Disable statx for native build perl: Makefile.PL: Fix _PATH_LOG for deterministic quilt: Disable external sendmail for deterministic build cups: Add --with-dbusdir to EXTRA_OECONF for deterministic build Ross Burton (67): Revert "cve-check: add lockfile to task" classes: add setuptools3_legacy asciidoc: update git repository bmap-tools: remove redundant python3native inherit setuptools3.bbclass: clean up pip_install_wheel: clean up pip_install_wheel: don't lazy assign PIPINSTALLARGS python3-pip: remove obsolete and confusing comment flit_core: clean up configure/compile setuptools_build_meta: clean up configure/compile flit_core: respect PIP_INSTALL_DIST_PATH flit_core: add variable to control where pyproject.toml is located setuptools_build_meta: respect PIP_INSTALL_DIST_PATH setuptools_build_meta: add variable to control where pyproject.toml is located python3-flit-core: improve recipe setuptools3: respect PIP_INSTALL_DIST_PATH python3-pip: clean up PYPA_WHEEL usage python3-setuptools3: clean up PYPA_WHEEL usage python3-wheel: clean up PYPA_WHEEL usage bmap-tools: remove redundant PYPA_WHEEL python3-markdown: use setuptools_build_meta python3-pyrsistent: use setuptools_build_meta python3-pyyaml: use setuptools_build_meta python3-scons: remove PIP_INSTALL_DIST_PATH pip_install_wheel: generate the wheels in directory we control outside of S pip_install_wheel: install wheel with a glob python3-scons: remove redundant FILES:${PN}-doc flit_core: remove redundant python3-pip-native DEPENDS python3-pip: remove redundant DEPENDS on python3-setuptools-native pip_install_wheel: add a generic do_install for bootstrapping seatd: upgrade to 0.6.4 (fixes CVE-2022-25643) setuptools3-base: improve RDEPENDS assignment meta: remove obsolete PIP_INSTALL_PACKAGE meta: rename pip_install_wheel.bbclass to python_pep517.bbclass python_pep517: move PEP517_SOURCE_PATH to python_pep517 python3-setuptools-rust-native: remove obsolete PIP_* python3-poetry-core: remove obsolete PIP_INSTALL_PACKAGE poetry_core: update for renamed class pip_install_wheel to python_pep517 python3-cryptography: mark test_create_certificate_with_extensions as expected to fail python3-cryptography: remove obsolete PIP_INSTALL_DIST_PATH python3-installer: add installer module python_pep517: use installer instead of pip devupstream: fix handling of SRC_URI linux-yocto: remove redundant devupstream assignments python3-setuptools-rust-native: use setuptools_build_meta openssl: upgrade to 3.0.2 Update documentation for Python packaging changes python3-packaging: remove duplicate python3-setuptools-native DEPENDS classes/flit_core: use python_pep517_do_compile classes/python_pep517: implement a standard do_compile classes/python_poetry_core: use python_pep517_do_compile classes/python_pep517: add more comments classes/setuptools_build_meta: use python_pep517_do_compile classes/flit_core: rename to python_flit_core classes/python_pep517: consolidate stub do_configure lttng-modules: remove redundant devupstream assignments python3-cryptography: enforce identical version for -cryptography-vectors python3-cryptography-vectors: upgrade to 36.0.2 classes/setuptools_build_meta: rename to python_setuptools_build_meta bitbake: bitbake: knotty: display active tasks when printing keepAlive() message bitbake: bitbake: knotty: reduce keep-alive timeout from 5000s (83 minutes) to 10 minutes tiff: backport CVE fixes: python3: ignore CVE-2022-26488 oeqa/runtime/context: remove duplicate sys.path entries when looking for modules grub: ignore CVE-2021-46705 qemu: backport fixes for CVE-2022-26353 and CVE-2022-26354 zlib: backport the fix for CVE-2018-25032 Sakib Sajal (1): perl: generate alternative link for streamzip Samuli Piippo (2): mesa: make sure GLES3 headers are installed binutils-cross-canadian: enable gold for mingw Saul Wold (4): base/license: Rework INCOMPATIBLE_LICENSE variable handling convert-variable-renames: Fix output string meta/scripts: Improve internal variable naming documentation: Update for skip_recipe rename Stefan Herbrechtsmeier (4): systemd: move systemd shared library into its own package classes: rootfs-postcommands: include /etc/fstab in overlayfs_qa_check oeqa: selftest: overlayfs: add test for image with fstab entry zstd: add libzstd package Tean Cunningham (1): rootfs-postcommands: amend systemd_create_users add user to group check Tim Orling (44): flit_core: inherit setuptools3-base flit_core: export do_configure and do_compile python3-tomli: inherit flit_core python3-flit-core: upgrade 3.6.0 to 3.7.1 docs: update setuptools3 class docs: ref-manual: drop distutils from variables docs: ref-manual: remove distutils* from classes docs: migration-3.5: distutils move docs: migration-2.6 drop distutils labels, terms docs: migration-3.3 drop distutils labels, terms docs: add new python packaging classes docs: add pip install variables python3-jsonschema: upgrade 3.2.0 -> 4.4.0 python3-importlib-metadata: upgrade 4.10.1 -> 4.11.2 bitbake: toaster-requirements.txt: Django 3.2 LTS bitbake: toaster: Update docs links in templates bitbake: toaster: orm/models -- drop django.utils.six bitbake: toaster: set DEFAULT_AUTO_FIELD bitbake: toaster: migratation for models.BigAutoField bitbake: bitbake: buildinfohelper.py fix for Django 3.2 bitbake: toaster: drop landing_not_managed template python3-setuptools-rust-native: from meta-python pyo3.bbclass: move from meta-python setuptools3_rust.bbclass: move from meta-python python3-cryptography: move from meta-python python3-pytest-subtests: move from meta-python python3-cryptography-vectors: from meta-python python3-asn1crypto: move from meta-python python3-cffi: move from meta-python python3-pytz: move from meta-python python3-bcrypt: move from meta-python python3-pretend: move from meta-python python3-psutil: move from meta-python poetry_core.bbclass: move from meta-python python3-poetry-core: move from meta-python python3-iso8601: move from meta-python python3-typing-extensions: move from meta-python python3-semantic-version: move from meta-python python3-pycparser: move from meta-python python3-ply: move from meta-python maintainers.inc: add python3-crypto and friends ptest-packagelists.inc: add python3-cryptography ptest-packagelists: add python3-bcrypt and -pytz python3-pytest: upgrade 7.0.1 -> 7.1.1 Tony McDowell (1): dev-manual: add instructions for compacting WSLv2 VHDX files Trevor Gamblin (3): iptables: do not install /etc/ethertypes iptables: use nft backend with libnftnl PACKAGECONFIG python3: upgrade 3.10.2 -> 3.10.3 Zoltán Böszörményi (1): mesa: Allow building Mesa's OpenCL through PACKAGECONFIG leimaohui (1): bitbake: monitordisk.py: Deleted redundant word in warning message. wangmy (72): python3-git: upgrade 3.1.26 -> 3.1.27 ell: upgrade 0.48 -> 0.49 libgit2: upgrade 1.4.1 -> 1.4.2 nghttp2: upgrade 1.46.0 -> 1.47.0 python3-dbusmock: upgrade 0.25.0 -> 0.26.1 python3-hypothesis: upgrade 6.37.2 -> 6.39.0 at: upgrade 3.2.4 -> 3.2.5 dbus: upgrade 1.12.20 -> 1.12.22 ccache: upgrade 4.5.1 -> 4.6 libjpeg-turbo: upgrade 2.1.2 -> 2.1.3 libsolv: upgrade 0.7.20 -> 0.7.21 libva: upgrade 2.13.0 -> 2.14.0 mesa: upgrade 21.3.6 -> 21.3.7 ovmf: upgrade 202111 -> 202202 wget: upgrade 1.21.2 -> 1.21.3 sqlite3: upgrade 3.37.2 -> 3.38.0 sysstat: upgrade 12.4.4 -> 12.4.5 btrfs-tools: upgrade 5.16 -> 5.16.2 python3-hypothesis: upgrade 6.39.0 -> 6.39.2 cmake: upgrade 3.22.2 -> 3.22.3 asciidoc: upgrade 10.1.3 -> 10.1.4 go: upgrade 1.17.7 -> 1.17.8 gpgme: upgrade 1.17.0 -> 1.17.1 python3-pycairo: upgrade 1.20.1 -> 1.21.0 stress-ng: upgrade 0.13.11 -> 0.13.12 sudo: upgrade 1.9.9 -> 1.9.10 createrepo-c: upgrade 0.18.0 -> 0.19.0 dnf: upgrade 4.10.0 -> 4.11.1 harfbuzz: upgrade 4.0.0 -> 4.0.1 libdnf: upgrade 0.65.0 -> 0.66.0 librsvg: upgrade 2.52.6 -> 2.52.7 linux-firmware: upgrade 20220209 -> 20220310 python3-importlib-metadata: upgrade 4.11.2 -> 4.11.3 lttng-modules: upgrade 2.13.1 -> 2.13.2 python3-numpy: upgrade 1.22.2 -> 1.22.3 libcgroup: upgrade 2.0 -> 2.0.1 libuv: upgrade 1.43.0 -> 1.44.1 dpkg: upgrade 1.21.1 -> 1.21.2 gobject-introspection: upgrade 1.70.0 -> 1.72.0 libdazzle: upgrade 3.42.0 -> 3.44.0 libsolv: upgrade 0.7.21 -> 0.7.22 man-db: upgrade 2.10.1 -> 2.10.2 python3-markupsafe: upgrade 2.1.0 -> 2.1.1 vala: upgrade 0.54.7 -> 0.56.0 adwaita-icon-theme: upgrade 41.0 -> 42.0 bluez5: upgrade 5.63 -> 5.64 gnutls: upgrade 3.7.3 -> 3.7.4 gsettings-desktop-schemas: upgrade 41.0 -> 42.0 rng-tools: enable macro JENT_CONF_ENABLE_INTERNAL_TIMER libjitterentropy: upgrade 3.3.1 -> 3.4.0 apt: upgrade 2.4.0 -> 2.4.3 atk: upgrade 2.36.0 -> 2.38.0 cronie: upgrade 1.5.7 -> 1.6.0 diffoscope: upgrade 207 -> 208 dpkg: upgrade 1.21.2 -> 1.21.4 glib-networking: upgrade 2.70.1 -> 2.72.0 iproute2: upgrade 5.16.0 -> 5.17.0 libevdev: upgrade 1.12.0 -> 1.12.1 libsoup: upgrade 3.0.4 -> 3.0.5 lttng-modules: upgrade 2.13.2 -> 2.13.3 lttng-ust: upgrade 2.13.1 -> 2.13.2 msmtp: upgrade 1.8.19 -> 1.8.20 sqlite3: upgrade 3.38.1 -> 3.38.2 python3-asn1crypto: upgrade 1.4.0 -> 1.5.1 python3-dbusmock: upgrade 0.26.1 -> 0.27.3 python3-hypothesis: upgrade 6.39.2 -> 6.39.5 python3-imagesize: upgrade 1.2.0 -> 1.3.0 python3-jinja2: upgrade 3.0.3 -> 3.1.1 python3-pytest-runner: upgrade 5.3.1 -> 6.0.0 python3-pytest-subtests: upgrade 0.6.0 -> 0.7.0 python3-pytz: upgrade 2021.3 -> 2022.1 python3-urllib3: upgrade 1.26.8 -> 1.26.9 Signed-off-by: Andrew Geissler Change-Id: Ib4c513b74dbc38e31b3792d8323e877294f959d9 --- meta-openembedded/contrib/pw-am.sh | 2 +- meta-openembedded/meta-filesystems/conf/layer.conf | 2 +- .../fuse-exfat/fuse-exfat_1.3.0.bb | 2 +- .../httpfs2-fuse/httpfs2_0.1.5.bb | 2 +- .../recipes-filesystems/ifuse/ifuse_1.1.4.bb | 2 +- .../logfsprogs/logfsprogs_git.bb | 2 +- .../ntfs-3g-ntfsprogs_2021.8.22.bb | 2 +- .../recipes-filesystems/owfs/owfs_3.2p3.bb | 2 +- .../simple-mtpfs/simple-mtpfs_0.4.0.bb | 2 +- .../smbnetfs/smbnetfs/configure.patch | 2 +- .../recipes-filesystems/smbnetfs/smbnetfs_git.bb | 6 +- .../sshfs-fuse/sshfs-fuse_3.7.2.bb | 2 +- .../recipes-filesystems/yaffs2/yaffs2-utils_git.bb | 2 +- .../recipes-support/fuse/fuse3_3.10.5.bb | 2 +- .../recipes-support/fuse/fuse_2.9.9.bb | 2 +- .../recipes-utils/aufs-util/aufs-util_git.bb | 2 +- .../recipes-utils/exfat-utils/exfat-utils_1.3.0.bb | 2 +- .../recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb | 2 +- .../recipes-utils/fatresize/fatresize_1.1.0.bb | 2 +- .../recipes-utils/udevil/udevil_0.4.4.bb | 2 +- .../recipes-utils/ufs-utils/ufs-utils_1.9.bb | 2 +- .../recipes-utils/xfsdump/xfsdump_3.1.10.bb | 2 +- .../recipes-utils/xfsprogs/xfsprogs_5.13.0.bb | 4 +- .../recipes-utils/xorriso/xorriso_1.5.5.bb | 2 +- meta-openembedded/meta-gnome/conf/layer.conf | 2 +- .../recipes-connectivity/folks/folks_0.15.4.bb | 28 - .../recipes-connectivity/folks/folks_0.15.5.bb | 28 + ...Lru-Workaround-missing-generic-type-argum.patch | 27 + ...bility-issues-with-initializer-of-constan.patch | 42 + .../recipes-connectivity/geary/geary_40.0.bb | 9 +- .../recipes-connectivity/libnma/libnma_1.8.34.bb | 2 +- .../network-manager-applet_1.24.0.bb | 2 +- .../recipes-extended/gparted/gparted_1.3.1.bb | 2 +- .../meta-gnome/recipes-gimp/babl/babl_0.1.88.bb | 20 - .../meta-gnome/recipes-gimp/babl/babl_0.1.92.bb | 20 + .../meta-gnome/recipes-gimp/gegl/gegl_0.4.34.bb | 59 - .../meta-gnome/recipes-gimp/gegl/gegl_0.4.36.bb | 59 + .../meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb | 3 +- .../meta-gnome/recipes-gnome/amtk/amtk_5.3.1.bb | 2 +- .../recipes-gnome/dconf/dconf-editor_3.38.3.bb | 2 +- .../meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb | 2 +- .../recipes-gnome/devilspie/devilspie2_0.44.bb | 2 +- .../meta-gnome/recipes-gnome/evince/evince_41.3.bb | 52 - .../meta-gnome/recipes-gnome/evince/evince_41.4.bb | 52 + .../evolution-data-server/evolution-data-server.bb | 3 +- .../evolution-data-server.inc | 6 +- ...-cmake-Do-not-export-CC-into-gir-compiler.patch | 13 + .../faenza-icon-theme/faenza-icon-theme_1.3.bb | 2 +- .../file-roller/file-roller_3.40.0.bb | 2 +- .../meta-gnome/recipes-gnome/gdm/gdm_41.0.bb | 2 +- .../meta-gnome/recipes-gnome/gedit/gedit_41.0.bb | 7 +- .../geocode-glib/geocode-glib_3.26.2.bb | 2 +- .../recipes-gnome/gexiv2/gexiv2_0.14.0.bb | 2 +- .../recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb | 7 +- .../meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb | 2 +- .../0001-Support-cross-builds-a-bit-better.patch | 17 +- ...-Do-not-add-dir-installed-tests-when-inst.patch | 9 +- .../meta-gnome/recipes-gnome/gjs/gjs_1.70.1.bb | 39 - .../meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb | 40 + .../gnome-autoar/gnome-autoar_0.4.3.bb | 2 +- .../gnome-bluetooth/gnome-bluetooth_3.34.5.bb | 2 +- .../gnome-calculator/gnome-calculator_41.1.bb | 2 +- .../gnome-calendar/gnome-calendar_41.2.bb | 2 +- .../gnome-control-center_41.2.bb | 2 +- .../gnome-desktop/gnome-desktop_41.2.bb | 2 +- ...01-build-fix-arguments-of-i18n.merge_file.patch | 34 - .../gnome-disk-utility/gnome-disk-utility_41.0.bb | 35 - .../gnome-disk-utility/gnome-disk-utility_42.0.bb | 36 + .../gnome-flashback/gnome-flashback_3.42.1.bb | 2 +- .../gnome-font-viewer/gnome-font-viewer_41.0.bb | 2 +- .../gnome-keyring/gnome-keyring_40.0.bb | 2 +- .../gnome-menus/gnome-menus_3.36.0.bb | 2 +- .../gnome-online-accounts_3.43.1.bb | 2 +- .../gnome-panel/gnome-panel_3.42.0.bb | 2 +- ...remove-incorrect-args-for-i18n.merge_file.patch | 31 - .../gnome-photos/gnome-photos_40.0.bb | 47 - .../gnome-photos/gnome-photos_42.0.bb | 46 + .../gnome-screenshot/gnome-screenshot_41.0.bb | 2 +- .../gnome-session/gnome-session_41.3.bb | 2 +- .../gnome-settings-daemon_41.0.bb | 2 +- ...-Drop-unused-argument-for-i18n.merge_file.patch | 30 + .../gnome-shell/gnome-shell-extensions_41.1.bb | 3 +- .../recipes-gnome/gnome-shell/gnome-shell_41.2.bb | 2 +- .../gnome-system-monitor_41.0.bb | 35 - .../gnome-system-monitor_42.0.bb | 35 + .../gnome-terminal/gnome-terminal_3.42.2.bb | 2 +- ...002-meson-fix-invalid-positional-argument.patch | 33 + .../gnome-tweaks/gnome-tweaks_40.0.bb | 7 +- .../recipes-gnome/grilo/grilo-plugins_0.3.14.bb | 2 +- .../meta-gnome/recipes-gnome/grilo/grilo_0.3.14.bb | 2 +- .../recipes-gnome/gsound/gsound_1.0.3.bb | 2 +- .../recipes-gnome/gspell/gspell_1.9.1.bb | 2 +- .../recipes-gnome/gthumb/gthumb_3.12.0.bb | 2 +- .../gtksourceview-classic-light_1.0.bb | 2 +- .../gtksourceview/gtksourceview3_3.24.11.bb | 2 +- .../gtksourceview/gtksourceview4_4.8.2.bb | 2 +- .../gtksourceview/gtksourceview5_5.2.0.bb | 2 +- ...Remove-incorrect-i18n.merge_file-argument.patch | 34 - .../meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb | 92 - .../meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb | 89 + .../libchamplain/libchamplain_0.12.20.bb | 2 +- .../recipes-gnome/libgdata/libgdata_0.18.1.bb | 2 +- .../recipes-gnome/libgsf/libgsf_1.14.48.bb | 22 - .../recipes-gnome/libgsf/libgsf_1.14.49.bb | 22 + .../recipes-gnome/libgtop/libgtop_2.40.0.bb | 2 +- .../recipes-gnome/libgweather/libgweather_40.0.bb | 2 +- .../recipes-gnome/libportal/libportal_0.5.bb | 2 +- .../libtimezonemap/libtimezonemap_0.4.6.bb | 2 +- .../recipes-gnome/libwnck/libwnck3_40.1.bb | 2 +- .../recipes-gnome/libwnck/libwnck_2.31.0.bb | 2 +- .../recipes-gnome/libxklavier/libxklavier_5.4.bb | 2 +- .../recipes-gnome/metacity/metacity_3.42.0.bb | 39 - .../recipes-gnome/metacity/metacity_3.44.0.bb | 39 + .../meta-gnome/recipes-gnome/mutter/mutter_41.2.bb | 2 +- .../nautilus/nautilus/liportal-0.5-fix.patch | 28 - .../recipes-gnome/nautilus/nautilus_41.2.bb | 46 - .../recipes-gnome/nautilus/nautilus_42.0.bb | 45 + .../meta-gnome/recipes-gnome/rest/rest_0.8.1.bb | 2 +- .../recipes-gnome/sysprof/sysprof_3.42.1.bb | 2 +- .../meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb | 5 +- .../recipes-gnome/tracker/tracker-miners_3.2.1.bb | 2 +- .../recipes-gnome/tracker/tracker_3.2.1.bb | 2 +- .../recipes-gnome/yelp/yelp-tools_41.0.bb | 2 +- .../meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb | 2 +- .../meta-gnome/recipes-gnome/yelp/yelp_41.2.bb | 2 +- .../recipes-graphics/clutter/clutter-1.0.inc | 2 +- .../recipes-graphics/clutter/clutter-gst-3.0.inc | 2 +- .../recipes-graphics/clutter/clutter-gtk-1.0.inc | 2 +- .../accountsservice/accountsservice_0.6.55.bb | 2 +- .../appstream-glib/appstream-glib_0.7.18.bb | 2 +- .../recipes-support/colord-gtk/colord-gtk_0.2.0.bb | 2 +- .../meta-gnome/recipes-support/ibus/ibus.inc | 2 +- .../recipes-support/libuser/libuser_0.62.bb | 2 +- .../recipes-support/libwacom/libwacom_2.1.0.bb | 24 - .../recipes-support/libwacom/libwacom_2.2.0.bb | 24 + .../recipes-support/onboard/onboard_1.4.1.bb | 4 +- .../recipes-support/usermode/usermode_1.114.bb | 2 +- meta-openembedded/meta-initramfs/conf/layer.conf | 2 +- .../recipes-bsp/kexecboot/kexecboot_git.bb | 2 +- .../recipes-devtools/dracut/dracut_055.bb | 2 +- .../recipes-devtools/grubby/grubby_8.40.bb | 2 +- .../recipes-devtools/grubby/grubby_git.bb | 2 +- .../recipes-devtools/klibc/klibc.inc | 2 +- .../recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb | 2 +- .../recipes-kernel/kexec/kexec-tools-klibc_git.bb | 2 +- meta-openembedded/meta-multimedia/conf/layer.conf | 2 +- .../recipes-connectivity/gupnp/gssdp_1.4.0.1.bb | 2 +- .../gupnp/gupnp-dlna_0.12.0.bb | 2 +- .../recipes-connectivity/gupnp/gupnp-igd_1.2.0.bb | 2 +- .../gupnp/gupnp-tools_0.10.2.bb | 2 +- .../recipes-connectivity/rygel/rygel_0.38.3.bb | 2 +- .../meta-multimedia/recipes-dvb/oscam/oscam_svn.bb | 2 +- .../recipes-dvb/tvheadend/tvheadend_git.bb | 2 +- .../recipes-mkv/libebml/libebml_1.3.0.bb | 2 +- .../recipes-mkv/libmatroska/libmatroska_1.4.1.bb | 2 +- .../alsa-equal/alsa-equal_0.6.bb | 2 +- .../recipes-multimedia/caps/caps_0.9.26.bb | 2 +- .../cdparanoia/cdparanoia_10.2.bb | 2 +- .../recipes-multimedia/dca/dcadec_0.2.0.bb | 2 +- .../dleyna/dleyna-connector-dbus_0.3.0.bb | 2 +- .../recipes-multimedia/dleyna/dleyna-core_0.6.0.bb | 2 +- .../dleyna/dleyna-renderer_0.6.0.bb | 2 +- .../dleyna/dleyna-server_0.6.0.bb | 2 +- .../recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb | 2 +- .../recipes-multimedia/faac/faac_1.29.9.2.bb | 2 +- .../recipes-multimedia/fluidsynth/fluidsynth.inc | 2 +- .../recipes-multimedia/gerbera/gerbera_1.9.2.bb | 2 +- .../gstreamer-1.0/gst-shark_git.bb | 2 +- .../recipes-multimedia/gstreamer-1.0/gstd_git.bb | 2 +- .../recipes-multimedia/juce/projucer.inc | 10 +- .../recipes-multimedia/libao/libao_1.2.0.bb | 2 +- .../libavc1394/libavc1394_0.5.4.bb | 2 +- .../recipes-multimedia/libcamera/libcamera.bb | 2 +- .../libdc1394/libdc1394_2.2.6.bb | 4 +- .../recipes-multimedia/libde265/libde265_1.0.5.bb | 2 +- .../libdvbcsa/libdvbcsa_1.1.0.bb | 2 +- .../libdvbpsi/libdvbpsi_1.3.0.bb | 2 +- .../libdvdnav/libdvdnav_6.1.1.bb | 2 +- .../libiec61883/libiec61883_1.2.0.bb | 2 +- .../libopenmpt/libopenmpt_0.3.10.bb | 104 - .../libopenmpt/libopenmpt_0.6.2.bb | 87 + .../0001-Add-support-for-variable-libdir.patch | 70 + .../libsquish/0001-makefile-Add-LIBDIR.patch | 36 + .../recipes-multimedia/libsquish/libsquish_git.bb | 7 +- .../recipes-multimedia/mimic/mimic_1.3.0.1.bb | 2 +- .../musicbrainz/libmusicbrainz_git.bb | 2 +- .../recipes-multimedia/musicpd/libmpd_11.8.17.bb | 2 +- .../musicpd/libmpdclient_2.19.bb | 22 - .../musicpd/libmpdclient_2.20.bb | 22 + .../recipes-multimedia/musicpd/mpc_0.33.bb | 13 - .../recipes-multimedia/musicpd/mpc_0.34.bb | 13 + .../recipes-multimedia/musicpd/mpd_0.23.5.bb | 101 - .../recipes-multimedia/musicpd/mpd_0.23.6.bb | 101 + .../recipes-multimedia/musicpd/ncmpc_0.45.bb | 39 - .../recipes-multimedia/musicpd/ncmpc_0.46.bb | 39 + .../openal/openal-soft_1.20.1.bb | 2 +- .../opus-tools/opus-tools_0.2.bb | 2 +- .../packagegroups/packagegroup-meta-multimedia.bb | 2 +- .../pipewire/pipewire-0.2_git.bb | 2 +- .../recipes-multimedia/rtmpdump/rtmpdump_2.4.bb | 2 +- .../schroedinger/schroedinger_1.0.11.bb | 2 +- .../recipes-multimedia/sox/sox_14.4.2.bb | 2 +- .../streamripper/streamripper_1.64.6.bb | 2 +- .../recipes-multimedia/vlc/libdvdcss_1.4.2.bb | 2 +- .../recipes-multimedia/vlc/vlc_3.0.12.bb | 132 - .../recipes-multimedia/vlc/vlc_3.0.17-1.bb | 132 + .../vorbis-tools/vorbis-tools_1.4.2.bb | 2 +- ...x-va_list-APIs-for-different-architecture.patch | 217 + .../wireplumber/wireplumber_0.4.8.bb | 1 + .../recipes-multimedia/x265/x265_3.2.1.bb | 2 +- .../recipes-support/crossguid/crossguid_0.2.2.bb | 6 +- .../gst-instruments/gst-instruments_git.bb | 2 +- .../libmediaart/libmediaart-2.0_1.9.5.bb | 2 +- .../recipes-connectivity/adcli/adcli_0.9.0.bb | 2 +- .../blueman/blueman/0001-Search-for-cython3.patch | 29 +- .../recipes-connectivity/blueman/blueman_2.2.3.bb | 57 - .../recipes-connectivity/blueman/blueman_2.2.4.bb | 57 + .../recipes-connectivity/bluepy/bluepy_git.bb | 2 +- .../cannelloni/cannelloni_1.0.0.bb | 2 +- .../recipes-connectivity/daq/daq_2.0.7.bb | 2 +- .../dhcp/dhcp-relay_4.4.2p1.bb | 83 - .../recipes-connectivity/dhcp/dhcp-relay_4.4.3.bb | 62 + .../0001-Makefile.am-only-build-dhcrelay.patch | 4 +- .../0002-bind-Makefile.in-disable-backtrace.patch | 31 + ...002-bind-version-update-to-latest-version.patch | 30 - .../0003-bind-Makefile.in-disable-backtrace.patch | 31 - ...003-bind-Makefile.in-regenerate-configure.patch | 30 + .../recipes-connectivity/dibbler/dibbler_git.bb | 2 +- .../ez-ipupdate/ez-ipupdate_3.0.11b7.bb | 2 +- .../firewalld/firewalld_0.9.4.bb | 2 +- .../freeradius/freeradius_3.0.21.bb | 2 +- .../recipes-connectivity/lftp/lftp_4.9.2.bb | 2 +- ...Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch | 29 + .../libiec61850/libiec61850_1.5.0.bb | 37 - .../libiec61850/libiec61850_1.5.1.bb | 38 + .../recipes-connectivity/nanomsg/nanomsg_1.1.5.bb | 2 +- .../0001-Makefile-fix-parallel-build-failure.patch | 44 + .../recipes-connectivity/netplan/netplan_0.104.bb | 3 +- .../networkmanager-openvpn_1.8.16.bb | 52 - .../networkmanager-openvpn_1.8.18.bb | 52 + ...figure.ac-Fix-pkgconfig-sysroot-locations.patch | 22 - .../0001-do-not-ask-host-for-ifcfg-defaults.patch | 24 + ...te-settings-settings-property-documentati.patch | 60 - ...ewalld-to-var-libdir-rather-than-hardcod-.patch | 30 - .../networkmanager/enable-dhcpcd.conf | 2 + .../networkmanager/networkmanager/enable-iwd.conf | 3 + .../networkmanager/networkmanager_1.34.0.bb | 180 - .../networkmanager/networkmanager_1.36.2.bb | 248 ++ .../openconnect/openconnect_8.10.bb | 32 - .../openconnect/openconnect_8.20.bb | 32 + .../recipes-connectivity/rdate/rdate_1.5.bb | 2 +- .../recipes-connectivity/relayd/relayd_git.bb | 2 +- .../recipes-connectivity/samba/samba_4.14.12.bb | 2 +- .../recipes-connectivity/sethdlc/sethdlc_1.18.bb | 2 +- .../recipes-connectivity/snort/snort_2.9.19.bb | 2 +- ...dd-an-option-to-specify-iptables-location.patch | 30 +- .../recipes-connectivity/ufw/ufw/setuptools.patch | 20 + .../recipes-connectivity/ufw/ufw_0.36.1.bb | 67 + .../recipes-connectivity/ufw/ufw_0.36.bb | 68 - .../recipes-connectivity/vlan/vlan_1.9.bb | 2 +- .../recipes-connectivity/vpnc/vpnc_0.5.3.bb | 2 +- .../recipes-connectivity/wolfssl/wolfssl_5.2.0.bb | 2 +- .../recipes-daemons/atftp/atftp_0.7.5.bb | 2 +- .../recipes-daemons/autofs/autofs_5.1.8.bb | 2 +- ...uthd-to-be-built-outside-of-source-tree-w.patch | 41 - ...0001-makeinit.sh-fix-parallel-build-issue.patch | 95 - ...01-sample-Rename-dprintf-to-cyrus_dprintf.patch | 91 + ...c-fix-condition-for-suppliment-snprintf-i.patch | 28 - .../cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch | 6 +- .../cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch | 53 +- .../cyrus-sasl/cyrus-sasl_2.1.27.bb | 101 - .../cyrus-sasl/cyrus-sasl_2.1.28.bb | 98 + .../recipes-daemons/igmpproxy/igmpproxy_0.3.bb | 2 +- .../recipes-daemons/ippool/ippool_1.3.bb | 2 +- .../iscsi-initiator-utils_2.1.6.bb | 2 +- .../recipes-daemons/keepalived/keepalived_2.2.2.bb | 2 +- .../networkd-dispatcher/networkd-dispatcher_2.1.bb | 2 +- .../recipes-daemons/opensaf/opensaf_5.22.01.bb | 2 +- .../0006-correct-signature-of-closefrom-API.patch | 104 - .../recipes-daemons/postfix/files/main.cf | 2 +- .../recipes-daemons/postfix/postfix_3.6.4.bb | 18 - .../recipes-daemons/postfix/postfix_3.6.5.bb | 17 + .../recipes-daemons/proftpd/proftpd_1.3.7a.bb | 145 - .../recipes-daemons/proftpd/proftpd_1.3.7c.bb | 145 + .../recipes-daemons/pure-ftpd/pure-ftpd_1.0.50.bb | 2 +- .../recipes-daemons/squid/squid_4.15.bb | 2 +- .../recipes-daemons/vblade/vblade_25.bb | 2 +- .../recipes-daemons/vsftpd/vsftpd_3.0.5.bb | 2 +- .../recipes-devtools/python/python3-ldap_3.4.0.bb | 2 +- .../recipes-devtools/python/python3-scapy_2.4.5.bb | 2 +- .../recipes-extended/dlm/dlm_4.0.9.bb | 2 +- .../recipes-extended/kronosnet/kronosnet_1.22.bb | 2 +- .../arno-iptables-firewall_2.1.1.bb | 2 +- .../conntrack-tools/conntrack-tools_1.4.6.bb | 2 +- .../recipes-filter/ebtables/ebtables_2.0.11.bb | 2 +- .../recipes-filter/ipset/ipset_7.15.bb | 2 +- .../libnetfilter/libnetfilter-acct_1.0.3.bb | 2 +- .../libnetfilter/libnetfilter-conntrack_1.0.8.bb | 2 +- .../libnetfilter/libnetfilter-cthelper_1.0.0.bb | 2 +- .../libnetfilter/libnetfilter-cttimeout_1.0.0.bb | 2 +- .../libnetfilter/libnetfilter-log_1.0.2.bb | 2 +- .../libnetfilter/libnetfilter-queue_1.0.5.bb | 2 +- .../libnfnetlink/libnfnetlink_1.0.1.bb | 2 +- .../recipes-filter/libnftnl/libnftnl_1.2.1.bb | 2 +- .../recipes-filter/nfacct/nfacct_1.0.2.bb | 2 +- ...mpile-with-make-check-and-add-AM_CPPFLAGS.patch | 39 + .../recipes-filter/nftables/nftables_1.0.1.bb | 31 - .../recipes-filter/nftables/nftables_1.0.2.bb | 34 + .../recipes-irc/weechat/weechat_3.4.1.bb | 36 + .../recipes-irc/weechat/weechat_3.4.bb | 33 - .../meta-networking/recipes-irc/znc/znc_1.8.2.bb | 2 +- .../recipes-kernel/wireguard/wireguard.inc | 2 +- .../recipes-protocols/net-snmp/net-snmp_5.9.1.bb | 1 + .../recipes-protocols/nopoll/nopoll_0.4.6.b400.bb | 2 +- .../recipes-protocols/openflow/openflow.inc | 2 +- .../recipes-protocols/openl2tp/openl2tp_1.8.bb | 2 +- .../recipes-protocols/openlldp/openlldp_1.0.1.bb | 2 +- .../pptp-linux/pptp-linux_1.10.0.bb | 2 +- .../recipes-protocols/quagga/quagga.inc | 2 +- .../recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb | 2 +- .../recipes-protocols/tsocks/tsocks_1.8beta5.bb | 2 +- .../recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb | 2 +- .../recipes-protocols/zeroconf/zeroconf_0.9.bb | 2 +- .../recipes-support/aoetools/aoetools_36.bb | 2 +- .../recipes-support/arptables/arptables_git.bb | 2 +- .../bridge-utils/bridge-utils_1.7.1.bb | 2 +- .../recipes-support/chrony/chrony_4.2.bb | 2 +- .../recipes-support/cifs/cifs-utils_6.14.bb | 2 +- .../recipes-support/dnsmasq/dnsmasq.inc | 2 +- .../recipes-support/dovecot/dovecot_2.3.14.bb | 2 +- .../recipes-support/drbd/drbd-utils_9.13.1.bb | 2 +- .../recipes-support/drbd/drbd_9.0.24-1.bb | 2 +- .../esmtp/0001-Fix-libESMTP-dependency-check.patch | 44 + .../recipes-support/esmtp/esmtp_1.2.bb | 8 +- .../recipes-support/ettercap/ettercap_0.8.3.1.bb | 2 +- .../recipes-support/fetchmail/fetchmail_6.4.23.bb | 2 +- .../recipes-support/fwknop/fwknop_2.6.10.bb | 2 +- .../recipes-support/geoip/geoip-perl_1.51.bb | 2 +- .../recipes-support/geoip/geoip_1.6.12.bb | 2 +- .../recipes-support/geoip/geoipupdate_2.5.0.bb | 2 +- .../recipes-support/htpdate/htpdate_1.2.2.bb | 2 +- .../http-parser/http-parser_2.9.4.bb | 4 +- .../recipes-support/ifenslave/ifenslave_2.13.bb | 2 +- .../recipes-support/ifmetric/ifmetric_0.3.bb | 2 +- .../recipes-support/iftop/iftop_1.0pre4.bb | 2 +- .../recipes-support/ipcalc/ipcalc_0.2.3.bb | 2 +- .../recipes-support/ipvsadm/ipvsadm_1.31.bb | 2 +- .../libesmtp/libesmtp/include-topdir.patch | 48 - .../libesmtp/libesmtp/snprintf.patch | 19 - .../recipes-support/libesmtp/libesmtp_1.0.6.bb | 38 - .../recipes-support/libesmtp/libesmtp_1.1.0.bb | 32 + .../recipes-support/libldb/libldb_2.3.2.bb | 2 +- .../recipes-support/libtalloc/libtalloc_2.3.3.bb | 2 +- .../recipes-support/libtdb/libtdb_1.4.3.bb | 2 +- .../recipes-support/libtevent/libtevent_0.10.2.bb | 2 +- .../recipes-support/linux-atm/linux-atm_2.5.2.bb | 2 +- .../lksctp-tools/lksctp-tools_1.0.19.bb | 2 +- .../lowpan-tools/lowpan-tools_git.bb | 2 +- .../recipes-support/macchanger/macchanger_1.7.0.bb | 2 +- .../recipes-support/mctp/mctp_git.bb | 2 +- .../recipes-support/mtr/mtr_0.95.bb | 2 +- .../recipes-support/nbd/nbd_3.20.bb | 2 +- .../recipes-support/ncp/libowfat_0.32.bb | 2 +- .../recipes-support/ncp/ncp_1.2.4.bb | 2 +- .../recipes-support/ndisc6/ndisc6_git.bb | 2 +- .../recipes-support/netcat/netcat_0.7.1.bb | 2 +- .../recipes-support/netcf/netcf_0.2.8.bb | 2 +- .../netsniff-ng/netsniff-ng_0.6.8.bb | 2 +- .../meta-networking/recipes-support/nis/nis.inc | 2 +- .../recipes-support/ntopng/ndpi_4.2.bb | 2 +- .../recipes-support/ntopng/ntopng_5.2.1.bb | 2 +- .../recipes-support/nuttcp/nuttcp_8.2.2.bb | 2 +- .../recipes-support/open-isns/open-isns_0.101.bb | 2 +- .../open-vm-tools/open-vm-tools_11.3.5.bb | 8 +- .../recipes-support/openipmi/openipmi_2.0.32.bb | 2 +- .../recipes-support/openvpn/openvpn_2.5.5.bb | 75 - .../recipes-support/openvpn/openvpn_2.5.6.bb | 75 + .../recipes-support/phytool/phytool.bb | 2 +- .../recipes-support/rdma-core/rdma-core_39.0.bb | 2 +- .../recipes-support/ruli/ruli_0.36.bb | 2 +- .../recipes-support/smcroute/smcroute_2.5.4.bb | 2 +- .../recipes-support/spice/spice_git.bb | 2 +- .../recipes-support/spice/usbredir_0.9.0.bb | 2 +- .../recipes-support/ssmtp/ssmtp_2.64.bb | 2 +- .../recipes-support/strongswan/strongswan_5.9.4.bb | 2 +- .../recipes-support/stunnel/stunnel_5.59.bb | 36 - .../recipes-support/stunnel/stunnel_5.63.bb | 33 + .../recipes-support/tcpreplay/tcpreplay_4.4.1.bb | 2 +- .../recipes-support/tinyproxy/tinyproxy_1.11.0.bb | 2 +- .../recipes-support/traceroute/traceroute_2.1.0.bb | 2 +- .../recipes-support/tunctl/tunctl.inc | 2 +- .../recipes-support/uftp/uftp_5.0.bb | 2 +- .../recipes-support/vnstat/vnstat_2.6.bb | 2 +- .../recipes-support/wireshark/wireshark_3.4.11.bb | 2 +- meta-openembedded/meta-oe/conf/layer.conf | 2 +- .../openbox/openbox-xdgmenu_0.3.bb | 2 +- .../meta-python/recipes-bsp/rwmem/rwmem_1.2.bb | 2 +- .../recipes-connectivity/lirc/lirc_0.10.1.bb | 2 +- .../recipes-extended/lcdproc/lcdproc_git.bb | 2 +- .../meta-python/recipes-support/smem/smem_1.5.bb | 2 +- .../packagegroups/packagegroup-meta-oe.bbappend | 4 - .../recipes-devtools/valijson/valijson_0.6.bb | 36 - .../recipes-support/debsums/debsums_2.2.2.bb | 2 +- .../recipes-support/rasdaemon/rasdaemon_0.6.7.bb | 2 +- .../recipes-benchmark/bonnie/bonnie++_1.04.bb | 2 +- .../meta-oe/recipes-benchmark/dbench/dbench_4.0.bb | 2 +- .../meta-oe/recipes-benchmark/fio/fio_3.29.bb | 2 +- .../recipes-benchmark/glmark2/glmark2_git.bb | 2 +- .../0001-configure.ac-check-for-CPP-prog.patch | 12 +- .../0002-Remove-pg-from-profile_CFLAGS.patch | 8 +- .../recipes-benchmark/iperf3/iperf3_3.11.bb | 32 + .../meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb | 30 - .../libhugetlbfs/libhugetlbfs_git.bb | 2 +- .../recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 2 +- .../meta-oe/recipes-benchmark/mbw/mbw_git.bb | 2 +- .../recipes-benchmark/memtester/memtester_4.5.1.bb | 2 +- .../phoronix-test-suite_10.8.1.bb | 2 +- .../recipes-benchmark/qperf/qperf_0.4.11.bb | 2 +- .../recipes-benchmark/s-suite/s-suite_git.bb | 2 +- .../recipes-benchmark/sysbench/sysbench_0.4.12.bb | 2 +- .../recipes-benchmark/tiobench/tiobench_0.3.3.bb | 2 +- .../meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb | 2 +- .../meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb | 2 +- .../recipes-bsp/cpufrequtils/cpufrequtils_008.bb | 2 +- .../recipes-bsp/edac-utils/edac-utils_git.bb | 10 +- .../meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb | 2 +- .../meta-oe/recipes-bsp/fwupd/fwupd-efi_1.2.bb | 2 +- .../meta-oe/recipes-bsp/fwupd/fwupd_1.7.3.bb | 121 - .../meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb | 127 + .../recipes-bsp/irda-utils/irda-utils_0.9.18.bb | 2 +- .../meta-oe/recipes-bsp/ledmon/ledmon_git.bb | 2 +- .../recipes-bsp/lm_sensors/lmsensors-config_1.0.bb | 2 +- .../recipes-bsp/lm_sensors/lmsensors_3.6.0.bb | 2 +- .../meta-oe/recipes-bsp/lsscsi/lsscsi_0.31.bb | 2 +- .../meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb | 2 +- .../recipes-bsp/pcmciautils/pcmciautils_018.bb | 2 +- .../recipes-connectivity/gammu/gammu_1.42.0.bb | 2 +- .../recipes-connectivity/gattlib/gattlib_git.bb | 2 +- .../recipes-connectivity/gensio/gensio_2.3.1.bb | 2 +- .../recipes-connectivity/ifplugd/ifplugd_0.28.bb | 2 +- .../recipes-connectivity/irssi/irssi_1.2.3.bb | 2 +- .../meta-oe/recipes-connectivity/iwd/iwd_1.24.bb | 55 - .../meta-oe/recipes-connectivity/iwd/iwd_1.26.bb | 55 + .../recipes-connectivity/libev/libev_4.33.bb | 2 +- .../libimobiledevice/libimobiledevice_1.3.0.bb | 2 +- .../recipes-connectivity/libmbim/libmbim_1.26.2.bb | 2 +- .../recipes-connectivity/libmtp/libmtp_1.1.18.bb | 2 +- .../recipes-connectivity/libndp/libndp_1.8.bb | 2 +- .../files/0001-build-use-python3-everywhere.patch | 33 + .../recipes-connectivity/libqmi/libqmi_1.30.4.bb | 23 +- .../libqrtr-glib/libqrtr-glib_git.bb | 21 + .../libtorrent/libtorrent_git.bb | 2 +- .../linuxptp/linuxptp_3.1.1.bb | 2 +- .../loudmouth/loudmouth_1.4.3.bb | 2 +- ...-bash-shell-scripts-to-use-bin-sh-for-use.patch | 68 + ...nlock-Make-scripts-POSIX-shell-compatible.patch | 100 + .../modemmanager/modemmanager_1.16.8.bb | 53 - .../modemmanager/modemmanager_1.18.6.bb | 62 + .../recipes-connectivity/mosh/mosh_1.3.2.bb | 2 +- .../obex/obex-data-server_0.4.6.bb | 2 +- .../recipes-connectivity/obex/openobex_1.7.2.bb | 2 +- .../recipes-connectivity/obexftp/obexftp_0.24.2.bb | 2 +- ...MAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch | 49 + .../paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb | 5 +- .../recipes-connectivity/rfkill/rfkill_1.0.bb | 2 +- .../recipes-connectivity/rtorrent/rtorrent_git.bb | 2 +- .../recipes-connectivity/ser2net/ser2net_4.3.5.bb | 2 +- .../smstools3/smstools3_3.1.21.bb | 2 +- .../telepathy/telepathy-glib_0.24.1.bb | 2 +- .../telepathy/telepathy-idle_0.2.0.bb | 2 +- .../transmission/transmission_git.bb | 2 +- .../recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb | 2 +- .../recipes-connectivity/wvdial/wvdial_1.61.bb | 2 +- .../recipes-connectivity/wvdial/wvstreams_4.6.1.bb | 2 +- .../recipes-connectivity/zabbix/zabbix_5.2.6.bb | 2 +- .../recipes-connectivity/zeromq/zeromq_4.3.4.bb | 2 +- .../recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb | 2 +- .../recipes-core/dbus/dbus-daemon-proxy_git.bb | 2 +- .../meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb | 2 +- .../meta-oe/recipes-core/emlog/emlog.inc | 2 +- .../recipes-core/glib-2.0/glibmm-2.68_2.70.0.bb | 2 +- .../meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb | 2 +- .../meta-oe/recipes-core/libnfc/libnfc_git.bb | 2 +- .../libsigc++-2.0/libsigc++-2.0_2.10.7.bb | 2 +- .../libsigc++-2.0/libsigc++-3_3.2.0.bb | 2 +- .../recipes-core/libxml/libxml++-5.0_5.0.1.bb | 2 +- .../meta-oe/recipes-core/libxml/libxml++_2.42.1.bb | 2 +- .../meta-oe/recipes-core/mdbus2/mdbus2_git.bb | 2 +- .../recipes-core/mm-common/mm-common_1.0.4.bb | 2 +- ...-meson-Use-pkg-config-to-detect-iniparser.patch | 41 + .../0001-util-Correct-path-to-iniparser.h.patch | 28 + .../meta-oe/recipes-core/ndctl/ndctl_v69.bb | 34 - .../meta-oe/recipes-core/ndctl/ndctl_v73.bb | 35 + .../recipes-core/opencl/opencl-clhpp_git.bb | 6 +- .../recipes-core/opencl/opencl-headers_git.bb | 7 +- .../recipes-core/opencl/opencl-icd-loader_git.bb | 54 +- .../packagegroups/packagegroup-meta-oe.bb | 6 +- .../recipes-core/plymouth/plymouth_0.9.5.bb | 2 +- .../proxy-libintl/proxy-libintl_20100902.bb | 2 +- .../sdbus-c++/sdbus-c++-libsystemd_250.3.bb | 2 +- .../sdbus-c++/sdbus-c++-tools_1.1.0.bb | 2 +- .../recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb | 4 +- .../meta-oe/recipes-core/toybox/toybox_0.8.5.bb | 2 +- .../meta-oe/recipes-core/usleep/usleep_1.0.bb | 2 +- .../fsverity-utils/fsverity-utils_1.5.bb | 2 +- .../recipes-crypto/libkcapi/libkcapi_1.3.1.bb | 2 +- .../recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb | 2 +- .../pkcs11-helper/pkcs11-helper_1.28.bb | 2 +- .../meta-oe/recipes-dbs/libdbi/libdbi.inc | 2 +- .../recipes-dbs/mysql/mariadb-native_10.6.4.bb | 20 - .../recipes-dbs/mysql/mariadb-native_10.7.3.bb | 20 + .../meta-oe/recipes-dbs/mysql/mariadb.inc | 14 +- .../mariadb/0001-Fix-library-LZ4-lookup.patch | 17 +- ...01-MDEV-25785-Add-support-for-OpenSSL-3.0.patch | 381 -- .../recipes-dbs/mysql/mariadb/c11_atomics.patch | 82 - .../mysql/mariadb/clang-64bit-atomics.patch | 178 + .../mysql/mariadb/mariadb-openssl3.patch | 385 ++ .../meta-oe/recipes-dbs/mysql/mariadb_10.6.4.bb | 27 - .../meta-oe/recipes-dbs/mysql/mariadb_10.7.3.bb | 28 + .../recipes-dbs/mysql/mysql-python_1.2.5.bb | 2 +- .../meta-oe/recipes-dbs/postgresql/postgresql.inc | 2 +- .../recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb | 2 +- .../meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb | 7 +- .../0001-Export-of-internal-Abseil-changes.patch | 87 - .../abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch | 13 +- .../recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 7 +- ...0014-add-u3-ss-descriptor-support-for-adb.patch | 342 ++ .../android-tools/android-tools_5.1.1.r37.bb | 3 +- .../autoconf-2.13/autoconf-2.13-native_2.13.bb | 4 +- .../recipes-devtools/capnproto/capnproto_0.9.1.bb | 1 + .../meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb | 2 +- .../meta-oe/recipes-devtools/cloc/cloc_1.92.bb | 2 +- .../recipes-devtools/cpuid/cpuid_20211129.bb | 2 +- .../recipes-devtools/ctags/ctags_5.9.20211114.0.bb | 2 +- .../dnf-plugin-tui/dnf-plugin-tui_git.bb | 2 +- .../recipes-devtools/doxygen/doxygen_1.9.3.bb | 2 +- ...ny.m4-Do-not-tinker-with-pkg-config-paths.patch | 32 + .../recipes-devtools/geany/geany-plugins_1.38.bb | 15 +- .../meta-oe/recipes-devtools/geany/geany_1.38.bb | 2 +- .../meta-oe/recipes-devtools/glade/glade_3.22.2.bb | 2 +- .../meta-oe/recipes-devtools/grpc/grpc_1.41.1.bb | 87 - .../meta-oe/recipes-devtools/grpc/grpc_1.45.0.bb | 88 + .../recipes-devtools/guider/guider_3.9.8.bb | 2 +- .../recipes-devtools/heaptrack/heaptrack_1.2.0.bb | 2 +- .../icon-slicer/icon-slicer_0.3.bb | 2 +- .../recipes-devtools/iptraf/iptraf-ng_1.2.1.bb | 2 +- .../0001-cmake-Use-GNUInstallDirs.patch | 46 + .../json-schema-validator_2.1.0.bb | 4 +- .../kconfig-frontends_4.11.0.1.bb | 2 +- .../recipes-devtools/libgee/libgee_0.20.5.bb | 2 +- .../libsombok3/libsombok3_2.4.0.bb | 2 +- .../recipes-devtools/libubox/libubox_git.bb | 2 +- .../meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb | 2 +- .../meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 2 +- .../meta-oe/recipes-devtools/luajit/luajit_git.bb | 6 +- .../recipes-devtools/luaposix/luaposix_35.1.bb | 2 +- .../recipes-devtools/memstat/memstat_1.0.bb | 2 +- .../recipes-devtools/mercurial/mercurial_5.5.bb | 2 +- .../recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb | 24 - .../recipes-devtools/msgpack/msgpack-cpp_4.1.1.bb | 21 + .../recipes-devtools/msr-tools/msr-tools_1.3.bb | 2 +- .../nlohmann-json/nlohmann-json_3.10.5.bb | 2 + .../0001-crypto-fix-build-without-scrypt.patch | 38 - .../0005-add-openssl-legacy-provider-option.patch | 36 +- .../recipes-devtools/nodejs/nodejs_16.11.1.bb | 185 - .../recipes-devtools/nodejs/nodejs_16.14.0.bb | 185 + .../recipes-devtools/octave/octave_4.4.1.bb | 2 +- .../recipes-devtools/openocd/openocd_git.bb | 2 +- .../meta-oe/recipes-devtools/pahole/pahole_1.22.bb | 2 +- .../recipes-devtools/pax-utils/pax-utils_1.2.2.bb | 2 +- .../meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb | 2 +- .../recipes-devtools/perl/ipc-run_20200505.0.bb | 2 +- .../perl/libdbd-mysql-perl_4.050.bb | 2 +- .../recipes-devtools/perl/libdbi-perl_1.643.bb | 2 +- .../perl/libdev-checklib-perl_1.14.bb | 2 +- .../recipes-devtools/perl/libio-pty-perl_1.16.bb | 2 +- .../recipes-devtools/perl/libjson-perl_4.03000.bb | 2 +- .../perl/libparse-yapp-perl_1.21.bb | 2 +- .../perl/libperlio-gzip-perl_0.20.bb | 2 +- .../meta-oe/recipes-devtools/php/php_8.1.3.bb | 279 -- .../meta-oe/recipes-devtools/php/php_8.1.4.bb | 280 ++ .../meta-oe/recipes-devtools/ply/ply_git.bb | 2 +- .../recipes-devtools/pmtools/pmtools_git.bb | 2 +- .../meta-oe/recipes-devtools/poke/poke_1.2.bb | 2 +- .../python/python-distutils-extra.inc | 13 - .../recipes-devtools/python/python3-apt_2.3.0.bb | 2 +- .../python/python3-distutils-extra.bb | 9 - .../python/python3-distutils-extra_2.39.bb | 17 + .../python/python3-pycups_2.0.1.bb | 4 +- .../serialcheck/serialcheck_1.0.0.bb | 2 +- .../meta-oe/recipes-devtools/sip/sip3_4.19.23.bb | 2 +- .../recipes-devtools/sqlite-orm/sqlite-orm_1.5.bb | 6 +- .../squashfs-tools-ng/squashfs-tools-ng_1.0.2.bb | 2 +- .../suitesparse/suitesparse_5.10.1.bb | 2 +- .../meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb | 2 +- .../recipes-devtools/uftrace/uftrace_0.11.bb | 2 +- .../unattended-upgrades/unattended-upgrades_2.6.bb | 10 +- .../recipes-devtools/valijson/valijson_0.6.bb | 38 + .../meta-oe/recipes-extended/beep/beep_1.4.9.bb | 2 +- .../recipes-extended/bitwise/bitwise_0.43.bb | 2 +- .../recipes-extended/boinc/boinc-client_7.18.1.bb | 4 +- .../recipes-extended/cfengine/cfengine_3.15.0.bb | 2 +- .../recipes-extended/cmatrix/cmatrix_2.0.bb | 2 +- .../recipes-extended/collectd/collectd_5.12.0.bb | 2 +- .../recipes-extended/ddrescue/ddrescue_1.26.bb | 2 +- .../recipes-extended/dialog/dialog_1.3-20210509.bb | 2 +- .../dlt-daemon/dlt-daemon_2.18.8.bb | 2 +- .../recipes-extended/duktape/duktape_2.6.0.bb | 21 - .../recipes-extended/duktape/duktape_2.7.0.bb | 20 + .../files/0001-Support-makefile-variables.patch | 297 -- .../recipes-extended/enscript/enscript_1.6.6.bb | 2 +- .../recipes-extended/haveged/haveged_1.9.14.bb | 47 - .../recipes-extended/haveged/haveged_1.9.17.bb | 26 + .../recipes-extended/hexedit/hexedit_1.5.bb | 2 +- .../recipes-extended/hplip/hplip_3.19.12.bb | 2 +- .../meta-oe/recipes-extended/icewm/icewm_2.9.0.bb | 2 +- .../recipes-extended/indent/indent_2.2.12.bb | 2 +- .../inputattach-config/inputattach-config.bb | 2 +- .../meta-oe/recipes-extended/iotop/iotop_1.21.bb | 2 +- .../recipes-extended/isomd5sum/isomd5sum_1.2.3.bb | 2 +- .../jpnevulator/jpnevulator_git.bb | 2 +- .../libblockdev/libblockdev_2.26.bb | 2 +- .../recipes-extended/libcec/libcec_6.0.2.bb | 2 +- .../recipes-extended/libconfig/libconfig_1.7.3.bb | 2 +- .../libdivecomputer/libdivecomputer_git.bb | 2 +- .../recipes-extended/libgxim/libgxim_0.5.0.bb | 2 +- .../meta-oe/recipes-extended/libidn/libidn_1.36.bb | 6 +- .../libimobiledevice/libplist_2.2.0.bb | 2 +- .../libimobiledevice/libusbmuxd_2.0.2.bb | 2 +- .../recipes-extended/libleak/libleak_git.bb | 2 +- .../liblightmodbus/liblightmodbus_2.0.2.bb | 2 +- .../liblockfile/liblockfile_1.14.bb | 2 +- .../recipes-extended/liblognorm/liblognorm.inc | 2 +- .../recipes-extended/libmodbus/libmodbus.inc | 2 +- .../libpwquality/libpwquality_1.4.4.bb | 2 +- .../meta-oe/recipes-extended/libqb/libqb_2.0.4.bb | 26 - .../meta-oe/recipes-extended/libqb/libqb_2.0.6.bb | 26 + .../recipes-extended/libreport/libreport_2.10.0.bb | 2 +- .../libserialport/libserialport_0.1.1.bb | 2 +- .../libstatgrab/libstatgrab_0.92.1.bb | 2 +- .../recipes-extended/libuio/libuio_0.2.1.bb | 2 +- .../recipes-extended/libwmf/libwmf_0.2.8.4.bb | 2 +- .../libyang/libyang/libyang-add-stdint-h.patch | 35 + .../libyang-skip-pcre2-config-add-stdint-h.patch | 55 - .../recipes-extended/libyang/libyang_2.0.164.bb | 38 + .../recipes-extended/libyang/libyang_2.0.7.bb | 37 - .../linuxconsole/linuxconsole_1.7.0.bb | 2 +- .../lockfile-progs/lockfile-progs_0.1.19.bb | 2 +- .../meta-oe/recipes-extended/lprng/lprng_3.8.C.bb | 2 +- .../recipes-extended/md5deep/md5deep_git.bb | 2 +- .../openlmi/openlmi-tools_0.10.5.bb | 2 +- .../recipes-extended/ostree/ostree_2021.6.bb | 2 +- .../meta-oe/recipes-extended/p7zip/p7zip_16.02.bb | 2 +- .../recipes-extended/p8platform/p8platform_git.bb | 2 +- .../recipes-extended/pam/pam-plugin-ccreds_11.bb | 2 +- .../pam/pam-ssh-agent-auth_0.10.3.bb | 2 +- .../perl/libfile-fnmatch-perl_0.02.bb | 2 +- ...-libdaxctl.h-instead-of-ndctl-libdaxctl.h.patch | 69 + .../meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb | 3 +- ...-local-privilege-escalation-CVE-2021-4034.patch | 84 + .../0002-CVE-2021-4115-GHSL-2021-077-fix.patch | 88 + .../polkit/0002-jsauthority-port-to-mozjs-91.patch | 38 - ...03-Added-support-for-duktape-as-JS-engine.patch | 3463 ++++++++++++++++ ...-ensure-to-call-JS_Init-and-JS_ShutDown-e.patch | 63 - .../recipes-extended/polkit/polkit_0.119.bb | 14 +- .../properties-cpp/properties-cpp_git.bb | 2 +- .../recipes-extended/rarpd/rarpd_ss981107.bb | 2 +- ...-CMAKE_INSTALL_LIBDIR-from-GNUInstallDirs.patch | 45 + .../redis-plus-plus/redis-plus-plus_1.3.3.bb | 4 +- .../recipes-extended/redis/redis/GNU_SOURCE.patch | 18 +- .../recipes-extended/rrdtool/rrdtool_1.7.2.bb | 129 - .../recipes-extended/rrdtool/rrdtool_1.8.0.bb | 129 + .../recipes-extended/rsyslog/librelp_1.10.0.bb | 2 +- .../recipes-extended/rsyslog/rsyslog_8.2202.0.bb | 2 +- .../sanlock/sanlock/setuptools.patch | 2 +- .../recipes-extended/sanlock/sanlock_3.8.4.bb | 2 +- .../recipes-extended/sedutil/sedutil_git.bb | 2 +- .../recipes-extended/sgpio/sgpio_1.2.0.10.bb | 2 +- .../recipes-extended/sigrok/libsigrok_0.5.2.bb | 2 +- .../sigrok/libsigrokdecode_0.5.3.bb | 2 +- .../recipes-extended/sigrok/sigrok-cli_0.7.2.bb | 2 +- ...e.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch | 66 +- .../smartmontools/smartmontools_7.2.bb | 53 - .../smartmontools/smartmontools_7.3.bb | 52 + .../recipes-extended/socketcan/can-isotp_git.bb | 2 +- .../recipes-extended/socketcan/can-utils_git.bb | 2 +- .../recipes-extended/socketcan/canutils_4.0.6.bb | 2 +- .../socketcan/libsocketcan_0.0.12.bb | 2 +- .../0001-cmake-Pass-PROBE_NAME-via-CFLAGS.patch | 29 + .../0001-fix-build-with-LuaJIT-2.1-betas.patch | 96 - ...x-a-lot-of-Werror-format-security-errors-.patch | 155 - .../recipes-extended/sysdig/sysdig/aarch64.patch | 359 -- .../recipes-extended/sysdig/sysdig_0.28.0.bb | 61 + .../meta-oe/recipes-extended/sysdig/sysdig_git.bb | 56 - .../recipes-extended/tipcutils/tipcutils_git.bb | 2 +- .../recipes-extended/tiptop/tiptop_2.3.1.bb | 2 +- .../triggerhappy/triggerhappy_git.bb | 2 +- .../uml-utilities/uml-utilities_20040406.bb | 4 +- .../meta-oe/recipes-extended/vlock/vlock_2.2.3.bb | 2 +- .../volume_key/volume-key_0.3.12.bb | 2 +- .../meta-oe/recipes-extended/wipe/wipe_0.24.bb | 2 +- .../wxwidgets/fix-libdir-for-multilib.patch | 83 + .../respect-DESTDIR-when-create-link.patch | 55 + .../recipes-extended/wxwidgets/wxwidgets_git.bb | 8 +- .../meta-oe/recipes-extended/zlog/zlog_1.2.15.bb | 2 +- .../meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.1.bb | 2 +- .../meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb | 2 +- .../meta-oe/recipes-gnome/gcab/gcab_1.4.bb | 2 +- .../meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb | 2 +- .../gnome-common/gnome-common_3.18.0.bb | 2 +- .../gnome-doc-utils-stub_1.0.bb | 2 +- .../gnome-themes/gnome-themes-extra_3.28.bb | 2 +- .../meta-oe/recipes-gnome/gtk+/gtk+.inc | 2 +- .../meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb | 2 +- .../meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb | 2 +- .../recipes-gnome/libjcat/libjcat_0.1.10.bb | 34 - .../recipes-gnome/libjcat/libjcat_0.1.11.bb | 34 + .../recipes-gnome/libpeas/libpeas_1.30.0.bb | 26 - .../recipes-gnome/libpeas/libpeas_1.32.0.bb | 26 + .../meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.7.bb | 20 - .../meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.8.bb | 20 + .../meta-oe/recipes-gnome/pyxdg/pyxdg_0.27.bb | 2 +- .../meta-oe/recipes-gnome/vte9/vte9.inc | 2 +- .../recipes-graphics/cairo/cairomm-1.16_1.16.1.bb | 2 +- .../recipes-graphics/cairo/cairomm_1.14.3.bb | 4 +- .../recipes-graphics/dietsplash/dietsplash_git.bb | 2 +- .../meta-oe/recipes-graphics/directfb/directfb.inc | 2 +- .../dnfdragora/dnfdragora_2.1.2.bb | 2 +- .../meta-oe/recipes-graphics/fbgrab/fbgrab_1.5.bb | 2 +- .../meta-oe/recipes-graphics/fbida/fbida_2.14.bb | 4 +- .../fontforge/fontforge_20190801.bb | 2 +- .../meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb | 2 +- .../recipes-graphics/gphoto2/gphoto2_2.5.27.bb | 2 +- .../recipes-graphics/gphoto2/libgphoto2_2.5.27.bb | 7 +- .../recipes-graphics/graphene/graphene_1.10.6.bb | 22 - .../recipes-graphics/graphene/graphene_1.10.8.bb | 22 + .../recipes-graphics/graphviz/graphviz_2.44.1.bb | 106 - .../recipes-graphics/graphviz/graphviz_2.50.0.bb | 117 + .../recipes-graphics/gtkperf/gtkperf_0.40.bb | 2 +- .../recipes-graphics/gtkwave/gtkwave_3.3.111.bb | 2 +- .../recipes-graphics/libforms/libforms_1.2.3.bb | 2 +- .../recipes-graphics/libsdl/libsdl2-ttf_2.0.18.bb | 2 +- .../recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 +- .../libvncserver/libvncserver_0.9.13.bb | 2 +- .../libyui/libyui-ncurses_4.1.1.bb | 2 +- .../recipes-graphics/libyui/libyui_4.1.1.bb | 2 +- .../recipes-graphics/lvgl/lv-drivers_7.11.0.bb | 2 +- .../recipes-graphics/lvgl/lv-lib-png_8.0.2.bb | 2 + .../meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb | 1 + .../meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb | 2 +- .../recipes-graphics/numlockx/numlockx_1.2.bb | 2 +- .../meta-oe/recipes-graphics/openbox/obconf_git.bb | 2 +- .../recipes-graphics/openbox/openbox_3.6.1.bb | 2 +- .../recipes-graphics/pango/pangomm-2.48_2.50.0.bb | 2 +- .../recipes-graphics/pango/pangomm_2.46.2.bb | 2 +- .../recipes-graphics/qrencode/qrencode_4.1.1.bb | 2 +- .../stalonetray/stalonetray_0.8.3.bb | 2 +- .../meta-oe/recipes-graphics/suckless/st_0.8.4.bb | 2 +- .../recipes-graphics/tigervnc/tigervnc_1.11.0.bb | 2 +- .../meta-oe/recipes-graphics/tslib/tslib_1.22.bb | 2 +- .../ttf-fonts/ttf-hunkyfonts_0.3.1.bb | 2 +- .../ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb | 2 +- .../ttf-fonts/ttf-liberation_0.2.bb | 2 +- .../ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb | 2 +- .../ttf-fonts/ttf-vlgothic_20200720.bb | 2 +- .../ttf-fonts/ttf-wqy-zenhei_0.9.45.bb | 2 +- .../meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb | 23 - .../meta-oe/recipes-graphics/vdpau/libvdpau_1.5.bb | 25 + .../recipes-graphics/x11vnc/x11vnc_0.9.16.bb | 2 +- .../recipes-graphics/xbindkeys/xbindkeys_1.8.7.bb | 18 + .../xorg-data/xorg-data-common.inc | 2 +- .../recipes-graphics/xorg-doc/xorg-doc-common.inc | 2 +- .../xorg-driver/xf86-video-armsoc_1.4.1.bb | 2 +- .../xscreensaver/xscreensaver_6.01.bb | 2 +- .../xserver-common/xserver-common_1.34.bb | 2 +- .../meta-oe/recipes-graphics/yad/yad_6.0.bb | 2 +- .../recipes-kernel/agent-proxy/agent-proxy_1.97.bb | 2 +- .../meta-oe/recipes-kernel/bpftool/bpftool.bb | 2 +- .../meta-oe/recipes-kernel/cpupower/cpupower.bb | 2 +- .../meta-oe/recipes-kernel/crash/crash_7.3.0.bb | 2 +- .../intel-speed-select/intel-speed-select.bb | 2 +- .../kernel-selftest/kernel-selftest.bb | 2 +- .../meta-oe/recipes-kernel/kpatch/kpatch.inc | 2 +- .../meta-oe/recipes-kernel/libbpf/libbpf_0.5.0.bb | 4 +- .../meta-oe/recipes-kernel/linux/linux.inc | 2 +- .../makedumpfile/makedumpfile_1.7.0.bb | 2 +- .../minicoredumper/minicoredumper_2.0.1.bb | 2 +- .../recipes-kernel/oprofile/oprofile_1.4.0.bb | 2 +- .../recipes-kernel/pm-graph/pm-graph_5.5.bb | 2 +- .../recipes-kernel/spidev-test/spidev-test.bb | 2 +- .../recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb | 2 +- .../recipes-kernel/turbostat/turbostat_3.4.bb | 2 +- .../recipes-kernel/usbip-tools/usbip-tools.bb | 2 +- .../recipes-multimedia/alsa/alsa-oss_1.1.8.bb | 2 +- .../audiofile/audiofile_0.3.6.bb | 2 +- .../recipes-multimedia/cdrkit/cdrkit_1.1.11.bb | 2 +- .../recipes-multimedia/faad2/faad2_2.8.8.bb | 2 +- .../recipes-multimedia/id3lib/id3lib_3.8.3.bb | 2 +- .../jack/a2jmidid/ppc_musl_ucontext.patch | 19 + .../meta-oe/recipes-multimedia/jack/a2jmidid_9.bb | 3 +- .../recipes-multimedia/jack/jack_1.19.19.bb | 2 +- .../recipes-multimedia/libburn/libburn_1.5.4.bb | 2 +- .../libcdio/libcdio-paranoia_10.2+2.0.1.bb | 2 +- .../recipes-multimedia/libcdio/libcdio_2.1.0.bb | 2 +- .../libdvdread/libdvdread_6.1.2.bb | 2 +- .../libid3tag/libid3tag_0.15.1b.bb | 2 +- .../recipes-multimedia/libmad/libmad_0.15.1b.bb | 2 +- .../recipes-multimedia/libmms/libmms_0.6.4.bb | 2 +- .../recipes-multimedia/live555/live555_20210824.bb | 3 +- .../mikmod/libmikmod_3.3.11.1.bb | 2 +- .../recipes-multimedia/mplayer/mpv_0.34.1.bb | 2 +- .../pulseaudio/pavucontrol_4.0.bb | 2 +- .../sound-themes/sound-theme-freedesktop_0.8.bb | 2 +- ...a-ctl-Don-t-install-libmediactl-and-libv4.patch | 7 +- ...t-Link-mc_nextgen_test-with-libargp-if-ne.patch | 28 - .../0002-original-patch-mediactl-pkgconfig.patch | 21 + ...03-original-patch-export-mediactl-headers.patch | 24 + .../v4l-utils/0007-Do-not-use-getsubopt.patch | 9 +- ...ure.ac-autodetect-availability-of-systemd.patch | 47 - ...estrict-installation-of-50-rc_keymap.conf.patch | 40 - .../v4l-utils/export-mediactl-headers.patch | 23 - .../v4l2apps/v4l-utils/mediactl-pkgconfig.patch | 20 - .../v4l2apps/v4l-utils_1.20.0.bb | 58 - .../v4l2apps/v4l-utils_1.22.1.bb | 56 + .../recipes-multimedia/v4l2apps/yavta_git.bb | 2 +- .../recipes-navigation/geoclue/geoclue_2.5.7.bb | 2 +- .../meta-oe/recipes-navigation/geos/geos.inc | 2 +- .../libspatialite/libspatialite_4.3.0a.bb | 2 +- .../recipes-navigation/orrery/orrery_2.7.bb | 2 +- .../meta-oe/recipes-printing/cups/cups-filters.inc | 2 +- .../recipes-printing/gutenprint/gutenprint.inc | 2 +- .../meta-oe/recipes-security/audit/audit_2.8.5.bb | 2 +- .../meta-oe/recipes-security/audit/audit_3.0.6.bb | 2 +- .../recipes-security/keyutils/keyutils_1.6.1.bb | 2 +- .../meta-oe/recipes-security/nmap/nmap_7.80.bb | 2 +- .../tomoyo-tools/tomoyo-tools_2.5.0.bb | 2 +- ...use-pkgconfig-instead-of-libgcrypt-config.patch | 106 + .../recipes-security/usbguard/usbguard_1.1.1.bb | 68 + .../meta-oe/recipes-shells/dash/dash_0.5.11.5.bb | 2 +- .../meta-oe/recipes-support/anthy/anthy_9100h.bb | 2 +- .../meta-oe/recipes-support/atop/atop_2.4.0.bb | 2 +- .../meta-oe/recipes-support/augeas/augeas.inc | 2 +- .../recipes-support/boost-sml/boost-sml_git.bb | 4 +- .../canonical-multitouch/frame_2.5.0.bb | 2 +- .../canonical-multitouch/geis_2.2.17.bb | 2 +- .../canonical-multitouch/grail_3.1.1.bb | 2 +- .../meta-oe/recipes-support/ccid/ccid_1.4.33.bb | 2 +- .../meta-oe/recipes-support/colord/colord.inc | 2 +- .../consolation/consolation_0.0.8.bb | 2 +- .../meta-oe/recipes-support/devmem2/devmem2.bb | 5 +- ...sure-word-is-32-bit-and-add-support-for-6.patch | 70 - .../devmem2/devmem2/devmem2-fixups-2.patch | 91 - .../recipes-support/dfu-util/dfu-util_0.11.bb | 2 +- .../meta-oe/recipes-support/dhex/dhex_0.69.bb | 2 +- .../recipes-support/digitemp/digitemp_3.7.2.bb | 2 +- .../meta-oe/recipes-support/dool/dool_1.0.0.bb | 2 +- .../recipes-support/driverctl/driverctl_0.111.bb | 2 +- .../meta-oe/recipes-support/eject/eject_2.1.5.bb | 2 +- .../meta-oe/recipes-support/emacs/emacs_27.2.bb | 2 +- .../meta-oe/recipes-support/enca/enca_1.19.bb | 2 +- .../recipes-support/espeak/espeak_1.48.04.bb | 2 +- .../recipes-support/evemu-tools/evemu-tools_git.bb | 2 +- .../meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb | 2 +- .../recipes-support/farsight/libnice_0.1.18.bb | 2 +- .../meta-oe/recipes-support/fbset/fbset_2.1.bb | 2 +- .../meta-oe/recipes-support/fftw/fftw_3.3.10.bb | 2 +- .../meta-oe/recipes-support/fltk/fltk.inc | 2 +- .../recipes-support/freerdp/freerdp_2.5.0.bb | 85 - .../recipes-support/freerdp/freerdp_2.6.1.bb | 85 + .../recipes-support/gengetopt/gengetopt_2.23.bb | 2 +- .../recipes-support/gnulib/gnulib_2018-03-07.03.bb | 2 +- .../meta-oe/recipes-support/gosu/gosu_1.14.bb | 20 + .../recipes-support/gperftools/gperftools_2.9.1.bb | 3 +- .../meta-oe/recipes-support/gpm/gpm_git.bb | 2 +- .../gradm/gradm_3.1-201903191516.bb | 2 +- .../meta-oe/recipes-support/gsl/gsl.inc | 5 +- .../recipes-support/hddtemp/hddtemp_0.3-beta15.bb | 2 +- .../meta-oe/recipes-support/hidapi/hidapi_git.bb | 2 +- .../0001-Use-OE-specific-checks-for-ncurses.patch | 42 + ...0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch | 33 + .../meta-oe/recipes-support/hstr/hstr_2.5.0.bb | 17 + .../meta-oe/recipes-support/htop/htop_3.1.2.bb | 2 +- .../hunspell/hunspell-dictionaries.bb | 88 +- .../recipes-support/hunspell/hunspell_1.7.0.bb | 2 +- .../meta-oe/recipes-support/hwdata/hwdata_0.356.bb | 25 - .../meta-oe/recipes-support/hwdata/hwdata_0.357.bb | 25 + .../meta-oe/recipes-support/iksemel/iksemel_1.5.bb | 2 +- ...0001-iniparser.pc-Make-libpath-a-variable.patch | 23 + .../recipes-support/iniparser/iniparser_4.1.bb | 11 +- .../inotify-tools/inotify-tools_3.22.1.0.bb | 2 +- .../meta-oe/recipes-support/joe/joe_4.6.bb | 2 +- .../meta-oe/recipes-support/lcov/lcov_1.14.bb | 2 +- .../libatasmart/libatasmart_0.19.bb | 2 +- .../recipes-support/libbytesize/libbytesize_2.6.bb | 2 +- .../libcanberra/libcanberra_0.30.bb | 2 +- .../recipes-support/libcereal/files/run-ptest | 12 + .../recipes-support/libcereal/libcereal_1.3.1.bb | 31 - .../recipes-support/libcereal/libcereal_1.3.2.bb | 45 + .../0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch | 30 + .../recipes-support/libcppkafka/libcppkafka_git.bb | 4 +- .../libcyusbserial/libcyusbserial_git.bb | 2 +- .../meta-oe/recipes-support/libee/libee.inc | 2 +- .../recipes-support/libeigen/libeigen_3.4.0.bb | 2 +- .../recipes-support/libestr/libestr_0.1.11.bb | 2 +- .../meta-oe/recipes-support/libfann/libfann_git.bb | 2 +- .../meta-oe/recipes-support/libftdi/libftdi_1.4.bb | 2 +- .../recipes-support/libgpiod/libgpiod_1.6.3.bb | 2 +- .../recipes-support/libgusb/libgusb_0.3.10.bb | 2 +- ...ot-verify-whether-libiio-is-installed-whe.patch | 34 - ...include-CheckCSourceCompiles-before-its-m.patch | 38 + .../meta-oe/recipes-support/libiio/libiio_git.bb | 28 +- .../recipes-support/libjs/libjs-jquery_3.3.1.bb | 2 +- .../recipes-support/libjs/libjs-sizzle_1.10.18.bb | 2 +- .../recipes-support/libmanette/libmanette_0.2.6.bb | 2 +- .../recipes-support/liboauth/liboauth_1.0.3.bb | 2 +- .../meta-oe/recipes-support/libol/libol_0.3.18.bb | 2 +- .../meta-oe/recipes-support/liboop/liboop_1.0.1.bb | 2 +- .../recipes-support/libp11/libp11_0.4.11.bb | 2 +- .../recipes-support/libraw/libraw_0.20.2.bb | 2 +- .../recipes-support/libraw1394/libraw1394_2.1.2.bb | 2 +- .../0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch | 30 + .../recipes-support/librdkafka/librdkafka_1.8.2.bb | 4 +- .../recipes-support/librsync/librsync_2.3.2.bb | 2 +- .../meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb | 2 +- .../meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb | 2 +- .../meta-oe/recipes-support/libssh/libssh_0.8.9.bb | 2 +- .../recipes-support/libteam/libteam_1.31.bb | 2 +- .../recipes-support/liburing/liburing_2.1.bb | 6 +- .../recipes-support/libusb/libusb-compat_0.1.7.bb | 2 +- .../meta-oe/recipes-support/libusbg/libusbg_git.bb | 2 +- .../recipes-support/libusbgx/libusbgx_git.bb | 2 +- .../recipes-support/libutempter/libutempter.bb | 2 +- .../meta-oe/recipes-support/links/links.inc | 2 +- .../recipes-support/lio-utils/lio-utils_4.1.bb | 2 +- .../recipes-support/lockdev/lockdev_1.0.3.bb | 2 +- .../meta-oe/recipes-support/log4c/log4c_1.2.4.bb | 2 +- .../recipes-support/log4cpp/log4cpp_1.1.3.bb | 2 +- .../meta-oe/recipes-support/lvm2/lvm2.inc | 2 +- .../recipes-support/mbuffer/mbuffer_20140310.bb | 2 +- .../recipes-support/mcelog/mce-inject_git.bb | 2 +- .../meta-oe/recipes-support/mcelog/mce-test_git.bb | 2 +- .../mcelog/0001-test-avoid-the-pfa-test-hang.patch | 36 - .../meta-oe/recipes-support/mcelog/mcelog_175.bb | 36 - .../meta-oe/recipes-support/mcelog/mcelog_180.bb | 35 + .../meta-oe/recipes-support/monit/monit_5.31.0.bb | 52 - .../meta-oe/recipes-support/monit/monit_5.32.0.bb | 56 + .../meta-oe/recipes-support/mscgen/mscgen_0.20.bb | 2 +- .../multipath-tools/multipath-tools_0.8.4.bb | 2 +- .../meta-oe/recipes-support/nano/nano_6.2.bb | 2 +- .../meta-oe/recipes-support/neon/neon_0.30.2.bb | 2 +- .../meta-oe/recipes-support/nmon/nmon_16m.bb | 2 +- .../meta-oe/recipes-support/nspr/nspr_4.29.bb | 4 +- .../meta-oe/recipes-support/nss/nss_3.74.bb | 2 +- .../recipes-support/openct/openct_0.6.20.bb | 2 +- .../recipes-support/openldap/openldap_2.5.9.bb | 3 +- .../recipes-support/opensc/opensc_0.22.0.bb | 2 +- .../recipes-support/opensync/wbxml2_0.10.8.bb | 2 +- .../meta-oe/recipes-support/p910nd/p910nd_0.97.bb | 2 +- .../recipes-support/pcp/pcp-native_5.3.5.bb | 53 - .../recipes-support/pcp/pcp-native_5.3.6.bb | 53 + .../meta-oe/recipes-support/pcp/pcp.inc | 14 +- ...figure-Limit-the-header-search-to-sysroot.patch | 88 + .../meta-oe/recipes-support/pcp/pcp_5.3.5.bb | 225 -- .../meta-oe/recipes-support/pcp/pcp_5.3.6.bb | 228 ++ .../recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb | 8 +- .../recipes-support/pcsc-tools/pcsc-tools_1.5.8.bb | 2 +- .../meta-oe/recipes-support/picocom/picocom_git.bb | 2 +- .../pidgin/funyahoo-plusplus_git.bb | 2 +- .../meta-oe/recipes-support/pidgin/icyque_git.bb | 2 +- .../recipes-support/pidgin/libgnt_2.14.1.bb | 2 +- .../meta-oe/recipes-support/pidgin/libotr_4.1.1.bb | 2 +- .../recipes-support/pidgin/pidgin-otr_4.0.2.bb | 2 +- .../recipes-support/pidgin/pidgin-sipe_1.25.0.bb | 2 +- .../recipes-support/pidgin/pidgin_2.14.2.bb | 2 +- .../recipes-support/pidgin/purple-skypeweb_git.bb | 2 +- .../recipes-support/pngcheck/pngcheck_2.3.0.bb | 2 +- .../poco/0001-fix-missing-expat-definition.patch | 27 - .../meta-oe/recipes-support/poco/poco_1.11.0.bb | 102 - .../meta-oe/recipes-support/poco/poco_1.11.1.bb | 101 + .../recipes-support/poppler/poppler-data_0.4.11.bb | 2 +- .../recipes-support/poppler/poppler_22.02.0.bb | 51 - .../recipes-support/poppler/poppler_22.03.0.bb | 51 + .../recipes-support/pps-tools/pps-tools_1.0.3.bb | 2 +- .../recipes-support/procmail/procmail_3.22.bb | 2 +- .../meta-oe/recipes-support/pv/pv/run-ptest | 7 + .../meta-oe/recipes-support/pv/pv_1.6.20.bb | 27 + .../meta-oe/recipes-support/pv/pv_1.6.6.bb | 16 - .../recipes-support/pxaregs/pxaregs_1.14.bb | 2 +- .../recipes-support/raptor2/raptor2_2.0.15.bb | 2 +- .../meta-oe/recipes-support/rdfind/rdfind_1.4.1.bb | 2 +- .../recipes-support/remmina/remmina_1.4.24.bb | 2 +- .../recipes-support/rsnapshot/rsnapshot_git.bb | 2 +- .../meta-oe/recipes-support/satyr/satyr_0.39.bb | 2 +- .../serial-utils/pty-forward-native.bb | 2 +- .../serial-utils/serial-forward_git.bb | 2 +- .../recipes-support/sg3-utils/sg3-utils_1.45.bb | 2 +- .../recipes-support/sharutils/sharutils_4.15.2.bb | 2 +- .../meta-oe/recipes-support/smarty/smarty_4.1.0.bb | 2 +- .../meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb | 4 - .../recipes-support/spitools/spitools_git.bb | 2 +- .../recipes-support/srecord/srecord_1.64.bb | 2 +- .../recipes-support/stm32flash/stm32flash_0.6.bb | 13 - .../recipes-support/stm32flash/stm32flash_0.7.bb | 13 + ...l-fix-wrong-ownership-during-installation.patch | 30 - .../0005-.py-s-python-python3-exclude-tests.patch | 53 - .../recipes-support/syslog-ng/syslog-ng_3.31.2.bb | 143 - .../recipes-support/syslog-ng/syslog-ng_3.36.1.bb | 140 + .../system-config-keyboard_1.4.0.bb | 2 +- .../thin-provisioning-tools_0.9.0.bb | 2 +- .../tokyocabinet/tokyocabinet_1.4.48.bb | 2 +- .../recipes-support/toscoterm/toscoterm_git.bb | 2 +- .../meta-oe/recipes-support/tree/tree_2.0.2.bb | 2 +- .../recipes-support/uchardet/uchardet_0.0.7.bb | 2 +- .../recipes-support/udisks/udisks2_2.9.4.bb | 2 +- .../recipes-support/uhubctl/uhubctl_2.4.0.bb | 2 +- .../meta-oe/recipes-support/uim/uim_1.8.8.bb | 5 +- .../recipes-support/unixodbc/unixodbc_2.3.7.bb | 2 +- .../recipes-support/upower/upower_0.99.13.bb | 2 +- .../usb-modeswitch/usb-modeswitch-data_20191128.bb | 2 +- .../usb-modeswitch/usb-modeswitch_2.6.0.bb | 2 +- .../recipes-support/utouch/utouch-evemu_git.bb | 2 +- .../recipes-support/utouch/utouch-frame_git.bb | 2 +- .../recipes-support/utouch/utouch-mtview_git.bb | 2 +- .../vboxguestdrivers/vboxguestdrivers_6.1.32.bb | 2 +- .../recipes-support/xdelta/xdelta3_3.1.0.bb | 2 +- .../xdg-user-dirs/xdg-user-dirs_0.17.bb | 2 +- .../xserver-xorg-cvt-native_1.20.10.bb | 2 +- .../meta-oe/recipes-support/zbar/zbar_git.bb | 2 +- .../meta-oe/recipes-support/zile/zile_2.4.15.bb | 2 +- .../meta-oe/recipes-test/bats/bats_1.5.0.bb | 30 - .../meta-oe/recipes-test/bats/bats_1.6.0.bb | 30 + .../meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb | 2 +- .../meta-oe/recipes-test/cukinia/cukinia_0.5.1.bb | 19 - .../meta-oe/recipes-test/cukinia/cukinia_0.6.0.bb | 19 + .../meta-oe/recipes-test/cunit/cunit_2.1-3.bb | 2 +- .../meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb | 4 +- .../meta-oe/recipes-test/evtest/evtest_1.34.bb | 2 +- .../meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb | 2 +- ...e-poll.h-instead-of-deprecated-sys-poll.h.patch | 48 - .../fwts/fwts/0003-Remove-Werror-from-build.patch | 13 +- ...efine-__SWORD_TYPE-if-not-defined-by-libc.patch | 5 - .../fwts/fwts/0005-Undefine-PAGE_SIZE.patch | 7 +- ...ntptr_t-to-fix-pointer-to-int-cast-issues.patch | 17 +- .../meta-oe/recipes-test/fwts/fwts_21.06.00.bb | 31 - .../meta-oe/recipes-test/fwts/fwts_22.01.00.bb | 34 + .../meta-oe/recipes-test/pm-qa/pm-qa_git.bb | 2 +- meta-openembedded/meta-perl/conf/layer.conf | 2 +- .../recipes-extended/logcheck/logcheck_1.3.23.bb | 2 +- .../mime-construct/mime-construct_1.11.bb | 2 +- .../recipes-perl/adduser/adduser_3.118.bb | 2 +- .../libalgorithm/libalgorithm-diff-perl_1.15.bb | 2 +- .../libauthen/libauthen-sasl-perl_2.16.bb | 2 +- .../libcapture/libcapture-tiny-perl_0.48.bb | 2 +- .../recipes-perl/libcgi/libcgi-perl_4.54.bb | 2 +- .../libclass-method-modifiers-perl_2.13.bb | 2 +- .../libconfig/libconfig-autoconf-perl_0.319.bb | 2 +- .../libcrypt/libcrypt-openssl-guess-perl_0.15.bb | 2 +- .../libcrypt/libcrypt-openssl-random-perl_0.15.bb | 2 +- .../libcrypt/libcrypt-openssl-rsa-perl_0.32.bb | 2 +- .../recipes-perl/libcurses/libcurses-perl_1.38.bb | 2 +- .../recipes-perl/libdb/libdbd-sqlite-perl_1.68.bb | 2 +- .../libdevel-globaldestruction-perl_0.14.bb | 2 +- .../libdigest/libdigest-hmac-perl_1.03.bb | 2 +- .../libdigest/libdigest-sha1-perl_2.13.bb | 2 +- .../libencode/libencode-locale-perl_1.05.bb | 2 +- .../recipes-perl/libencode/libencode-perl_3.16.bb | 2 +- .../recipes-perl/libenv/libenv-perl_1.04.bb | 2 +- .../libextutils/libextutils-config-perl_0.008.bb | 2 +- .../libextutils/libextutils-cppguess-perl_0.23.bb | 2 +- .../libextutils/libextutils-helpers-perl_0.026.bb | 2 +- .../libextutils-installpaths-perl_0.012.bb | 2 +- .../libextutils/libextutils-parsexs-perl_3.35.bb | 2 +- .../libfile/libfile-slurp-perl_9999.19.bb | 2 +- .../libfile/libfile-slurper-perl_0.013.bb | 2 +- .../libhtml/libhtml-parser-perl_3.72.bb | 2 +- .../libhtml/libhtml-tagset-perl_3.20.bb | 2 +- .../recipes-perl/libhtml/libhtml-tree-perl_5.03.bb | 2 +- .../libimport/libimport-into-perl_1.002004.bb | 2 +- .../libio/compress-raw-bzip2-perl_2.096.bb | 2 +- .../libio/compress-raw-lzma-perl_2.096.bb | 2 +- .../libio/compress-raw-zlib-perl_2.096.bb | 2 +- .../libio/io-compress-lzma-perl_2.096.bb | 24 - .../recipes-perl/libio/io-compress-perl_2.096.bb | 24 - .../libio/libio-compress-lzma-perl_2.096.bb | 24 + .../libio/libio-compress-perl_2.096.bb | 24 + .../libio/libio-socket-ssl-perl_2.074.bb | 2 +- .../recipes-perl/libio/libio-stringy-perl_2.111.bb | 2 +- .../recipes-perl/libipc/libipc-signal-perl_1.00.bb | 2 +- .../liblocale/liblocale-gettext-perl_1.07.bb | 2 +- .../libmime/libmime-charset-perl_1.012.2.bb | 2 +- .../libmime/libmime-types-perl_2.17.bb | 2 +- .../libmodule/libmodule-build-tiny-perl_0.039.bb | 2 +- .../libmodule/libmodule-pluggable-perl_5.2.bb | 2 +- .../libmodule/libmodule-runtime-perl_0.016.bb | 2 +- .../recipes-perl/libmoo/libmoo-perl_2.005004.bb | 2 +- .../recipes-perl/libnet/libnet-ldap-perl_0.68.bb | 2 +- .../recipes-perl/libnet/libnet-libidn-perl_0.12.bb | 2 +- .../recipes-perl/libnet/libnet-ssleay-perl_1.85.bb | 2 +- .../recipes-perl/libnet/libnet-telnet-perl_3.05.bb | 2 +- .../libproc/libproc-waitstat-perl_1.00.bb | 2 +- .../librole/librole-tiny-perl_2.002004.bb | 2 +- .../libstatgrab/libunix-statgrab_0.112.bb | 2 +- .../libstrictures/libstrictures-perl_2.000006.bb | 2 +- .../libsub-exporter-progressive-perl_0.001013.bb | 2 +- .../libsub/libsub-uplevel-perl_0.2800.bb | 2 +- .../libterm/libterm-readkey-perl_2.38.bb | 2 +- .../libtest/libtest-deep-perl_1.130.bb | 2 +- .../libtest/libtest-harness-perl_3.42.bb | 2 +- .../libtest/libtest-nowarnings-perl_1.04.bb | 2 +- .../recipes-perl/libtest/libtest-warn-perl_0.36.bb | 2 +- .../libtest/libtest-warnings-perl_0.031.bb | 2 +- .../libtext/libtext-charwidth-perl_0.04.bb | 2 +- .../recipes-perl/libtext/libtext-diff-perl_1.41.bb | 2 +- .../recipes-perl/libtext/libtext-iconv-perl_1.7.bb | 2 +- .../libtext/libtext-wrapi18n-perl_0.06.bb | 2 +- .../libunicode-linebreak-perl_2019.001.bb | 2 +- .../libxml/libxml-filter-buffertext-perl_1.01.bb | 2 +- .../libxml/libxml-libxml-perl_2.0134.bb | 2 +- .../libxml/libxml-sax-writer-perl_0.57.bb | 2 +- .../packagegroups/packagegroup-meta-perl.bb | 4 +- .../meta-perl/recipes-perl/po4a/po4a_0.49.bb | 2 +- .../classes/distutils-common-base.bbclass | 28 + .../meta-python/classes/distutils3-base.bbclass | 9 + .../meta-python/classes/distutils3.bbclass | 71 + meta-openembedded/meta-python/classes/pyo3.bbclass | 30 - .../meta-python/classes/setuptools3_rust.bbclass | 11 - meta-openembedded/meta-python/conf/layer.conf | 2 +- .../meta-python/licenses/CRC32C-ADLER | 15 + .../python-txws/python3-txws_0.9.1.bb | 1 + .../telepathy/telepathy-python3_0.15.19.bb | 2 +- .../packagegroups/packagegroup-meta-python.bb | 41 +- .../0001-Fix-for-Python-3.10-compatibility.patch | 9 + .../recipes-devtools/python/python-pyasn1.inc | 31 - .../python/python-pyzmq/club-rpath-out.patch | 29 - ...up.py-switch-from-distutils-to-setuptools.patch | 30 + .../python/python3-aiofiles_0.8.0.bb | 2 +- .../python/python3-aiohttp_3.8.1.bb | 3 +- .../python/python3-alembic_1.7.6.bb | 19 - .../python/python3-alembic_1.7.7.bb | 19 + .../python/python3-ansi2html_1.7.0.bb | 9 +- .../python/python3-antlr4-runtime_4.9.2.bb | 11 + .../python/python3-anyjson_0.3.3.bb | 28 - .../recipes-devtools/python/python3-argh_0.26.2.bb | 2 +- .../python/python3-arpeggio_1.10.2.bb | 17 - .../python/python3-arpeggio_2.0.0.bb | 17 + .../python/python3-asn1crypto_1.4.0.bb | 25 - .../recipes-devtools/python/python3-astor_0.8.1.bb | 1 + .../python/python3-astroid_2.11.2.bb | 32 + .../python/python3-astroid_2.9.3.bb | 32 - .../python/python3-asttokens_2.0.5.bb | 7 +- .../python/python3-async-timeout_4.0.2.bb | 2 +- .../python/python3-asyncinotify_2.0.2.bb | 15 + .../python/python3-asyncio-glib_0.1.bb | 2 +- .../python/python3-autobahn_22.1.1.bb | 23 - .../python/python3-autobahn_22.3.2.bb | 23 + ...up.py-Use-setuptools-instead-of-distutils.patch | 29 + .../python3-aws-iot-device-sdk-python_1.4.9.bb | 40 - .../python3-aws-iot-device-sdk-python_1.5.1.bb | 44 + .../recipes-devtools/python/python3-babel_2.9.1.bb | 26 - .../python/python3-backcall_0.2.0.bb | 2 +- .../python3-backports-functools-lru-cache_1.6.4.bb | 31 - .../python/python3-bandit_1.7.2.bb | 13 - .../python/python3-bandit_1.7.4.bb | 13 + .../python/python3-bcrypt/run-ptest | 3 - .../python/python3-bcrypt_3.2.0.bb | 30 - .../python/python3-bidict_0.21.4.bb | 2 +- .../python/python3-bitarray_2.3.7.bb | 10 - .../python/python3-bitarray_2.4.0.bb | 10 + .../python/python3-bitstruct_8.12.1.bb | 13 - .../python/python3-bitstruct_8.13.0.bb | 13 + .../python/python3-cachetools_4.2.4.bb | 32 - .../python/python3-cachetools_5.0.0.bb | 32 + .../recipes-devtools/python/python3-can_3.3.4.bb | 2 +- .../python/python3-cantools_37.0.1.bb | 19 - .../python/python3-cantools_37.0.7.bb | 21 + .../recipes-devtools/python/python3-cbor2_5.4.2.bb | 2 +- .../python/python3-cchardet_2.1.7.bb | 2 +- .../python/python3-certifi_2021.10.8.bb | 14 - .../recipes-devtools/python/python3-cffi_1.15.0.bb | 18 - .../python/python3-chardet_4.0.0.bb | 23 - .../python/python3-charset-normalizer_2.0.10.bb | 15 - .../python/python3-charset-normalizer_2.0.12.bb | 15 + .../python/python3-cheetah_3.2.6.post1.bb | 14 - .../python/python3-cheetah_3.2.6.post2.bb | 14 + .../python/python3-coloredlogs_15.0.1.bb | 4 - ...Switch-from-using-distutils-to-setuptools.patch | 28 + .../python/python3-configobj_5.0.6.bb | 2 + .../python/python3-configparser_5.2.0.bb | 13 - .../python/python3-configshell-fb_1.1.29.bb | 1 + .../python/python3-contextlib2_21.6.0.bb | 2 +- .../recipes-devtools/python/python3-cppy_1.1.0.bb | 11 - .../recipes-devtools/python/python3-cppy_1.2.0.bb | 12 + .../python/python3-crc32c_2.2.post0.bb | 22 + ...up.py-use-setuptools-instead-of-distutils.patch | 22 + .../recipes-devtools/python/python3-crcmod_1.7.bb | 2 +- .../python/python3-cryptography-vectors_36.0.1.bb | 24 - .../0001-Cargo.toml-specify-pem-version.patch | 31 - .../0002-Cargo.toml-edition-2018-2021.patch | 28 - .../python/python3-cryptography/check-memfree.py | 10 - .../python/python3-cryptography/run-ptest | 4 - .../python/python3-cryptography_36.0.1.bb | 121 - .../python/python3-cvxopt_1.2.7.bb | 2 +- .../python/python3-dateutil_2.8.2.bb | 3 +- .../recipes-devtools/python/python3-dbussy_1.3.bb | 4 +- .../python/python3-defusedxml_0.7.1.bb | 2 +- .../python/python3-django_2.2.26.bb | 12 - .../python/python3-django_2.2.27.bb | 12 + .../python/python3-django_3.2.11.bb | 13 - .../python/python3-django_3.2.12.bb | 13 + .../python/python3-django_4.0.1.bb | 13 - .../python/python3-django_4.0.2.bb | 13 + .../python/python3-dnspython_2.2.0.bb | 35 - .../python/python3-dnspython_2.2.1.bb | 35 + .../python/python3-dominate_2.6.0.bb | 2 +- .../python/python3-engineio_4.3.1.bb | 2 +- .../recipes-devtools/python/python3-fann2_1.1.2.bb | 2 +- .../python/python3-fasteners_0.17.3.bb | 7 +- .../python/python3-feedformatter_0.4.bb | 18 - .../python/python3-flask-migrate_3.1.0.bb | 2 +- .../python/python3-flask-socketio_5.1.1.bb | 2 +- .../python/python3-frozenlist_1.3.0.bb | 2 +- .../recipes-devtools/python/python3-gcovr_5.0.bb | 1 + .../python/python3-geomet_0.3.0.bb | 1 + .../recipes-devtools/python/python3-gmpy2_2.1.2.bb | 2 +- .../python/python3-greenlet_1.1.2.bb | 2 +- ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 13 +- .../python/python3-grpcio-tools_1.41.1.bb | 22 - .../python/python3-grpcio-tools_1.44.0.bb | 17 + ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 17 +- .../python/python3-grpcio/abseil-ppc-fixes.patch | 79 + .../python/python3-grpcio_1.43.0.bb | 48 - .../python/python3-grpcio_1.44.0.bb | 46 + .../recipes-devtools/python/python3-h11_0.12.0.bb | 8 - .../recipes-devtools/python/python3-h11_0.13.0.bb | 8 + .../recipes-devtools/python/python3-h5py_3.5.0.bb | 32 - .../recipes-devtools/python/python3-h5py_3.6.0.bb | 31 + .../python/python3-html2text_2020.1.16.bb | 2 +- .../python/python3-httplib2_0.20.2.bb | 15 - .../python/python3-httplib2_0.20.4.bb | 15 + .../python/python3-humanize_3.14.0.bb | 21 - .../python/python3-humanize_4.0.0.bb | 21 + .../python/python3-hyperlink_21.0.0.bb | 2 +- ...1-Fix-host-contamination-of-include-files.patch | 12 +- .../recipes-devtools/python/python3-icu_2.8.1.bb | 15 + .../recipes-devtools/python/python3-icu_2.8.bb | 15 - .../python/python3-imageio_2.16.0.bb | 12 - .../python/python3-imageio_2.16.1.bb | 12 + .../python/python3-intervals_1.10.0.bb | 27 + .../python/python3-intervals_1.10.0.post1.bb | 27 - .../recipes-devtools/python/python3-ipy_1.01.bb | 2 +- .../python/python3-iso3166_2.0.2.bb | 2 +- .../python/python3-iso8601_1.0.2.bb | 15 - .../python/python3-isort_5.10.1.bb | 2 +- .../python/python3-itsdangerous_2.1.0.bb | 17 - .../python/python3-itsdangerous_2.1.1.bb | 17 + .../python/python3-jsonrpcserver_5.0.3.bb | 21 - .../python/python3-jsonrpcserver_5.0.7.bb | 21 + .../python/python3-keras-applications_1.0.8.bb | 2 + .../recipes-devtools/python/python3-kivy_2.0.0.bb | 1 + .../python/python3-kiwisolver_1.3.2.bb | 19 - .../python/python3-kiwisolver_1.4.0.bb | 19 + .../python/python3-langtable_0.0.57.bb | 2 +- .../python/python3-license-expression_21.6.14.bb | 7 +- ...up.py-use-setuptools-instead-of-distutils.patch | 27 + .../python/python3-lrparsing_1.0.17.bb | 7 +- .../python/python3-luma-core_2.3.1.bb | 4 +- .../0001-setupinfo.py-check-the-return-value.patch | 46 - .../recipes-devtools/python/python3-lxml_4.7.1.bb | 44 - .../recipes-devtools/python/python3-lxml_4.8.0.bb | 42 + .../recipes-devtools/python/python3-lz4/run-ptest | 3 + .../recipes-devtools/python/python3-lz4_3.1.10.bb | 15 - .../recipes-devtools/python/python3-lz4_4.0.0.bb | 26 + .../python/python3-marshmallow_3.14.1.bb | 2 + .../python/python3-matplotlib_3.5.1.bb | 2 +- .../python/python3-mccabe_0.6.1.bb | 12 - .../python/python3-mccabe_0.7.0.bb | 11 + .../python/python3-monotonic_1.6.bb | 2 + .../recipes-devtools/python/python3-mypy_0.910.bb | 2 +- .../python/python3-ndg-httpsclient_0.5.1.bb | 31 - .../python/python3-networkx_2.6.3.bb | 19 - .../python/python3-networkx_2.7.1.bb | 19 + .../python/python3-nocasedict_1.0.2.bb | 2 +- .../python/python3-ntplib_0.4.0.bb | 10 +- .../recipes-devtools/python/python3-obd_0.7.1.bb | 2 +- .../python/python3-ordered-set_4.1.0.bb | 2 +- .../recipes-devtools/python/python3-pako_0.3.1.bb | 3 +- .../python/python3-paramiko_2.10.3.bb | 19 + .../python/python3-paramiko_2.9.2.bb | 19 - .../recipes-devtools/python/python3-path_16.4.0.bb | 9 + .../python/python3-pillow_9.0.0.bb | 37 - .../python/python3-pillow_9.0.1.bb | 42 + .../recipes-devtools/python/python3-pint_0.18.bb | 2 +- .../python/python3-pkgconfig_1.5.5.bb | 2 +- .../recipes-devtools/python/python3-ply_3.11.bb | 18 - .../python/python3-portion_2.2.0.bb | 2 +- .../recipes-devtools/python/python3-prctl_1.8.1.bb | 5 +- .../python/python3-pretend_1.0.9.bb | 11 - .../python/python3-prettytable_2.4.0.bb | 43 - .../python/python3-prettytable_3.1.1.bb | 44 + .../python/python3-protobuf_3.19.3.bb | 39 - .../python/python3-protobuf_3.19.4.bb | 39 + .../0001-fix-failure-test-cases.patch | 197 - .../python/python3-psutil_5.9.0.bb | 28 - .../python/python3-ptyprocess_0.7.0.bb | 2 +- .../python/python3-pyalsaaudio_0.9.0.bb | 2 +- .../python/python3-pyasn1/run-ptest | 3 - .../python/python3-pyasn1_0.4.8.bb | 2 - .../python/python3-pyatspi_2.38.2.bb | 2 +- .../python/python3-pybind11_2.8.1.bb | 3 + .../python/python3-pybluez_0.23.bb | 2 +- .../python/python3-pychromecast_10.2.3.bb | 18 - .../python/python3-pychromecast_10.3.0.bb | 18 + .../python/python3-pycparser_2.21.bb | 21 - .../python/python3-pycurl_7.44.1.bb | 9 +- .../python/python3-pydbus_0.6.0.bb | 2 +- .../python/python3-pyhamcrest_2.0.3.bb | 2 +- .../python/python3-pyiface_0.0.11.bb | 11 - .../recipes-devtools/python/python3-pyiface_git.bb | 18 + .../python/python3-pylint_1.8.3.bb | 38 - .../python/python3-pylint_2.13.2.bb | 18 + .../python/python3-pymetno_0.9.0.bb | 2 + .../python/python3-pymisp_2.4.152.bb | 24 - .../python/python3-pymisp_2.4.157.bb | 26 + .../python/python3-pymodbus_2.5.3.bb | 35 + .../python/python3-pymongo_4.0.1.bb | 30 - .../python/python3-pymongo_4.0.2.bb | 30 + .../python/python3-pynacl_1.5.0.bb | 3 +- .../0001-setup.py-switch-to-setuptools.patch | 32 + .../python/python3-pynetlinux_1.1.bb | 3 +- .../python/python3-pyopenssl_22.0.0.bb | 23 - .../recipes-devtools/python/python3-pyrad_2.4.bb | 2 +- .../python/python3-pyroute2_0.5.19.bb | 2 +- ...ux.rs-Define-consts-for-rv32-architecture.patch | 26 + ...01-riscv64-mod.rs-Add-missing-error-codes.patch | 32 - .../python/python3-pyruvate_1.1.2.bb | 13 +- .../python/python3-pyscaffold_4.1.4.bb | 22 - .../python/python3-pyscaffold_4.1.5.bb | 22 + .../python/python3-pyserial-asyncio_0.6.bb | 10 + .../python/python3-pyserial_3.5.bb | 1 + .../python/python3-pysocks_1.7.1.bb | 20 - ...ython-versions-remove-py2x-and-fix-tests-.patch | 4150 -------------------- .../python/python3-pystache_0.5.4.bb | 17 - .../python/python3-pystemd_0.8.0.bb | 2 +- .../python/python3-pytest-forked_1.4.0.bb | 2 +- .../python3-pytest-helpers-namespace_2021.4.29.bb | 12 +- .../python/python3-pytest-html_3.1.1.bb | 3 +- .../python/python3-pytest-lazy-fixture/run-ptest | 3 + .../python/python3-pytest-lazy-fixture_0.6.3.bb | 23 + .../python/python3-pytest-metadata_1.11.0.bb | 17 - .../python/python3-pytest-metadata_2.0.1.bb | 17 + .../python/python3-pytest-runner_5.3.1.bb | 15 - .../python/python3-pytest-subtests_0.6.0.bb | 20 - .../python/python3-pytest-xdist_2.5.0.bb | 2 +- .../python/python3-python-vlc_3.0.12118.bb | 8 - .../python/python3-python-vlc_3.0.16120.bb | 8 + .../python3-pytz-deprecation-shim_0.1.0.post0.bb | 7 +- .../recipes-devtools/python/python3-pytz/run-ptest | 3 - .../recipes-devtools/python/python3-pytz_2021.3.bb | 35 - .../python/python3-pyudev_0.23.2.bb | 2 +- .../python/python3-pyzmq/club-rpath-out.patch | 29 + .../python/python3-pyzmq_22.3.0.bb | 8 +- .../recipes-devtools/python/python3-qface_2.0.6.bb | 24 + .../recipes-devtools/python/python3-redis_4.1.1.bb | 15 - .../recipes-devtools/python/python3-redis_4.2.0.bb | 15 + .../python/python3-regex_2021.11.10.bb | 14 - .../python/python3-regex_2022.3.2.bb | 14 + .../python/python3-requests_2.27.1.bb | 25 - .../python/python3-robotframework_4.1.3.bb | 30 - .../python/python3-robotframework_5.0.bb | 30 + .../recipes-devtools/python/python3-rsa_4.8.bb | 2 +- .../python/python3-scrypt_0.8.19.bb | 27 - .../python/python3-scrypt_0.8.20.bb | 27 + .../0001-setup.py-switch-to-setuptools.patch | 31 + .../python/python3-sdnotify_0.3.2.bb | 3 +- .../python/python3-semantic-version_2.8.5.bb | 12 - .../python/python3-sentry-sdk_1.5.3.bb | 14 - .../python/python3-sentry-sdk_1.5.7.bb | 14 + .../python/python3-setuptools-rust-native_1.1.2.bb | 26 - .../python/python3-simpleeval_0.9.12.bb | 6 +- ...up.py-Use-setuptools-instead-of-distutils.patch | 38 + .../9b939c0b534c1b7958fa0a3c7aedf30bca910431.patch | 76 + .../python/python3-slip-dbus_0.6.5.bb | 13 +- .../recipes-devtools/python/python3-smbus_4.3.bb | 2 +- .../python/python3-smpplib_2.2.1.bb | 2 +- .../python/python3-snappy_0.6.0.bb | 15 - .../python/python3-snappy_0.6.1.bb | 15 + .../python/python3-socketio_5.5.1.bb | 28 - .../python/python3-socketio_5.5.2.bb | 28 + .../python/python3-soupsieve_2.3.1.bb | 2 +- .../python/python3-sqlalchemy_1.4.31.bb | 23 - .../python/python3-sqlalchemy_1.4.32.bb | 23 + .../recipes-devtools/python/python3-systemd_234.bb | 7 +- .../recipes-devtools/python/python3-term_2.3.bb | 2 +- ...up.py-Use-setuptools-instead-of-distutils.patch | 27 + .../python/python3-termcolor_1.1.0.bb | 3 +- .../recipes-devtools/python/python3-tqdm_4.62.3.bb | 19 - .../recipes-devtools/python/python3-tqdm_4.63.1.bb | 19 + .../python/python3-traitlets_5.1.1.bb | 2 +- .../python/python3-transitions_0.8.10.bb | 9 - .../python/python3-transitions_0.8.11.bb | 9 + .../recipes-devtools/python/python3-twine_3.7.1.bb | 23 - .../recipes-devtools/python/python3-twine_3.8.0.bb | 18 + .../python/python3-twisted_22.1.0.bb | 324 -- .../python/python3-twisted_22.2.0.bb | 310 ++ .../0002-setup.py-switch-to-setuptools.patch | 26 + .../python/python3-twofish_0.3.0.bb | 6 +- .../python/python3-txaio_21.2.1.bb | 14 - .../python/python3-txaio_22.2.1.bb | 14 + .../python/python3-typed-ast_1.4.3.bb | 12 - .../python/python3-typed-ast_1.5.2.bb | 12 + .../python/python3-typeguard_2.13.3.bb | 2 +- .../python/python3-typing-extensions_3.10.0.0.bb | 12 - .../recipes-devtools/python/python3-tzlocal_4.1.bb | 2 +- .../python/python3-urllib3_1.26.8.bb | 22 - .../python/python3-versiontools_1.9.1.bb | 2 +- .../python/python3-waitress_2.0.0.bb | 11 - .../python/python3-waitress_2.1.1.bb | 15 + .../python/python3-watchdog_2.1.6.bb | 18 - .../python/python3-watchdog_2.1.7.bb | 18 + .../python/python3-websocket-client_1.2.3.bb | 17 - .../python/python3-websocket-client_1.3.1.bb | 17 + .../python/python3-websockets_10.1.bb | 15 - .../python/python3-websockets_10.2.bb | 15 + .../python/python3-wrapt_1.13.3.bb | 16 - .../python/python3-wrapt_1.14.0.bb | 16 + .../recipes-devtools/python/python3-xlrd_2.0.1.bb | 2 + .../python/python3-xlsxwriter_3.0.2.bb | 21 - .../python/python3-xlsxwriter_3.0.3.bb | 21 + .../python/python3-xmlrunner_1.7.7.bb | 2 +- .../python/python3-xmodem_0.4.6.bb | 7 +- .../python/python3-xstatic-font-awesome_4.7.0.0.bb | 2 +- .../python/python3-xxhash_2.0.2.bb | 21 - .../python/python3-xxhash_3.0.0.bb | 21 + .../python/python3-yamlloader_1.1.0.bb | 2 +- .../python/python3-zeroconf_0.38.1.bb | 2 +- .../python-blivet/python3-blivet_3.4.0.bb | 45 - .../python-blivet/python3-blivet_3.4.3.bb | 37 + ...tuptools-instead-of-distutils-in-setup.py.patch | 30 + .../python-blivet/python3-blivetgui_2.2.1.bb | 26 - .../python-blivet/python3-blivetgui_2.3.0.bb | 30 + .../python-cson/python3-cson_git.bb | 2 + ...up.py-switch-from-distutils-to-setuptools.patch | 31 + .../python-meh/python3-meh_0.50.1.bb | 13 +- .../python-pykickstart/python3-pykickstart_3.34.bb | 4 +- .../python-pyparted/python3-pyparted_3.11.7.bb | 2 +- .../python3-portalocker_2.3.2.bb | 2 +- .../python3-pydot/python3-pydot_1.4.2.bb | 11 + .../pywbem/python3-pywbem_1.3.0.bb | 2 +- .../pywbemtools/python3-pywbemtools_0.9.1.bb | 39 - .../pywbemtools/python3-pywbemtools_1.0.0.bb | 39 + meta-openembedded/meta-webserver/conf/layer.conf | 2 +- ...nfigure-use-pkg-config-for-PCRE-detection.patch | 37 +- ...-apxs.in-force-destdir-to-be-empty-string.patch | 49 - ...p-up-the-core-size-limit-if-CoreDumpDirec.patch | 13 +- ...not-export-apr-apr-util-symbols-when-usin.patch | 11 +- ...pache2-log-the-SELinux-context-at-startup.patch | 15 +- ...-replace-lynx-to-curl-in-apachectl-script.patch | 4 +- ...x-the-race-issue-of-parallel-installation.patch | 4 +- ...-apache2-allow-to-disable-selinux-support.patch | 8 +- ...008-Fix-perl-install-directory-to-usr-bin.patch | 36 + ...o-not-use-relative-path-for-gen_test_char.patch | 27 - ...-apxs.in-force-destdir-to-be-empty-string.patch | 49 + ...o-not-use-relative-path-for-gen_test_char.patch | 26 + .../apache2/apache2/apache-configure_perlbin.patch | 34 - .../recipes-httpd/apache2/apache2_2.4.52.bb | 224 -- .../recipes-httpd/apache2/apache2_2.4.53.bb | 224 ++ .../recipes-httpd/cherokee/cherokee_git.bb | 2 +- .../recipes-httpd/hiawatha/hiawatha_10.12.bb | 2 +- .../meta-webserver/recipes-httpd/nginx/nginx.inc | 1 + .../recipes-php/phpmyadmin/phpmyadmin_5.1.3.bb | 2 +- .../recipes-webadmin/cockpit/cockpit_220.bb | 4 +- .../recipes-webadmin/netdata/netdata_1.33.1.bb | 7 +- meta-openembedded/meta-xfce/conf/layer.conf | 2 +- .../recipes-apps/catfish/catfish_4.16.3.bb | 4 +- .../meta-xfce/recipes-apps/gigolo/gigolo_0.5.2.bb | 2 +- .../recipes-apps/menulibre/menulibre_2.2.3.bb | 5 +- .../recipes-apps/mousepad/mousepad_0.5.8.bb | 2 +- .../meta-xfce/recipes-apps/orage/orage_4.12.1.bb | 2 +- .../recipes-apps/ristretto/ristretto_0.12.1.bb | 2 +- .../recipes-apps/xarchiver/xarchiver_git.bb | 2 +- .../recipes-apps/xfce-polkit/xfce-polkit_0.3.bb | 2 +- .../xfce4-datetime-setter_3.32.2.bb | 2 +- .../xfce4-notifyd/xfce4-notifyd_0.6.2.bb | 2 +- .../xfce4-panel-profiles_1.0.13.bb | 2 +- .../xfce4-screensaver/xfce4-screensaver_4.16.0.bb | 2 +- .../xfce4-screenshooter_1.9.9.bb | 2 +- .../xfce4-taskmanager/xfce4-taskmanager_1.5.2.bb | 2 +- .../xfce4-terminal/xfce4-terminal_0.8.10.bb | 4 +- .../rodent-icon-theme/rodent-icon-theme_5.0.bb | 2 +- .../xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb | 2 +- .../xfwm4-themes/xfwm4-themes_4.10.0.bb | 2 +- .../recipes-bindings/vala/xfce4-vala_4.10.3.bb | 2 +- .../imsettings/imsettings_1.8.3.bb | 2 +- .../packagegroups/packagegroup-xfce-multimedia.bb | 5 +- .../recipes-multimedia/parole/parole_4.16.0.bb | 2 +- .../xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb | 2 +- .../recipes-multimedia/xfmpc/xfmpc_0.3.0.bb | 2 +- .../battery/xfce4-battery-plugin_1.1.4.bb | 2 +- .../calculator/xfce4-calculator-plugin_0.7.1.bb | 2 +- .../clipman/xfce4-clipman-plugin_1.6.2.bb | 2 +- .../closebutton/xfce4-closebutton-plugin_git.bb | 2 +- .../cpufreq/xfce4-cpufreq-plugin_1.2.5.bb | 2 +- .../cpugraph/xfce4-cpugraph-plugin_1.2.5.bb | 2 +- .../datetime/xfce4-datetime-plugin_0.8.1.bb | 2 +- .../eyes/xfce4-eyes-plugin_4.5.1.bb | 2 +- .../genmon/xfce4-genmon-plugin_4.1.1.bb | 2 +- .../mailwatch/xfce4-mailwatch-plugin_1.3.0.bb | 2 +- .../mount/xfce4-mount-plugin_1.1.5.bb | 2 +- .../netload/xfce4-netload-plugin_1.4.0.bb | 2 +- .../notes/xfce4-notes-plugin_1.9.0.bb | 2 +- .../places/xfce4-places-plugin_1.8.1.bb | 2 +- .../pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb | 2 +- .../sensors/xfce4-sensors-plugin_1.4.2.bb | 2 +- .../xfce4-smartbookmark-plugin_0.5.2.bb | 2 +- .../time-out/xfce4-time-out-plugin_1.1.2.bb | 2 +- .../timer/xfce4-timer-plugin_1.7.1.bb | 2 +- .../verve/xfce4-verve-plugin_2.0.1.bb | 2 +- .../weather/xfce4-weather-plugin_0.11.0.bb | 2 +- .../whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb | 2 +- .../xkb/xfce4-xkb-plugin_0.8.2.bb | 2 +- .../archive/thunar-archive-plugin_0.4.0.bb | 2 +- .../media-tags/thunar-media-tags-plugin_0.3.0.bb | 2 +- .../shares/thunar-shares-plugin_0.3.1.bb | 5 +- .../meta-xfce/recipes-xfce/exo/exo_4.16.3.bb | 2 +- .../meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb | 2 +- .../recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb | 2 +- .../libxfce4util/libxfce4util_4.16.0.bb | 2 +- .../thunar-volman/thunar-volman_4.16.0.bb | 2 +- .../meta-xfce/recipes-xfce/thunar/thunar_4.16.9.bb | 2 +- .../recipes-xfce/tumbler/tumbler_4.16.0.bb | 2 +- .../xfce4-appfinder/xfce4-appfinder_4.16.1.bb | 2 +- .../xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb | 2 +- .../recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb | 2 +- .../xfce4-power-manager_4.16.0.bb | 2 +- .../xfce4-session/xfce4-session_4.16.0.bb | 2 +- .../xfce4-settings/xfce4-settings_4.16.2.bb | 2 +- .../meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb | 2 +- .../recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb | 2 +- .../meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb | 2 +- 1540 files changed, 15824 insertions(+), 16420 deletions(-) delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.5.bb create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch create mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0002-Fix-accessibility-issues-with-initializer-of-constan.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.88.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.92.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.34.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.36.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.3.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.4.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.70.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_42.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_42.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_41.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_42.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.48.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.49.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.42.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.44.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.1.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.2.0.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.3.10.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.6.2.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-Add-support-for-variable-libdir.patch create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.19.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.20.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.33.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.34.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.6.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.45.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.46.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.17-1.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/files/0001-spa-json-fix-va_list-APIs-for-different-architecture.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.3.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-Makefile.in-disable-backtrace.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-regenerate-configure.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-fix-parallel-build-failure.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.16.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.18.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-do-not-ask-host-for-ifcfg-defaults.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-dhcpcd.conf create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-iwd.conf delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.34.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.20.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setuptools.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-makeinit.sh-fix-parallel-build-issue.patch create mode 100644 meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-sample-Rename-dprintf-to-cyrus_dprintf.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.28.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/postfix/files/0006-correct-signature-of-closefrom-API.patch delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.4.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.5.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb create mode 100644 meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.4.1.bb delete mode 100644 meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.4.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/esmtp/esmtp/0001-Fix-libESMTP-dependency-check.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/include-topdir.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/snprintf.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.5.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.6.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.59.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.63.bb delete mode 100644 meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.11.bb delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.24.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.26.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/modemmanager/files/0002-fcc-unlock-Make-scripts-POSIX-shell-compatible.patch delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.18.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch create mode 100644 meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-meson-Use-pkg-config-to-detect-iniparser.patch create mode 100644 meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-util-Correct-path-to-iniparser.h.patch delete mode 100644 meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v69.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.6.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.7.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-25785-Add-support-for-OpenSSL-3.0.patch delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/clang-64bit-atomics.patch create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mariadb-openssl3.patch delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.6.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.7.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.41.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-cmake-Use-GNUInstallDirs.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.1.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-crypto-fix-build-without-scrypt.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_16.14.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php_8.1.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php_8.1.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python-distutils-extra.inc delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python3-distutils-extra.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/python/python3-distutils-extra_2.39.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_0.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.6.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/duktape/files/0001-Support-makefile-variables.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.17.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libqb/libqb_2.0.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/libqb/libqb_2.0.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/libyang/libyang/libyang-add-stdint-h.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libyang/libyang/libyang-skip-pcre2-config-add-stdint-h.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.164.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/pmdk/pmdk/0001-use-daxctl-libdaxctl.h-instead-of-ndctl-libdaxctl.h.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0001-pkexec-local-privilege-escalation-CVE-2021-4034.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0002-CVE-2021-4115-GHSL-2021-077-fix.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0002-jsauthority-port-to-mozjs-91.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0003-Added-support-for-duktape-as-JS-engine.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0003-jsauthority-ensure-to-call-JS_Init-and-JS_ShutDown-e.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallDirs.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-cmake-Pass-PROBE_NAME-via-CFLAGS.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-fix-build-with-LuaJIT-2.1-betas.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Fix-a-lot-of-Werror-format-security-errors-.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/aarch64.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/respect-DESTDIR-when-create-link.patch delete mode 100644 meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.10.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.11.bb delete mode 100644 meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.30.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.32.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/libxmlb/libxmlb_0.3.8.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/graphene/graphene_1.10.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/graphene/graphene_1.10.8.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.44.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/xbindkeys/xbindkeys_1.8.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/ppc_musl_ucontext.patch delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0008-configure.ac-autodetect-availability-of-systemd.patch delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.22.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-security/usbguard/usbguard/0001-Add-and-use-pkgconfig-instead-of-libgcrypt-config.patch create mode 100644 meta-openembedded/meta-oe/recipes-security/usbguard/usbguard_1.1.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.5.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.6.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/gosu/gosu_1.14.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/hstr/files/0001-Use-OE-specific-checks-for-ncurses.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/hstr/files/0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/hstr/hstr_2.5.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.356.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.357.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch create mode 100755 meta-openembedded/meta-oe/recipes-support/libcereal/files/run-ptest delete mode 100644 meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/libiio/libiio/0001-CMake-Move-include-CheckCSourceCompiles-before-its-m.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_175.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_180.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/monit/monit_5.31.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/monit/monit_5.32.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/pcp/pcp-native_5.3.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/pcp/pcp-native_5.3.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/pcp/pcp_5.3.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/pcp/pcp_5.3.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco/0001-fix-missing-expat-definition.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.02.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.03.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/pv/pv/run-ptest create mode 100644 meta-openembedded/meta-oe/recipes-support/pv/pv_1.6.20.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/pv/pv_1.6.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/stm32flash/stm32flash_0.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/stm32flash/stm32flash_0.7.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0002-scl-fix-wrong-ownership-during-installation.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0005-.py-s-python-python3-exclude-tests.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.36.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-test/bats/bats_1.5.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-test/bats/bats_1.6.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-test/cukinia/cukinia_0.5.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-test/cukinia/cukinia_0.6.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Include-poll.h-instead-of-deprecated-sys-poll.h.patch delete mode 100644 meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.06.00.bb create mode 100644 meta-openembedded/meta-oe/recipes-test/fwts/fwts_22.01.00.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libio/io-compress-lzma-perl_2.096.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libio/io-compress-perl_2.096.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.096.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libio/libio-compress-perl_2.096.bb create mode 100644 meta-openembedded/meta-python/classes/distutils-common-base.bbclass create mode 100644 meta-openembedded/meta-python/classes/distutils3-base.bbclass create mode 100644 meta-openembedded/meta-python/classes/distutils3.bbclass delete mode 100644 meta-openembedded/meta-python/classes/pyo3.bbclass delete mode 100644 meta-openembedded/meta-python/classes/setuptools3_rust.bbclass create mode 100644 meta-openembedded/meta-python/licenses/CRC32C-ADLER delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1.inc delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-systemd/0002-setup.py-switch-from-distutils-to-setuptools.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.7.6.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.7.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-antlr4-runtime_4.9.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-anyjson_0.3.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_1.10.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_2.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_1.4.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.11.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.9.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_22.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_22.3.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python/0001-setup.py-Use-setuptools-instead-of-distutils.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.4.9.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.5.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.9.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache_1.6.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt/run-ptest delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.3.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.4.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.12.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.13.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_4.2.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_37.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_37.0.7.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2021.10.8.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.15.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-chardet_4.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_2.0.10.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_2.0.12.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.post1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cheetah_3.2.6.post2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-configobj/0001-Switch-from-using-distutils-to-setuptools.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_5.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cppy_1.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-crc32c_2.2.post0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-crcmod/0001-setup.py-use-setuptools-instead-of-distutils.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_36.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography/0002-Cargo.toml-edition-2018-2021.patch delete mode 100755 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography/check-memfree.py delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography/run-ptest delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_36.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.26.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.27.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-django_3.2.11.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-django_3.2.12.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.0.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.2.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-feedformatter_0.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.41.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.44.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.43.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.44.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-h11_0.12.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-h11_0.13.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.5.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.6.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-httplib2_0.20.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-httplib2_0.20.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.14.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.8.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-icu_2.8.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.16.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.16.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.post1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-iso8601_1.0.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.7.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.3.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lrparsing/0001-setup.py-use-setuptools-instead-of-distutils.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lxml/0001-setupinfo.py-check-the-return-value.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.7.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lz4/run-ptest delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_3.1.10.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_4.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.6.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.7.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.6.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.7.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_2.10.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_2.9.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-path_16.4.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ply_3.11.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pretend_1.0.9.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_2.4.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.19.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.19.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.9.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1/run-ptest delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.4.8.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_10.2.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_10.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pycparser_2.21.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_0.0.11.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_git.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_1.8.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.13.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.152.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.157.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_2.5.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_4.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_4.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux/0001-setup.py-switch-to-setuptools.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_22.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyruvate/0001-linux.rs-Define-consts-for-rv32-architecture.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyruvate/0001-riscv64-mod.rs-Add-missing-error-codes.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.1.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.1.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial-asyncio_0.6.bb delete 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-pystache/0001-Modernize-python-versions-remove-py2x-and-fix-tests-.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pystache_0.5.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture_0.6.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.11.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.3.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-subtests_0.6.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.12118.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.16120.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytz/run-ptest delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2021.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq/club-rpath-out.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2021.11.10.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.3.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.27.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.1.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_5.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.19.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify/0001-setup.py-switch-to-setuptools.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-semantic-version_2.8.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.5.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.5.7.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-rust-native_1.1.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus/0001-setup.py-Use-setuptools-instead-of-distutils.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus/9b939c0b534c1b7958fa0a3c7aedf30bca910431.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.5.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.5.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.31.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.32.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.62.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.63.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.10.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.11.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.7.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.8.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twofish/0002-setup.py-switch-to-setuptools.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_21.2.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_22.2.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-typed-ast_1.4.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-typed-ast_1.5.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-typing-extensions_3.10.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.8.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.6.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.7.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.2.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_10.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_10.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.13.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.14.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_2.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.0.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch delete mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.2.1.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch create mode 100644 meta-openembedded/meta-python/recipes-extended/python3-pydot/python3-pydot_1.4.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.9.1.bb create mode 100644 meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.0.0.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0001-support-apxs.in-force-destdir-to-be-empty-string.patch create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0008-apache2-do-not-use-relative-path-for-gen_test_char.patch create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0009-support-apxs.in-force-destdir-to-be-empty-string.patch create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0010-apache2-do-not-use-relative-path-for-gen_test_char.patch delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.52.bb create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.53.bb (limited to 'meta-openembedded') diff --git a/meta-openembedded/contrib/pw-am.sh b/meta-openembedded/contrib/pw-am.sh index 8987eee8eb..d9d1187b0b 100755 --- a/meta-openembedded/contrib/pw-am.sh +++ b/meta-openembedded/contrib/pw-am.sh @@ -9,7 +9,7 @@ for patchnumber in $@; do - wget -nv http://patches.openembedded.org/patch/$patchnumber/mbox/ -O pw-am-$patchnumber.patch + wget -nv http://patchwork.yoctoproject.org/patch/$patchnumber/mbox/ -O pw-am-$patchnumber.patch git am -s pw-am-$patchnumber.patch rm pw-am-$patchnumber.patch done diff --git a/meta-openembedded/meta-filesystems/conf/layer.conf b/meta-openembedded/meta-filesystems/conf/layer.conf index b5f59d9bac..75a27d6654 100644 --- a/meta-openembedded/meta-filesystems/conf/layer.conf +++ b/meta-openembedded/meta-filesystems/conf/layer.conf @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "filesystems-layer" BBFILE_PATTERN_filesystems-layer = "^${LAYERDIR}/" -BBFILE_PRIORITY_filesystems-layer = "6" +BBFILE_PRIORITY_filesystems-layer = "5" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.3.0.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.3.0.bb index 2586b79470..ac18fe90fe 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.3.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.3.0.bb @@ -5,7 +5,7 @@ is provided under the name mount.exfat-fuse. \ " HOMEPAGE = "https://github.com/relan/exfat" SECTION = "universe/otherosfs" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/relan/exfat/releases/download/v${PV}/${BP}.tar.gz" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb index 0895ce5b35..0086551f62 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/httpfs2-fuse/httpfs2_0.1.5.bb @@ -1,6 +1,6 @@ SUMMARY = "This is a filesystem client based on the HTTP using FUSE" HOMEPAGE = "http://httpfs.sourceforge.net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://debian/copyright;md5=83f224c5182f148ec92e0b9f84b3c6c7" inherit pkgconfig diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb index 8a317cddbe..c9702eb93e 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.4.bb @@ -1,5 +1,5 @@ SUMMARY = "A fuse filesystem to access the contents of an iPhone or iPod Touch" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7" HOMEPAGE ="http://www.libimobiledevice.org/" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb index e4a0f95692..7d0a83609e 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb @@ -7,7 +7,7 @@ LogFS is included in the mainline Linux kernel and was introduced in \ version 2.6.34, released on May 16, 2010." HOMEPAGE = "https://github.com/prasad-joshi/logfsprogs" SECTION = "base" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://fsck.c;md5=3859dc73da97909ff1d0125e88a27e02" DEPENDS = "zlib" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2021.8.22.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2021.8.22.bb index 1ebbb410ee..aa1b4c2e95 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2021.8.22.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2021.8.22.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The NTFS-3G driver is an open source, freely available NTFS drive HOMEPAGE = "http://www.ntfs-3g.org/" DEPENDS = "fuse libgcrypt" PROVIDES = "ntfsprogs ntfs-3g" -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb index c4bb94e5dc..b641e4c24e 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "OWFS is an easy way to use the powerful 1-wire system of Dallas/M HOMEPAGE = "http://www.owfs.org/" SECTION = "console/network" -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=628b867016631792781a8735a04760e5 \ file://COPYING.LIB;md5=9021b7435efdd9fb22beef8291134099" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_0.4.0.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_0.4.0.bb index 2335771319..b8399265cd 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_0.4.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_0.4.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SIMPLE-MTPFS is a FUSE based filsystem for MTP devices connected via USB" HOMEPAGE = "https://github.com/phatina/simple-mtpfs" BUGTRACKER = "19e7bb9b608b0c0dce2ee6f56fac75901bc69529" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" DEPENDS = "fuse libmtp autoconf-archive" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch index f22b389b1c..31892d230d 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch @@ -1,7 +1,7 @@ --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ - AC_INIT([SMBNetFS],[0.6.2]) + AC_INIT([SMBNetFS],[0.6.3]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_HEADERS([src/config.h]) diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb index e84bdc98e6..2d9eab1dd5 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb @@ -4,7 +4,7 @@ DESCRIPTION = "SMBNetFS is a Linux/FreeBSD filesystem that allow you to use \ neighborhood in Microsoft Windows. Please donate me to help \ in SMBNetFS development." -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" HOMEPAGE ="http://sourceforge.net/projects/smbnetfs" @@ -16,9 +16,9 @@ inherit autotools pkgconfig features_check # samba depends on libpam REQUIRED_DISTRO_FEATURES = "pam" -PV = "0.6.1+git${SRCPV}" +PV = "0.6.3" -SRCREV = "a117eec8de7ed7249871da73dcc350283ce72069" +SRCREV = "736d5e599df3bebce3450125118ac2e70358b0c9" SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master \ file://configure.patch \ diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.2.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.2.bb index 8eeca84c43..b839c26e9f 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.2.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.2.bb @@ -2,7 +2,7 @@ SUMMARY = "This is a filesystem client based on the SSH File Transfer Protocol u AUTHOR = "Miklos Szeredi " HOMEPAGE = "https://github.com/libfuse/sshfs" SECTION = "console/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" DEPENDS = "glib-2.0 fuse3" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb index 0e61c9c1f3..6bf321e237 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Tools for managing 'yaffs2' file systems." SECTION = "base" HOMEPAGE = "http://www.yaffs.net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://utils/mkyaffs2image.c;beginline=11;endline=13;md5=5f5464f9b3e981ca574e65b00e438561 \ file://utils/mkyaffsimage.c;beginline=10;endline=12;md5=5f5464f9b3e981ca574e65b00e438561 \ " diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.5.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.5.bb index 6af9fc9c09..e0cf2092a6 100644 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.5.bb +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.5.bb @@ -6,7 +6,7 @@ DESCRIPTION = "FUSE (Filesystem in Userspace) is a simple interface for userspac " HOMEPAGE = "https://github.com/libfuse/libfuse" SECTION = "libs" -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LGPL2.txt;md5=4fbd65380cdd255951079008b364516c \ file://LICENSE;md5=a55c12a2d7d742ecb41ca9ae0a6ddc66" diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb index d7a692352b..cee4879eee 100644 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb @@ -6,7 +6,7 @@ DESCRIPTION = "FUSE (Filesystem in Userspace) is a simple interface for userspac " HOMEPAGE = "https://github.com/libfuse/libfuse" SECTION = "libs" -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb index d06aed75e7..f565be3f7e 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb @@ -1,7 +1,7 @@ SUMMARY = "Tools for managing AUFS mounts" SECTION = "base" HOMEPAGE = "http://aufs.sourceforge.net/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" DEPENDS = "coreutils-native aufs-util-native" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb index 7f804a708f..abb8fece3a 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.3.0.bb @@ -9,7 +9,7 @@ contains \ " HOMEPAGE = "https://github.com/relan/exfat" SECTION = "universe/otherosfs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/relan/exfat/releases/download/v${PV}/${BP}.tar.gz" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb index 14af721720..fb71b18b60 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.14.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Tools for Flash-Friendly File System (F2FS)" HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3" # to provide libuuid diff --git a/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb index 2517e9db8e..1ca8bb3fe9 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Resize FAT partitions using libparted" SECTION = "console/tools" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https;branch=master \ diff --git a/meta-openembedded/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb b/meta-openembedded/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb index 3591a4f6d6..20d6036686 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb @@ -8,7 +8,7 @@ DEPENDS = "glib-2.0 \ " RDEPENDS:${PN} = "udev bash" -LICENSE = "GPL-3.0" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit autotools pkgconfig systemd diff --git a/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb b/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb index 11cbb2d409..f6aa872fde 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_1.9.bb @@ -1,5 +1,5 @@ SUMMARY = "Tool to access UFS (Universal Flash Storage) devices" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" BRANCH ?= "dev" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.10.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.10.bb index 3b80fb5b0c..fdaebbe02d 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.10.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.10.bb @@ -6,7 +6,7 @@ DESCRIPTION = "The xfsdump package contains xfsdump, xfsrestore and a \ specified disk, tape or other storage medium." HOMEPAGE = "http://oss.sgi.com/projects/xfs" SECTION = "base" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=15c832894d10ddd00dfcf57bee490ecc" DEPENDS = "xfsprogs attr" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.13.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.13.0.bb index df5f764e16..fae7a93a1f 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.13.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.13.0.bb @@ -1,8 +1,8 @@ SUMMARY = "XFS Filesystem Utilities" HOMEPAGE = "http://oss.sgi.com/projects/xfs" SECTION = "base" -LICENSE = "GPLv2 & LGPLv2.1" -LICENSE:libhandle = "LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LICENSE:libhandle = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \ file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" DEPENDS = "util-linux util-linux-native" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.5.bb b/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.5.bb index cf0092291a..a83950db82 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.5.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.5.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "xorriso copies file objects from POSIX compliant filesystems \ into Rock Ridge enhanced ISO 9660 filesystems and allows session-wise \ manipulation of such filesystems" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://www.gnu.org/software/${BPN}/${BPN}-${PV}.tar.gz" diff --git a/meta-openembedded/meta-gnome/conf/layer.conf b/meta-openembedded/meta-gnome/conf/layer.conf index 3f6b4f7b76..2fb3485155 100644 --- a/meta-openembedded/meta-gnome/conf/layer.conf +++ b/meta-openembedded/meta-gnome/conf/layer.conf @@ -6,7 +6,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "gnome-layer" BBFILE_PATTERN_gnome-layer := "^${LAYERDIR}/" -BBFILE_PRIORITY_gnome-layer = "7" +BBFILE_PRIORITY_gnome-layer = "5" # auto-pack gnome help files IMAGE_LINGUAS_COMPLEMENTARY:append = " ${@bb.utils.contains('DISTRO_FEATURES','helpfiles','*-help-%s','',d)}" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb b/meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb deleted file mode 100644 index c3c30ca467..0000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Folks is a contact aggregation library." -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -DEPENDS = " \ - glib-2.0 \ - libgee \ -" - -GNOMEBASEBUILDCLASS = "meson" -EXTRA_OEMESON += "-Dtests=false" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -GIR_MESON_OPTION = "" - -PACKAGECONFIG[eds] = "-Deds_backend=true,-Deds_backend=false,evolution-data-server" -PACKAGECONFIG[bluez] = "-Dbluez_backend=true,-Dbluez_backend=false,evolution-data-server" -PACKAGECONFIG[ofono] = "-Deds_backend=true -Dofono_backend=true,-Dofono_backend=false,evolution-data-server" -PACKAGECONFIG[telepathy] = "-Dtelepathy_backend=true,-Dtelepathy_backend=false,telepathy-glib dbus-glib" -PACKAGECONFIG[import_tool] = "-Dimport_tool=true,-Dimport_tool=false,libxml2" -PACKAGECONFIG[inspect_tool] = "-Dinspect_tool=true,-Dinspect_tool=false" - -PACKAGECONFIG ??= "" - -inherit pkgconfig gnomebase gettext gobject-introspection vala features_check - -SRC_URI[archive.sha256sum] = "e71099afc9e88fad4e757ae134bc3fd63e12b901ad62b0ed5536afb79124af5f" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.5.bb b/meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.5.bb new file mode 100644 index 0000000000..51620bba8e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/folks/folks_0.15.5.bb @@ -0,0 +1,28 @@ +SUMMARY = "Folks is a contact aggregation library." +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = " \ + glib-2.0 \ + libgee \ +" + +GNOMEBASEBUILDCLASS = "meson" +EXTRA_OEMESON += "-Dtests=false" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +GIR_MESON_OPTION = "" + +PACKAGECONFIG[eds] = "-Deds_backend=true,-Deds_backend=false,evolution-data-server" +PACKAGECONFIG[bluez] = "-Dbluez_backend=true,-Dbluez_backend=false,evolution-data-server" +PACKAGECONFIG[ofono] = "-Deds_backend=true -Dofono_backend=true,-Dofono_backend=false,evolution-data-server" +PACKAGECONFIG[telepathy] = "-Dtelepathy_backend=true,-Dtelepathy_backend=false,telepathy-glib dbus-glib" +PACKAGECONFIG[import_tool] = "-Dimport_tool=true,-Dimport_tool=false,libxml2" +PACKAGECONFIG[inspect_tool] = "-Dinspect_tool=true,-Dinspect_tool=false" + +PACKAGECONFIG ??= "" + +inherit pkgconfig gnomebase gettext gobject-introspection vala features_check + +SRC_URI[archive.sha256sum] = "0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch new file mode 100644 index 0000000000..22af4f5bea --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch @@ -0,0 +1,27 @@ +From 166198735e9f4fbe91557df1351b3481bcf79e78 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Sun, 30 Jan 2022 19:54:11 +0100 +Subject: [PATCH 1/2] Util.Cache.Lru: Workaround missing generic type argument + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/geary/-/commit/0f75e7a84a39492d0748cec2ba6028e08cae3644] +Signed-off-by: Khem Raj +--- + src/client/util/util-cache.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala +index f054e32e..ecc275e8 100644 +--- a/src/client/util/util-cache.vala ++++ b/src/client/util/util-cache.vala +@@ -12,7 +12,7 @@ public class Util.Cache.Lru : Geary.BaseObject { + private class CacheEntry { + + +- public static int lru_compare(CacheEntry a, CacheEntry b) { ++ public static int lru_compare(CacheEntry a, CacheEntry b) { + if (a.key == b.key) { + return 0; + } +-- +2.35.1 + diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0002-Fix-accessibility-issues-with-initializer-of-constan.patch b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0002-Fix-accessibility-issues-with-initializer-of-constan.patch new file mode 100644 index 0000000000..76315f3a0e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0002-Fix-accessibility-issues-with-initializer-of-constan.patch @@ -0,0 +1,42 @@ +From 64b56e75a54a9fa3f37c7686be97a5c8818413a4 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Tue, 30 Nov 2021 15:31:31 +0100 +Subject: [PATCH 2/2] Fix accessibility issues with initializer of constants + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/geary/-/commit/9bd4c82952a0a2c3308c5cc86c0b85650c1fb484] +Signed-off-by: Khem Raj +--- + src/client/application/application-client.vala | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala +index 6ce19ce2..e6ba8533 100644 +--- a/src/client/application/application-client.vala ++++ b/src/client/application/application-client.vala +@@ -8,16 +8,16 @@ + + // Defined by CMake build script. + extern const string GETTEXT_PACKAGE; +-extern const string _APP_ID; +-extern const string _BUILD_ROOT_DIR; +-extern const string _GSETTINGS_DIR; +-extern const string _INSTALL_PREFIX; +-extern const string _NAME_SUFFIX; ++public extern const string _APP_ID; ++public extern const string _BUILD_ROOT_DIR; ++public extern const string _GSETTINGS_DIR; ++public extern const string _INSTALL_PREFIX; ++public extern const string _NAME_SUFFIX; + extern const string _PLUGINS_DIR; + extern const string _PROFILE; + extern const string _REVNO; +-extern const string _SOURCE_ROOT_DIR; +-extern const string _VERSION; ++public extern const string _SOURCE_ROOT_DIR; ++public extern const string _VERSION; + extern const string _WEB_EXTENSIONS_DIR; + + +-- +2.35.1 + diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_40.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_40.0.bb index b3b4311320..501b27a544 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_40.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Geary is an email application built around conversations, for the GNOME 3 desktop." SECTION = "network" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2a2244d5a13871ad950c55877546a6a2" DEPENDS = " \ @@ -30,16 +30,19 @@ DEPENDS = " \ RDEPENDS:${PN} = "gnome-keyring" -inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala +inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check SRC_URI = " \ git://github.com/GNOME/geary.git;nobranch=1;protocol=https \ + file://0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch \ + file://0002-Fix-accessibility-issues-with-initializer-of-constan.patch \ " S = "${WORKDIR}/git" SRCREV = "e561775c1580a9f60a726355b2b897bfc9cb3382" -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +# for gnome-online-accounts +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" GIR_MESON_OPTION = "" EXTRA_OEMESON = "-Dprofile=release" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.34.bb b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.34.bb index 311492eea3..ea852ce3a0 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.34.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.34.bb @@ -1,5 +1,5 @@ SUMMARY = "NetworkManager GUI library" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "glib-2.0 gtk+3 networkmanager" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb index c181d3943e..c0667b5bb1 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GTK+ applet for NetworkManager" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gtk+3 libnma libnotify libsecret libgudev networkmanager iso-codes nss" diff --git a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb index 355bcce9b6..d1a9759303 100644 --- a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb +++ b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.3.1.bb @@ -1,6 +1,6 @@ SUMMARY = "A partition editor to graphically manage disk partitions " HOMEPAGE = "http://gparted.org/index.php" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit features_check autotools pkgconfig python3native gnome-help gtk-icon-cache diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.88.bb b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.88.bb deleted file mode 100644 index 8a09fdf0e5..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.88.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Babl is a dynamic, any to any, pixel format conversion library" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" - -GNOMEBASEBUILDCLASS = "meson" - -GIR_MESON_OPTION = "enable-gir" - -inherit setuptools3 gnomebase gobject-introspection vala - -DEPENDS += "lcms" - -# https://bugs.llvm.org/show_bug.cgi?id=45555 -CFLAGS:append:toolchain-clang:mipsarch = " -ffp-exception-behavior=ignore " -CFLAGS:append:toolchain-clang:riscv64 = " -ffp-exception-behavior=ignore " - -SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" -SRC_URI[sha256sum] = "4f0d7f4aaa0bb2e725f349adf7b351a957d9fb26d555d9895a7af816b4167039" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.92.bb b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.92.bb new file mode 100644 index 0000000000..156c91bcbd --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.92.bb @@ -0,0 +1,20 @@ +SUMMARY = "Babl is a dynamic, any to any, pixel format conversion library" +LICENSE = "LGPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" + +GNOMEBASEBUILDCLASS = "meson" + +GIR_MESON_OPTION = "enable-gir" + +inherit setuptools3 gnomebase gobject-introspection vala + +DEPENDS += "lcms" + +# https://bugs.llvm.org/show_bug.cgi?id=45555 +CFLAGS:append:toolchain-clang:mipsarch = " -ffp-exception-behavior=ignore " +CFLAGS:append:toolchain-clang:riscv64 = " -ffp-exception-behavior=ignore " + +SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" +SRC_URI[sha256sum] = "f667735028944b6375ad18f160a64ceb93f5c7dccaa9d8751de359777488a2c1" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.34.bb b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.34.bb deleted file mode 100644 index 2f8928d164..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.34.bb +++ /dev/null @@ -1,59 +0,0 @@ -SUMMARY = "GEGL (Generic Graphics Library) is a graph based image processing framework" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=f1a8bfcbc85304df454b65d378b299c7" - -DEPENDS = " \ - intltool-native \ - babl \ - glib-2.0 \ - cairo \ - expat \ - zlib \ - \ - json-glib \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit features_check gnomebase vala gobject-introspection - -REQUIRED_DISTRO_FEATURES = "x11" - -SHPV = "${@gnome_verdir("${PV}")}" - -SRC_URI = "https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz" -SRC_URI[sha256sum] = "ef63f0bca5b431c6119addd834ca7fbb507c900c4861c57b3667b6f4ccfcaaaa" - -PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg pango poppler sdl2" -PACKAGECONFIG:class-native = "libpng librsvg" - -PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper" -PACKAGECONFIG[gexiv2] = "-Dgexiv2=enabled,-Dgexiv2=disabled,gexiv2" -PACKAGECONFIG[graphviz] = "-Dgraphviz=enabled,-Dgraphviz=disabled,graphviz" -PACKAGECONFIG[jpeg] = "-Dlibjpeg=enabled,-Dlibjpeg=disabled,jpeg" -PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms" -PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav" -PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng" -PACKAGECONFIG[libraw] = "-Dlibraw=enabled,-Dlibraw=disabled,libraw" -PACKAGECONFIG[librsvg] = "-Dlibrsvg=enabled,-Dlibrsvg=disabled,librsvg" -PACKAGECONFIG[pango] = "-Dpango=enabled -Dpangocairo=enabled,-Dpango=disabled -Dpangocairo=disabled,pango" -PACKAGECONFIG[poppler] = "-Dpoppler=enabled,-Dpoppler=disabled,poppler" -PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,virtual/libsdl" -PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" -PACKAGECONFIG[tiff] = "-Dlibtiff=enabled,-Dlibtiff=disabled,tiff" -PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,webp" - -# There are a couple of non-symlink .so files installed into libdir, which need to go into main package -FILES:${PN} += " \ - ${libdir}/*.so \ - ${libdir}/gegl-${SHPV}/*.json \ - ${libdir}/gegl-${SHPV}/*.so \ -" -FILES_SOLIBSDEV = "${libdir}/libgegl-${SHPV}${SOLIBSDEV}" - -# Fails to build with thumb-1 (qemuarm) -# gegl-0.2.0/operations/common/matting-global.c: In function 'matting_process': -# gegl-0.2.0/operations/common/matting-global.c:463:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275 -ARM_INSTRUCTION_SET = "arm" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.36.bb b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.36.bb new file mode 100644 index 0000000000..a6e5fa0300 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.36.bb @@ -0,0 +1,59 @@ +SUMMARY = "GEGL (Generic Graphics Library) is a graph based image processing framework" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=f1a8bfcbc85304df454b65d378b299c7" + +DEPENDS = " \ + intltool-native \ + babl \ + glib-2.0 \ + cairo \ + expat \ + zlib \ + \ + json-glib \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit features_check gnomebase vala gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" + +SHPV = "${@gnome_verdir("${PV}")}" + +SRC_URI = "https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz" +SRC_URI[sha256sum] = "6fd58a0cdcc7702258adaeffb573a389228ae8f0eff47578efda2309b61b2ca6" + +PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg pango poppler sdl2" +PACKAGECONFIG:class-native = "libpng librsvg" + +PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper" +PACKAGECONFIG[gexiv2] = "-Dgexiv2=enabled,-Dgexiv2=disabled,gexiv2" +PACKAGECONFIG[graphviz] = "-Dgraphviz=enabled,-Dgraphviz=disabled,graphviz" +PACKAGECONFIG[jpeg] = "-Dlibjpeg=enabled,-Dlibjpeg=disabled,jpeg" +PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms" +PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav" +PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng" +PACKAGECONFIG[libraw] = "-Dlibraw=enabled,-Dlibraw=disabled,libraw" +PACKAGECONFIG[librsvg] = "-Dlibrsvg=enabled,-Dlibrsvg=disabled,librsvg" +PACKAGECONFIG[pango] = "-Dpango=enabled -Dpangocairo=enabled,-Dpango=disabled -Dpangocairo=disabled,pango" +PACKAGECONFIG[poppler] = "-Dpoppler=enabled,-Dpoppler=disabled,poppler" +PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,virtual/libsdl" +PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" +PACKAGECONFIG[tiff] = "-Dlibtiff=enabled,-Dlibtiff=disabled,tiff" +PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,webp" + +# There are a couple of non-symlink .so files installed into libdir, which need to go into main package +FILES:${PN} += " \ + ${libdir}/*.so \ + ${libdir}/gegl-${SHPV}/*.json \ + ${libdir}/gegl-${SHPV}/*.so \ +" +FILES_SOLIBSDEV = "${libdir}/libgegl-${SHPV}${SOLIBSDEV}" + +# Fails to build with thumb-1 (qemuarm) +# gegl-0.2.0/operations/common/matting-global.c: In function 'matting_process': +# gegl-0.2.0/operations/common/matting-global.c:463:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275 +ARM_INSTRUCTION_SET = "arm" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb index 5081583d63..1155e0eec3 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb @@ -1,7 +1,7 @@ SUMMARY = "The GIMP is the GNU Image Manipulation Program" HOMEPAGE = "http://www.gimp.org" SECTION = "x11/graphics" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" DEPENDS = " \ @@ -55,6 +55,7 @@ EXTRA_OECONF:append:toolchain-clang:arm = " --disable-vector-icons" EXTRA_OECONF:append:toolchain-clang:riscv32 = " --disable-vector-icons" EXTRA_OECONF:append:toolchain-clang:mips = " --disable-vector-icons" EXTRA_OECONF:append:toolchain-clang:x86 = " --disable-vector-icons" +EXTRA_OECONF:append:powerpc = " --disable-vector-icons" do_configure:append() { find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g diff --git a/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.3.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.3.1.bb index d4d91ed51a..f6d8739dae 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.3.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.3.1.bb @@ -1,5 +1,5 @@ SUMMARY = "Actions, Menus and Toolbars Kit" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb index 55b29139bb..ef26caa144 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb @@ -1,5 +1,5 @@ SUMMARY = "Configuration editor for dconf" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb index 5613556aa7..6641be86ee 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb @@ -1,5 +1,5 @@ SUMMARY = "configuation database system" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "x11/gnome" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb b/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb index 8e048170bc..01900cce39 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Devilspie2 is a window matching utility, allowing the user to perform scripted actions on windows as they are created" HOMEPAGE = "http://www.gusnan.se/devilspie2" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=00aefaa50aad75c21367df66102d542c \ file://GPL3.txt;md5=d32239bcb673463ab874e80d47fae504" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.3.bb deleted file mode 100644 index ec3dca209d..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.3.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" -SECTION = "x11/office" -DEPENDS = " \ - gnome-common-native \ - yelp-tools-native \ - appstream-glib \ - gtk+3 \ - gspell \ - libsecret \ - poppler \ - gstreamer1.0-plugins-base \ - orc \ - adwaita-icon-theme \ - libhandy \ - ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop','',d)} \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection gettext mime-xdg gtk-doc - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -SRC_URI += " file://0001-Remove-incorrect-args-for-i18n.merge_file.patch" -SRC_URI[archive.sha256sum] = "3346b01f9bdc8f2d5ffea92f110a090c64a3624942b5b543aad4592a9de33bb0" - -GTKDOC_MESON_OPTION = "gtk_doc" - -EXTRA_OEMESON = " \ - -Dsystemduserunitdir=no \ -" - -do_compile:prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs" -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[nautilus] = "-Dnautilus=true,-Dnautilus=false,nautilus" - -RDEPENDS:${PN} += "glib-2.0-utils" -RRECOMMMENDS_${PN} = "adwaita-icon-theme" - -PACKAGES =+ "${PN}-nautilus-extension" - -FILES:${PN} += "${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/thumbnailers \ -" -FILES:${PN}-nautilus-extension = "${libdir}/nautilus/*/*so" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.4.bb new file mode 100644 index 0000000000..6b3479c264 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.4.bb @@ -0,0 +1,52 @@ +SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" +SECTION = "x11/office" +DEPENDS = " \ + gnome-common-native \ + yelp-tools-native \ + appstream-glib \ + gtk+3 \ + gspell \ + libsecret \ + poppler \ + gstreamer1.0-plugins-base \ + orc \ + adwaita-icon-theme \ + libhandy \ + ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop','',d)} \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection gettext mime-xdg gtk-doc + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI += " file://0001-Remove-incorrect-args-for-i18n.merge_file.patch" +SRC_URI[archive.sha256sum] = "ff245240f230922bec32a4d7b0a1d91b247a83d13484f99b74035d51eb232130" + +GTKDOC_MESON_OPTION = "gtk_doc" + +EXTRA_OEMESON = " \ + -Dsystemduserunitdir=no \ +" + +do_compile:prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs" +} + +PACKAGECONFIG ??= "" +PACKAGECONFIG[nautilus] = "-Dnautilus=true,-Dnautilus=false,nautilus" + +RDEPENDS:${PN} += "glib-2.0-utils" +RRECOMMMENDS_${PN} = "adwaita-icon-theme" + +PACKAGES =+ "${PN}-nautilus-extension" + +FILES:${PN} += "${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/thumbnailers \ +" +FILES:${PN}-nautilus-extension = "${libdir}/nautilus/*/*so" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb index 59856f3ab7..f6b719392d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb @@ -11,6 +11,7 @@ inherit pkgconfig gsettings gobject-introspection features_check cmake gtk-doc g REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += " \ + file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ @@ -25,7 +26,7 @@ GI_DATA_ENABLED="False" EXTRA_OECMAKE = " \ -DSYSCONF_INSTALL_DIR=${sysconfdir} \ -DWITH_KRB5=OFF \ - -DENABLE_UOA=OFF \ + -DENABLE_GOA=OFF \ -DENABLE_GOOGLE_AUTH=OFF \ -DENABLE_WEATHER=OFF \ -DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index 96367aa0c6..bcbe20d752 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -2,12 +2,12 @@ SUMMARY = "Evolution database backend server" HOMEPAGE = "http://www.gnome.org/projects/evolution/" BUGTRACKER = "https://bugzilla.gnome.org/" -LICENSE = "LGPLv2 & LGPLv2+" +LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \ file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543" inherit gnomebase upstream-version-is-even -SRC_URI[archive.sha256sum] = "6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d" -PV = "3.42.3" +SRC_URI[archive.sha256sum] = "8c437af75edbef196034f7913f505c3f68acc18515a6eed20f3ef52452785898" +PV = "3.43.1" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch new file mode 100644 index 0000000000..8fd077cedc --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch @@ -0,0 +1,13 @@ +--- a/cmake/modules/GObjectIntrospection.cmake 2022-03-06 18:10:47.724184883 +0100 ++++ b/cmake/modules/GObjectIntrospection.cmake 2022-03-06 18:10:12.560450948 +0100 +@@ -122,9 +122,7 @@ + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}") + + add_custom_command( +- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS= +- ${INTROSPECTION_SCANNER_ENV} +- ${G_IR_SCANNER} ++ COMMAND ${G_IR_SCANNER} + ${INTROSPECTION_SCANNER_ARGS} + --namespace=${_gir_namespace} + --nsversion=${_gir_version} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb index 55fdba5e38..5ed3375eb0 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb @@ -1,6 +1,6 @@ DESCRIPTION = "An icon theme for Gnome" SECTION = "x11/wm" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" HOMEPAGE = "http://code.google.com/p/faenza-icon-theme/" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb index ccc82aec45..cce7f211f7 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb @@ -1,5 +1,5 @@ SUMMARY = "An archive manager utility for the GNOME Environment" -LICENSE="GPLv2" +LICENSE="GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb index e31ca13f0f..94ffdc28eb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME Display Manager" -LICENSE="GPLv2" +LICENSE="GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb index 8c11fb52e0..adba8ab2f9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb @@ -1,6 +1,6 @@ SUMMARY = "GNOME editor" SECTION = "x11/gnome" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" GNOMEBASEBUILDCLASS = "meson" @@ -21,12 +21,11 @@ inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc val def gnome_verdir(v): return oe.utils.trim_version(v, 1) -REQUIRED_DISTRO_FEATURES = "x11" - SRC_URI[archive.sha256sum] = "7a9b18b158808d1892989165f3706c4f1a282979079ab7458a79d3c24ad4deb5" # gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +# x11 is needed for tepl and gtksourceview4 +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" GIR_MESON_OPTION = "" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb index c0f3c27af4..df401f7291 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb @@ -1,6 +1,6 @@ SUMMARY = "A convenience library for the geocoding" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb index b2fd4b0316..afec302cb4 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb @@ -1,5 +1,5 @@ SUMMARY = "A GObject-based Exiv2 wrapper" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" DEPENDS = "exiv2 python3-pygobject-native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb index 23b3bf63a5..2b36003635 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb @@ -1,6 +1,6 @@ SUMMARY = "A GObject library for Facebook Graph API" SECTION = "x11/gnome" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5804fe91d3294da4ac47c02b454bbc8a" DEPENDS = " \ @@ -10,7 +10,10 @@ DEPENDS = " \ gnome-online-accounts \ " -inherit gnomebase gtk-doc gobject-introspection pkgconfig +inherit gnomebase gtk-doc gobject-introspection pkgconfig features_check + +# for gnome-online-accounts +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += " file://0001-Update-rest-requirement-to-rest-1.0.patch" SRC_URI[archive.md5sum] = "c38af63e49f8fe8baad99537956b69ba" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb index 438f8113a6..08e50409eb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb @@ -1,5 +1,5 @@ SUMMARY = "GHex - a hex editor for GNOME" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch index 55af681af0..0c45e60957 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch @@ -1,4 +1,4 @@ -From 550e98013b0e003c1a6771d8e811375913adf16b Mon Sep 17 00:00:00 2001 +From fa47185d9c8150a0dcb0ea12b92fcf139edbef35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 27 Oct 2021 20:18:47 +0200 Subject: [PATCH] Support cross builds a bit better @@ -17,10 +17,10 @@ Signed-off-by: Andreas Müller 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index dfcc2c3..192b1b5 100644 +index 136e812..f5b91e0 100644 --- a/meson.build +++ b/meson.build -@@ -234,6 +234,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with +@@ -252,6 +252,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with --disable-debug.''') endif @@ -28,15 +28,15 @@ index dfcc2c3..192b1b5 100644 # Check if a minimal SpiderMonkey program compiles, links, and runs. If not, # it's most likely the case that SpiderMonkey was configured incorrectly, for # example by building mozglue as a shared library. -@@ -254,6 +255,7 @@ could not be compiled, linked, or run. Most likely you should build it with a - different configuration. Check the recommended configuration: - https://github.com/spidermonkey-embedders/spidermonkey-embedding-examples/blob/esr78/docs/Building%20SpiderMonkey.md''') +@@ -282,6 +283,7 @@ elif minimal_program.returncode() != 0 + failed to execute. Most likely you should build it with a different + configuration.''' + recommended_configuration) endif +endif # not meson.is_cross_build() have_printf_alternative_int = cc.compiles(''' #include -@@ -662,7 +664,7 @@ endif +@@ -682,7 +684,7 @@ subdir('installed-tests') # Note: The test program in test/ needs to be ported # to Windows before we can build it on Windows. @@ -45,6 +45,3 @@ index dfcc2c3..192b1b5 100644 subdir('test') endif --- -2.31.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch index 8777d14f53..6e7b5504e8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch @@ -1,4 +1,4 @@ -From 6a29818204e647d5fad68ed7ca8cac53d301cae6 Mon Sep 17 00:00:00 2001 +From 2b8aa1ea4a4d1836164c934b1ab2556a32cb5af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 27 Oct 2021 20:04:02 +0200 Subject: [PATCH] meson.build: Do not add dir installed-tests when @@ -15,10 +15,10 @@ Signed-off-by: Andreas Müller 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 6878e2e..edbbf79 100644 +index f5b91e0..3110530 100644 --- a/meson.build +++ b/meson.build -@@ -635,7 +635,9 @@ if not get_option('skip_gtk_tests') +@@ -680,7 +680,9 @@ if not get_option('skip_gtk_tests') have_gtk4 = dependency('gtk4', required: false).found() endif @@ -29,6 +29,3 @@ index 6878e2e..edbbf79 100644 # Note: The test program in test/ needs to be ported # to Windows before we can build it on Windows. --- -2.31.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.70.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.70.1.bb deleted file mode 100644 index 90ea140448..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.70.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Javascript bindings for GNOME" -LICENSE = "MIT & LGPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = "mozjs-78 gtk4" - -inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even pkgconfig - -SRC_URI[archive.sha256sum] = "bbdc0eec7cf25fbc534769f6a1fb2c7a18e17b871efdb0ca58e9abf08b28003f" -SRC_URI += " \ - file://0001-Support-cross-builds-a-bit-better.patch \ - file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \ -" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -GIR_MESON_OPTION = "" - -EXTRA_OEMESON = " \ - -Dinstalled_tests=false \ - -Dskip_dbus_tests=true \ -" - -LDFLAGS:append:mipsarch = " -latomic" -LDFLAGS:append:powerpc = " -latomic" -LDFLAGS:append:powerpc64 = " -latomic" -LDFLAGS:append:riscv32 = " -latomic" - -FILES:${PN} += "${datadir}/gjs-1.0/lsan" - -PACKAGES =+ "${PN}-valgrind" -FILES:${PN}-valgrind = "${datadir}/gjs-1.0/valgrind" -RDEPENDS:${PN}-valgrind += "valgrind" - -# Valgrind not yet available on rv32/rv64 -RDEPENDS:${PN}-valgrind:remove:riscv32 = "valgrind" -RDEPENDS:${PN}-valgrind:remove:riscv64 = "valgrind" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb new file mode 100644 index 0000000000..9e6fc45db3 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb @@ -0,0 +1,40 @@ +SUMMARY = "Javascript bindings for GNOME" +LICENSE = "MIT & LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = "mozjs-91" + +inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even pkgconfig + +SRC_URI[archive.sha256sum] = "3ef0caf716e3920dd61f7748f6d56e476cc0fc18351ad0548e7df1a0ab9bdcad" +SRC_URI += " \ + file://0001-Support-cross-builds-a-bit-better.patch \ + file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \ +" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +GIR_MESON_OPTION = "" + +EXTRA_OEMESON = " \ + -Dinstalled_tests=false \ + -Dskip_dbus_tests=true \ + -Dskip_gtk_tests=true \ +" + +LDFLAGS:append:mipsarch = " -latomic" +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:powerpc64 = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" + +FILES:${PN} += "${datadir}/gjs-1.0/lsan" + +PACKAGES =+ "${PN}-valgrind" +FILES:${PN}-valgrind = "${datadir}/gjs-1.0/valgrind" +RDEPENDS:${PN}-valgrind += "valgrind" + +# Valgrind not yet available on rv32/rv64 +RDEPENDS:${PN}-valgrind:remove:riscv32 = "valgrind" +RDEPENDS:${PN}-valgrind:remove:riscv64 = "valgrind" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb index 0015e9f05b..017d67b5a6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME archive library" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb index 8eed262998..57fe74495d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME bluetooth manager" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_41.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_41.1.bb index f4aba65953..607f52afeb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_41.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_41.1.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME calculator" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "x11/gnome" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb index 4b62a0c07c..c97bf0bec8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME calendar" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" SECTION = "x11/gnome" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb index f2b95edd06..1cdc96ba0b 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb @@ -1,6 +1,6 @@ SUMMARY = "GNOME Settings" DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb index 3085d2767e..6bf2ab3986 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb @@ -1,6 +1,6 @@ SUMMARY = "GNOME library for reading .desktop files" SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch deleted file mode 100644 index 2758af5079..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 629ca0e61bb59303d43d7eac44a47ae866cc78f0 Mon Sep 17 00:00:00 2001 -From: rvalue -Date: Fri, 17 Dec 2021 12:29:30 +0000 -Subject: [PATCH] build: fix arguments of i18n.merge_file - -`i18n.merge_file` has been ignoring positional arguments for a time -and explicitly rejects with error since meson 0.60.0 - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index e38a1d8..38fb520 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -11,7 +11,6 @@ desktops = [ - - foreach desktop: desktops - i18n.merge_file ( -- desktop, - type: 'desktop', - input: desktop + '.in', - output: desktop, -@@ -38,7 +37,6 @@ install_data( - info = 'org.gnome.DiskUtility.appdata.xml' - - i18n.merge_file( -- info, - input: info + '.in', - output: info, - po_dir: po_dir, diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb deleted file mode 100644 index 7e254f52c7..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "GNOME disk utility" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SECTION = "x11/gnome" - -DEPENDS = " \ - gtk+3 \ - libdvdread \ - libcanberra \ - libnotify \ - libsecret \ - libpwquality \ - udisks2 \ - libhandy \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gtk-icon-cache gettext features_check mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11 polkit" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -# As soon as elogind is of interest this needs rework: meson option is combo -PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" - -SRC_URI += " file://0001-build-fix-arguments-of-i18n.merge_file.patch" -SRC_URI[archive.sha256sum] = "8743c98fd656062ef862933efe30c5be4c6b322ec02eee154ec70d08ed0895df" - -FILES:${PN} += " \ - ${datadir}/metainfo \ - ${datadir}/dbus-1 \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_42.0.bb new file mode 100644 index 0000000000..e9724748ca --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_42.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "GNOME disk utility" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SECTION = "x11/gnome" + +DEPENDS = " \ + gtk+3 \ + libdvdread \ + libcanberra \ + libnotify \ + libsecret \ + libpwquality \ + udisks2 \ + libhandy \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gtk-icon-cache gettext features_check mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11 polkit" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +# As soon as elogind is of interest this needs rework: meson option is combo +PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" + +SRC_URI[archive.sha256sum] = "1b6564454d67426322cb3bfc5a5558653bfc7dfeea2ae0825b1d08629f01090b" + +EXTRA_OEMESON = "-Dman=false" + +FILES:${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.42.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.42.1.bb index 3f47de6f29..13a68e3c80 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.42.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.42.1.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME Flashback (GNOME 2) session" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit gnomebase gsettings gtk-icon-cache gettext upstream-version-is-even features_check diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb index 9528b6641c..2e2927f1c7 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME font viewer" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SECTION = "x11/gnome" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb index 5bc5f2e0fb..5aa52d1a50 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnome.org/" BUGTRACKER = "https://bugzilla.gnome.org/" SECTION = "x11/gnome" -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = " \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb index c58229879c..dbc6e962eb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb @@ -1,6 +1,6 @@ SUMMARY = "GNOME menus" SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.43.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.43.1.bb index 3dca7e37a8..8dabb9e0c1 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.43.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.43.1.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME Online Accounts - Single sign-on framework for GNOME" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36" GNOMEBASEBUILDCLASS = "autotools" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.42.0.bb index 9c9add4f48..2bcf145471 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.42.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.42.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME flashback panel" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit gnomebase gsettings itstool gnome-help gtk-icon-cache gtk-doc gettext upstream-version-is-even features_check diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch deleted file mode 100644 index 9fb7a5b9e5..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a112e8a089851035945b6848849149bb36787906 Mon Sep 17 00:00:00 2001 -From: rvalue -Date: Fri, 21 Jan 2022 12:36:02 +0000 -Subject: [PATCH] meson: remove incorrect args for i18n.merge_file - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 6e7192e..94271de 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -3,7 +3,6 @@ subdir('icons') - appdata = photos_namespace + '.appdata.xml' - - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, -@@ -23,7 +22,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb deleted file mode 100644 index ae8ab31f64..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Access, organize and share your photos on GNOME" -SECTION = "x11/gnome" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" - -DEPENDS = " \ - glib-2.0-native \ - gdk-pixbuf-native \ - librsvg-native \ - gtk+3 \ - babl \ - gegl \ - geocode-glib \ - gnome-online-accounts \ - grilo \ - gsettings-desktop-schemas \ - libdazzle \ - libgdata \ - gfbgraph \ - tracker \ - libhandy \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gettext gnome-help features_check - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " file://0001-meson-remove-incorrect-args-for-i18n.merge_file.patch" -SRC_URI[archive.sha256sum] = "e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af" - -do_install:append() { - # make gnome-photos available on all desktops - sed -i 's:OnlyShowIn=:#OnlyShowIn=:g' ${D}${datadir}/applications/org.gnome.Photos.desktop -} - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/gnome-shell \ -" - -RRECOMMENDS:${PN} = "grilo-plugins" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_42.0.bb new file mode 100644 index 0000000000..5af3088e3a --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_42.0.bb @@ -0,0 +1,46 @@ +SUMMARY = "Access, organize and share your photos on GNOME" +SECTION = "x11/gnome" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +DEPENDS = " \ + glib-2.0-native \ + gdk-pixbuf-native \ + librsvg-native \ + gtk+3 \ + babl \ + gegl \ + geocode-glib \ + gnome-online-accounts \ + grilo \ + gsettings-desktop-schemas \ + libdazzle \ + libgdata \ + gfbgraph \ + tracker \ + libhandy \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gettext gnome-help features_check + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "25cb281425199dec7b045f13f32f8f96034cb0cb8b94d96f9dffaf4f5be68551" + +do_install:append() { + # make gnome-photos available on all desktops + sed -i 's:OnlyShowIn=:#OnlyShowIn=:g' ${D}${datadir}/applications/org.gnome.Photos.desktop +} + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/gnome-shell \ +" + +RRECOMMENDS:${PN} = "grilo-plugins" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb index 18d73d872a..fa7e161e9e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb @@ -1,7 +1,7 @@ SUMMARY = "GNOME Screenshot" DESCRIPTION = "GNOME Screenshot is a small utility that takes a screenshot \ of the whole desktop, the currently focused window, or an area of the screen." -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SECTION = "x11/gnome" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_41.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_41.3.bb index 010f815cdd..07f3634294 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_41.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_41.3.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME session" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb index 78d6811700..cbc4c460c1 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Window navigation construction toolkit" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch new file mode 100644 index 0000000000..df8fe0e6e6 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch @@ -0,0 +1,30 @@ +From cdaa837d48894737ca0b4e7d2dfb365119e53759 Mon Sep 17 00:00:00 2001 +From: Jan Beich +Date: Tue, 25 Jan 2022 11:49:54 +0000 +Subject: [PATCH] meson: Drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:23:0: ERROR: Function does not take positional arguments. + +Part-of: + +Upstream-Status: Backport[https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/commit/cdaa837d48894737ca0b4e7d2dfb365119e53759] +--- + data/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 27f4287..a4bcd5e 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,5 +1,5 @@ + session_desktop = 'gnome-classic.desktop' +-i18n.merge_file('', ++i18n.merge_file( + input: session_desktop + '.in', + output: session_desktop, + po_dir: '../po', +-- +2.34.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_41.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_41.1.bb index 16184f2c6c..f51ca9f918 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_41.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_41.1.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME Shell Extensions" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4cb3a392cbf81a9e685ec13b88c4c101" GNOMEBASEBUILDCLASS = "meson" @@ -9,6 +9,7 @@ inherit gnomebase gettext gsettings features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" SRC_URI[archive.sha256sum] = "d0e6f2273f08d52d925fc2bb66b47b28e5ef50d1b8a14020877c662423d507d3" +SRC_URI += "file://0001-meson-Drop-unused-argument-for-i18n.merge_file.patch" DEPENDS += " \ sassc-native \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb index d1b19895ae..8d0dba4840 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME Shell is the graphical shell of the GNOME desktop environment" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_41.0.bb deleted file mode 100644 index 9b573d0ff0..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_41.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Gnome system monitor" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = " \ - gnome-common-native \ - libxml2-native \ - glib-2.0-native \ - gtkmm3 \ - libgtop \ - librsvg \ - polkit \ - libhandy \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check gettext - -REQUIRED_DISTRO_FEATURES = "x11 polkit" - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -SRC_URI[archive.sha256sum] = "c7fc44c61949b794b0289968ebbbcc0c15f8cfc3d9e45bfaa81ed45c12139e5f" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" - -RRECOMMENDS:${PN} = "adwaita-icon-theme" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_42.0.bb new file mode 100644 index 0000000000..219a069b6a --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_42.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "Gnome system monitor" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = " \ + gnome-common-native \ + libxml2-native \ + glib-2.0-native \ + gtkmm3 \ + libgtop \ + librsvg \ + polkit \ + libhandy \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check gettext + +REQUIRED_DISTRO_FEATURES = "x11 polkit" + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "13239d22032201a22bd29833c575b684816700d2de168a1530223577c5c075dc" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" + +RRECOMMENDS:${PN} = "adwaita-icon-theme" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb index 2b3f3a6162..061da27f60 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME terminal" -LICENSE = "GPLv3 & GFDL-1.3" +LICENSE = "GPL-3.0-only & GFDL-1.3" LIC_FILES_CHKSUM = " \ file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch new file mode 100644 index 0000000000..dfa4615a3d --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch @@ -0,0 +1,33 @@ +From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001 +From: Mae Dartmann +Date: Wed, 16 Feb 2022 06:08:41 +0000 +Subject: [PATCH] meson: fix invalid positional argument + +Upstream-Status: Accepted[https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8] +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index fd6d5da..74f7e82 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,5 +1,5 @@ + appdata_file = 'org.gnome.tweaks.appdata.xml' +-i18n.merge_file(appdata_file, ++i18n.merge_file( + input: appdata_file + '.in', + output: appdata_file, + po_dir: '../po', +@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file, + ) + + desktop_file = 'org.gnome.tweaks.desktop' +-i18n.merge_file(desktop_file, ++i18n.merge_file( + input: desktop_file + '.in', + output: desktop_file, + po_dir: '../po', +-- +GitLab + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb index 30275c97e3..ffdf2c9d38 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME tweaks: Advanced options for GNOME 3 session" -LICENSE = "GPLv3 & CC0-1.0" +LICENSE = "GPL-3.0-only & CC0-1.0" LIC_FILES_CHKSUM = " \ file://LICENSES/CC0-1.0;md5=65d3616852dbf7b1a6d4b53b00626032 \ file://LICENSES/GPL-3.0;md5=9eef91148a9b14ec7f9df333daebc746 \ @@ -19,7 +19,10 @@ REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" GIR_MESON_OPTION = "" SRC_URI[archive.sha256sum] = "f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a" -SRC_URI += "file://0001-Make-python-path-configurable.patch" +SRC_URI += " \ + file://0001-Make-python-path-configurable.patch \ + file://0002-meson-fix-invalid-positional-argument.patch \ +" EXTRA_OEMESON = "-Dpython_site_dir=${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.14.bb b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.14.bb index 028e1d22b7..d00e737f4a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.14.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.14.bb @@ -1,5 +1,5 @@ SUMMARY = "Grilo is a framework forsearching media content from various sources" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.14.bb b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.14.bb index 53d80c5cbe..7ceb26d7a2 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.14.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.14.bb @@ -1,5 +1,5 @@ SUMMARY = "Grilo is a framework forsearching media content from various sources" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb index 7c7925420c..bdef603f0d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb @@ -1,5 +1,5 @@ SUMMARY = "Small gobject library for playing system sounds" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=447b837ae57f08b7060593ac6256163f" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.9.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.9.1.bb index aba9be87aa..15f1cadbab 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.9.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.9.1.bb @@ -1,6 +1,6 @@ SUMMARY = "gspell adds spell-checking to a GTK+ applications" HOMEPAGE = "https://wiki.gnome.org/Projects/gspell" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8c2e1ec1540fb3e0beb68361344cba7e" DEPENDS = "gtk+3 iso-codes enchant2" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb index e9c52f3470..1459e0b434 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Image viewer and browser" -LICENSE="GPLv2" +LICENSE="GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb index 64d5b868f7..4e1e434314 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Gtksourceview Classic-Light theme" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://classic-light.xml;beginline=6;endline=23;md5=2b4f75364fad00a4d752214dcbd7d7c3" inherit allarch diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb index 9f88513f7d..1e5652d3bd 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb @@ -1,7 +1,7 @@ SUMMARY = "Portable C library for multiline text editing" HOMEPAGE = "http://projects.gnome.org/gtksourceview/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DEPENDS = "gtk+3 libxml2 intltool-native gnome-common-native glib-2.0-native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.2.bb index 5b5ce5328a..db4d89de22 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.2.bb @@ -1,7 +1,7 @@ SUMMARY = "Portable C library for multiline text editing" HOMEPAGE = "http://projects.gnome.org/gtksourceview/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DEPENDS = "gtk+3 libxml2 intltool-native gnome-common-native glib-2.0-native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.2.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.2.0.bb index c7c6e92037..00487743e8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.2.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.2.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Portable C library for multiline text editing" HOMEPAGE = "http://projects.gnome.org/gtksourceview/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch deleted file mode 100644 index a6e3523743..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Backport - -Fixes "../gvfs-1.49.1/daemon/meson.build:362:7: ERROR: Function does not take positional arguments. - -Signed-off-by: Markus Volk f_l_k@t-online.de - -From 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0 Mon Sep 17 00:00:00 2001 -From: Ondrej Holy -Date: Fri, 21 Jan 2022 08:32:31 +0100 -Subject: [PATCH] build: Remove incorrect i18n.merge_file argument - -The positional argument was being silently ignored until meson 0.60.0 where -it fails with "ERROR: Function does not take positional arguments". - -Related: https://github.com/mesonbuild/meson/issues/9441 -Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599 ---- - daemon/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/daemon/meson.build b/daemon/meson.build -index 5f9559aa..e20ada29 100644 ---- a/daemon/meson.build -+++ b/daemon/meson.build -@@ -360,7 +360,6 @@ if enable_admin - policy = gvfs_namespace + '.file-operations.policy' - - i18n.merge_file( -- policy, - input: configure_file( - input: policy + '.in.in', - output: '@BASENAME@', --- - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb deleted file mode 100644 index c73716d749..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb +++ /dev/null @@ -1,92 +0,0 @@ -DESCRIPTION = "gvfs is a userspace virtual filesystem" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check useradd - -DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \ - gsettings-desktop-schemas dbus" - -RDEPENDS:${PN} += "gsettings-desktop-schemas" - -SRC_URI = " \ - https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive \ - file://Remove-incorrect-i18n.merge_file-argument.patch \ -" - -SRC_URI[archive.sha256sum] = "b0d1dda4e475066207305b0776b0daefeae790f6c0107ffd2687994c8e71915a" - -# depends on gsettings-desktop-schemas->gcr->gtk+3-> x11 -REQUIRED_DISTRO_FEATURES = "x11" - -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, fuse3" - -# libcdio-paranoia recipe doesn't exist yet -PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 polkitd" - -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.50.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb new file mode 100644 index 0000000000..93f7f57617 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb @@ -0,0 +1,89 @@ +DESCRIPTION = "gvfs is a userspace virtual filesystem" +LICENSE = "LGPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check useradd + +DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \ + gsettings-desktop-schemas dbus" + +RDEPENDS:${PN} += "gsettings-desktop-schemas" + +SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" + +SRC_URI[archive.sha256sum] = "cbc2f564d2e9f00c760673f42d6803bce3e081ab7ffb4456deffffba9339b4dd" + +# depends on gsettings-desktop-schemas->gcr->gtk+3-> x11 +REQUIRED_DISTRO_FEATURES = "x11" + +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, fuse3" + +# libcdio-paranoia recipe doesn't exist yet +PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 polkitd" + +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/libchamplain/libchamplain_0.12.20.bb b/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb index 51ca63e1fb..859eab9164 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb @@ -1,5 +1,5 @@ SUMMARY = "libchamplain is a Gtk widget displaying zoomable and pannable maps" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "glib-2.0 gtk+3 gdk-pixbuf clutter-1.0 clutter-gtk-1.0 libsoup-2.4" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb index a1be2a2b64..921c3ee805 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb @@ -2,7 +2,7 @@ SUMMARY = "GLib-based library for accessing online service APIs using the GData HOMEPAGE = "http://live.gnome.org/libgdata" BUGTRACKER = "https://bugzilla.gnome.org/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \ file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.48.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.48.bb deleted file mode 100644 index a3ff13f9ba..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.48.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "GNOME Structured File Library" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \ - file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63" - -SECTION = "libs" - -DEPENDS= "libxml2 bzip2 glib-2.0 zlib gnome-common-native" - -inherit gnomebase gobject-introspection gettext gtk-doc - -SRC_URI[archive.sha256sum] = "ff86d7f1d46dd0ebefb7bd830a74a41db64362b987bf8853fff6ab4c1132b837" -SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf" - -EXTRA_OECONF = "\ - --with-bz2 \ -" - -FILES:${PN} += "${datadir}/thumbnailers" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.49.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.49.bb new file mode 100644 index 0000000000..f663141bd5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.49.bb @@ -0,0 +1,22 @@ +SUMMARY = "GNOME Structured File Library" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \ + file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63" + +SECTION = "libs" + +DEPENDS= "libxml2 bzip2 glib-2.0 zlib gnome-common-native" + +inherit gnomebase gobject-introspection gettext gtk-doc + +SRC_URI[archive.sha256sum] = "e9ebe36688f010c9e6e40c8903f3732948deb8aca032578d07d0751bd82cf857" +SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf" + +EXTRA_OECONF = "\ + --with-bz2 \ +" + +FILES:${PN} += "${datadir}/thumbnailers" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb index 6d9398f4e4..3ee7746c10 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb @@ -1,5 +1,5 @@ SUMMARY = "A library for collecting system monitoring data" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-version-is-even diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb index 49493b17b2..771fc62e1e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb @@ -1,6 +1,6 @@ SUMMARY = "A library to access weather information from online services" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.5.bb index 67f63fea68..6deac38fda 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.5.bb @@ -3,7 +3,7 @@ DESCRIPTION = "It provides simple asynchronous wrappers for most Flatpak portals with a familiar GObject API along side the D-Bus API" HOMEPAGE = "https://github.com/flatpak/libportal" BUGTRACKER = "https://github.com/flatpak/libportal/issues" -LICENSE = "LGPLv3" +LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=master" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb index c74e1d4388..d633b0621d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Time zone map widget for Gtk+" HOMEPAGE = "https://launchpad.net/timezonemap" SECTION = "devel/lib" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/libt/${BPN}/${BPN}_${PV}.tar.gz" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb index 6c9e631e11..cb4e459b3d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb @@ -1,5 +1,5 @@ SUMMARY = "Window navigation construction toolkit" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" BPN = "libwnck" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb index d1f36a94d2..3abba94990 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Window navigation construction toolkit" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" SECTION = "x11/libs" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb index e47d74b7b8..7955663f26 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb @@ -1,5 +1,5 @@ SUMMARY = "Helper lib for keyboard management" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" DEPENDS = "xkbcomp gtk+ iso-codes libxi libxml2" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.42.0.bb deleted file mode 100644 index 58479cf7b3..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.42.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SECTION = "x11/wm" -SUMMARY = "Metacity is the boring window manager for the adult in you" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b4cce53560b8e619ffa7c830fb8761aa \ - file://src/include/main.h;endline=24;md5=72148ede07a6dadd01de6a882d20a9ad" - -PE = "1" - -DEPENDS = " \ - gdk-pixbuf-native \ - gtk+3 \ - gsettings-desktop-schemas \ - startup-notification \ - libcanberra \ - libgtop \ - libxres \ - libxpresent \ -" - - -# depends on startup-notification which depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -inherit gnomebase gsettings gettext upstream-version-is-even features_check - -SRC_URI[archive.sha256sum] = "d89d679dcfed9b5eef18f06e2dcb33a7ab543d53b358fa89ce65593c231eeebc" -SRC_URI += "file://0001-drop-zenity-detection.patch" - -PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" -# enable as neccessary until new warnings are dealt with -PACKAGECONFIG[werror] = "--enable-Werror,--disable-Werror,," - -FILES:${PN} += " \ - ${datadir}/themes \ - ${datadir}/gnome-control-center \ - ${datadir}/gnome\ -" - -RDEPENDS:${PN} += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.44.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.44.0.bb new file mode 100644 index 0000000000..b6708552ac --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.44.0.bb @@ -0,0 +1,39 @@ +SECTION = "x11/wm" +SUMMARY = "Metacity is the boring window manager for the adult in you" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b4cce53560b8e619ffa7c830fb8761aa \ + file://src/include/main.h;endline=24;md5=72148ede07a6dadd01de6a882d20a9ad" + +PE = "1" + +DEPENDS = " \ + gdk-pixbuf-native \ + gtk+3 \ + gsettings-desktop-schemas \ + startup-notification \ + libcanberra \ + libgtop \ + libxres \ + libxpresent \ +" + + +# depends on startup-notification which depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +inherit gnomebase gsettings gettext upstream-version-is-even features_check + +SRC_URI[archive.sha256sum] = "19c3c5d79d2171f45baa0f632cc8995f8607bf1231a16014439bac9ba165a7c0" +SRC_URI += "file://0001-drop-zenity-detection.patch" + +PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" +# enable as neccessary until new warnings are dealt with +PACKAGECONFIG[werror] = "--enable-Werror,--disable-Werror,," + +FILES:${PN} += " \ + ${datadir}/themes \ + ${datadir}/gnome-control-center \ + ${datadir}/gnome\ +" + +RDEPENDS:${PN} += "gsettings-desktop-schemas" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_41.2.bb index 19dad21380..08ac897a7f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_41.2.bb @@ -1,5 +1,5 @@ SUMMARY = "Window and compositing manager based on Clutter" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch deleted file mode 100644 index 708595a7f1..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix an issue building Nautilus with libportal-0.5+ -where expected header is moved to different directory -in staging sysroot - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- a/meson.build -+++ b/meson.build -@@ -123,7 +123,7 @@ gtk = dependency('gtk+-3.0', version: '> - libhandy = dependency('libhandy-1', version: '>= 1.1.90') - libportal = [] - if get_option('libportal') -- libportal = dependency('libportal', version: '>= 0.3') -+ libportal = dependency('libportal-gtk3', version: '>= 0.3') - endif - selinux = [] - if get_option('selinux') ---- a/src/nautilus-files-view.c -+++ b/src/nautilus-files-view.c -@@ -92,7 +92,7 @@ - - #ifdef HAVE_LIBPORTAL - #include --#include -+#include - #endif - - /* Minimum starting update inverval */ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb deleted file mode 100644 index e9541a7150..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "File manager for GNOME" -SECTION = "x11/gnome" - -LICENSE="GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - fontconfig \ - gtk+3 \ - gnome-desktop \ - gsettings-desktop-schemas \ - gnome-autoar \ - tracker \ - libhandy \ - libportal \ -" - -inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check mime-xdg - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -SRC_URI += "file://liportal-0.5-fix.patch" -SRC_URI[archive.sha256sum] = "872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b" - -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OEMESON += " \ - -Dtests=none \ -" - -PACKAGECONFIG = "extensions" -PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/gnome-shell \ - ${datadir}/tracker3 \ -" - -# mandatory - not checked during configuration: -# | (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed -RDEPENDS:${PN} += "tracker-miners" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb new file mode 100644 index 0000000000..2935cc2bfe --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb @@ -0,0 +1,45 @@ +SUMMARY = "File manager for GNOME" +SECTION = "x11/gnome" + +LICENSE="GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + fontconfig \ + gtk+3 \ + gnome-desktop \ + gsettings-desktop-schemas \ + gnome-autoar \ + tracker \ + libhandy \ + libportal \ +" + +inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check mime-xdg + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "3c904f33ba2d2a078892bee2af71484cd608923cd78ec7e8a1517bc2155113d5" + +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OEMESON += " \ + -Dtests=none \ +" + +PACKAGECONFIG = "extensions" +PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/gnome-shell \ + ${datadir}/tracker3 \ +" + +# mandatory - not checked during configuration: +# | (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed +RDEPENDS:${PN} += "tracker-miners" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb index 545224a99e..f1c9915c09 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb @@ -1,6 +1,6 @@ SUMMARY = "library to access web services that claim to be "RESTful"" HOMEPAGE = "https://wiki.gnome.org/Projects/Librest" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" GNOMEBASEBUILDCLASS = "autotools" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.42.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.42.1.bb index 3dd08a29cd..99b3c60fa5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.42.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.42.1.bb @@ -1,6 +1,6 @@ SUMMARY = "System-wide Performance Profiler for Linux" HOMEPAGE = "http://www.sysprof.com" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb index 0ac7e3693d..61e82e2856 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb @@ -15,10 +15,13 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gettext features_check +# for gtksourceview4 +REQUIRED_DISTRO_FEATURES += "x11" + SRC_URI[archive.sha256sum] = "a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63" # gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" GIR_MESON_OPTION = "" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb index 44b3671122..2847635b6d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb @@ -1,5 +1,5 @@ SUMMARY = "Tracker miners and metadata extractors" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = " \ file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.2.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.2.1.bb index 1c18efbcef..f81a84cd31 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.2.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.2.1.bb @@ -1,5 +1,5 @@ SUMMARY = "Tracker is a file search engine" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = " \ file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_41.0.bb index ec8edb80d3..13dada4438 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_41.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Collection of scripts and build utilities for documentation" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = " \ file://COPYING;md5=d67c6f9f1515506abfea4f0d920c0774 \ file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb index 3b23979780..50cc8fc3a7 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb @@ -1,5 +1,5 @@ SUMMARY = "XSL stylesheets for the yelp help browser" -LICENSE = "LGPLv2.1 & GPLv2 & BSD-3-Clause" +LICENSE = "LGPL-2.1-only & GPL-2.0-only & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://COPYING;md5=8ca13a5a6972ac1620a1e42a3dacd774 \ file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_41.2.bb index 590ff2f548..01427b157d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_41.2.bb @@ -1,5 +1,5 @@ SUMMARY = "Help browser for the GNOME desktop" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=6e1b9cb787e76d7e6946887a65caa754 \ " diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc index b91bc30488..ce6b8a0f49 100644 --- a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc @@ -3,7 +3,7 @@ DESCRIPTION = "Clutter is an Open GL based interactive canvas library, \ designed for creating fast, mainly 2D single window applications such as media \ box UIs, presentations, kiosk style applications and so on." HOMEPAGE = "http://www.clutter-project.org/" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" inherit clutter ptest-gnome features_check upstream-version-is-even gobject-introspection # depends on cogl-1.0 which needs opengl diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc index 8c6d0b3a07..7880021755 100644 --- a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc @@ -4,7 +4,7 @@ It provides a GStreamer sink to upload frames to GL and an actor that \ implements the ClutterGstPlayer interface using playbin." HOMEPAGE = "http://www.clutter-project.org/" BUGTRACKER = "https://gitlab.gnome.org/GNOME/clutter-gst/-/issues" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" inherit clutter features_check upstream-version-is-even gobject-introspection # depends on clutter-1.0 which depends on cogl-1.0 diff --git a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0.inc index 9a28b5219b..025e95b5d4 100644 --- a/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0.inc +++ b/meta-openembedded/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -5,7 +5,7 @@ a Clutter stage into any GtkContainer; and GtkClutterActor, a Clutter \ actor for embedding any GtkWidget inside a Clutter stage." HOMEPAGE = "http://www.clutter-project.org/" BUGTRACKER = "https://gitlab.gnome.org/GNOME/clutter/-/issues" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" CLUTTERBASEBUILDCLASS = "meson" inherit clutter features_check upstream-version-is-even gobject-introspection gtk-doc diff --git a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb b/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb index 26cc04b8e2..551ff5dc9d 100644 --- a/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb +++ b/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb @@ -1,6 +1,6 @@ DESCRIPTION = "D-Bus interfaces for querying and manipulating user account information" HOMEPAGE = "https://www.freedesktop.org/wiki/Software/AccountsService/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb b/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb index 3488fb568c..45a28ed967 100644 --- a/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb +++ b/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.18.bb @@ -1,6 +1,6 @@ SUMMARY = "Objects and helper methods to help reading and writing AppStream metadata" HOMEPAGE = "https://people.freedesktop.org/~hughsient/appstream-glib/index.htm" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb index 2b09adf710..e9c79e28b2 100644 --- a/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb +++ b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb @@ -1,6 +1,6 @@ SUMMARY = "GTK support library for colord" HOMEPAGE = "https://www.freedesktop.org/software/colord/" -LICENSE = "LGPLv3" +LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" inherit meson gobject-introspection gettext gtk-doc features_check diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc index 01f05c1b69..23f565f661 100644 --- a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc @@ -1,6 +1,6 @@ SUMMARY = "Intelligent Input Bus for Linux/Unix" HOMEPAGE = "https://github.com/ibus/ibus/wiki" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala diff --git a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb index 722b647f21..22ddd10a63 100644 --- a/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb +++ b/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb @@ -4,7 +4,7 @@ and group accounts" HOMEPAGE = "https://pagure.io/libuser" BUGTRACKER = "https://pagure.io/libuser/issues" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://lib/user.h;endline=19;md5=76b301f63c39fa992062395efbdc9558 \ file://samples/testuser.c;endline=19;md5=3b87fa660fa3f4a6bb31d624afe30ba1" diff --git a/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.1.0.bb b/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.1.0.bb deleted file mode 100644 index 226446dcbb..0000000000 --- a/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.1.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "A tablet description library" -DESCRIPTION = "libwacom is a library to identify Wacom tablets and their model-specific features. \ - It provides easy access to information such as 'is this a built-in on-screen tablet\', \ - 'what is the size of this model', etc." -HOMEPAGE = "https://github.com/linuxwacom/libwacom" -BUGTRACKER = "https://github.com/linuxwacom/libwacom/issues" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e" - -SRC_URI = "git://github.com/linuxwacom/libwacom.git;branch=master;protocol=https" -SRCREV = "0f263ce26edc47587d5f7604e44fad1b61240c3d" - -DEPENDS = " \ - libxml2-native \ - libgudev \ -" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig - -EXTRA_OEMESON = " \ - -Dtests=disabled \ -" diff --git a/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.2.0.bb b/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.2.0.bb new file mode 100644 index 0000000000..78f5a289c6 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.2.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "A tablet description library" +DESCRIPTION = "libwacom is a library to identify Wacom tablets and their model-specific features. \ + It provides easy access to information such as 'is this a built-in on-screen tablet\', \ + 'what is the size of this model', etc." +HOMEPAGE = "https://github.com/linuxwacom/libwacom" +BUGTRACKER = "https://github.com/linuxwacom/libwacom/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e" + +SRC_URI = "git://github.com/linuxwacom/libwacom.git;branch=master;protocol=https" +SRCREV = "be485deca03157b0dbd702c7acaf35b71378be9e" + +DEPENDS = " \ + libxml2-native \ + libgudev \ +" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +EXTRA_OEMESON = " \ + -Dtests=disabled \ +" diff --git a/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb b/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb index e7733bf8b3..9325ef9c25 100644 --- a/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb +++ b/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb @@ -1,5 +1,5 @@ SUMMARY = "An onscreen keyboard" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=8521fa4dd51909b407c5150498d34f4e" DEPENDS += "gtk+3 hunspell libcanberra libxkbfile dconf python3-distutils-extra-native intltool-native" @@ -10,7 +10,7 @@ SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz SRC_URI[md5sum] = "1a2fbe82e934f5b37841d17ff51e80e8" SRC_URI[sha256sum] = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865" -inherit features_check setuptools3 pkgconfig gtk-icon-cache gsettings mime-xdg +inherit features_check setuptools3-base pkgconfig gtk-icon-cache gsettings mime-xdg REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.114.bb b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.114.bb index 478d8fa9b5..1811b2d3c4 100644 --- a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.114.bb +++ b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.114.bb @@ -7,7 +7,7 @@ graphical tools for users: \ * userpasswd allows users to change their passwords. \ " HOMEPAGE = "https://pagure.io/usermode" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "libuser ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ diff --git a/meta-openembedded/meta-initramfs/conf/layer.conf b/meta-openembedded/meta-initramfs/conf/layer.conf index 33e61d333f..c63383faf7 100644 --- a/meta-openembedded/meta-initramfs/conf/layer.conf +++ b/meta-openembedded/meta-initramfs/conf/layer.conf @@ -13,7 +13,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" # choosing carefully how this layer interacts with all of the # other layers. -BBFILE_PRIORITY_meta-initramfs = "8" +BBFILE_PRIORITY_meta-initramfs = "5" LAYERDEPENDS_meta-initramfs = "core" LAYERSERIES_COMPAT_meta-initramfs = "kirkstone" diff --git a/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb index 08d983e625..9f7a214d8b 100644 --- a/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb @@ -1,7 +1,7 @@ SUMMARY = "kexecboot linux-as-bootloader" DESCRIPTION = "kexecboot is a graphical linux-as-bootloader implementation based on kexec." HOMEPAGE = "http://kexecboot.org" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PV = "0.6+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_055.bb b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_055.bb index 3eee6669a3..a8fc5462f7 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_055.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_055.bb @@ -2,7 +2,7 @@ SUMMARY = "Initramfs generator using udev" HOMEPAGE = "https://dracut.wiki.kernel.org/index.php/Main_Page" DESCRIPTION = "Dracut is an event driven initramfs infrastructure. dracut (the tool) is used to create an initramfs image by copying tools and files from an installed system and combining it with the dracut framework, usually found in /usr/lib/dracut/modules.d." -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PE = "1" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb index b224a5c255..307c0e85d8 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb @@ -5,7 +5,7 @@ zipl (s390) boot loaders. It is primarily designed to be used from scripts which new kernels and need to find information about the current boot environment. \ " HOMEPAGE = "https://github.com/rhboot/grubby" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb index 43fcc1aee8..a276bf423c 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb @@ -5,7 +5,7 @@ zipl (s390) boot loaders. It is primarily designed to be used from scripts which new kernels and need to find information about the current boot environment. \ " HOMEPAGE = "https://github.com/rhboot/grubby" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc index 1a188a6faf..ceb4f5ad3b 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -2,7 +2,7 @@ DESCRIPTION = "klibc is intended to be a minimalistic libc subset for \ use with initramfs. It is deliberately written for small size, \ minimal entaglement, and portability, not speed." SECTION = "libs" -LICENSE = "BSD-3-Clause & GPL-2.0 & MIT & Zlib" +LICENSE = "BSD-3-Clause & GPL-2.0-only & MIT & Zlib" LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8b" DEPENDS = "linux-libc-headers perl-native" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb index e5446c1806..8b91fb4b93 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Small sized tools from mtd-utils for use with initramfs." SECTION = "base" DEPENDS = "zlib lzo e2fsprogs util-linux" HOMEPAGE = "http://www.linux-mtd.infradead.org/" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" diff --git a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb index a588296c05..88f32c8182 100644 --- a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb @@ -3,7 +3,7 @@ SUMMARY = "Kexec tools, statically compiled against klibc" AUTHOR = "Eric Biederman" HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/" SECTION = "kernel/userland" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \ file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09" PV = "2.0.18+git${SRCPV}" diff --git a/meta-openembedded/meta-multimedia/conf/layer.conf b/meta-openembedded/meta-multimedia/conf/layer.conf index 1fe9c80330..b5120bb539 100644 --- a/meta-openembedded/meta-multimedia/conf/layer.conf +++ b/meta-openembedded/meta-multimedia/conf/layer.conf @@ -23,7 +23,7 @@ LICENSE_PATH += "${LAYERDIR}/licenses" # choosing carefully how this layer interacts with all of the # other layers. -BBFILE_PRIORITY_multimedia-layer = "6" +BBFILE_PRIORITY_multimedia-layer = "5" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.4.0.1.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.4.0.1.bb index 97b0bbd287..1d8cbb1aea 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.4.0.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.4.0.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "GSSDP implements resource discovery and announcement over SSDP \ (Simpe Service Discovery Protocol)." HOMEPAGE = "https://gitlab.gnome.org/GNOME/gssdp/" BUGTRACKER = "https://gitlab.gnome.org/GNOME/gssdp/-/issues" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.12.0.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.12.0.bb index e1758c19b2..8dc5fce199 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.12.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.12.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Helpers for AV applications using DLNA" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://libgupnp-dlna/gupnp-dlna-profile.h;beginline=1;endline=22;md5=1b85459f65cb1e73a885ca137aab6274" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.2.0.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.2.0.bb index 4bbfb6e705..49cd8d8318 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.2.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.2.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Helpers for interacting with Internet Gateway Devices over UPnP" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://libgupnp-igd/gupnp-simple-igd.c;beginline=1;endline=21;md5=aa292c0d9390463a6e1055dc5fc68e80" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb index 49f7d91b74..20aced8329 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb @@ -1,5 +1,5 @@ SUMMARY = "Tools for GUPnP" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://src/network-light/main.c;beginline=1;endline=21;md5=2c39b3a000495dabd4932f231c7efed8" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb index 9633cab530..ec7824b60d 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb @@ -5,7 +5,7 @@ Additionally, media player software may use Rygel to become a MediaRenderer \ that may be controlled remotely by a UPnP or DLNA Controller." HOMEPAGE = "http://live.gnome.org/Rygel" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 gstreamer1.0-plugins-base libgee libsoup-2.4 libmediaart-2.0 libunistring sqlite3 intltool-native" diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb index 5acdd7ebc7..7c09e39d66 100644 --- a/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb +++ b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb @@ -1,7 +1,7 @@ SUMMARY = "OSCam: Open Source Conditional Access Module" HOMEPAGE = "http://www.streamboard.tv/oscam/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libusb1 openssl pcsc-lite" diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb index 193055893c..c278cf5994 100644 --- a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb @@ -5,7 +5,7 @@ inherit autotools-brokensep gettext gitpkgv pkgconfig DEPENDS = "avahi cmake-native dvb-apps libdvbcsa libpcre2 openssl uriparser zlib" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9cae5acac2e9ee2fc3aec01ac88ce5db" SRC_URI = "git://github.com/tvheadend/tvheadend.git;branch=master;protocol=https \ diff --git a/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb index 70df73f835..744486fa2a 100644 --- a/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb @@ -1,5 +1,5 @@ SUMMARY = "libebml is a C++ libary to parse EBML files" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=7fbc338309ac38fefcd64b04bb903e34" SRC_URI = "\ diff --git a/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb b/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb index fdffa41ec5..890be69269 100644 --- a/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb @@ -1,5 +1,5 @@ SUMMARY = "libmatroska is a C++ libary to parse Matroska files (.mkv and .mka)" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libebml" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb index 4d100999b6..b5c8ddca11 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb @@ -1,6 +1,6 @@ DESCRIPTION = "A real-time adjustable equalizer plugin for ALSA" HOMEPAGE = "https://web.archive.org/web/20161105202833/http://thedigitalmachine.net/alsaequal.html" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" DEPENDS = "alsa-lib" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.26.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.26.bb index ed2b6c6adf..f33d7ad582 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.26.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.26.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The CAPS Audio Plugin Suite - LADSPA plugin suite" HOMEPAGE = "http://quitte.de/dsp/caps.html" -LICENSE = "GPL-3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://quitte.de/dsp/${BPN}_${PV}.tar.bz2 \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb index 27fa0e5855..0b844ee7d3 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb @@ -4,7 +4,7 @@ error corrections, hence the name paranoia." HOMEPAGE = "https://www.xiph.org/" SECTION = "multimedia" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING-LGPL;md5=d370feaa1c9edcdbd29ca27ea3d2304d" SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-${PV}.src.tgz \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb index 343b9d7915..ddd4c26efe 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb @@ -1,6 +1,6 @@ SUMMARY = "DTS Coherent Acoustics decoder with support for HD extensions" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c" SRCREV = "b93deed1a231dd6dd7e39b9fe7d2abe05aa00158" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-connector-dbus_0.3.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-connector-dbus_0.3.0.bb index 5645de2a71..033854f19e 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-connector-dbus_0.3.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-connector-dbus_0.3.0.bb @@ -1,7 +1,7 @@ SUMMARY = "D-Bus connector for dLeyna libraries" HOMEPAGE = "https://01.org/dleyna/" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://src/connector-dbus.c;endline=21;md5=0a1695cef53beefc36651de439f643b5" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb index 647532d9fa..eafbb50db4 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb @@ -5,7 +5,7 @@ e.g., dleyna-server. In brief, it provides APIs for logging, error, settings \ and task management and an IPC asbstraction API." HOMEPAGE = "https://01.org/dleyna/" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://libdleyna/core/core.c;endline=21;md5=68602998351825b0844aae34c684c54e" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb index 9c4af8128d..3e43c0d2a7 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb @@ -4,7 +4,7 @@ that allow clients to discover and manipulate Digital Media Renderers. \ An implementation of such a service for linux is also included." HOMEPAGE = "https://01.org/dleyna/" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://libdleyna/renderer/server.c;endline=21;md5=f51acd4757fb6a779a87122c43cf1346" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb index 036d5c1591..b25e446c41 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb @@ -4,7 +4,7 @@ allow clients to discover, browse and manipulate Digital Media Servers. \ An implementation of such a service for linux is also included." HOMEPAGE = "https://01.org/dleyna/" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://libdleyna/server/server.c;endline=22;md5=437455d8aeff69ebd0996a76c67397bb" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb index 3cf0ca4eb8..98970d5b71 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Linux DVB API applications and utilities" HOMEPAGE = "http://www.linuxtv.org" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRCREV = "3d43b280298c39a67d1d889e01e173f52c12da35" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.29.9.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.29.9.2.bb index 44662e2a30..1663548b22 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.29.9.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.29.9.2.bb @@ -1,6 +1,6 @@ SUMMARY = "Freeware Advanced Audio Coder (MPEG2-AAC, MPEG4-AAC)" SECTION = "libs" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" HOMEPAGE = "http://www.audiocoding.com/faac.html" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://libfaac/coder.h;beginline=5;endline=17;md5=fa1fd6a5fa8cdc877d63a12530d273e0" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc index 978d05e74a..218a51fc48 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth.inc @@ -1,7 +1,7 @@ SUMMARY = "Fluidsynth is a software synthesizer" HOMEPAGE = "http://www.fluidsynth.org/" SECTION = "libs/multimedia" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=master;protocol=https" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb index 7e6ae97983..cbb127d3dc 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.9.2.bb @@ -1,6 +1,6 @@ Description = "Gerbera - An UPnP media server" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https;branch=master \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb index 8c0a5c153f..4e50897de6 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Gst-Shark Tracers" DESCRIPTION = "Benchmarks and profiling tools for GStreamer" HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=GstShark" SECTION = "multimedia" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=e1caa368743492879002ad032445fa97" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb index d37ab986c0..38fafe82e4 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Gstreamer Daemon" SUMMARY = "GStreamer framework for controlling audio and video streaming using TCP connection messages" HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=Gstd-1.0" SECTION = "multimedia" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon jansson" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc index ee97993426..feb3564633 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc @@ -3,8 +3,10 @@ DESCRIPTION = "Projucer is used to build and generate support files and build in JUCE supported platforms, including Linux and Embedded Linux." SECTION = "utils" HOMEPAGE = "http://juce.com/" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=12e9c2db7897c0349a4cc1c6d2a8c5d5" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eff9da77cdb81a803f8cbca6c16801d8" + +LICENSE_FLAGS = "commercial" inherit pkgconfig features_check @@ -13,13 +15,13 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS = "libx11 libxext libxinerama libxrandr libxcursor freetype alsa-lib curl bzip2 libpng harfbuzz glib-2.0 libpcre" DEPENDS:append:libc-musl = " libexecinfo" -SRCREV = "90e8da0cfb54ac593cdbed74c3d0c9b09bad3a9f" +SRCREV = "2f980209cc4091a4490bb1bafc5d530f16834e58" BRANCH = "master" SRC_URI = "git://github.com/WeAreROLI/JUCE.git;protocol=https;branch=${BRANCH} \ " S = "${WORKDIR}/git" -PV = "6.0.8" +PV = "6.1.6" JUCE_PROJUCER_BUILD_PATH = "${B}/extras/Projucer/Builds" JUCE_PROJUCER_MAKEFILE_PATH = "${JUCE_PROJUCER_BUILD_PATH}/LinuxMakefile" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb index e6a9b7d250..b30f398e87 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Libao is a cross-platform audio library that allows programs to \ SECTION = "multimedia" HOMEPAGE = "https://www.xiph.org/ao/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI="http://downloads.xiph.org/releases/ao/${BP}.tar.gz" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb index f85c166f1e..02a90c547d 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb @@ -6,7 +6,7 @@ SECTION = "libs/multimedia" DEPENDS = "libraw1394" DEPENDS:append:libc-musl = " argp-standalone" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb index a8d54f08f6..7136260699 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb @@ -1,7 +1,7 @@ SUMMARY = "Linux libcamera framework" SECTION = "libs" -LICENSE = "GPL-2.0+ & LGPL-2.1+" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "\ file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_2.2.6.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_2.2.6.bb index c9ade4ac99..952ba603ba 100755 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_2.2.6.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_2.2.6.bb @@ -1,13 +1,13 @@ SUMMARY = "Capture and control API for IIDC compliant cameras" HOMEPAGE = "http://sourceforge.net/projects/libdc1394/" SECTION = "libs" -LICENSE = "LGPL-2.0" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=c848e78d9a4a5cc69906178e4d6fbd64" # libsdl to provide sdl.m4 with AM_PATH_SDL DEPENDS += "libusb1 libraw1394 libsdl \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxv virtual/libx11', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/egl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'libglu', '', d)} \ " diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.5.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.5.bb index f101afd193..d0ecd04f16 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.5.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.5.bb @@ -4,7 +4,7 @@ simple integration into other software." HOMEPAGE = "http://www.libde265.org/" SECTION = "libs/multimedia" -LICENSE = "LGPLv3 & MIT" +LICENSE = "LGPL-3.0-only & MIT" LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://COPYING;md5=695b556799abb2435c97a113cdca512f" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbcsa/libdvbcsa_1.1.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbcsa/libdvbcsa_1.1.0.bb index f9b8c7d722..5de717c281 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbcsa/libdvbcsa_1.1.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbcsa/libdvbcsa_1.1.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Open implementation of the DVB Common Scrambling Algorithm, encrypt and decrypt " SECTION = "libs/multimedia" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRCREV = "bc6c0b164a87ce05e9925785cc6fb3f54c02b026" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbpsi/libdvbpsi_1.3.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbpsi/libdvbpsi_1.3.0.bb index 48b0111047..5ca146792c 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbpsi/libdvbpsi_1.3.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbpsi/libdvbpsi_1.3.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "libdvbpsi is a simple library designed for decoding \ and generation of MPEG TS and DVB PSI tables according to standards \ ISO/IEC 13818 and ITU-T H.222.0." HOMEPAGE = "http://www.videolan.org/developers/libdvbpsi.html" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "http://download.videolan.org/pub/libdvbpsi/${PV}/libdvbpsi-${PV}.tar.bz2" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_6.1.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_6.1.1.bb index c1a9c4879a..766ee02ca2 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_6.1.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_6.1.1.bb @@ -1,6 +1,6 @@ SUMMARY = "library for DVD navigation features" SECTION = "libs/multimedia" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libdvdread" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libiec61883/libiec61883_1.2.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libiec61883/libiec61883_1.2.0.bb index e6079bd752..7c90faa45e 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libiec61883/libiec61883_1.2.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libiec61883/libiec61883_1.2.0.bb @@ -6,7 +6,7 @@ SECTION = "libs/multimedia" DEPENDS = "libraw1394" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=771782cb6245c7fbbe74bc0ec059beff" SRC_URI = "https://www.kernel.org/pub/linux/libs/ieee1394/${BPN}-${PV}.tar.xz" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.3.10.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.3.10.bb deleted file mode 100644 index b1634732cf..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.3.10.bb +++ /dev/null @@ -1,104 +0,0 @@ -SUMMARY = "C and C++ cross-platform library for decoding tracked music files (modules)" -DESCRIPTION = "libopenmpt is a cross-platform C++ and C library to decode tracked \ -music files (modules) into a raw PCM audio stream. It also comes with openmpt123, a \ -cross-platform command-line or terminal based module file player, and libopenmpt_modplug, \ -a wrapper around libopenmpt that provides an interface that is ABI compatile with \ -libmodplug. libopenmpt is based on the player code of the OpenMPT project." -HOMEPAGE = "https://lib.openmpt.org/libopenmpt/" -SECTION = "libs" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e804150573f149befef6c07e173f20c3" - -DEPENDS = "virtual/libiconv" - -SRC_URI = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${PV}+release.autotools.tar.gz \ - file://run-ptest \ - " -SRC_URI[md5sum] = "66bbc6fbb5f27a554cb145d805e9ef9d" -SRC_URI[sha256sum] = "14a137b8d1a20e1b6a5e67cbc9467ab7e5e4e67d5aa38a247afc825685c53939" - -S = "${WORKDIR}/libopenmpt-${PV}+release.autotools" - -inherit autotools pkgconfig ptest - -PACKAGECONFIG ??= " \ - libopenmpt-modplug openmpt123 \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ - flac mpg123 ogg sndfile vorbis vorbisfile zlib \ - ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ -" - -# libopenmpt_modplug is a library that wraps libopenmpt calls into -# functions that are ABI compatible with libmodplug. This allows for -# using modplug headers and linking against libopenmpt_modplug -# instead of against the original libmodplug library. -# NOTE: The wrapper is compatible to the ABI from libmodplug version -# 0.8.8 and newer. -PACKAGECONFIG[libopenmpt-modplug] = "--enable-libopenmpt_modplug,--disable-libopenmpt_modplug" -PACKAGECONFIG[openmpt123] = "--enable-openmpt123,--disable-openmpt123" -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests" - -# These packageconfigs affect openmpt123 -PACKAGECONFIG[flac] = "--with-flac,--without-flac,flac" -PACKAGECONFIG[mpg123] = "--with-mpg123,--without-mpg123,mpg123" -PACKAGECONFIG[ogg] = "--with-ogg,--without-ogg,libogg" -PACKAGECONFIG[portaudio] = "--with-portaudio,--without-portaudio,portaudio-v19" -PACKAGECONFIG[pulseaudio] = "--with-pulseaudio,--without-pulseaudio,pulseaudio" -PACKAGECONFIG[sdl] = "--with-sdl,--without-sdl,virtual/libsdl" -PACKAGECONFIG[sdl2] = "--with-sdl2,--without-sdl2,virtual/libsdl2" -PACKAGECONFIG[sndfile] = "--with-sndfile,--without-sndfile,libsndfile1" -PACKAGECONFIG[vorbis] = "--with-vorbis,--without-vorbis,libvorbis" -PACKAGECONFIG[vorbisfile] = "--with-vorbisfile,--without-vorbisfile,libvorbis" -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" - -# --disable-libmodplug is necessary, since otherwise we'd -# have a collision with the libmodplug package, because of the -# libmodplug.so file. (libmodplug.so from libopenmpt isintended -# to be used as a drop-in replacement, and according to the -# documentation, is not complete.) -EXTRA_OECONF += " \ - --disable-doxygen-doc \ - --disable-examples \ - --disable-libmodplug \ - --without-portaudiocpp \ -" - -do_compile_ptest() { - oe_runmake ${PARALLEL_MAKE} libopenmpttest -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/test - install -m 0755 ${B}/libopenmpttest ${D}${PTEST_PATH} - install -m 0644 ${S}/test/test.mptm ${D}${PTEST_PATH}/test - install -m 0644 ${S}/test/test.s3m ${D}${PTEST_PATH}/test - install -m 0644 ${S}/test/test.xm ${D}${PTEST_PATH}/test - - install -d ${D}${PTEST_PATH}/libopenmpt - install -m 0644 ${S}/libopenmpt/libopenmpt_version.mk ${D}${PTEST_PATH}/libopenmpt -} - -python __anonymous() { - packageconfig = (d.getVar("PACKAGECONFIG") or "").split() - if ("sdl" in packageconfig) and ("sdl2" in packageconfig): - bb.error("sdl and sdl2 packageconfigs cannot be both enabled") -} - -PACKAGES =+ "${PN}-modplug ${PN}-openmpt123 ${PN}-openmpt123-doc" -FILES:${PN}-modplug = "${libdir}/libopenmpt_modplug.so.*" -FILES:${PN}-openmpt123 = "${bindir}/openmpt123" -FILES:${PN}-openmpt123-doc = "${mandir}/man1/openmpt123*" - -# Since version 0.3, libopenmpt uses SemVer 2.0.0 versioning. -# The SemVer versioning scheme is incompatible with Debian/Ubuntu -# package version names. -DEBIAN_NOAUTONAME:${PN} = "1" -DEBIAN_NOAUTONAME:${PN}-modplug = "1" - -RDEPENDS:${PN}:libc-glibc = " \ - glibc-gconv-cp1252 \ - glibc-gconv-ibm437 \ - glibc-gconv-iso8859-1 \ - glibc-gconv-iso8859-15 \ -" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.6.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.6.2.bb new file mode 100644 index 0000000000..a7b6b00076 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.6.2.bb @@ -0,0 +1,87 @@ +SUMMARY = "C and C++ cross-platform library for decoding tracked music files (modules)" +DESCRIPTION = "libopenmpt is a cross-platform C++ and C library to decode tracked \ +music files (modules) into a raw PCM audio stream. It also comes with openmpt123, a \ +cross-platform command-line or terminal based module file player. libopenmpt is based \ +on the player code of the OpenMPT project." +HOMEPAGE = "https://lib.openmpt.org/libopenmpt/" +SECTION = "libs" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae09d6164bdecb499183479fd32b66fb" + +DEPENDS = "virtual/libiconv" + +SRC_URI = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${PV}+release.autotools.tar.gz \ + file://run-ptest \ + " +SRC_URI[md5sum] = "d21fb799695cbe10a1e9aeaea23ed708" +SRC_URI[sha256sum] = "50c0d62ff2d9afefa36cce9f29042cb1fb8d4f0b386b81a0fc7734f35e21e6b6" + +S = "${WORKDIR}/libopenmpt-${PV}+release.autotools" + +inherit autotools pkgconfig ptest + +PACKAGECONFIG ??= " \ + openmpt123 \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ + flac mpg123 ogg sndfile vorbis vorbisfile zlib \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ +" + +PACKAGECONFIG[openmpt123] = "--enable-openmpt123,--disable-openmpt123" +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests" + +# These packageconfigs affect openmpt123 +PACKAGECONFIG[flac] = "--with-flac,--without-flac,flac" +PACKAGECONFIG[mpg123] = "--with-mpg123,--without-mpg123,mpg123" +PACKAGECONFIG[ogg] = "--with-ogg,--without-ogg,libogg" +PACKAGECONFIG[portaudio] = "--with-portaudio,--without-portaudio,portaudio-v19" +PACKAGECONFIG[pulseaudio] = "--with-pulseaudio,--without-pulseaudio,pulseaudio" +PACKAGECONFIG[sdl2] = "--with-sdl2,--without-sdl2,virtual/libsdl2" +PACKAGECONFIG[sndfile] = "--with-sndfile,--without-sndfile,libsndfile1" +PACKAGECONFIG[vorbis] = "--with-vorbis,--without-vorbis,libvorbis" +PACKAGECONFIG[vorbisfile] = "--with-vorbisfile,--without-vorbisfile,libvorbis" +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" + +EXTRA_OECONF += " \ + --disable-doxygen-doc \ + --disable-examples \ + --without-portaudiocpp \ +" + +do_compile_ptest() { + oe_runmake ${PARALLEL_MAKE} libopenmpttest +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + install -m 0755 ${B}/libopenmpttest ${D}${PTEST_PATH} + install -m 0644 ${S}/test/test.mptm ${D}${PTEST_PATH}/test + install -m 0644 ${S}/test/test.s3m ${D}${PTEST_PATH}/test + install -m 0644 ${S}/test/test.xm ${D}${PTEST_PATH}/test + + install -d ${D}${PTEST_PATH}/libopenmpt + install -m 0644 ${S}/libopenmpt/libopenmpt_version.mk ${D}${PTEST_PATH}/libopenmpt +} + +python __anonymous() { + packageconfig = (d.getVar("PACKAGECONFIG") or "").split() + if ("sdl" in packageconfig) and ("sdl2" in packageconfig): + bb.error("sdl and sdl2 packageconfigs cannot be both enabled") +} + +PACKAGES =+ "${PN}-openmpt123 ${PN}-openmpt123-doc" +FILES:${PN}-openmpt123 = "${bindir}/openmpt123" +FILES:${PN}-openmpt123-doc = "${mandir}/man1/openmpt123*" + +# Since version 0.3, libopenmpt uses SemVer 2.0.0 versioning. +# The SemVer versioning scheme is incompatible with Debian/Ubuntu +# package version names. +DEBIAN_NOAUTONAME:${PN} = "1" + +RDEPENDS:${PN}:libc-glibc = " \ + glibc-gconv-cp1252 \ + glibc-gconv-ibm437 \ + glibc-gconv-iso8859-1 \ + glibc-gconv-iso8859-15 \ +" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-Add-support-for-variable-libdir.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-Add-support-for-variable-libdir.patch new file mode 100644 index 0000000000..a6a58688bc --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-Add-support-for-variable-libdir.patch @@ -0,0 +1,70 @@ +From 20d14f323c877eca631f0a75efcf19727fb18dd9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 22 Mar 2022 09:17:06 -0700 +Subject: [PATCH] Add support for variable libdir + +sometimes libdir is not 'lib' in such cases set LIBDIR_SUFFIX to 32 or +64 to append to it. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + Makefile | 9 +++++---- + config.in | 2 ++ + squish.pc.in | 3 ++- + 3 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 1c01f89..768a4a7 100644 +--- a/Makefile ++++ b/Makefile +@@ -10,13 +10,13 @@ LIB = libsquish.a + all : $(LIB) squish.pc + + install : $(LIB) squish.pc +- install squish.h $(INSTALL_DIR)/include +- install libsquish.a $(INSTALL_DIR)/lib +- install squish.pc $(INSTALL_DIR)/lib/pkgconfig ++ install squish.h $(INSTALL_DIR)/include ++ install libsquish.a $(INSTALL_DIR)/lib$(LIBDIR_SUFFIX) ++ install squish.pc $(INSTALL_DIR)/lib$(LIBDIR_SUFFIX)/pkgconfig + + uninstall: + $(RM) $(INSTALL_DIR)/include/squish.h +- $(RM) $(INSTALL_DIR)/lib/libsquish.a ++ $(RM) $(INSTALL_DIR)/lib$(LIBDIR_SUFFIX)/libsquish.a + + $(LIB) : $(OBJ) + $(AR) cr $@ $? +@@ -30,4 +30,5 @@ clean : + + squish.pc: + sed 's|@PREFIX@|$(PREFIX)|' $@.in > $@ ++ sed 's|@LIBDIR_SUFFIX@|$(LIBDIR_SUFFIX)|' $@.in > $@ + +diff --git a/config.in b/config.in +index fdca022..a6cf833 100644 +--- a/config.in ++++ b/config.in +@@ -19,3 +19,5 @@ endif + + # where should we install to + INSTALL_DIR ?= @PREFIX@ ++# libdir is architecture specific ++LIBDIR_SUFFIX ?= @LIBDIR_SUFFIX@ +diff --git a/squish.pc.in b/squish.pc.in +index ca04334..73c21bb 100644 +--- a/squish.pc.in ++++ b/squish.pc.in +@@ -1,6 +1,7 @@ + prefix=@PREFIX@ ++suffix=@LIBDIR_SUFFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/lib ++libdir=${prefix}/lib${suffix} + sharedlibdir=${libdir} + includedir=${prefix}/include + +-- +2.35.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch new file mode 100644 index 0000000000..c6eb7ac576 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish/0001-makefile-Add-LIBDIR.patch @@ -0,0 +1,36 @@ +From 4fd08c0446ca02917014b63f9080c4205958a130 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 20 Mar 2022 01:15:32 -0700 +Subject: [PATCH] makefile: Add LIBDIR + +Avoid hardcoding /lib + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 1c01f89..2b1df5b 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,12 +11,12 @@ all : $(LIB) squish.pc + + install : $(LIB) squish.pc + install squish.h $(INSTALL_DIR)/include +- install libsquish.a $(INSTALL_DIR)/lib +- install squish.pc $(INSTALL_DIR)/lib/pkgconfig ++ install libsquish.a $(INSTALL_DIR)/$(LIBDIR) ++ install squish.pc $(INSTALL_DIR)/$(LIBDIR)/pkgconfig + + uninstall: + $(RM) $(INSTALL_DIR)/include/squish.h +- $(RM) $(INSTALL_DIR)/lib/libsquish.a ++ $(RM) $(INSTALL_DIR)/$(LIBDIR)/libsquish.a + + $(LIB) : $(OBJ) + $(AR) cr $@ $? +-- +2.35.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb index cb42d943fc..fb74881c03 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb @@ -6,11 +6,14 @@ LIC_FILES_CHKSUM = "file://alpha.cpp;beginline=3;endline=22;md5=6665e479f71feb92 PV = "1.10+git${SRCPV}" SRCREV = "52e7d93c5947f72380521116c05d97c528863ba8" -SRC_URI = "git://github.com/OpenELEC/libsquish.git;protocol=https;branch=master" +SRC_URI = "git://github.com/OpenELEC/libsquish.git;protocol=https;branch=master \ + file://0001-Add-support-for-variable-libdir.patch \ + " S = "${WORKDIR}/git" -EXTRA_OEMAKE = "INSTALL_DIR=${D}${prefix}" +EXTRA_OEMAKE = "INSTALL_DIR=${D}${prefix} LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ + ${@bb.utils.contains('TUNE_FEATURES', 'altivec', 'USE_ALTIVEC=1', '', d)}" do_install() { install -d ${D}${includedir} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb index 0cdc709f09..ac0165a5d0 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://mimic.mycroft.ai/" SECTION = "multimedia" # "Mimic is available under permissive BSD-like licenses" -LICENSE = "MIT-X & \ +LICENSE = "MIT & \ PD & \ CMU-Tex & \ BSD & \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb index 3564f6df87..803c6279ce 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb @@ -1,7 +1,7 @@ SUMMARY = "MusicBrainz client library" DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. The library allows you to access the data held on the MusicBrainz server." HOMEPAGE = "http://musicbrainz.org" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24" DEPENDS = "expat libxml2 libxml2-native neon neon-native libmusicbrainz-native" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb index 54d79109df..d5ee395af8 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb @@ -1,5 +1,5 @@ SUMMARY = "Music Player Daemon library" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" HOMEPAGE ="http://sourceforge.net/projects/musicpd" DEPENDS = "glib-2.0" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.19.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.19.bb deleted file mode 100644 index 6cff3c404d..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.19.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "C client library for the Music Player Daemon" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=06b9dfd2f197dc514d8ef06549684b77" -HOMEPAGE = "https://www.musicpd.org/libs/libmpdclient/" - -inherit meson - -SRC_URI = " \ - git://github.com/MusicPlayerDaemon/libmpdclient;branch=master;protocol=https \ -" -SRCREV = "27767959442ef390aabb16790494ba93fed962ef" -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "tcp" -PACKAGECONFIG[tcp] = "-Dtcp=true,-Dtcp=false" - -do_install:append() { - # libmpdclient's Vala bindings are outdated and unmaintained; it - # is likely that nobody will ever use them, so let's not install - # them - rm -rf ${D}${datadir}/vala -} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.20.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.20.bb new file mode 100644 index 0000000000..2746c6bb80 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.20.bb @@ -0,0 +1,22 @@ +SUMMARY = "C client library for the Music Player Daemon" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=06b9dfd2f197dc514d8ef06549684b77" +HOMEPAGE = "https://www.musicpd.org/libs/libmpdclient/" + +inherit meson + +SRC_URI = " \ + git://github.com/MusicPlayerDaemon/libmpdclient;branch=master;protocol=https \ +" +SRCREV = "7124a0ad4841a44db084bb785a6e7120bc8f0139" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "tcp" +PACKAGECONFIG[tcp] = "-Dtcp=true,-Dtcp=false" + +do_install:append() { + # libmpdclient's Vala bindings are outdated and unmaintained; it + # is likely that nobody will ever use them, so let's not install + # them + rm -rf ${D}${datadir}/vala +} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.33.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.33.bb deleted file mode 100644 index 09190a8197..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.33.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "A minimalist command line interface to the Music Player Daemon" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -HOMEPAGE = "https://www.musicpd.org/clients/mpc/" - -inherit meson pkgconfig - -DEPENDS += "libmpdclient" - -SRC_URI = "git://github.com/MusicPlayerDaemon/mpc;branch=master;protocol=https" -SRCREV = "ef16b280052ef0320cb80f79d74c8ce0324005ed" - -S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.34.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.34.bb new file mode 100644 index 0000000000..93df25ee2f --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.34.bb @@ -0,0 +1,13 @@ +SUMMARY = "A minimalist command line interface to the Music Player Daemon" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE = "https://www.musicpd.org/clients/mpc/" + +inherit meson pkgconfig + +DEPENDS += "libmpdclient" + +SRC_URI = "git://github.com/MusicPlayerDaemon/mpc;branch=master;protocol=https" +SRCREV = "31c900b79b3a1cd7f2944e92f24223d12589fdaa" + +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb deleted file mode 100644 index 5596760d56..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.5.bb +++ /dev/null @@ -1,101 +0,0 @@ -SUMMARY = "Music Player Daemon" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -HOMEPAGE ="http://www.musicpd.org" - -inherit meson useradd systemd pkgconfig - -DEPENDS += " \ - curl \ - sqlite3 \ - ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ - yajl \ - boost \ - icu \ - dbus \ - expat \ - fmt \ -" - -SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=v0.23.x;protocol=https \ - file://mpd.conf.in \ - " -SRCREV = "df4b6b92f2c4bba1b55fe0a5559b19808abb28ff" -S = "${WORKDIR}/git" - -EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}" - -PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "aac", "", d)} \ - alsa ao bzip2 daemon \ - ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "ffmpeg aac", "", d)} \ - fifo flac fluidsynth iso9660 \ - jack libsamplerate httpd \ - mms mpg123 modplug sndfile \ - upnp openal opus oss recorder \ - vorbis wavpack zlib" - -PACKAGECONFIG[aac] = "-Dfaad=enabled,-Dfaad=disabled,faad2" -PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" -PACKAGECONFIG[ao] = "-Dao=enabled,-Dao=disabled,libao" -PACKAGECONFIG[audiofile] = "-Daudiofile=enabled,-Daudiofile=disabled,audiofile" -PACKAGECONFIG[bzip2] = "-Dbzip2=enabled,-Dbzip2=disabled,bzip2" -PACKAGECONFIG[cdioparanoia] = "-Dcdio_paranoia=enabled,-Dcdio_paranoia=disabled,libcdio-paranoia" -PACKAGECONFIG[daemon] = "-Ddaemon=true,-Ddaemon=false" -PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" -PACKAGECONFIG[fifo] = "-Dfifo=true,-Dfifo=false" -PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" -PACKAGECONFIG[fluidsynth] = "-Dfluidsynth=enabled,-Dfluidsynth=disabled,fluidsynth" -PACKAGECONFIG[httpd] = "-Dhttpd=true,-Dhttpd=false" -PACKAGECONFIG[id3tag] = "-Did3tag=enabled,-Did3tag=disabled,libid3tag" -PACKAGECONFIG[iso9660] = "-Diso9660=enabled,-Diso9660=disabled,libcdio" -PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" -PACKAGECONFIG[lame] = "-Dlame=enabled,-Dlame=disabled,lame" -PACKAGECONFIG[libsamplerate] = "-Dlibsamplerate=enabled,-Dlibsamplerate=disabled,libsamplerate0" -PACKAGECONFIG[mad] = "-Dmad=enabled,-Dmad=disabled,libmad" -PACKAGECONFIG[mms] = "-Dmms=enabled,-Dmms=disabled,libmms" -PACKAGECONFIG[modplug] = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug" -PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" -PACKAGECONFIG[openal] = "-Dopenal=enabled,-Dopenal=disabled,openal-soft" -PACKAGECONFIG[opus] = "-Dopus=enabled,-Dopus=disabled,libopus libogg" -PACKAGECONFIG[oss] = "-Doss=enabled,-Doss=disabled," -PACKAGECONFIG[recorder] = "-Drecorder=true,-Drecorder=false" -PACKAGECONFIG[smb] = "-Dsmbclient=enabled,-Dsmbclient=disabled,samba" -PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" -PACKAGECONFIG[upnp] = "-Dupnp=pupnp,-Dupnp=disabled,libupnp" -PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis libogg" -PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack" -PACKAGECONFIG[zlib] = "-Dzlib=enabled,-Dzlib=disabled,zlib" - -do_install:append() { - install -o mpd -d \ - ${D}/${localstatedir}/lib/mpd \ - ${D}/${localstatedir}/lib/mpd/playlists - install -m775 -o mpd -g mpd -d \ - ${D}/${localstatedir}/lib/mpd/music - - install -d ${D}/${sysconfdir} - install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf - sed -i \ - -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ - -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ - -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ - -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ - -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ - ${D}/${sysconfdir}/mpd.conf - - # we don't need the icon - rm -rf ${D}${datadir}/icons -} - -RPROVIDES:${PN} += "${PN}-systemd" -RREPLACES:${PN} += "${PN}-systemd" -RCONFLICTS:${PN} += "${PN}-systemd" -SYSTEMD_SERVICE:${PN} = "mpd.socket" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = " \ - --system --no-create-home \ - --home ${localstatedir}/lib/mpd \ - --groups audio \ - --user-group mpd" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.6.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.6.bb new file mode 100644 index 0000000000..c74f1074cc --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.6.bb @@ -0,0 +1,101 @@ +SUMMARY = "Music Player Daemon" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +HOMEPAGE ="http://www.musicpd.org" + +inherit meson useradd systemd pkgconfig + +DEPENDS += " \ + curl \ + sqlite3 \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ + yajl \ + boost \ + icu \ + dbus \ + expat \ + fmt \ +" + +SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=v0.23.x;protocol=https \ + file://mpd.conf.in \ + " +SRCREV = "f591193ddaa7f9bcb6c85ff5899517fc7b53e35a" +S = "${WORKDIR}/git" + +EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}" + +PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "aac", "", d)} \ + alsa ao bzip2 daemon \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "ffmpeg aac", "", d)} \ + fifo flac fluidsynth iso9660 \ + jack libsamplerate httpd \ + mms mpg123 modplug sndfile \ + upnp openal opus oss recorder \ + vorbis wavpack zlib" + +PACKAGECONFIG[aac] = "-Dfaad=enabled,-Dfaad=disabled,faad2" +PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" +PACKAGECONFIG[ao] = "-Dao=enabled,-Dao=disabled,libao" +PACKAGECONFIG[audiofile] = "-Daudiofile=enabled,-Daudiofile=disabled,audiofile" +PACKAGECONFIG[bzip2] = "-Dbzip2=enabled,-Dbzip2=disabled,bzip2" +PACKAGECONFIG[cdioparanoia] = "-Dcdio_paranoia=enabled,-Dcdio_paranoia=disabled,libcdio-paranoia" +PACKAGECONFIG[daemon] = "-Ddaemon=true,-Ddaemon=false" +PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" +PACKAGECONFIG[fifo] = "-Dfifo=true,-Dfifo=false" +PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" +PACKAGECONFIG[fluidsynth] = "-Dfluidsynth=enabled,-Dfluidsynth=disabled,fluidsynth" +PACKAGECONFIG[httpd] = "-Dhttpd=true,-Dhttpd=false" +PACKAGECONFIG[id3tag] = "-Did3tag=enabled,-Did3tag=disabled,libid3tag" +PACKAGECONFIG[iso9660] = "-Diso9660=enabled,-Diso9660=disabled,libcdio" +PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" +PACKAGECONFIG[lame] = "-Dlame=enabled,-Dlame=disabled,lame" +PACKAGECONFIG[libsamplerate] = "-Dlibsamplerate=enabled,-Dlibsamplerate=disabled,libsamplerate0" +PACKAGECONFIG[mad] = "-Dmad=enabled,-Dmad=disabled,libmad" +PACKAGECONFIG[mms] = "-Dmms=enabled,-Dmms=disabled,libmms" +PACKAGECONFIG[modplug] = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug" +PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" +PACKAGECONFIG[openal] = "-Dopenal=enabled,-Dopenal=disabled,openal-soft" +PACKAGECONFIG[opus] = "-Dopus=enabled,-Dopus=disabled,libopus libogg" +PACKAGECONFIG[oss] = "-Doss=enabled,-Doss=disabled," +PACKAGECONFIG[recorder] = "-Drecorder=true,-Drecorder=false" +PACKAGECONFIG[smb] = "-Dsmbclient=enabled,-Dsmbclient=disabled,samba" +PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" +PACKAGECONFIG[upnp] = "-Dupnp=pupnp,-Dupnp=disabled,libupnp" +PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis libogg" +PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack" +PACKAGECONFIG[zlib] = "-Dzlib=enabled,-Dzlib=disabled,zlib" + +do_install:append() { + install -o mpd -d \ + ${D}/${localstatedir}/lib/mpd \ + ${D}/${localstatedir}/lib/mpd/playlists + install -m775 -o mpd -g mpd -d \ + ${D}/${localstatedir}/lib/mpd/music + + install -d ${D}/${sysconfdir} + install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf + sed -i \ + -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ + -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ + -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ + -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ + -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ + ${D}/${sysconfdir}/mpd.conf + + # we don't need the icon + rm -rf ${D}${datadir}/icons +} + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "mpd.socket" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = " \ + --system --no-create-home \ + --home ${localstatedir}/lib/mpd \ + --groups audio \ + --user-group mpd" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.45.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.45.bb deleted file mode 100644 index b1ecbf1e43..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.45.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "A curses client for the Music Player Daemon" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -HOMEPAGE = "https://www.musicpd.org/clients/ncmpc/" - -inherit meson pkgconfig - -DEPENDS += " \ - boost \ - ncurses \ - libmpdclient \ -" - -RDEPENDS:${PN} += "python3-core" - -PACKAGECONFIG ??= "colors locale mouse nls regex help_screen library_screen search_screen song_screen key_screen lyrics_screen outputs_screen" - -PACKAGECONFIG[colors] = "-Dcolors=true,-Dcolors=false" -PACKAGECONFIG[lirc] = "-Dlirc=enabled,-Dlirc=disabled,lirc" -PACKAGECONFIG[locale] = "-Dlocale=enabled,-Dlocale=disabled" -PACKAGECONFIG[mini] = "-Dmini=true,-Dmini=false" -PACKAGECONFIG[mouse] = "-Dmouse=enabled,-Dmouse=disabled" -PACKAGECONFIG[nls] = "-Dnls=enabled,-Dnls=disabled,gettext-native" -PACKAGECONFIG[regex] = "-Dregex=enabled,-Dregex=disabled,pcre" - -PACKAGECONFIG[help_screen] = "-Dhelp_screen=true,-Dhelp_screen=false" -PACKAGECONFIG[library_screen] = "-Dlibrary_screen=true,-Dlibrary_screen=false" -PACKAGECONFIG[search_screen] = "-Dsearch_screen=true,-Dsearch_screen=false" -PACKAGECONFIG[song_screen] = "-Dsong_screen=true,-Dsong_screen=false" -PACKAGECONFIG[key_screen] = "-Dkey_screen=true,-Dkey_screen=false" -PACKAGECONFIG[lyrics_screen] = "-Dlyrics_screen=true,-Dlyrics_screen=false" -PACKAGECONFIG[outputs_screen] = "-Doutputs_screen=true,-Doutputs_screen=false" -PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false" - -SRC_URI = " \ - git://github.com/MusicPlayerDaemon/ncmpc;branch=master;protocol=https \ -" -SRCREV = "6780ec072f1d314f44ed77efdc58d03c6fbcc96b" -S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.46.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.46.bb new file mode 100644 index 0000000000..a77d4f9783 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.46.bb @@ -0,0 +1,39 @@ +SUMMARY = "A curses client for the Music Player Daemon" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +HOMEPAGE = "https://www.musicpd.org/clients/ncmpc/" + +inherit meson pkgconfig + +DEPENDS += " \ + ncurses \ + libpcre2 \ + libmpdclient \ +" + +RDEPENDS:${PN} += "python3-core" + +PACKAGECONFIG ??= "colors locale mouse nls regex help_screen library_screen search_screen song_screen key_screen lyrics_screen outputs_screen" + +PACKAGECONFIG[colors] = "-Dcolors=true,-Dcolors=false" +PACKAGECONFIG[lirc] = "-Dlirc=enabled,-Dlirc=disabled,lirc" +PACKAGECONFIG[locale] = "-Dlocale=enabled,-Dlocale=disabled" +PACKAGECONFIG[mini] = "-Dmini=true,-Dmini=false" +PACKAGECONFIG[mouse] = "-Dmouse=enabled,-Dmouse=disabled" +PACKAGECONFIG[nls] = "-Dnls=enabled,-Dnls=disabled,gettext-native" +PACKAGECONFIG[regex] = "-Dregex=enabled,-Dregex=disabled,pcre" + +PACKAGECONFIG[help_screen] = "-Dhelp_screen=true,-Dhelp_screen=false" +PACKAGECONFIG[library_screen] = "-Dlibrary_screen=true,-Dlibrary_screen=false" +PACKAGECONFIG[search_screen] = "-Dsearch_screen=true,-Dsearch_screen=false" +PACKAGECONFIG[song_screen] = "-Dsong_screen=true,-Dsong_screen=false" +PACKAGECONFIG[key_screen] = "-Dkey_screen=true,-Dkey_screen=false" +PACKAGECONFIG[lyrics_screen] = "-Dlyrics_screen=true,-Dlyrics_screen=false" +PACKAGECONFIG[outputs_screen] = "-Doutputs_screen=true,-Doutputs_screen=false" +PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false" + +SRC_URI = " \ + git://github.com/MusicPlayerDaemon/ncmpc;branch=master;protocol=https \ +" +SRCREV = "b9b5e11e10d8f66cd672ffb51728aa447f78ecd4" +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb index 095ef93a11..ad70005721 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb @@ -1,6 +1,6 @@ SUMMARY = "OpenAL is a cross-platform 3D audio API" HOMEPAGE = "http://kcat.strangesoft.net/openal.html" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0f159f19f9377e1895fbb477d5a7953e" inherit cmake pkgconfig diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/opus-tools/opus-tools_0.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/opus-tools/opus-tools_0.2.bb index b5e6ed947a..b76c5ba01d 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/opus-tools/opus-tools_0.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/opus-tools/opus-tools_0.2.bb @@ -1,7 +1,7 @@ SUMMARY = "Opus Audio Tools" HOMEPAGE = "http://www.opus-codec.org/" -LICENSE = "BSD-2-Clause & GPLv2" +LICENSE = "BSD-2-Clause & GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=79f6fc2a6239fbe5f6e52f20ac76698c" SRC_URI = "http://downloads.xiph.org/releases/opus/opus-tools-${PV}.tar.gz" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index 62ca273160..2b7a43b93d 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -55,7 +55,7 @@ RDEPENDS:packagegroup-meta-multimedia = "\ tearsofsteel-1080p \ schroedinger \ pipewire \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "projucer", "", d)} \ libcamera \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "libde265 openh264", "", d)} \ vorbis-tools \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb index d6dfd87fce..52a672f042 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Multimedia processing server for Linux" AUTHOR = "Wim Taymans " HOMEPAGE = "https://pipewire.org" SECTION = "multimedia" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = " \ file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb index 53ee2a82fb..aa92c58808 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb @@ -2,7 +2,7 @@ SUMMARY = "RTMP Dump" DESCRIPTION = "rtmpdump is a toolkit for RTMP streams. All forms of RTMP are \ supported, including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://." HOMEPAGE = "http://rtmpdump.mplayerhq.hu/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "gnutls zlib" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb index 2f1fda341e..c9d98a2da1 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb @@ -1,6 +1,6 @@ SUMMARY = "Dirac compressed video encoder/decoder" HOMEPAGE = "http://schrodinger.sourceforge.net/" -LICENSE = "MPL-1.1 | GPLv2 | LGPLv2 | MIT" +LICENSE = "MPL-1.1 | GPL-2.0-only | LGPL-2.0-only | MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d91a46405fc074b88c963cc4f2a0aae9 \ file://COPYING.GPL;md5=e181e3b7c66f5f96921d813c1074f833 \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb index 544b6138fc..0791c85f74 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb @@ -23,7 +23,7 @@ PACKAGECONFIG[id3tag] = "--with-id3tag,--without-id3tag,libid3tag," PACKAGECONFIG[lame] = "--with-lame,--without-lame,lame," PACKAGECONFIG[ao] = "--with-ao,--without-ao,libao," -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb index 3068a476e5..6014326826 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb @@ -2,7 +2,7 @@ SUMMARY = "download online streams into audio files" DESCRIPTION = "This command-line tool can be used to record MPEG III \ and OGG online radio-streams into track-separated audio files." HOMEPAGE = "http://streamripper.sourceforge.net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "glib-2.0 libmad libogg libvorbis" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.2.bb index fe06699ab4..0b472b81d9 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.2.bb @@ -1,6 +1,6 @@ SUMMARY = "libdvdcss is a simple library for accessing DVDs like block devices" DESCRIPTION = "libdvdcss is a simple library designed for accessing DVDs like a block device without having to bother about the decryption." -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://download.videolan.org/pub/libdvdcss/${PV}/libdvdcss-${PV}.tar.bz2" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb deleted file mode 100644 index fde7b04335..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb +++ /dev/null @@ -1,132 +0,0 @@ -DESCRIPTION = "Video player and streamer - davinci edition" -HOMEPAGE = "http://www.videolan.org" -SECTION = "multimedia" - -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \ - dbus libxml2 gnutls \ - tremor faad2 ffmpeg flac alsa-lib \ - lua-native lua libidn \ - avahi jpeg xz libmodplug mpeg2dec \ - libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ - tiff" - -LDFLAGS:append:riscv64 = " -latomic" -LDFLAGS:append:riscv32 = " -latomic" - -SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \ - file://0001-make-opencv-configurable.patch \ - file://0002-use-vorbisidec.patch \ - file://0003-fix-luaL-checkint.patch \ - file://0004-Use-packageconfig-to-detect-mmal-support.patch \ - file://0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch \ - file://0001-include-limits-header.patch \ -" -SRC_URI[sha256sum] = "eff458f38a92126094f44f2263c2bf2c7cdef271b48192d0fe7b1726388cf879" - -inherit autotools features_check gettext pkgconfig mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -export BUILDCC = "${BUILD_CC}" -EXTRA_OECONF = "\ - --enable-run-as-root \ - --enable-xvideo \ - --disable-screen --disable-caca \ - --enable-vlm \ - --enable-freetype \ - --enable-tremor \ - --enable-v4l2 --disable-aa --disable-faad \ - --enable-dbus \ - --without-contrib \ - --without-kde-solid \ - --enable-realrtsp \ - --disable-libtar \ - --enable-avcodec \ - ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \ - ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \ - ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \ -" - -PACKAGECONFIG ?= " \ - live555 dc1394 dv1394 notify fontconfig fluidsynth freetype dvdread png \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - x264 \ -" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} - -PACKAGECONFIG[mmal] = "--enable-omxil --enable-omxil-vout --enable-rpi-omxil --enable-mmal,,userland" -PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" -PACKAGECONFIG[fluidsynth] = ",,fluidsynth" -PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" -PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" -PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" -PACKAGECONFIG[live555] = "--enable-live555 LIVE555_PREFIX=${STAGING_DIR_HOST}${prefix},--disable-live555,live555" -PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" -PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" -PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" -PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" -PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" -PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" -PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" -PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" -PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" -PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" -PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" -PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" -PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav libdvdcss" -PACKAGECONFIG[sftp] = "--enable-sftp,--disable-sftp,libssh2" -PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" -PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis libogg" -PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394" -PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libavc1394" -PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg" -PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo" -PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+3" -PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig" -PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" -PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" -PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" -PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" -PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" -PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" -PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native" - -do_configure:append() { - # moc needs support: precreate build paths - for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do - mkdir -p "${B}/modules/gui/qt/$qtpath" - done -} - -# This recipe packages vlc as a library as well, so qt4 dependencies -# can be avoided when only the library is installed. -PACKAGES =+ "libvlc" - -LEAD_SONAME_libvlc = "libvlc.so.5" -FILES:libvlc = "${libdir}/lib*.so.*" - -FILES:${PN} += "\ - ${bindir}/vlc \ - ${libdir}/vlc/vlc/libvlc_vdpau.so \ - ${datadir}/applications \ - ${datadir}/vlc/ \ - ${datadir}/icons \ - ${datadir}/metainfo/vlc.appdata.xml \ -" - -FILES:${PN}-dbg += "\ - ${libdir}/vlc/*/.debug \ - ${libdir}/vlc/plugins/*/.debug \ -" - -FILES:${PN}-staticdev += "\ - ${libdir}/vlc/plugins/*/*.a \ -" - -INSANE_SKIP:${PN} = "dev-so" - -EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.17-1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.17-1.bb new file mode 100644 index 0000000000..9b85cb5374 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.17-1.bb @@ -0,0 +1,132 @@ +DESCRIPTION = "Video player and streamer - davinci edition" +HOMEPAGE = "http://www.videolan.org" +SECTION = "multimedia" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native bison-native \ + dbus libxml2 gnutls \ + tremor faad2 ffmpeg flac alsa-lib \ + lua-native lua libidn \ + avahi jpeg xz libmodplug mpeg2dec \ + libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ + tiff" + +LDFLAGS:append:riscv64 = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" + +SRC_URI = "git://github.com/videolan/vlc.git;protocol=https;branch=3.0.x \ + file://0001-make-opencv-configurable.patch \ + file://0002-use-vorbisidec.patch \ + file://0003-fix-luaL-checkint.patch \ + file://0004-Use-packageconfig-to-detect-mmal-support.patch \ + file://0005-linux-thread-Use-SYS_futex-instead-of-__NR_futex.patch \ +" +SRCREV = "aa76328c572d93f1d99c867a94ecad1dc3259733" +S = "${WORKDIR}/git" + +inherit autotools-brokensep features_check gettext pkgconfig mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +export BUILDCC = "${BUILD_CC}" +EXTRA_OECONF = "\ + --enable-run-as-root \ + --enable-xvideo \ + --disable-screen --disable-caca \ + --enable-vlm \ + --enable-freetype \ + --enable-tremor \ + --enable-v4l2 --disable-aa --disable-faad \ + --enable-dbus \ + --without-contrib \ + --without-kde-solid \ + --enable-realrtsp \ + --disable-libtar \ + --enable-avcodec \ + ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \ + ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \ + ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \ +" + +PACKAGECONFIG ?= " \ + live555 dc1394 dv1394 notify fontconfig fluidsynth freetype dvdread png \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + x264 \ +" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} + +PACKAGECONFIG[mmal] = "--enable-omxil --enable-omxil-vout --enable-rpi-omxil --enable-mmal,,userland" +PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" +PACKAGECONFIG[fluidsynth] = ",,fluidsynth" +PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" +PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" +PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[live555] = "--enable-live555 LIVE555_PREFIX=${STAGING_DIR_HOST}${prefix},--disable-live555,live555" +PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" +PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" +PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" +PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" +PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" +PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" +PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" +PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg" +PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp" +PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi" +PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba" +PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" +PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav libdvdcss" +PACKAGECONFIG[sftp] = "--enable-sftp,--disable-sftp,libssh2" +PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" +PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis libogg" +PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394" +PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libavc1394" +PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg" +PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo" +PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+3" +PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig" +PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" +PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" +PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" +PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" +PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" +PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native" + +do_configure:append() { + # moc needs support: precreate build paths + for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do + mkdir -p "${B}/modules/gui/qt/$qtpath" + done +} + +# This recipe packages vlc as a library as well, so qt4 dependencies +# can be avoided when only the library is installed. +PACKAGES =+ "libvlc" + +LEAD_SONAME_libvlc = "libvlc.so.5" +FILES:libvlc = "${libdir}/lib*.so.*" + +FILES:${PN} += "\ + ${bindir}/vlc \ + ${libdir}/vlc/vlc/libvlc_vdpau.so \ + ${datadir}/applications \ + ${datadir}/vlc/ \ + ${datadir}/icons \ + ${datadir}/metainfo/vlc.appdata.xml \ +" + +FILES:${PN}-dbg += "\ + ${libdir}/vlc/*/.debug \ + ${libdir}/vlc/plugins/*/.debug \ +" + +FILES:${PN}-staticdev += "\ + ${libdir}/vlc/plugins/*/*.a \ +" + +INSANE_SKIP:${PN} = "dev-so" + +EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.2.bb index f399bfaa28..290162127f 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.2.bb @@ -5,7 +5,7 @@ include some command line applications to use the libraries." HOMEPAGE = "http://www.vorbis.com/" BUGTRACKER = "https://trac.xiph.org" SECTION = "multimedia" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libogg libvorbis" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/files/0001-spa-json-fix-va_list-APIs-for-different-architecture.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/files/0001-spa-json-fix-va_list-APIs-for-different-architecture.patch new file mode 100644 index 0000000000..75c7b850f4 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/files/0001-spa-json-fix-va_list-APIs-for-different-architecture.patch @@ -0,0 +1,217 @@ +From e429db7e8c266045aee25e153fb2308bd61fe233 Mon Sep 17 00:00:00 2001 +From: Julian Bouzas +Date: Wed, 9 Feb 2022 07:59:59 -0500 +Subject: [PATCH] spa-json: fix va_list APIs for different architectures + +The va_list type might not always be a pointer in some architectures, so we +cannot guarantee it will be modified after using it for a second time in another +function. This fixes the issue by using macros so args does not get copied, and +always gets modified when using it more than once. + +Upstream-Status: Backport [https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e429db7e8c266045aee25e153fb2308bd61fe233] + +Signed-off-by: Peter Bergin + +--- + lib/wp/spa-json.c | 156 ++++++++++++++++++++++++---------------------- + 1 file changed, 80 insertions(+), 76 deletions(-) + +diff --git a/lib/wp/spa-json.c b/lib/wp/spa-json.c +index f14f395..c5e59a3 100644 +--- a/lib/wp/spa-json.c ++++ b/lib/wp/spa-json.c +@@ -363,33 +363,33 @@ wp_spa_json_new_string (const gchar *value) + wp_spa_json_builder_new_formatted ("\"%s\"", value)); + } + +-static void +-wp_spa_json_builder_add_value (WpSpaJsonBuilder *self, const gchar *fmt, +- va_list args) +-{ +- switch (*fmt) { +- case 'n': +- wp_spa_json_builder_add_null (self); +- break; +- case 'b': +- wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); +- break; +- case 'i': +- wp_spa_json_builder_add_int (self, va_arg(args, gint)); +- break; +- case 'f': +- wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); +- break; +- case 's': +- wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); +- break; +- case 'J': +- wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); +- break; +- default: +- return; +- } +-} ++/* Args is not a pointer in some architectures, so this needs to be a macro to ++ * avoid args being copied */ ++#define wp_spa_json_builder_add_value(self,fmt,args) \ ++do { \ ++ switch (*fmt) { \ ++ case 'n': \ ++ wp_spa_json_builder_add_null (self); \ ++ break; \ ++ case 'b': \ ++ wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); \ ++ break; \ ++ case 'i': \ ++ wp_spa_json_builder_add_int (self, va_arg(args, gint)); \ ++ break; \ ++ case 'f': \ ++ wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); \ ++ break; \ ++ case 's': \ ++ wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); \ ++ break; \ ++ case 'J': \ ++ wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); \ ++ break; \ ++ default: \ ++ break; \ ++ } \ ++} while(false) + + /*! + * \brief Creates a spa json of type array +@@ -724,48 +724,46 @@ wp_spa_json_parse_object_valist (WpSpaJson *self, va_list args) + return res; + } + +-static gboolean +-wp_spa_json_parse_value (const gchar *data, int len, const gchar *fmt, +- va_list args) +-{ +- switch (*fmt) { +- case 'n': +- if (!spa_json_is_null (data, len)) +- return FALSE; +- break; +- case 'b': +- if (!wp_spa_json_parse_boolean_internal (data, len, +- va_arg(args, gboolean *))) +- return FALSE; +- break; +- case 'i': +- if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) +- return FALSE; +- break; +- case 'f': +- if (spa_json_parse_float (data, len, +- (float *)va_arg(args, double *)) < 0) +- return FALSE; +- break; +- case 's': { +- gchar *str = wp_spa_json_parse_string_internal (data, len); +- if (!str) +- return FALSE; +- *va_arg(args, gchar **) = str; +- break; +- } +- case 'J': { +- WpSpaJson *j = wp_spa_json_new (data, len); +- if (!j) +- return FALSE; +- *va_arg(args, WpSpaJson **) = j; +- break; +- } +- default: +- return FALSE; +- } +- return TRUE; +-} ++/* Args is not a pointer in some architectures, so this needs to be a macro to ++ * avoid args being copied */ ++#define wp_spa_json_parse_value(data,len,fmt,args) \ ++do { \ ++ switch (*fmt) { \ ++ case 'n': \ ++ if (!spa_json_is_null (data, len)) \ ++ return FALSE; \ ++ break; \ ++ case 'b': \ ++ if (!wp_spa_json_parse_boolean_internal (data, len, \ ++ va_arg(args, gboolean *))) \ ++ return FALSE; \ ++ break; \ ++ case 'i': \ ++ if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) \ ++ return FALSE; \ ++ break; \ ++ case 'f': \ ++ if (spa_json_parse_float (data, len, va_arg(args, float *)) < 0) \ ++ return FALSE; \ ++ break; \ ++ case 's': { \ ++ gchar *str = wp_spa_json_parse_string_internal (data, len); \ ++ if (!str) \ ++ return FALSE; \ ++ *va_arg(args, gchar **) = str; \ ++ break; \ ++ } \ ++ case 'J': { \ ++ WpSpaJson *j = wp_spa_json_new (data, len); \ ++ if (!j) \ ++ return FALSE; \ ++ *va_arg(args, WpSpaJson **) = j; \ ++ break; \ ++ } \ ++ default: \ ++ return FALSE; \ ++ } \ ++} while(false) + + /*! + * \brief Parses the object property values of a spa json object +@@ -827,8 +825,7 @@ wp_spa_json_object_get_valist (WpSpaJson *self, va_list args) + value = g_value_get_boxed (&item); + + if (g_strcmp0 (key_str, lookup_key) == 0) { +- if (!wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args)) +- return FALSE; ++ wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args); + lookup_key = va_arg(args, const gchar *); + if (!lookup_key) + return TRUE; +@@ -1366,9 +1363,12 @@ gboolean + wp_spa_json_parser_get_value (WpSpaJsonParser *self, const gchar *fmt, + va_list args) + { +- return wp_spa_json_parser_advance (self) && +- wp_spa_json_parse_value (self->curr.cur, +- self->curr.end - self->curr.cur, fmt, args); ++ if (wp_spa_json_parser_advance (self)) { ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, ++ fmt, args); ++ return TRUE; ++ } ++ return FALSE; + } + + /*! +@@ -1419,9 +1419,13 @@ wp_spa_json_parser_get_valist (WpSpaJsonParser *self, va_list args) + if (!format) + return TRUE; + +- /* parse value */ +- if (!wp_spa_json_parser_get_value (self, format, args)) ++ /* advance */ ++ if (!wp_spa_json_parser_advance (self)) + return FALSE; ++ ++ /* parse value */ ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, ++ format, args); + } while (TRUE); + + return FALSE; +-- +2.32.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.8.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.8.bb index 2310c3a780..ed7417c280 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.8.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.8.bb @@ -14,6 +14,7 @@ DEPENDS = "glib-2.0 glib-2.0-native lua pipewire \ SRCREV = "e14bb72dcc85e2130d0ea96768e5ae3b375a041e" SRC_URI = "git://gitlab.freedesktop.org/pipewire/wireplumber.git;branch=master;protocol=https \ file://90-OE-disable-session-dbus-dependent-features.lua \ + file://0001-spa-json-fix-va_list-APIs-for-different-architecture.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb index 3d8aef0cfe..c36619b819 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb @@ -2,7 +2,7 @@ SUMMARY = "H.265/HEVC video encoder" DESCRIPTION = "A free software library and application for encoding video streams into the H.265/HEVC format." HOMEPAGE = "http://www.videolan.org/developers/x265.html" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://../COPYING;md5=c9e0427bc58f129f99728c62d4ad4091" diff --git a/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb b/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb index bc54ea9fe5..b496531ab1 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb @@ -7,14 +7,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=1373274bc8d8001edc54933919f36f68" DEPENDS += "util-linux" -SRCREV = "5b45cdd9a56ca9da35ee0f8845cb4e2603d245dc" +SRCREV = "ca1bf4b810e2d188d04cb6286f957008ee1b7681" SRC_URI = "git://github.com/graeme-hill/crossguid;protocol=https;branch=master" S = "${WORKDIR}/git" inherit cmake -do_install() { - install -D -m 0644 ${B}/libxg.a ${D}${libdir}/libxg.a - install -D -m 0644 ${S}/Guid.hpp ${D}${includedir}/Guid.hpp -} diff --git a/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb b/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb index c3457217eb..9a6c71cb71 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Profiling utilities for GStreamer 1.0 pipelines" HOMEPAGE = "https://github.com/kirushyk/gst-instruments" SECTION = "multimedia" -LICENSE = "LGPL-3.0" +LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" DEPENDS = "gstreamer1.0" diff --git a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb index ffedb2625e..ad42e27278 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb @@ -1,6 +1,6 @@ SUMMARY = "Library tasked with managing, extracting and handling media art caches" -LICENSE = "LGPLv2+ & GPLv2+" +LICENSE = "LGPL-2.0-or-later & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ file://libmediaart/extract.c;endline=18;md5=dff2b6328ab067b5baadc135f9876c36 \ file://tests/mediaarttest.c;endline=18;md5=067106eaa1f7a9d918759a096667f18e" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb index 074292b43b..b9fefa8589 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb @@ -13,7 +13,7 @@ SRC_URI = "git://gitlab.freedesktop.org/realmd/adcli;branch=master \ S = "${WORKDIR}/git" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" inherit autotools xmlcatalog diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch index 269174b2f6..913566dce9 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch @@ -1,31 +1,24 @@ -From 77db892cdee265e971270c06ca1ffbaeea6449a3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 26 Jun 2018 00:27:40 +0200 Subject: [PATCH] Search for cython3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Pending +Upstream-Status: Inappropriate -Signed-off-by: Andreas Müller +Signed-off-by: Markus Volk --- - configure.ac | 2 +- + meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 727089d1..6b565cdc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,7 +58,7 @@ AC_SUBST([PYGOBJECT_LIBS]) +--- a/module/meson.build 2022-02-10 08:49:35.000000000 +0100 ++++ b/module/meson.build 2022-03-29 12:58:03.456193737 +0200 +@@ -1,4 +1,4 @@ +-cython = find_program('cython', required: true) ++cython = find_program('cython3', required: true) - AC_ARG_VAR([CYTHONEXEC], [Cython compiler]) - if test "x$CYTHONEXEC" = "x"; then -- AC_PATH_PROG([CYTHONEXEC],[cython]) -+ AC_PATH_PROG([CYTHONEXEC],[cython3]) - fi - AC_SUBST([CYTHONEXEC]) - AC_MSG_CHECKING([for cython executable]) + blueman_c = custom_target( + 'blueman_c', + -- 2.14.3 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.3.bb deleted file mode 100644 index df496c3683..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.3.bb +++ /dev/null @@ -1,57 +0,0 @@ -DESCRIPTION = "Blueman is a GTK+ Bluetooth Manager" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "bluez5 python3-pygobject python3-cython-native python3-setuptools-native intltool-native" - -inherit autotools gettext systemd gsettings pkgconfig python3native gtk-icon-cache - -SRC_URI = " \ - https://github.com/blueman-project/blueman/releases/download/${PV}/blueman-${PV}.tar.xz \ - file://0001-Search-for-cython3.patch \ - file://0002-fix-fail-to-enable-bluetooth.patch \ -" -SRC_URI[sha256sum] = "6edd791da6afd8f610ffb08d5138cfcf50e6257ad30efad686287f3a2be106e9" - -EXTRA_OECONF = " \ - --disable-appindicator \ - --disable-runtime-deps-check \ - --disable-schemas-compile \ -" - -SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service" -SYSTEMD_AUTO_ENABLE:${PN} = "disable" - -RRECOMENDS_${PN} += "adwaita-icon-theme" -RDEPENDS:${PN} += " \ - python3-core \ - python3-dbus \ - packagegroup-tools-bluetooth \ -" - -PACKAGECONFIG ??= "thunar" -PACKAGECONFIG[thunar] = "--enable-thunar-sendto,--disable-thunar-sendto" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/Thunar \ - ${systemd_user_unitdir} \ - ${exec_prefix}${systemd_system_unitdir} \ - ${PYTHON_SITEPACKAGES_DIR} \ -" - -FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_blueman.a" - -# In code, path to python is a variable that is replaced with path to native version of it -# during the configure stage, e.g ../recipe-sysroot-native/usr/bin/python3-native/python3. -# Replace it with #!/usr/bin/env python3 -do_install:append() { - sed -i "1s/.*/#!\/usr\/bin\/env python3/" ${D}${prefix}/libexec/blueman-rfcomm-watcher \ - ${D}${prefix}/libexec/blueman-mechanism \ - ${D}${bindir}/blueman-adapters \ - ${D}${bindir}/blueman-applet \ - ${D}${bindir}/blueman-manager \ - ${D}${bindir}/blueman-sendto \ - ${D}${bindir}/blueman-services \ - ${D}${bindir}/blueman-tray -} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb new file mode 100644 index 0000000000..ea06ee67f7 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.4.bb @@ -0,0 +1,57 @@ +DESCRIPTION = "Blueman is a GTK+ Bluetooth Manager" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "gtk+3 glib-2.0 bluez5 python3-pygobject python3-cython-native" + +inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache + +SRC_URI = " \ + https://github.com/blueman-project/blueman/releases/download/${PV}/blueman-${PV}.tar.xz \ + file://0001-Search-for-cython3.patch \ + file://0002-fix-fail-to-enable-bluetooth.patch \ +" +SRC_URI[sha256sum] = "55d639feeda0b43b18a659e65985213a54b47dcb1348f3b4effb5238db242602" + +EXTRA_OEMESON = "-Druntime_deps_check=false -Dappindicator=false" + +SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" + +RRECOMENDS_${PN} += "adwaita-icon-theme" +RDEPENDS:${PN} += " \ + python3-core \ + python3-dbus \ + python3-pygobject \ + python3-terminal \ + packagegroup-tools-bluetooth \ +" + +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'polkit pulseaudio ', d)} \ + thunar \ +" +PACKAGECONFIG[thunar] = "-Dthunar-sendto=true,-Dthunar-sendto=false" +PACKAGECONFIG[pulseaudio] = "-Dpulseaudio=true,-Dpulseaudio=false" +PACKAGECONFIG[polkit] = "-Dpolicykit=true,-Dpolicykit=false" + +FILES:${PN} += " \ + ${datadir} \ + ${systemd_user_unitdir} \ + ${PYTHON_SITEPACKAGES_DIR} \ +" + +# In code, path to python is a variable that is replaced with path to native version of it +# during the configure stage, e.g ../recipe-sysroot-native/usr/bin/python3-native/python3. +# Replace it with #!/usr/bin/env python3 +do_install:append() { + sed -i "1s/.*/#!\/usr\/bin\/env python3/" ${D}${prefix}/libexec/blueman-rfcomm-watcher \ + ${D}${prefix}/libexec/blueman-mechanism \ + ${D}${bindir}/blueman-adapters \ + ${D}${bindir}/blueman-applet \ + ${D}${bindir}/blueman-manager \ + ${D}${bindir}/blueman-sendto \ + ${D}${bindir}/blueman-services \ + ${D}${bindir}/blueman-tray +} + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb index a3b734c2ec..8e164708ed 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python interface to Bluetooth LE on Linux" HOMEPAGE = "https://github.com/IanHarvey/bluepy" SECTION = "devel/python" -LICENSE = "GPLv2 & PD" +LICENSE = "GPL-2.0-only & PD" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=59e0d45ea684dda215889aa1b5acd001" DEPENDS = "glib-2.0" SRCREV = "7ad565231a97c304c0eff45f2649cd005e69db09" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb index 86b6577721..f34c73c173 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/cannelloni/cannelloni_1.0.0.bb @@ -1,6 +1,6 @@ SUMMARY = "a SocketCAN over Ethernet tunnel" HOMEPAGE = "https://github.com/mguentner/cannelloni" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=https;branch=master" SRCREV = "0bd7e27db35bdef361226882ae04205504f7b2f4" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb b/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb index 8e5ee66a2a..14d809f518 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb @@ -1,7 +1,7 @@ SUMMARY = "The dump DAQ test the various inline mode features " HOMEPAGE = "http://www.snort.org" SECTION = "libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f9ce51a65dd738dc1ae631d8b21c40e0" PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb deleted file mode 100644 index 8d4be95cfe..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb +++ /dev/null @@ -1,83 +0,0 @@ -SECTION = "console/network" -SUMMARY = "Internet Software Consortium DHCP Relay Agent" -DESCRIPTION = "A DHCP relay agent passes DHCP requests from one \ -LAN to another, so that a DHCP server is not needed on every LAN." - -HOMEPAGE = "http://www.isc.org/" - -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747c01" - -DEPENDS = "openssl libcap zlib chrpath-replacement-native" -EXTRANATIVEPATH += "chrpath-native" - -SRC_URI = "https://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz \ - https://ftp.isc.org/isc/bind9/9.11.32/bind-9.11.32.tar.gz;name=bind;unpack=0 \ - file://default-relay \ - file://init-relay \ - file://dhcrelay.service \ - file://0001-Makefile.am-only-build-dhcrelay.patch \ - file://0002-bind-version-update-to-latest-version.patch \ - file://0003-bind-Makefile.in-disable-backtrace.patch \ - " - -SRC_URI[md5sum] = "3089a1ebd20a802ec0870ae337d43907" -SRC_URI[sha256sum] = "b05e04337539545a8faa0d6ac518defc61a07e5aec66a857f455e7f218c85a1a" -SRC_URI[bind.md5sum] = "0d029dd06ca60c6739c3189c999ef757" -SRC_URI[bind.sha256sum] = "cbf8cb4b74dd1452d97c3a2a8c625ea346df8516b4b3508ef07443121a591342" - -UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/" -UPSTREAM_CHECK_REGEX = "(?P\d+\.\d+\.(\d+?))/" - -S = "${WORKDIR}/dhcp-4.4.2-P1" - -inherit autotools-brokensep systemd - -SYSTEMD_SERVICE:${PN} = "dhcrelay.service" -SYSTEMD_AUTO_ENABLE:${PN} = "disable" - -CFLAGS += "-D_GNU_SOURCE -fcommon" -LDFLAGS:append = " -pthread" - -EXTRA_OECONF = "--enable-paranoia \ - --disable-static \ - --enable-libtool \ - --with-randomdev=/dev/random \ - " - -# Enable shared libs per dhcp README -do_configure:prepend () { - cp configure.ac+lt configure.ac - cp ${WORKDIR}/bind-9.11.32.tar.gz ${S}/bind/bind.tar.gz -} - -do_compile:prepend() { - # Need to unpack this now instead of earlier as do_configure will delete the configure script - rm -rf ${S}/bind/bind-9.11.32/ - tar xf ${S}/bind/bind.tar.gz -C ${S}/bind - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/bind/bind-9.11.32/ - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/bind/bind-9.11.32/ - cp -fpR ${S}/m4/*.m4 ${S}/bind/bind-9.11.32/libtool.m4/ - rm -rf ${S}/bind/bind-9.11.32/libtool - install -m 0755 ${S}/libtool ${S}/bind/bind-9.11.32/ -} - -do_install:append () { - install -Dm 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay - install -Dm 0755 ${B}/bind/bind-9.11.32/lib/isccfg/.libs/libisccfg.so.163 ${D}${libdir}/libisccfg.so.163 - install -Dm 0755 ${B}/bind/bind-9.11.32/lib/dns/.libs/libdns.so.1115 ${D}${libdir}/libdns.so.1115 - chrpath --delete ${D}${libdir}/libisccfg.so.163 - chrpath --delete ${D}${libdir}/libdns.so.1115 - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcrelay.service - sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service - else - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay - fi -} - -PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3.bb new file mode 100644 index 0000000000..92c648708e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3.bb @@ -0,0 +1,62 @@ +SECTION = "console/network" +SUMMARY = "Internet Software Consortium DHCP Relay Agent" +DESCRIPTION = "A DHCP relay agent passes DHCP requests from one \ +LAN to another, so that a DHCP server is not needed on every LAN." + +HOMEPAGE = "http://www.isc.org/" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c463f4afde26d9eb60f14f50aeb85f8f" + +DEPENDS = "openssl libcap zlib" + +SRC_URI = "https://downloads.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \ + file://default-relay \ + file://init-relay \ + file://dhcrelay.service \ + file://0001-Makefile.am-only-build-dhcrelay.patch \ + file://0002-bind-Makefile.in-disable-backtrace.patch \ + file://0003-bind-Makefile.in-regenerate-configure.patch \ + " + +SRC_URI[sha256sum] = "0e3ec6b4c2a05ec0148874bcd999a66d05518378d77421f607fb0bc9d0135818" + +UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/" +UPSTREAM_CHECK_REGEX = "(?P\d+\.\d+\.(\d+?))/" + +S = "${WORKDIR}/dhcp-${PV}" + +inherit autotools-brokensep systemd pkgconfig + +SYSTEMD_SERVICE:${PN} = "dhcrelay.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" + +CFLAGS += "-D_GNU_SOURCE -fcommon" +LDFLAGS:append = " -pthread" + +EXTRA_OECONF = "--enable-paranoia \ + --disable-static \ + --enable-libtool \ + --with-randomdev=/dev/random \ + " + +# Enable shared libs per dhcp README +do_configure:prepend () { + cp configure.ac+lt configure.ac +} + +do_install:append () { + install -Dm 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcrelay.service + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service + else + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay + fi +} + +PARALLEL_MAKE = "" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch index fed85d2a8c..5320d7c9e9 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0001-Makefile.am-only-build-dhcrelay.patch @@ -1,4 +1,4 @@ -From 17cc080e58894644dd18664ac6f3451096d5f065 Mon Sep 17 00:00:00 2001 +From 4fd67b6adb7c1d8524ba17d1a0b3894f901555a9 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Thu, 13 May 2021 15:23:16 +0800 Subject: [PATCH] Makefile.am: only build dhcrelay @@ -26,5 +26,5 @@ index ed692a5..34f9772 100644 DIST_SUBDIRS = $(SUBDIRS) keama -- -2.17.1 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-Makefile.in-disable-backtrace.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-Makefile.in-disable-backtrace.patch new file mode 100644 index 0000000000..631a640ecc --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-Makefile.in-disable-backtrace.patch @@ -0,0 +1,31 @@ +From 6c6bbfe6b33e5c7e46a4260d656593dbe610fd8a Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Tue, 8 Jun 2021 10:13:57 +0800 +Subject: [PATCH] bind/Makefile.in: disable backtrace + +Fixes build error for qemuarm on musl: +libisc.so: undefined reference to `_Unwind_GetIP' + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + bind/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bind/Makefile.in b/bind/Makefile.in +index 2e60091..533d55c 100644 +--- a/bind/Makefile.in ++++ b/bind/Makefile.in +@@ -22,7 +22,7 @@ prefix = @prefix@ + exec_prefix = @exec_prefix@ + + bindconfig = --without-openssl --without-libxml2 --without-libjson \ +- --without-gssapi --disable-threads --without-lmdb \ ++ --without-gssapi --disable-threads --without-lmdb --disable-backtrace \ + --includedir=@includedir@ --libdir=@libdir@ --without-python\ + @BINDLT@ @BINDIOMUX@ @BINDCONFIG@ --enable-full-report + +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch deleted file mode 100644 index 5c7a5f058f..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch +++ /dev/null @@ -1,30 +0,0 @@ -From edb68972f8dc636e6208e78f02dec6f9805e4c0b Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Wed, 26 May 2021 11:39:00 +0800 -Subject: [PATCH] bind/version: update to latest version - -Update the bundled bind from 9.11.14 to 9.11.32. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Yi Zhao ---- - bind/version.tmp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bind/version.tmp b/bind/version.tmp -index cf52f1b..4cc538e 100644 ---- a/bind/version.tmp -+++ b/bind/version.tmp -@@ -5,7 +5,7 @@ PRODUCT=BIND - DESCRIPTION="(Extended Support Version)" - MAJORVER=9 - MINORVER=11 --PATCHVER=14 -+PATCHVER=32 - RELEASETYPE= - RELEASEVER= - EXTENSIONS= --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch deleted file mode 100644 index 51520bc621..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bc9c5d64ad4829c7830ef70fcaff94470974247c Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Tue, 8 Jun 2021 10:13:57 +0800 -Subject: [PATCH] bind/Makefile.in: disable backtrace - -Fixes build error for qemuarm on musl: -libisc.so: undefined reference to `_Unwind_GetIP' - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Yi Zhao ---- - bind/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bind/Makefile.in b/bind/Makefile.in -index 8fe8883..1058160 100644 ---- a/bind/Makefile.in -+++ b/bind/Makefile.in -@@ -22,7 +22,7 @@ prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindconfig = --without-openssl --without-libxml2 --without-libjson \ -- --without-gssapi --disable-threads --without-lmdb \ -+ --without-gssapi --disable-threads --without-lmdb --disable-backtrace \ - --includedir=@includedir@ --libdir=@libdir@ --without-python\ - @BINDLT@ @BINDIOMUX@ @BINDCONFIG@ --enable-full-report - --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-regenerate-configure.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-regenerate-configure.patch new file mode 100644 index 0000000000..71be0276a3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-regenerate-configure.patch @@ -0,0 +1,30 @@ +From 6ca1b224032355521b35471d222d0b09c08369a0 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Thu, 27 May 2021 11:38:36 +0800 +Subject: [PATCH] bind/Makefile.in: regenerate configure + +Run autogen.sh to regenerate configure. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + bind/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bind/Makefile.in b/bind/Makefile.in +index 533d55c..fdffe15 100644 +--- a/bind/Makefile.in ++++ b/bind/Makefile.in +@@ -55,7 +55,7 @@ bind1: + else \ + echo Configuring BIND libraries for DHCP. ; \ + rm -rf ${cleandirs} ${cleanfiles} ; \ +- (cd ${bindsrcdir} && \ ++ (cd ${bindsrcdir} && ./autogen.sh && \ + ./configure ${bindconfig} > ${binddir}/configure.log); \ + fi + +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index 8c74c3954e..bdda35a24b 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Dibbler DHCPv6 client" DESCRIPTION = "Dibbler is a portable DHCPv6 implementation. It supports stateful as well as stateless autoconfiguration for IPv6." HOMEPAGE = "http://klub.com.pl/dhcpv6" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=7236695bb6d4461c105d685a8b61c4e3" SRCREV = "a7c6cf58a88a510cb00841351e75030ce78d36bf" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb b/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb index 51e220c9e7..8648f2e0e6 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb @@ -1,7 +1,7 @@ SUMMARY = "daemon that sends updates when your IP changes" HOMEPAGE = "http://sourceforge.net/projects/ez-ipupdate/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=7783169b4be06b54e86730eb01bc3a31" SRC_URI = "http://sourceforge.net/projects/ez-ipupdate/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb index 7d29bf1ed0..1dea339535 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb @@ -2,7 +2,7 @@ SUMMARY = "Dynamic firewall daemon with a D-Bus interface" HOMEPAGE = "https://firewalld.org/" BUGTRACKER = "https://github.com/firewalld/firewalld/issues" UPSTREAM_CHECK_URI = "https://github.com/firewalld/firewalld/releases" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb index 3e5cca6405..da7e60419e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb @@ -9,7 +9,7 @@ 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+" +LICENSE = "GPL-2.0-only & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" DEPENDS = "openssl-native openssl libidn libtool libpcap libtalloc" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb index 9b64388a0f..bf3e18dce7 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb @@ -3,7 +3,7 @@ DESCRIPTION = "LFTP is a sophisticated file transfer program with \ FISH, SFTP, HTTPS and FTPS protocols" HOMEPAGE = "http://lftp.yar.ru/" SECTION = "console/network" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.bz2" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch new file mode 100644 index 0000000000..e778e8158b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch @@ -0,0 +1,29 @@ +From 16d07a82242c3263ec0038c9b4c97355795d2dd9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 19 Mar 2022 23:16:51 -0700 +Subject: [PATCH] pyiec61850: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs in + cmake + +This ensures that it gets installed in platform specified system libdir +all platforms do not use /usr/lib as assumed here e.g. ppc64 uses lib64 + +Upstream-Status: Submitted [https://github.com/mz-automation/libiec61850/pull/376] +Signed-off-by: Khem Raj +--- + pyiec61850/CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/pyiec61850/CMakeLists.txt ++++ b/pyiec61850/CMakeLists.txt +@@ -31,7 +31,9 @@ endif() + + swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) + +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) +-install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) ++include(GNUInstallDirs) ++ ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) ++install(TARGETS _iec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}//python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) + + add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb deleted file mode 100644 index fa42be62a2..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Open source iec61850 implementation" -DESCRIPTION = "IEC 61850 is an international standard for \ -communication systems in Substation Automation Systems \ -(SAS) and management of Decentralized Energy Resources \ -(DER). It is seen as one of the communication standards \ -of the emerging Smart Grid. \ -The project libIEC61850 provides a server and client \ -library for the IEC 61850/MMS, IEC 61850/GOOSE and IEC \ -61850-9-2/Sampled Values communication protocols \ -written in C. It is available under the GPLv3 license." -HOMEPAGE = "http://libiec61850.com" -SECTION = "console/network" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "swig-native python3" -SRCREV = "fcefc746fea286aeaa40d2f62240216da81c85e5" - -SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \ - file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ -" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig python3-dir python3native siteinfo - -EXTRA_OECMAKE = " \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_PYTHON_BINDINGS=ON \ -" - -RDEPENDS:${PN}-python = " python3-core " -RDEPENDS:${PN} = " python3-core " - -FILES:${PN} += " \ - ${libdir}/${PYTHON_DIR}/site-packages/iec61850.py \ - ${libdir}/${PYTHON_DIR}/site-packages/_iec61850.so \ -" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb new file mode 100644 index 0000000000..3e5fc91dad --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb @@ -0,0 +1,38 @@ +SUMMARY = "Open source iec61850 implementation" +DESCRIPTION = "IEC 61850 is an international standard for \ +communication systems in Substation Automation Systems \ +(SAS) and management of Decentralized Energy Resources \ +(DER). It is seen as one of the communication standards \ +of the emerging Smart Grid. \ +The project libIEC61850 provides a server and client \ +library for the IEC 61850/MMS, IEC 61850/GOOSE and IEC \ +61850-9-2/Sampled Values communication protocols \ +written in C. It is available under the GPLv3 license." +HOMEPAGE = "http://libiec61850.com" +SECTION = "console/network" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +DEPENDS = "swig-native python3" +SRCREV = "210cf30897631fe2006ac50483caf8fd616622a2" + +SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \ + file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ + file://0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch \ +" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig python3-dir python3native siteinfo + +EXTRA_OECMAKE = " \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_PYTHON_BINDINGS=ON \ +" + +RDEPENDS:${PN}-python = " python3-core " +RDEPENDS:${PN} = " python3-core " + +FILES:${PN} += " \ + ${libdir}/${PYTHON_DIR}/site-packages/iec61850.py \ + ${libdir}/${PYTHON_DIR}/site-packages/_iec61850.so \ +" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb index 3c2ab980e5..005ad726f3 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb @@ -4,7 +4,7 @@ communication patterns. It aims to make the networking layer fast, scalable, \ and easy to use. Implemented in C, it works on a wide range of operating \ systems with no further dependencies." HOMEPAGE = "https://nanomsg.org/" -LICENSE = "MIT-X" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=587b3fd7fd291e418ff4d2b8f3904755" SECTION = "libs/networking" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-fix-parallel-build-failure.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-fix-parallel-build-failure.patch new file mode 100644 index 0000000000..2149ee30cd --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-fix-parallel-build-failure.patch @@ -0,0 +1,44 @@ +From 2e84550b47b475d830622f41576992a1d45d6af0 Mon Sep 17 00:00:00 2001 +From: Zhao Yi <38274519+yizhao1@users.noreply.github.com> +Date: Tue, 15 Mar 2022 19:28:26 +0800 +Subject: [PATCH] Makefile: fix parallel build failure (#267) + +* Makefile: fix parallel build failure + +Add src/_features.h as dependency for dbus.o to fix the parallel build +failure: +src/dbus.c:17:10: fatal error: _features.h: No such file or directory + +Upstream-Status: Backport +[https://github.com/canonical/netplan/commit/2e84550b47b475d830622f41576992a1d45d6af0] + +Signed-off-by: Yi Zhao +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 0368e41..8ac7432 100644 +--- a/Makefile ++++ b/Makefile +@@ -52,7 +52,7 @@ NOSETESTS3 ?= $(shell command -v nosetests-3 || command -v nosetests3 || echo tr + + default: netplan/_features.py generate netplan-dbus dbus/io.netplan.Netplan.service doc/netplan.html doc/netplan.5 doc/netplan-generate.8 doc/netplan-apply.8 doc/netplan-try.8 doc/netplan-dbus.8 doc/netplan-get.8 doc/netplan-set.8 + +-%.o: src/%.c ++%.o: src/%.c src/_features.h + $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -c $^ `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid` + + libnetplan.so.$(NETPLAN_SOVER): $(SRCS) abicompat.lds +@@ -62,7 +62,7 @@ libnetplan.so.$(NETPLAN_SOVER): $(SRCS) abicompat.lds + generate: libnetplan.so.$(NETPLAN_SOVER) generate.o + $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(filter-out $<,$^) -L. -lnetplan `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid` + +-netplan-dbus: libnetplan.so.$(NETPLAN_SOVER) src/_features.h dbus.o ++netplan-dbus: libnetplan.so.$(NETPLAN_SOVER) dbus.o + $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(filter-out $<,$(patsubst %.h,,$^)) -L. -lnetplan `pkg-config --cflags --libs libsystemd glib-2.0 gio-2.0 yaml-0.1 uuid` + + src/_features.h: src/[^_]*.[hc] +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.104.bb b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.104.bb index e26649744c..ea944fa9db 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.104.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.104.bb @@ -7,7 +7,7 @@ tool." HOMEPAGE = "https://netplan.io" SECTION = "net/misc" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" S = "${WORKDIR}/git" @@ -16,6 +16,7 @@ PV = "0.104" SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \ file://0001-Makefile-do-not-use-Werror.patch \ + file://0001-Makefile-fix-parallel-build-failure.patch \ " SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.16.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.16.bb deleted file mode 100644 index 19cac13458..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.16.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "NetworkManager-openvpn-plugin" -SECTION = "net/misc" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c" - -DEPENDS = "dbus dbus-glib networkmanager openvpn intltool-native glib-2.0-native" - -inherit gnomebase useradd gettext systemd - -SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz" - -SRC_URI[sha256sum] = "8920de09c7ae5f1f520c83f844455db8faec31427350268fe2dd95b860f91fb5" - -S = "${WORKDIR}/NetworkManager-openvpn-${PV}" - -# meta-gnome in layers is required using gnome: -PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret" - -do_configure:append() { - # network-manager-openvpn.metainfo.xml is created in source folder but - # compile expects it in build folder. As long as nobody comes up with a - # better solution just support build: - if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then - mkdir -p ${B}/appdata - cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/ - fi -} - -do_install:append () { - rm -rf ${D}${libdir}/NetworkManager/*.la -} - -# Create user and group nm-openvpn that are needed since version 1.0.6 -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system nm-openvpn" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${libdir}/NetworkManager/*.so \ - ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \ -" - -FILES:${PN}-staticdev += " \ - ${libdir}/NetworkManager/*.a \ -" - -RDEPENDS:${PN} = " \ - networkmanager \ - openvpn \ -" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.18.bb new file mode 100644 index 0000000000..1d0c38e035 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.18.bb @@ -0,0 +1,52 @@ +SUMMARY = "NetworkManager-openvpn-plugin" +SECTION = "net/misc" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c" + +DEPENDS = "dbus dbus-glib networkmanager openvpn intltool-native glib-2.0-native" + +inherit gnomebase useradd gettext systemd + +SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz" + +SRC_URI[sha256sum] = "53dfb0acf64478adc728074f162f62e60bff62a605bd897eb88b267e7057927a" + +S = "${WORKDIR}/NetworkManager-openvpn-${PV}" + +# meta-gnome in layers is required using gnome: +PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret" + +do_configure:append() { + # network-manager-openvpn.metainfo.xml is created in source folder but + # compile expects it in build folder. As long as nobody comes up with a + # better solution just support build: + if [ -e ${S}/appdata/network-manager-openvpn.metainfo.xml ]; then + mkdir -p ${B}/appdata + cp -f ${S}/appdata/network-manager-openvpn.metainfo.xml ${B}/appdata/ + fi +} + +do_install:append () { + rm -rf ${D}${libdir}/NetworkManager/*.la +} + +# Create user and group nm-openvpn that are needed since version 1.0.6 +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system nm-openvpn" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${libdir}/NetworkManager/*.so \ + ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \ +" + +FILES:${PN}-staticdev += " \ + ${libdir}/NetworkManager/*.a \ +" + +RDEPENDS:${PN} = " \ + networkmanager \ + openvpn \ +" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch deleted file mode 100644 index 19c8c74811..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9bcf4c81a559d1e7deac47b2e510d7f1e5837a02 Mon Sep 17 00:00:00 2001 -From: Pablo Saavedra -Date: Tue, 13 Mar 2018 17:36:20 +0100 -Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 65ceffb..ad4b0fc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -561,7 +561,7 @@ if test "$have_jansson" = "yes"; then - AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) - - AC_CHECK_TOOLS(READELF, [eu-readelf readelf]) -- JANSSON_LIBDIR=`$PKG_CONFIG --variable=libdir jansson` -+ JANSSON_LIBDIR=${PKG_CONFIG_SYSROOT_DIR}`$PKG_CONFIG --variable=libdir jansson` - JANSSON_SONAME=`$READELF -d $JANSSON_LIBDIR/libjansson.so |sed -n 's/.*SONAME.*\[[\([^]]*\)]]/\1/p'` - - if test "$JANSSON_SONAME" = ""; then diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-do-not-ask-host-for-ifcfg-defaults.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-do-not-ask-host-for-ifcfg-defaults.patch new file mode 100644 index 0000000000..92b129320c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-do-not-ask-host-for-ifcfg-defaults.patch @@ -0,0 +1,24 @@ +From 37559b659e22886d5f55837d4f167ba5fda73e85 Mon Sep 17 00:00:00 2001 +From: Adrian Freihofer +Date: Sun, 29 Aug 2021 15:50:35 +0200 +Subject: [PATCH] do-not-ask-host-for-ifcfg-defaults + +--- + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index d0cec83..289aa1b 100644 +--- a/meson.build ++++ b/meson.build +@@ -304,8 +304,8 @@ else + distro = 'unknown' + endif + +-enable_ifcfg_rh = get_option('ifcfg_rh') or (distro == 'redhat') +-enable_ifupdown = get_option('ifupdown') or (distro == 'debian') ++enable_ifcfg_rh = get_option('ifcfg_rh') ++enable_ifupdown = get_option('ifupdown') + + config_plugins_default = get_option('config_plugins_default') + config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_PLUGINS', config_plugins_default) diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch deleted file mode 100644 index 86e8eaafc5..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch +++ /dev/null @@ -1,60 +0,0 @@ -From d0dead0478a070b96f37bd3b310443eaa8c93a25 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 5 Jul 2021 00:42:23 +0200 -Subject: [PATCH] Do not create settings settings/property documentation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It was tried to get this work by adding python3-pygobject-native to DEPENDS but -compile could not find (configure passed) python module gi. -Anyway it is not necessary for us to have the settings/property docs. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller -Signed-off-by: Vinicius Aquino ---- - Makefile.am | 5 ----- - configure.ac | 5 ----- - 2 files changed, 10 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 5a62070..3d0ebcd 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1860,15 +1860,10 @@ src/libnm-client-impl/libnm.typelib: src/libnm-client-impl/libnm.gir - INTROSPECTION_GIRS += src/libnm-client-impl/NM-1.0.gir - - libnm_noinst_data = \ -- src/nmcli/generate-docs-nm-settings-nmcli.xml \ -- man/nm-settings-docs-dbus.xml \ -- man/nm-settings-docs-nmcli.xml \ - src/libnm-client-impl/nm-property-infos-dbus.xml \ - src/libnm-client-impl/nm-property-infos-ifcfg-rh.xml \ - src/libnm-client-impl/nm-property-infos-keyfile.xml \ - src/libnm-client-impl/nm-property-infos-nmcli.xml \ -- src/libnm-client-impl/nm-settings-docs-gir.xml \ -- src/libnmc-setting/settings-docs-input.xml \ - $(NULL) - - noinst_DATA += $(libnm_noinst_data) -diff --git a/configure.ac b/configure.ac -index 8fe23de..dc24850 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1258,11 +1258,6 @@ GTK_DOC_CHECK(1.0) - # check if we can build setting property documentation - build_docs=no - if test -n "$INTROSPECTION_MAKEFILE"; then -- # If g-i is installed we know we have python, but we might not have pygobject -- if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then -- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)]) -- fi -- - AC_PATH_PROG(PERL, perl) - if test -z "$PERL"; then - AC_MSG_ERROR([--enable-introspection requires perl]) --- -2.31.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch deleted file mode 100644 index 11741897f6..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6388b16b93ba805f8877a94f47509f701250812f Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 6 Jul 2020 19:33:54 -0700 -Subject: [PATCH] install firewalld to var-libdir rather than hardcod lib - -The oe install firewalld (split packages) to ${libdir}/firewalld/zones - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 358b01a..5745339 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4778,7 +4778,7 @@ data/server.conf: $(srcdir)/data/server.conf.in - $(AM_V_GEN) $(data_edit) $< >$@ - - if WITH_FIREWALLD_ZONE --firewalldzonedir = $(prefix)/lib/firewalld/zones -+firewalldzonedir = $(libdir)/firewalld/zones - firewalldzone_DATA = data/nm-shared.xml - endif - --- -2.21.0 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-dhcpcd.conf b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-dhcpcd.conf new file mode 100644 index 0000000000..8da4fe0487 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-dhcpcd.conf @@ -0,0 +1,2 @@ +[main] +dhcp=dhcpcd diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-iwd.conf b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-iwd.conf new file mode 100644 index 0000000000..abb5937341 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/enable-iwd.conf @@ -0,0 +1,3 @@ +[device] +wifi.iwd.autoconnect=yes +wifi.backend=iwd diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.34.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.34.0.bb deleted file mode 100644 index ec15aea070..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.34.0.bb +++ /dev/null @@ -1,180 +0,0 @@ -SUMMARY = "NetworkManager" -HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" -SECTION = "net/misc" - -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ -" - -DEPENDS = " \ - intltool-native \ - libxslt-native \ - libnl \ - udev \ - util-linux \ - libndp \ - libnewt \ - curl \ -" - -inherit gnomebase gettext update-rc.d systemd vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even - -SRC_URI = " \ - ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ - file://${BPN}.initd \ - file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ - file://0002-Do-not-create-settings-settings-property-documentati.patch \ - file://0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \ -" -SRC_URI[sha256sum] = "819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd" - -S = "${WORKDIR}/NetworkManager-${PV}" - -EXTRA_OECONF = " \ - --disable-ifcfg-rh \ - --disable-more-warnings \ - --with-iptables=${sbindir}/iptables \ - --with-tests \ - --with-nmtui=yes \ - --with-udev-dir=${nonarch_base_libdir}/udev \ - --with-dhclient=no \ - --with-dhcpcd=no \ - --with-dhcpcanon=no \ - --with-netconfig=no \ -" - -# stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template -# avoids: -# | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'? -CFLAGS:append:libc-musl = " \ - -DRTLD_DEEPBIND=0 \ -" - -do_compile:prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/libnm-client-impl/.libs" -} - -PACKAGECONFIG ??= "nss ifupdown dnsmasq nmcli \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ -" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'nmcli', 'bash-completion', '', d)} - -PACKAGECONFIG[systemd] = " \ - --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ - --without-systemdsystemunitdir, \ -" -PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit" -PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" -# consolekit is not picked by shlibs, so add it to RDEPENDS too -PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" -PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" -PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" -PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" -PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" -PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf" -PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" -PACKAGECONFIG[wifi] = "--with-wext=yes --enable-wifi=yes,--with-wext=no --enable-wifi=no,,wpa-supplicant" -PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" -PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" -PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no" -PACKAGECONFIG[nmcli] = "--with-nmcli=yes,--with-nmcli=no,readline" -PACKAGECONFIG[ovs] = "--enable-ovs,--disable-ovs,jansson" -PACKAGECONFIG[audit] = "--with-libaudit,--without-libaudit,audit" -PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" - -PACKAGES =+ " \ - ${PN}-nmcli ${PN}-nmcli-doc \ - ${PN}-nmtui ${PN}-nmtui-doc \ - ${PN}-adsl ${PN}-cloud-setup \ -" - -SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup" - -FILES:${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so" - -FILES:${PN}-cloud-setup = " \ - ${libexecdir}/nm-cloud-setup \ - ${systemd_system_unitdir}/nm-cloud-setup.service \ - ${systemd_system_unitdir}/nm-cloud-setup.timer \ - ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \ - ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \ -" -ALLOW_EMPTY:${PN}-cloud-setup = "1" -SYSTEMD_SERVICE:${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}" - -FILES:${PN} += " \ - ${libexecdir} \ - ${libdir}/NetworkManager/${PV}/*.so \ - ${libdir}/NetworkManager \ - ${libdir}/firewalld/zones \ - ${nonarch_libdir}/NetworkManager/conf.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \ - ${nonarch_libdir}/NetworkManager/VPN \ - ${nonarch_libdir}/NetworkManager/system-connections \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${nonarch_base_libdir}/udev/* \ - ${systemd_system_unitdir} \ - ${libdir}/pppd \ -" - -RRECOMMENDS:${PN} += "iptables \ - ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ -" -RCONFLICTS:${PN} = "connman" - -FILES:${PN}-dev += " \ - ${datadir}/NetworkManager/gdb-cmd \ - ${libdir}/pppd/*/*.la \ - ${libdir}/NetworkManager/*.la \ - ${libdir}/NetworkManager/${PV}/*.la \ -" - -FILES:${PN}-nmcli = " \ - ${bindir}/nmcli \ -" - -FILES:${PN}-nmcli-doc = " \ - ${mandir}/man1/nmcli* \ -" - -FILES:${PN}-nmtui = " \ - ${bindir}/nmtui \ - ${bindir}/nmtui-edit \ - ${bindir}/nmtui-connect \ - ${bindir}/nmtui-hostname \ -" - -FILES:${PN}-nmtui-doc = " \ - ${mandir}/man1/nmtui* \ -" - -INITSCRIPT_NAME = "network-manager" -SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}" - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}" -ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.NetworkManager','',d)}" -ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" - -do_install:append() { - install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager - - rm -rf ${D}/run ${D}${localstatedir}/run - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - # For read-only filesystem, do not create links during bootup - ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager - - # systemd v210 and newer do not need this rule file - rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules - fi -} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb new file mode 100644 index 0000000000..b09ff18bf7 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb @@ -0,0 +1,248 @@ +SUMMARY = "NetworkManager" +HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" +SECTION = "net/misc" + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ +" + +DEPENDS = " \ + coreutils-native \ + intltool-native \ + libxslt-native \ + libnl \ + udev \ + util-linux \ + libndp \ + libnewt \ + curl \ + dbus \ +" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gettext update-rc.d systemd gobject-introspection gtk-doc update-alternatives upstream-version-is-even + +SRC_URI = " \ + ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ + file://${BPN}.initd \ + file://enable-dhcpcd.conf \ + file://enable-iwd.conf \ + file://0001-do-not-ask-host-for-ifcfg-defaults.patch \ +" +SRC_URI[sha256sum] = "ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab" + +S = "${WORKDIR}/NetworkManager-${PV}" + +# ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] +NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT ??= "auto" + +# ['dhcpcanon', 'dhclient', 'dhcpcd', 'internal', 'nettools'] +NETWORKMANAGER_DHCP_DEFAULT ??= "internal" + +EXTRA_OEMESON = "\ + -Difcfg_rh=false \ + -Dtests=yes \ + -Dnmtui=true \ + -Dudev_dir=${nonarch_base_libdir}/udev \ + -Dlibpsl=false \ + -Dqt=false \ + -Dconfig_dns_rc_manager_default=${NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT} \ + -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \ + -Ddhcpcanon=false \ +" + +# stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template +# avoids: +# | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'? +CFLAGS:append:libc-musl = " \ + -DRTLD_DEEPBIND=0 \ +" + +do_compile:prepend() { + export GI_TYPELIB_PATH="${B}}/src/libnm-client-impl${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" +} + +PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli vala \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ +" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'nmcli', 'bash-completion', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)} + +PACKAGECONFIG[systemd] = "\ + -Dsystemdsystemunitdir=${systemd_unitdir}/system -Dsession_tracking=systemd,\ + -Dsystemdsystemunitdir=no -Dsystemd_journal=false -Dsession_tracking=no\ +" +PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit" +PACKAGECONFIG[bluez5] = "-Dbluez5_dun=true,-Dbluez5_dun=false,bluez5" +# consolekit is not picked by shlibs, so add it to RDEPENDS too +PACKAGECONFIG[consolekit] = "-Dsession_tracking_consolekit=true,-Dsession_tracking_consolekit=false,consolekit,consolekit" +PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info" +PACKAGECONFIG[ppp] = "-Dppp=true,-Dppp=false,ppp,ppp" +PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq" +PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss" +PACKAGECONFIG[resolvconf] = "-Dresolvconf=${base_sbindir}/resolvconf,-Dresolvconf=no,,resolvconf" +PACKAGECONFIG[gnutls] = "-Dcrypto=gnutls,,gnutls" +PACKAGECONFIG[wifi] = "-Dwext=true -Dwifi=true,-Dwext=false -Dwifi=false" +PACKAGECONFIG[iwd] = "-Diwd=true,-Diwd=false" +PACKAGECONFIG[ifupdown] = "-Difupdown=true,-Difupdown=false" +PACKAGECONFIG[cloud-setup] = "-Dnm_cloud_setup=true,-Dnm_cloud_setup=false" +PACKAGECONFIG[nmcli] = "-Dnmcli=true,-Dnmcli=false" +PACKAGECONFIG[readline] = "-Dreadline=libreadline,,readline" +PACKAGECONFIG[libedit] = "-Dreadline=libedit,,libedit" +PACKAGECONFIG[ovs] = "-Dovs=true,-Dovs=false,jansson" +PACKAGECONFIG[audit] = "-Dlibaudit=yes,-Dlibaudit=no" +PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux" +PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" +PACKAGECONFIG[dhcpcd] = "-Ddhcpcd=yes,-Ddhcpcd=no,,dhcpcd" +PACKAGECONFIG[dhclient] = "-Ddhclient=yes,-Ddhclient=no,,dhcp" +PACKAGECONFIG[concheck] = "-Dconcheck=true,-Dconcheck=false" + + +PACKAGES =+ " \ + ${PN}-adsl \ + ${PN}-bluetooth \ + ${PN}-cloud-setup \ + ${PN}-nmcli ${PN}-nmcli-doc \ + ${PN}-nmtui ${PN}-nmtui-doc \ + ${PN}-wifi \ + ${PN}-wwan \ + ${PN}-ovs ${PN}-ovs-doc \ + ${PN}-ppp \ +" + +SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup" + +NETWORKMANAGER_PLUGINDIR = "${libdir}/NetworkManager/${PV}" + +FILES:${PN}-adsl = "${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-adsl.so" + +FILES:${PN}-bluetooth = "${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-bluetooth.so" + +FILES:${PN}-cloud-setup = " \ + ${libexecdir}/nm-cloud-setup \ + ${systemd_system_unitdir}/nm-cloud-setup.service \ + ${systemd_system_unitdir}/nm-cloud-setup.timer \ + ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \ + ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \ +" +ALLOW_EMPTY:${PN}-cloud-setup = "1" +SYSTEMD_SERVICE:${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}" + +FILES:${PN}-nmcli = " \ + ${bindir}/nmcli \ +" + +FILES:${PN}-nmcli-doc = " \ + ${mandir}/man1/nmcli* \ +" + +FILES:${PN}-nmtui = " \ + ${bindir}/nmtui \ + ${bindir}/nmtui-edit \ + ${bindir}/nmtui-connect \ + ${bindir}/nmtui-hostname \ +" + +FILES:${PN}-nmtui-doc = " \ + ${mandir}/man1/nmtui* \ +" + +FILES:${PN}-wifi = "${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-wifi.so" + +FILES:${PN}-wwan = "\ + ${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-wwan.so \ + ${NETWORKMANAGER_PLUGINDIR}/libnm-wwan.so \ +" + +FILES:${PN}-ovs = "\ + ${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-ovs.so \ + ${systemd_system_unitdir}/NetworkManager.service.d/NetworkManager-ovs.conf \ +" + +FILES:${PN}-ovs-doc = "\ + ${mandir}/man7/nm-openvswitch.7* \ +" + +FILES:${PN}-ppp = "\ + ${NETWORKMANAGER_PLUGINDIR}/libnm-ppp-plugin.so \ + ${libdir}/pppd/*/nm-pppd-plugin.so \ +" + +FILES:${PN}-dev += " \ + ${libdir}/pppd/*/*.la \ + ${libdir}/NetworkManager/*.la \ + ${NETWORKMANAGER_PLUGINDIR}/*.la \ +" + +FILES:${PN} += " \ + ${libexecdir} \ + ${libdir}/NetworkManager \ + ${nonarch_libdir}/firewalld/zones \ + ${nonarch_libdir}/NetworkManager/conf.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \ + ${nonarch_libdir}/NetworkManager/VPN \ + ${nonarch_libdir}/NetworkManager/system-connections \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${nonarch_base_libdir}/udev/* \ + ${systemd_system_unitdir} \ +" + +RRECOMMENDS:${PN} += "\ + iptables \ + ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ + ${@bb.utils.contains('PACKAGECONFIG','adsl','${PN}-adsl','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','bluez5','${PN}-bluetooth','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','cloud-setup','${PN}-cloud-setup','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','nmcli','${PN}-nmcli','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','nmtui','${PN}-nmtui','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','wifi','${PN}-wifi','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','wwan','${PN}-wwan','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','ovs','${PN}-ovs','',d)} \ + ${@bb.utils.contains('PACKAGECONFIG','ppp','${PN}-ppp','',d)} \ +" +RCONFLICTS:${PN} = "connman" + + +INITSCRIPT_NAME = "network-manager" +SYSTEMD_SERVICE:${PN} = "\ + NetworkManager.service \ + NetworkManager-dispatcher.service \ +" + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}" +ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.NetworkManager','',d)}" +ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" + +do_install:append() { + install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager + + rm -rf ${D}/run ${D}${localstatedir}/run + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + # For read-only filesystem, do not create links during bootup + ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager + + # systemd v210 and newer do not need this rule file + rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules + fi + + # Enable iwd if compiled + if ${@bb.utils.contains('PACKAGECONFIG','iwd','true','false',d)}; then + install -Dm 0644 ${WORKDIR}/enable-iwd.conf ${D}${libdir}/NetworkManager/conf.d/enable-iwd.conf + fi + + # Enable dhcpd if compiled + if ${@bb.utils.contains('PACKAGECONFIG','dhcpcd','true','false',d)}; then + install -Dm 0644 ${WORKDIR}/enable-dhcpcd.conf ${D}${libdir}/NetworkManager/conf.d/enable-dhcpcd.conf + fi +} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb deleted file mode 100644 index 7a61f74e31..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Open client for Cisco AnyConnect VPN" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad" - -SRC_URI = " \ - git://git.infradead.org/users/dwmw2/openconnect.git;branch=master \ -" -SRCREV = "9d287e40c57233190a51b6434ba7345370e36f38" - -DEPENDS = "vpnc libxml2 krb5 gettext-native" -RDEPENDS:${PN} = "bash python3-core vpnc-script" - -PACKAGECONFIG ??= "gnutls lz4 libproxy" - -# config defaults -PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls," -PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," -PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy," - -# not config defaults -PACKAGECONFIG[pcsc-lite] = "--with-libpcsclite,--without-libpcsclite,pcsc-lite," - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig bash-completion - -EXTRA_OECONF += "--with-vpnc-script=${sysconfdir}/vpnc/vpnc-script \ - --disable-static" - -do_install:append() { - rm ${D}/usr/libexec/openconnect/hipreport-android.sh -} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.20.bb b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.20.bb new file mode 100644 index 0000000000..022ba85a26 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.20.bb @@ -0,0 +1,32 @@ +SUMMARY = "Open client for Cisco AnyConnect VPN" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=8c2e1ec1540fb3e0beb68361344cba7e" + +SRC_URI = " \ + git://git.infradead.org/users/dwmw2/openconnect.git;branch=master \ +" +SRCREV = "03a3b9c76a9b6d0a65073b6bebbc1192e3445507" + +DEPENDS = "vpnc libxml2 krb5 gettext-native" +RDEPENDS:${PN} = "bash python3-core vpnc-script" + +PACKAGECONFIG ??= "gnutls lz4 libproxy" + +# config defaults +PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls," +PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," +PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy," + +# not config defaults +PACKAGECONFIG[pcsc-lite] = "--with-libpcsclite,--without-libpcsclite,pcsc-lite," + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig bash-completion + +EXTRA_OECONF += "--with-vpnc-script=${sysconfdir}/vpnc/vpnc-script \ + --disable-static" + +do_install:append() { + rm ${D}/usr/libexec/openconnect/hipreport-android.sh +} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb index cd4db12c08..67e7c1c615 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb @@ -8,7 +8,7 @@ DESCRIPTION = "The rdate utility retrieves the date and time from \ HOMEPAGE= "https://www.aelius.com/njh/rdate/" SECTION = "Applications/System" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "https://www.aelius.com/njh/${BPN}/${BP}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb index 1dd50f6e12..1da18d7ca0 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Layer 3 relay daemon" SECTION = "console/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://main.c;endline=17;md5=86aad799085683e0a2e1c2684a20bab2" DEPENDS = "libubox" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb index 84eee44195..dc6e4b5e16 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.12.bb @@ -1,7 +1,7 @@ HOMEPAGE = "https://www.samba.org/" SECTION = "console/network" -LICENSE = "GPL-3.0+ & LGPL-3.0+ & GPL-2.0+" +LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://${COREBASE}/meta/files/common-licenses/LGPL-3.0-or-later;md5=c51d3eef3be114124d11349ca0d7e117 \ file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb index 744e782064..4e3c157713 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb @@ -1,7 +1,7 @@ DESCRIPTION = "set Linux HDLC packet radio modem driver port information" HOMEPAGE = "https://www.kernel.org/pub/linux/utils/net/hdlc" SECTION = "comm" -LICENSE = "GPLv2 & GPLv2+ " +LICENSE = "GPL-2.0-only & GPL-2.0-or-later " LIC_FILES_CHKSUM = "file://sethdlc.c;endline=10;md5=90f936879e9f8b755a138aeb348782eb" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.19.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.19.bb index 9c479d2200..26b335dbd5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.19.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.19.bb @@ -1,7 +1,7 @@ DESCRIPTION = "snort - a free lightweight network intrusion detection system for UNIX and Windows." HOMEPAGE = "http://www.snort.org/" SECTION = "net" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native libtirpc bison-native" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch index 884fa1647e..ee935eb615 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-add-an-option-to-specify-iptables-location.patch @@ -23,11 +23,9 @@ Signed-off-by: Silcet setup.py | 65 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 28 deletions(-) -diff --git a/setup.py b/setup.py -index 09204d3..2343bc9 100644 --- a/setup.py +++ b/setup.py -@@ -246,41 +246,50 @@ shutil.copytree('src', 'staging') +@@ -245,45 +245,50 @@ shutil.copytree('src', 'staging') os.unlink(os.path.join('staging', 'ufw-init')) os.unlink(os.path.join('staging', 'ufw-init-functions')) @@ -36,7 +34,11 @@ index 09204d3..2343bc9 100644 iptables_dir = '' -for e in ['iptables']: -- for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \ +- # Historically iptables was in /sbin, then later also symlinked from +- # /usr/sbin/iptables to /sbin/iptables. Debian bullseye moves iptables +- # to /usr/sbin with no symlink in /sbin except on upgrades. To accomodate +- # buildds that may still have the old iptables, search /usr/sbin first +- for dir in ['/usr/sbin', '/sbin', '/usr/bin', '/bin', '/usr/local/sbin', \ - '/usr/local/bin']: - if e == "iptables": - if os.path.exists(os.path.join(dir, e)): @@ -49,6 +51,14 @@ index 09204d3..2343bc9 100644 - if iptables_exe != "": - break - +- +-if iptables_exe == '': +- print("ERROR: could not find required binary 'iptables'", file=sys.stderr) +- sys.exit(1) +- +-for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']: +- if not os.path.exists(os.path.join(iptables_dir, e)): +- print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr) +if "--iptables-dir" in sys.argv: + iptables_dir = sys.argv[sys.argv.index("--iptables-dir") + 1] + iptables_exe = os.path.join(iptables_dir, "iptables") @@ -59,7 +69,7 @@ index 09204d3..2343bc9 100644 + +if not iptables_set: + for e in ['iptables']: -+ for dir in ['/sbin', '/bin', '/usr/sbin', '/usr/bin', '/usr/local/sbin', \ ++ for dir in ['/usr/sbin', '/sbin', '/usr/bin', '/bin', '/usr/local/sbin', \ + '/usr/local/bin']: + if e == "iptables": + if os.path.exists(os.path.join(dir, e)): @@ -68,16 +78,10 @@ index 09204d3..2343bc9 100644 + print("Found '%s'" % iptables_exe) + else: + continue - --if iptables_exe == '': -- print("ERROR: could not find required binary 'iptables'", file=sys.stderr) -- sys.exit(1) ++ + if iptables_exe != "": + break - --for e in ['ip6tables', 'iptables-restore', 'ip6tables-restore']: -- if not os.path.exists(os.path.join(iptables_dir, e)): -- print("ERROR: could not find required binary '%s'" % (e), file=sys.stderr) ++ + if iptables_exe == '': + print("ERROR: could not find required binary 'iptables'", file=sys.stderr) sys.exit(1) diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setuptools.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setuptools.patch new file mode 100644 index 0000000000..ad5391cb98 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setuptools.patch @@ -0,0 +1,20 @@ +Move to setuptools as distutils is now deprecated. + +Upstream-Status: Submitted [https://code.launchpad.net/~tgamblin/ufw/distutils-to-setuptools] +Signed-off-by: Ross Burton + +diff --git a/setup.py b/setup.py +index cb67a6a..de648d3 100644 +--- a/setup.py ++++ b/setup.py +@@ -25,8 +25,8 @@ + # + + from __future__ import print_function +-from distutils.command.install import install as _install +-from distutils.core import setup ++from setuptools.command.install import install as _install ++from setuptools import setup + import errno + import os + import re diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb new file mode 100644 index 0000000000..70216a85e3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.1.bb @@ -0,0 +1,67 @@ + +SUMMARY = "Uncomplicated Firewall" +DESCRIPTION = "UFW stands for Uncomplicated Firewall, and is program for \ +managing a netfilter firewall. It provides a command line interface and aims \ +to be uncomplicated and easy to use." +HOMEPAGE = "https://launchpad.net/ufw" +SECTION = "net" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" + +SRC_URI = "https://launchpad.net/ufw/0.36/0.36.1/+download/ufw-0.36.1.tar.gz \ + file://0001-optimize-boot.patch \ + file://0002-add-an-option-to-specify-iptables-location.patch \ + file://0003-only-make-one-reference-to-env.patch \ + file://setuptools.patch \ + " +SRC_URI[sha256sum] = "1c57e78fbf2970f0cc9c56ea87a231e6d83d825e55b9e31e2c88b91b0ea03c8c" + +UPSTREAM_CHECK_URI = "https://launchpad.net/ufw" + +inherit setuptools3_legacy features_check systemd update-rc.d + +RDEPENDS:${PN} = " \ + iptables \ + python3 \ + python3-modules \ + " + +RRECOMMENDS:${PN} = " \ + kernel-module-ipv6 \ + kernel-module-nf-conntrack-ipv6 \ + kernel-module-nf-log-common \ + kernel-module-nf-log-ipv4 \ + kernel-module-nf-log-ipv6 \ + kernel-module-nf-addrtype \ + kernel-module-nf-limit \ + kernel-module-nf-log \ + kernel-module-nf-recent \ +" + +do_install:append() { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${S}/doc/systemd.example ${D}${systemd_unitdir}/system/ufw.service + + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${S}/doc/initscript.example ${D}${sysconfdir}/init.d/ufw +} + +SYSTEMD_SERVICE:${PN} = "ufw.service" + +INITSCRIPT_NAME = "ufw" +INITSCRIPT_PARAMS = "defaults" + +# Certain items are explicitly put under /lib, not base_libdir when installed. +# +FILES:${PN} += " \ + ${sbindir}/* \ + ${datadir}/ufw/* \ + /lib/ufw/* \ + ${sysconfdir}/ufw/* \ + ${sysconfdir}/default/ufw \ +" + +REQUIRED_DISTRO_FEATURES = "ipv6" + +DISTUTILS_BUILD_ARGS:append = " --iptables-dir /usr/sbin" +DISTUTILS_INSTALL_ARGS:append = " --iptables-dir /usr/sbin" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb deleted file mode 100644 index 40188cea21..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb +++ /dev/null @@ -1,68 +0,0 @@ - -SUMMARY = "Uncomplicated Firewall" -DESCRIPTION = "UFW stands for Uncomplicated Firewall, and is program for \ -managing a netfilter firewall. It provides a command line interface and aims \ -to be uncomplicated and easy to use." -HOMEPAGE = "https://launchpad.net/ufw" -SECTION = "net" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" - -SRC_URI = "https://launchpad.net/ufw/0.36/0.36/+download/ufw-0.36.tar.gz \ - file://0001-optimize-boot.patch \ - file://0002-add-an-option-to-specify-iptables-location.patch \ - file://0003-only-make-one-reference-to-env.patch \ - " - -UPSTREAM_CHECK_URI = "https://launchpad.net/ufw" - -SRC_URI[md5sum] = "6d8ab1506da21ae003f4628f93d05781" -SRC_URI[sha256sum] = "754b22ae5edff0273460ac9f57509c3938187e0cf4fb9692c6a02833fff33cfc" - -inherit setuptools3 features_check systemd update-rc.d - -RDEPENDS:${PN} = " \ - iptables \ - python3 \ - python3-modules \ - " - -RRECOMMENDS:${PN} = " \ - kernel-module-ipv6 \ - kernel-module-nf-conntrack-ipv6 \ - kernel-module-nf-log-common \ - kernel-module-nf-log-ipv4 \ - kernel-module-nf-log-ipv6 \ - kernel-module-nf-addrtype \ - kernel-module-nf-limit \ - kernel-module-nf-log \ - kernel-module-nf-recent \ -" - -do_install:append() { - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${S}/doc/systemd.example ${D}${systemd_unitdir}/system/ufw.service - - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${S}/doc/initscript.example ${D}${sysconfdir}/init.d/ufw -} - -SYSTEMD_SERVICE:${PN} = "ufw.service" - -INITSCRIPT_NAME = "ufw" -INITSCRIPT_PARAMS = "defaults" - -# Certain items are explicitly put under /lib, not base_libdir when installed. -# -FILES:${PN} += " \ - ${sbindir}/* \ - ${datadir}/ufw/* \ - /lib/ufw/* \ - ${sysconfdir}/ufw/* \ - ${sysconfdir}/default/ufw \ -" - -REQUIRED_DISTRO_FEATURES = "ipv6" - -DISTUTILS_BUILD_ARGS:append = " --iptables-dir /usr/sbin" -DISTUTILS_INSTALL_ARGS:append = " --iptables-dir /usr/sbin" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb b/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb index 8f899e62de..035d4946f1 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb @@ -1,7 +1,7 @@ SUMMARY = "VLAN provides vconfig utility" HOMEPAGE = "http://www.candelatech.com/~greear/vlan.html" SECTION = "misc" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://vconfig.c;beginline=1;endline=19;md5=094ca47de36c20c598b15b32c270ce0a" SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/vlan/1.9-3ubuntu10.6/${BPN}_${PV}.orig.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb index 421ebaa969..adc2a72eeb 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb @@ -2,7 +2,7 @@ SUMMARY = "A client for the Cisco3000 VPN Concentrator" HOMEPAGE = "http://www.unix-ag.uni-kl.de/~massar/vpnc/" AUTHOR = "Maurice Massar vpnc@unix-ag.uni-kl.de" SECTION = "net" -LICENSE = "GPL-2.0+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=173b74cb8ac640a9992c03f3bce22a33" DEPENDS += "libgcrypt" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.2.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.2.0.bb index a597fb3ccd..78a24bcddd 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.2.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.2.0.bb @@ -6,7 +6,7 @@ DESCRIPTION = "wolfSSL, formerly CyaSSL, is a lightweight SSL library written \ HOMEPAGE = "https://www.wolfssl.com/products/wolfssl" BUGTRACKER = "https://github.com/wolfssl/wolfssl/issues" SECTION = "libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PROVIDES += "cyassl" diff --git a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.5.bb b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.5.bb index 59905b54fe..f893a4d6dc 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.5.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.5.bb @@ -1,7 +1,7 @@ SUMMARY = "Advanced TFTP server and client" SECTION = "net" HOMEPAGE = "http://packages.debian.org/atftp" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=f65159f73e603f89d6867d43191900e5" SRCREV = "00921e75728e3681b051c2e48c59e36c6cfa2e97" diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb index c41d0e6b93..1f87bddbee 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb @@ -1,6 +1,6 @@ SUMMARY = "Kernel based automounter for linux" SECTION = "utils" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ee9324a6f564bb2376b63878ac396798" DEPENDS += "libtirpc flex-native bison-native e2fsprogs openssl libxml2 util-linux cyrus-sasl libnsl2" diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch deleted file mode 100644 index c89822c36b..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6515f3e7656d97d40a6a1cf4eb3ada193a698309 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Wed, 12 Sep 2018 23:18:12 +0800 -Subject: [PATCH] Allow saslauthd to be built outside of source tree while - configuring with `--enable-ldapdb' - -[snip] -| powerpc-wrs-linux-gcc [snip] -I../common -|../../git/saslauthd/lak.c:58:10: fatal error: crypto-compat.h: -No such file or directory -[snip] - -The crypto-compat.h locates in git/common/, it should be | -`-I../../git/common' - -Remove useless `-I$(top_srcdir)/../include' which was incorrectly -added by commit `faae590 cleanup misc INCLUDES for different build paths' - -Upstream-Status: Submitted [https://github.com/cyrusimap/cyrus-sasl] - -Signed-off-by: Hongxu Jia ---- - saslauthd/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/saslauthd/Makefile.am b/saslauthd/Makefile.am -index d7244be..864b29b 100644 ---- a/saslauthd/Makefile.am -+++ b/saslauthd/Makefile.am -@@ -34,7 +34,7 @@ saslcache_SOURCES = saslcache.c - - EXTRA_DIST = saslauthd.8 saslauthd.mdoc include \ - getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD --AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/../include -I$(top_builddir)/common -+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)/common -I$(top_srcdir)/common - DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I.. - - --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-makeinit.sh-fix-parallel-build-issue.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-makeinit.sh-fix-parallel-build-issue.patch deleted file mode 100644 index bf232ac272..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-makeinit.sh-fix-parallel-build-issue.patch +++ /dev/null @@ -1,95 +0,0 @@ -From bb693db0e1d1d693e8ca31fcbc4f46d1674eeca1 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Thu, 13 Sep 2018 14:20:57 +0800 -Subject: [PATCH] makeinit.sh: fix parallel build issue - -While building plugins, each .c requires a _init.c, -and the _init.c is dynamically generated by makeinit.sh. - -But the makeinit.sh generates all *_init.c (13 mechanism plugins, -3 auxprop plugins) at one time, if there are multiple plugins, -there will be multiple makeinit.sh invoking. - -It caused a parallel issue, the *_init.c files will be generated -repeatedly. - -It occasionally generate dapdb_init.c incorrectly -[snip plugins/ldapdb_init.c] -SASL_CANONUSER_PLUG_INIT( ldapdb ) -SASL_CANONUSER_PLUG_INIT( ldapdb ) -SASL_CANONUSER_PLUG_INIT( ldapdb ) -[snip plugins/ldapdb_init.c] - -Let makeinit.sh generate the expected _init.c which -is exactly required by .c. - -Upstream-Status: Submitted [https://github.com/cyrusimap/cyrus-sasl/pull/532] - -Signed-off-by: Hongxu Jia ---- - plugins/Makefile.am | 2 +- - plugins/makeinit.sh | 19 ++++++++++++++----- - 2 files changed, 15 insertions(+), 6 deletions(-) - -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 929f6a4..81e7f0b 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -149,4 +149,4 @@ passdss_init.c sasldb_init.c sql_init.c ldapdb_init.c - CLEANFILES=$(init_src) - - ${init_src}: $(srcdir)/makeinit.sh -- $(SHELL) $(srcdir)/makeinit.sh -+ $(SHELL) $(srcdir)/makeinit.sh $@ -diff --git a/plugins/makeinit.sh b/plugins/makeinit.sh -index cc65f7d..3131877 100644 ---- a/plugins/makeinit.sh -+++ b/plugins/makeinit.sh -@@ -1,7 +1,9 @@ -+plugin_init="$1" - # mechanism plugins - for mech in anonymous crammd5 digestmd5 scram gssapiv2 kerberos4 login ntlm otp passdss plain srp gs2; do -+ if [ ${plugin_init} = "${mech}_init.c" ];then - --echo " -+ echo " - #include - - #include -@@ -43,13 +45,16 @@ BOOL APIENTRY DllMain( HANDLE hModule, - - SASL_CLIENT_PLUG_INIT( $mech ) - SASL_SERVER_PLUG_INIT( $mech ) --" > ${mech}_init.c -+" > ${mech}_init.c -+ echo "generating $1" -+ fi # End of `if [ ${plugin_init} = "${mech}_init.c" ];then' - done - - # auxprop plugins - for auxprop in sasldb sql ldapdb; do -+ if [ ${plugin_init} = "${auxprop}_init.c" ];then - --echo " -+ echo " - #include - - #include -@@ -86,8 +91,12 @@ BOOL APIENTRY DllMain( HANDLE hModule, - #endif - - SASL_AUXPROP_PLUG_INIT( $auxprop ) --" > ${auxprop}_init.c -+" > ${auxprop}_init.c -+ echo "generating $1" -+ fi # End of `if [ ${plugin_init} = "${auxprop}_init.c" ];then' - done - - # ldapdb is also a canon_user plugin --echo "SASL_CANONUSER_PLUG_INIT( ldapdb )" >> ldapdb_init.c -+if [ ${plugin_init} = "ldapdb_init.c" ];then -+ echo "SASL_CANONUSER_PLUG_INIT( ldapdb )" >> ldapdb_init.c -+fi --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-sample-Rename-dprintf-to-cyrus_dprintf.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-sample-Rename-dprintf-to-cyrus_dprintf.patch new file mode 100644 index 0000000000..4c6d61dfc7 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0001-sample-Rename-dprintf-to-cyrus_dprintf.patch @@ -0,0 +1,91 @@ +From ade70f39c4aa5a8830462d9ccf3b8f8dd968c0d8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 28 Feb 2022 11:10:26 -0800 +Subject: [PATCH] sample: Rename dprintf to cyrus_dprintf + +This avoids shadowing the dprintf implementations in glibc + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + sample/client.c | 12 ++++++------ + sample/common.c | 2 +- + sample/common.h | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/sample/client.c b/sample/client.c +index e723c6b7..6a04f428 100644 +--- a/sample/client.c ++++ b/sample/client.c +@@ -241,9 +241,9 @@ int mysasl_negotiate(FILE *in, FILE *out, sasl_conn_t *conn) + int r, c; + + /* get the capability list */ +- dprintf(0, "receiving capability list... "); ++ cyrus_dprintf(0, "receiving capability list... "); + len = recv_string(in, buf, sizeof buf); +- dprintf(0, "%s\n", buf); ++ cyrus_dprintf(0, "%s\n", buf); + + if (mech) { + /* make sure that 'mech' appears in 'buf' */ +@@ -262,7 +262,7 @@ int mysasl_negotiate(FILE *in, FILE *out, sasl_conn_t *conn) + return -1; + } + +- dprintf(1, "using mechanism %s\n", chosenmech); ++ cyrus_dprintf(1, "using mechanism %s\n", chosenmech); + + /* we send up to 3 strings; + the mechanism chosen, the presence of initial response, +@@ -276,7 +276,7 @@ int mysasl_negotiate(FILE *in, FILE *out, sasl_conn_t *conn) + } + + for (;;) { +- dprintf(2, "waiting for server reply...\n"); ++ cyrus_dprintf(2, "waiting for server reply...\n"); + + c = fgetc(in); + switch (c) { +@@ -303,10 +303,10 @@ int mysasl_negotiate(FILE *in, FILE *out, sasl_conn_t *conn) + } + + if (data) { +- dprintf(2, "sending response length %d...\n", len); ++ cyrus_dprintf(2, "sending response length %d...\n", len); + send_string(out, data, len); + } else { +- dprintf(2, "sending null response...\n"); ++ cyrus_dprintf(2, "sending null response...\n"); + send_string(out, "", 0); + } + } +diff --git a/sample/common.c b/sample/common.c +index 712549fd..d138e450 100644 +--- a/sample/common.c ++++ b/sample/common.c +@@ -127,7 +127,7 @@ int recv_string(FILE *f, char *buf, int buflen) + + int debuglevel = 0; + +-int dprintf(int lvl, const char *fmt, ...) ++int cyrus_dprintf(int lvl, const char *fmt, ...) + { + va_list ap; + int ret = 0; +diff --git a/sample/common.h b/sample/common.h +index 819d0101..cd56907a 100644 +--- a/sample/common.h ++++ b/sample/common.h +@@ -43,7 +43,7 @@ extern int send_string(FILE *f, const char *s, int l); + extern int recv_string(FILE *f, char *buf, int buflen); + + extern int debuglevel; +-extern int dprintf(int lvl, const char *fmt, ...); ++extern int cyrus_dprintf(int lvl, const char *fmt, ...); + + extern void saslerr(int why, const char *what); + extern void saslfail(int why, const char *what); +-- +2.35.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch deleted file mode 100644 index 68d09c385b..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 98082f81da1b49876081ff1ab340e952755f985a Mon Sep 17 00:00:00 2001 -From: OBATA Akio -Date: Fri, 11 May 2018 18:36:26 +0900 -Subject: [PATCH] configure.ac: fix condition for suppliment snprintf - implementation - -$sasl_cv_snprintf means requremnt of suppliment snprintf -implementation, not existence of system snprintf implementation, - -Upstream-Status: Submitted [https://github.com/cyrusimap/cyrus-sasl/pull/512] -Signed-off-by: Khem Raj ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index ac59f14..9804e98 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1264,7 +1264,7 @@ SNPRINTFOBJS="" - LTSNPRINTFOBJS="" - AC_CHECK_FUNC(snprintf, [AC_DEFINE(HAVE_SNPRINTF,[],[Does the system have snprintf()?])], [sasl_cv_snprintf=yes]) - AC_CHECK_FUNC(vsnprintf, [AC_DEFINE(HAVE_VSNPRINTF,[],[Does the system have vsnprintf()?])], [sasl_cv_snprintf=yes]) --if test $sasl_cv_snprintf = no; then -+if test $sasl_cv_snprintf = yes; then - AC_LIBOBJ(snprintf) - SNPRINTFOBJS="snprintf.o" - LTSNPRINTFOBJS="snprintf.lo" diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch index b94780f302..33a9e3f6e6 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/CVE-2019-19906.patch @@ -18,7 +18,7 @@ Signed-off-by: Changqing Li 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/common.c b/lib/common.c -index 305311d..445c5d5 100644 +index d9104c8..fef82db 100644 --- a/lib/common.c +++ b/lib/common.c @@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t *alloclen, @@ -27,9 +27,9 @@ index 305311d..445c5d5 100644 - addlen=strlen(add); /* only compute once */ + addlen=strlen(add)+1; /* only compute once */ - if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK) + if (_buf_alloc(out, alloclen, (*outlen)+addlen+1)!=SASL_OK) return SASL_NOMEM; -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch index aa271b8fb0..1e6f99603c 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch @@ -9,41 +9,42 @@ Avoid to call AC_TRY_RUN to check if GSSAPI libraries support SPNEGO on cross-compile environment by definition AC_ARG_ENABLE enable-spnego Signed-off-by: Roy.Li - --- - m4/sasl2.m4 | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) + m4/sasl2.m4 | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/m4/sasl2.m4 b/m4/sasl2.m4 -index 56e0504..cf62607 100644 +index 80371ef..ff70083 100644 --- a/m4/sasl2.m4 +++ b/m4/sasl2.m4 -@@ -314,7 +314,18 @@ if test "$gssapi" != no; then - cmu_save_LIBS="$LIBS" - LIBS="$LIBS $GSSAPIBASE_LIBS" - -- AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries]) -+ AC_ARG_ENABLE([spnego], -+ [AC_HELP_STRING([--enable-spnego=], -+ [enable SPNEGO support in GSSAPI libraries [no]])], -+ [spnego=$enableval], -+ [spnego=no]) -+ -+ if test "$spnego" = no; then -+ echo "no" -+ elif test "$spnego" = yes; then -+ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) -+ else -+ AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries]) - AC_TRY_RUN([ +@@ -316,6 +316,18 @@ if test "$gssapi" != no; then + AC_CACHE_CHECK([for SPNEGO support in GSSAPI libraries],[ac_cv_gssapi_supports_spnego],[ + cmu_save_LIBS="$LIBS" + LIBS="$LIBS $GSSAPIBASE_LIBS" ++ AC_ARG_ENABLE([spnego], ++ [AC_HELP_STRING([--enable-spnego=], ++ [enable SPNEGO support in GSSAPI libraries [no]])], ++ [spnego=$enableval], ++ [spnego=no]) ++ ++ if test "$spnego" = no; then ++ echo "no" ++ elif test "$spnego" = yes; then ++ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) ++ else ++ AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries]) + AC_TRY_RUN([ #ifdef HAVE_GSSAPI_H #include -@@ -341,7 +352,7 @@ int main(void) - AC_MSG_RESULT(yes) ], - AC_MSG_RESULT(no)) - LIBS="$cmu_save_LIBS" +@@ -343,7 +355,7 @@ int main(void) + AS_IF([test "$ac_cv_gssapi_supports_spnego" = yes],[ + AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) + ]) - + fi else AC_MSG_RESULT([disabled]) fi +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb deleted file mode 100644 index 43b69f7a21..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb +++ /dev/null @@ -1,101 +0,0 @@ -SUMMARY = "Generic client/server library for SASL authentication" -SECTION = "libs" -HOMEPAGE = "http://asg.web.cmu.edu/sasl/" -DEPENDS = "openssl db groff-native" -LICENSE = "BSD-4-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=3f55e0974e3d6db00ca6f57f2d206396" - -SRCREV = "e41cfb986c1b1935770de554872247453fdbb079" - -SRC_URI = "git://github.com/cyrusimap/cyrus-sasl;protocol=https;branch=master \ - file://avoid-to-call-AC_TRY_RUN.patch \ - file://Fix-hardcoded-libdir.patch \ - file://debian_patches_0014_avoid_pic_overwrite.diff \ - file://saslauthd.service \ - file://saslauthd.conf \ - file://0004-configure.ac-fix-condition-for-suppliment-snprintf-i.patch \ - file://0001-Allow-saslauthd-to-be-built-outside-of-source-tree-w.patch \ - file://0001-makeinit.sh-fix-parallel-build-issue.patch \ - file://CVE-2019-19906.patch \ - " - -UPSTREAM_CHECK_URI = "https://github.com/cyrusimap/cyrus-sasl/archives" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig useradd systemd - -EXTRA_OECONF += "--with-dblib=berkeley \ - --with-plugindir='${libdir}/sasl2' \ - andrew_cv_runpath_switch=none" - -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam', d)} \ -" -PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5," -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," -PACKAGECONFIG[opie] = "--with-opie,--without-opie,opie," -PACKAGECONFIG[des] = "--with-des,--without-des,," -PACKAGECONFIG[ldap] = "--with-ldap=${STAGING_LIBDIR} --enable-ldapdb,--without-ldap --disable-ldapdb,openldap," -PACKAGECONFIG[ntlm] = "--enable-ntlm=yes,--enable-ntlm=no,," - -CFLAGS += "-fPIC" - -do_configure:prepend () { - # make it be able to work with db 5.0 version - local sed_files="sasldb/db_berkeley.c utils/dbconverter-2.c" - for sed_file in $sed_files; do - sed -i 's#DB_VERSION_MAJOR == 4.*#(&) || DB_VERSION_MAJOR == 5#' ${S}/$sed_file - done -} - -do_compile:prepend () { - cd include - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} ${S}/include/makemd5.c -o makemd5 - touch makemd5.o makemd5.lo makemd5 - cd .. -} - -do_install:append() { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/saslauthd.service ${D}${systemd_unitdir}/system - - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/saslauthd.service - sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/saslauthd.service - sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/saslauthd.service - - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /run/saslauthd/ - - - -" > ${D}${sysconfdir}/tmpfiles.d/saslauthd.conf - - install -d ${D}${sysconfdir}/default/ - install -m 0644 ${WORKDIR}/saslauthd.conf ${D}${sysconfdir}/default/saslauthd - sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${sysconfdir}/default/saslauthd - fi -} - -USERADD_PACKAGES = "${PN}-bin" -USERADD_PARAM:${PN}-bin = "--system --home=/var/spool/mail -g mail cyrus" - -SYSTEMD_PACKAGES = "${PN}-bin" -SYSTEMD_SERVICE:${PN}-bin = "saslauthd.service" -SYSTEMD_AUTO_ENABLE = "disable" - -SRC_URI[md5sum] = "a7f4e5e559a0e37b3ffc438c9456e425" -SRC_URI[sha256sum] = "8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3" - -PACKAGES =+ "${PN}-bin" - -FILES:${PN} += "${libdir}/sasl2/*.so*" -FILES:${PN}-bin += "${bindir} \ - ${sysconfdir}/default/saslauthd \ - ${systemd_unitdir}/system/saslauthd.service \ - ${sysconfdir}/tmpfiles.d/saslauthd.conf" -FILES:${PN}-dev += "${libdir}/sasl2/*.la" -FILES:${PN}-dbg += "${libdir}/sasl2/.debug" -FILES:${PN}-staticdev += "${libdir}/sasl2/*.a" - -INSANE_SKIP:${PN} += "dev-so" - -# CVE-2020-8032 affects only openSUSE -CVE_CHECK_IGNORE += "CVE-2020-8032" diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.28.bb b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.28.bb new file mode 100644 index 0000000000..98899dfd5e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.28.bb @@ -0,0 +1,98 @@ +SUMMARY = "Generic client/server library for SASL authentication" +SECTION = "libs" +HOMEPAGE = "http://asg.web.cmu.edu/sasl/" +DEPENDS = "openssl db groff-native" +LICENSE = "BSD-4-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=3f55e0974e3d6db00ca6f57f2d206396" + +SRCREV = "7a6b45b177070198fed0682bea5fa87c18abb084" + +SRC_URI = "git://github.com/cyrusimap/cyrus-sasl;protocol=https;branch=cyrus-sasl-2.1 \ + file://avoid-to-call-AC_TRY_RUN.patch \ + file://debian_patches_0014_avoid_pic_overwrite.diff \ + file://0001-sample-Rename-dprintf-to-cyrus_dprintf.patch \ + file://saslauthd.service \ + file://saslauthd.conf \ + file://CVE-2019-19906.patch \ + " + +UPSTREAM_CHECK_URI = "https://github.com/cyrusimap/cyrus-sasl/archives" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig useradd systemd + +EXTRA_OECONF += "--with-dblib=berkeley \ + --with-plugindir='${libdir}/sasl2' \ + andrew_cv_runpath_switch=none" + +PACKAGECONFIG ??= "\ + ${@bb.utils.filter('DISTRO_FEATURES', 'ldap pam', d)} \ +" +PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5," +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," +PACKAGECONFIG[opie] = "--with-opie,--without-opie,opie," +PACKAGECONFIG[des] = "--with-des,--without-des,," +PACKAGECONFIG[ldap] = "--with-ldap=${STAGING_LIBDIR} --enable-ldapdb,--without-ldap --disable-ldapdb,openldap," +PACKAGECONFIG[ntlm] = "--enable-ntlm=yes,--enable-ntlm=no,," + +CFLAGS += "-fPIC" + +do_configure:prepend () { + # make it be able to work with db 5.0 version + local sed_files="sasldb/db_berkeley.c utils/dbconverter-2.c" + for sed_file in $sed_files; do + sed -i 's#DB_VERSION_MAJOR == 4.*#(&) || DB_VERSION_MAJOR == 5#' ${S}/$sed_file + done +} + +do_compile:prepend () { + cd include + ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} ${S}/include/makemd5.c -o makemd5 + touch makemd5.o makemd5.lo makemd5 + cd .. +} + +do_install:append() { + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/saslauthd.service ${D}${systemd_unitdir}/system + + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/saslauthd.service + sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/saslauthd.service + sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/saslauthd.service + + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /run/saslauthd/ - - - -" > ${D}${sysconfdir}/tmpfiles.d/saslauthd.conf + + install -d ${D}${sysconfdir}/default/ + install -m 0644 ${WORKDIR}/saslauthd.conf ${D}${sysconfdir}/default/saslauthd + sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${sysconfdir}/default/saslauthd + fi +} + +USERADD_PACKAGES = "${PN}-bin" +USERADD_PARAM:${PN}-bin = "--system --home=/var/spool/mail -g mail cyrus" + +SYSTEMD_PACKAGES = "${PN}-bin" +SYSTEMD_SERVICE:${PN}-bin = "saslauthd.service" +SYSTEMD_AUTO_ENABLE = "disable" + +SRC_URI[md5sum] = "a7f4e5e559a0e37b3ffc438c9456e425" +SRC_URI[sha256sum] = "8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3" + +PACKAGES =+ "${PN}-bin" + +FILES:${PN} += "${libdir}/sasl2/*.so*" +FILES:${PN}-bin += "${bindir} \ + ${sysconfdir}/default/saslauthd \ + ${systemd_unitdir}/system/saslauthd.service \ + ${sysconfdir}/tmpfiles.d/saslauthd.conf" +FILES:${PN}-dev += "${libdir}/sasl2/*.la" +FILES:${PN}-dbg += "${libdir}/sasl2/.debug" +FILES:${PN}-staticdev += "${libdir}/sasl2/*.a" + +INSANE_SKIP:${PN} += "dev-so" + +# CVE-2020-8032 affects only openSUSE +CVE_CHECK_IGNORE += "CVE-2020-8032" diff --git a/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb b/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb index 119475f25f..e8567ccebf 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.3.bb @@ -1,7 +1,7 @@ SUMMARY = "simple dynamic multicast routing daemon that only uses IGMP signalling" HOMEPAGE = "http://sourceforge.net/projects/igmpproxy/" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=432040ff3a55670c1dec0c32b209ad69" SRC_URI = "https://github.com/pali/igmpproxy/releases/download/${PV}/${BP}.tar.gz" diff --git a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 3ed1767a01..b91ca53682 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb @@ -9,7 +9,7 @@ addresses from ippoold. \ " HOMEPAGE = "http://www.openl2tp.org/" SECTION = "console/network" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" SRC_URI = "https://sourceforge.net/projects/openl2tp/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ file://runtest.sh \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb index e85fdd7856..921f7d4883 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.6.bb @@ -5,7 +5,7 @@ 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" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" SECTION = "net" DEPENDS = "openssl flex-native bison-native open-isns util-linux kmod" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb index d04b73876d..204d2fd116 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb @@ -7,7 +7,7 @@ Server (IPVS) kernel module providing Layer4 loadbalancing \ " HOMEPAGE = "http://www.keepalived.org/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb index 5159cf51e4..e929534c3f 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb @@ -4,7 +4,7 @@ more limited in the types of events it supports due to the limited nature of \ systemd-networkd(8)." AUTHOR = "Clayton Craft and others" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" inherit features_check systemd diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb index b4ee3ed4bd..8ce324d306 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb @@ -11,7 +11,7 @@ Foundation was founded on January 22nd 2008 with Emerson Network Power, \ Ericsson, Nokia Siemens Networks, HP and Sun Microsystems as founding members." HOMEPAGE = "http://www.opensaf.org" SECTION = "admin" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" DEPENDS = "libxml2 python3" diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/files/0006-correct-signature-of-closefrom-API.patch b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/0006-correct-signature-of-closefrom-API.patch deleted file mode 100644 index 95ca03b223..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/postfix/files/0006-correct-signature-of-closefrom-API.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 56bec31c4117fddee3a141bcca6c585aa8ddbbe2 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 14 Jul 2021 18:08:30 -0700 -Subject: [PATCH] correct signature of closefrom() API - -glibc 2.34 introduced this function and finds this error which has been -all along. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/util/sys_compat.c | 6 +++--- - src/util/sys_defs.h | 12 ++++++------ - 2 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/util/sys_compat.c b/src/util/sys_compat.c -index 8bf8e58..c87f043 100644 ---- a/src/util/sys_compat.c -+++ b/src/util/sys_compat.c -@@ -286,7 +286,7 @@ int dup2_pass_on_exec(int oldd, int newd) - - /* closefrom() - closes all file descriptors from the given one up */ - --int closefrom(int lowfd) -+void closefrom(int lowfd) - { - int fd_limit = open_limit(0); - int fd; -@@ -298,14 +298,14 @@ int closefrom(int lowfd) - */ - if (lowfd < 0) { - errno = EBADF; -- return (-1); -+ return; - } - if (fd_limit > 500) - fd_limit = 500; - for (fd = lowfd; fd < fd_limit; fd++) - (void) close(fd); - -- return (0); -+ return; - } - - #endif -diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h -index 2e1c953..515de6c 100644 ---- a/src/util/sys_defs.h -+++ b/src/util/sys_defs.h -@@ -1509,7 +1509,7 @@ extern int setsid(void); - #endif - - #ifndef HAS_CLOSEFROM --extern int closefrom(int); -+extern void closefrom(int); - - #endif - -@@ -1563,7 +1563,7 @@ typedef int pid_t; - - /* - * Clang-style attribute tests. -- * -+ * - * XXX Without the unconditional test below, gcc 4.6 will barf on ``elif - * defined(__clang__) && __has_attribute(__whatever__)'' with error message - * ``missing binary operator before token "("''. -@@ -1577,7 +1577,7 @@ typedef int pid_t; - * warn for missing initializations and other trouble. However, OPENSTEP4 - * gcc 2.7.x cannot handle this so we define this only if NORETURN isn't - * already defined above. -- * -+ * - * Data point: gcc 2.7.2 has __attribute__ (Wietse Venema) but gcc 2.6.3 does - * not (Clive Jones). So we'll set the threshold at 2.7. - */ -@@ -1653,12 +1653,12 @@ typedef int pid_t; - * write to output parameters (for example, stat- or scanf-like functions) - * or from functions that have other useful side effects (for example, - * fseek- or rename-like functions). -- * -+ * - * DO NOT use this for functions that write to a stream; it is entirely - * legitimate to detect write errors with fflush() or fclose() only. On the - * other hand most (but not all) functions that read from a stream must - * never ignore result values. -- * -+ * - * XXX Prepending "(void)" won't shut up GCC. Clang behaves as expected. - */ - #if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ > 3) -@@ -1739,7 +1739,7 @@ typedef const char *CONST_CHAR_STAR; - * Safety. On some systems, ctype.h misbehaves with non-ASCII or negative - * characters. More importantly, Postfix uses the ISXXX() macros to ensure - * protocol compliance, so we have to rule out non-ASCII characters. -- * -+ * - * XXX The (unsigned char) casts in isalnum() etc arguments are unnecessary - * because the ISASCII() guard already ensures that the values are - * non-negative; the casts are done anyway to shut up chatty compilers. --- -2.17.1 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/files/main.cf b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/main.cf index e75c6fc0d7..22c57485d7 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/postfix/files/main.cf +++ b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/main.cf @@ -1,4 +1,4 @@ -compatibility_level = 2 +compatibility_level = 3.6 smtputf8_enable = no # Configure your domain and accounts diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.4.bb b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.4.bb deleted file mode 100644 index 54c8eab5c9..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.4.bb +++ /dev/null @@ -1,18 +0,0 @@ -require postfix.inc - -SRC_URI += "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \ - file://main.cf \ - file://postfix \ - file://internal_recipient \ - file://postfix.service \ - file://aliasesdb \ - file://check_hostname.sh \ - file://0001-Fix-makedefs.patch \ - file://0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch \ - file://0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch \ - file://0004-Fix-icu-config.patch \ - file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ - file://0006-correct-signature-of-closefrom-API.patch \ - " -SRC_URI[sha256sum] = "8de0619dcf2fa7c215a80cf84b82ab71631d4d4722cba0949725ce3e18031d4e" -UPSTREAM_CHECK_REGEX = "postfix\-(?P3\.6(\.\d+)+).tar.gz" diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.5.bb b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.5.bb new file mode 100644 index 0000000000..343a8b2df0 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.5.bb @@ -0,0 +1,17 @@ +require postfix.inc + +SRC_URI += "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \ + file://main.cf \ + file://postfix \ + file://internal_recipient \ + file://postfix.service \ + file://aliasesdb \ + file://check_hostname.sh \ + file://0001-Fix-makedefs.patch \ + file://0002-Change-fixed-postconf-to-a-variable-for-cross-compil.patch \ + file://0003-makedefs-Use-native-compiler-to-build-makedefs.test.patch \ + file://0004-Fix-icu-config.patch \ + file://0005-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ + " +SRC_URI[sha256sum] = "300fa8811cea20d01d25c619d359bffab82656e704daa719e0c9afc4ecff4808" +UPSTREAM_CHECK_REGEX = "postfix\-(?P3\.6(\.\d+)+).tar.gz" diff --git a/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb deleted file mode 100644 index cdebd24af1..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb +++ /dev/null @@ -1,145 +0,0 @@ -SUMMARY = "Secure and configurable FTP server" -SECTION = "net" -HOMEPAGE = "http://www.proftpd.org" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184" - -SRCREV = "715eadc1aa4f6b07d69f9d09558e9cb471e51d87" -BRANCH = "1.3.7" - -SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https \ - file://basic.conf.patch \ - file://proftpd-basic.init \ - file://default \ - file://close-RequireValidShell-check.patch \ - file://contrib.patch \ - file://build_fixup.patch \ - file://proftpd.service \ - " - -S = "${WORKDIR}/git" - -inherit autotools-brokensep useradd update-rc.d systemd multilib_script - -PACKAGECONFIG ??= "shadow \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ - static \ - " - -PACKAGECONFIG[curses] = "--enable-curses --enable-ncurses, --disable-curses --disable-ncurses, ncurses" -PACKAGECONFIG[openssl] = "--enable-openssl, --disable-openssl, openssl, openssl" -PACKAGECONFIG[pam] = "--enable-auth-pam, --disable-auth-pam, libpam, libpam" -PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6" -PACKAGECONFIG[shadow] = "--enable-shadow, --disable-shadow" -PACKAGECONFIG[pcre] = "--enable-pcre, --disable-pcre, libpcre " -PACKAGECONFIG[static] = "--enable-static=yes, --enable-static=no" - -# enable POSIX.1e capabilities -PACKAGECONFIG[cap] = "--enable-cap, --disable-cap, libcap, libcap" - -#enable support for POSIX ACLs -PACKAGECONFIG[acl] = "--enable-facl, --disable-facl" - -#enable proftpd controls via ftpdct -PACKAGECONFIG[ctrls] = "--enable-ctrls, --disable-crtls" - -#prevent proftpd from using its bundled getopt implementation. -PACKAGECONFIG[getopt] = "--with-getopt, --without-getopt" - -#do not strip debugging symbols from installed code -PACKAGECONFIG[strip] = "--enable-strip, --disable-strip" - -#enable SIA authentication support (Tru64) -PACKAGECONFIG[sia] = "--enable-sia, --disable-sia" -PACKAGECONFIG[sendfile] = "-enable-sendfile, --disable-sendfile" - -#enable Native Language Support (NLS) -PACKAGECONFIG[nls] = "--enable-nls, --disable-nls" - -#add mod_dso to core modules -PACKAGECONFIG[dso] = "--enable-dso, --disable-dso" -PACKAGECONFIG[largefile] = "--enable-largefile, --disable-largefile" - -#omit mod_auth_file from core modules -PACKAGECONFIG[auth] = "--enable-auth-file, --disable-auth-file" - -# proftpd uses libltdl which currently makes configuring using -# autotools.bbclass a pain... -do_configure () { - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} - oe_runconf -} - -FTPUSER = "ftp" -FTPGROUP = "ftp" - -do_install () { - oe_runmake DESTDIR=${D} install - rmdir ${D}${libdir}/proftpd ${D}${datadir}/locale - [ -d ${D}${libexecdir} ] && rmdir ${D}${libexecdir} - sed -i '/ *User[ \t]*/s/ftp/${FTPUSER}/' ${D}${sysconfdir}/proftpd.conf - sed -i '/ *Group[ \t]*/s/ftp/${FTPGROUP}/' ${D}${sysconfdir}/proftpd.conf - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/proftpd-basic.init ${D}${sysconfdir}/init.d/proftpd - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/proftpd - sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/proftpd - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/proftpd - sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/proftpd - - install -d ${D}${sysconfdir}/default - install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/proftpd - - # create the pub directory - mkdir -p ${D}/home/${FTPUSER}/pub/ - chown -R ${FTPUSER}:${FTPGROUP} ${D}/home/${FTPUSER}/pub - if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then - # install proftpd pam configuration - install -d ${D}${sysconfdir}/pam.d - install -m 644 ${S}/contrib/dist/rpm/ftp.pamd ${D}${sysconfdir}/pam.d/proftpd - sed -i '/ftpusers/d' ${D}${sysconfdir}/pam.d/proftpd - # specify the user Authentication config - sed -i '/^MaxInstances/a\AuthPAM on\nAuthPAMConfig proftpd' \ - ${D}${sysconfdir}/proftpd.conf - fi - - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/proftpd.service ${D}/${systemd_unitdir}/system - sed -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@SBINDIR@,${sbindir},g' \ - -i ${D}${systemd_unitdir}/system/*.service - - sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \ - -e 's|${STAGING_DIR_NATIVE}||g' \ - -e 's|-ffile-prefix-map=[^ ]*||g' \ - -e 's|-fdebug-prefix-map=[^ ]*||g' \ - -e 's|-fmacro-prefix-map=[^ ]*||g' \ - -i ${D}/${bindir}/prxs - - # ftpmail perl script, which reads the proftpd log file and sends - # automatic email notifications once an upload finishs, - # depends on an old perl Mail::Sendmail - # The Mail::Sendmail has not been maintained for almost 10 years - # Other distribution not ship with ftpmail, so do the same to - # avoid confusion about having it fails to run - rm -rf ${D}${bindir}/ftpmail - rm -rf ${D}${mandir}/man1/ftpmail.1 -} - -INITSCRIPT_NAME = "proftpd" -INITSCRIPT_PARAM = "defaults 85 15" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "proftpd.service" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "--system ${FTPGROUP}" -USERADD_PARAM:${PN} = "--system -g ${FTPGROUP} --home-dir /var/lib/${FTPUSER} --no-create-home \ - --shell /bin/false ${FTPUSER}" - -MULTILIB_SCRIPTS = "${PN}:${bindir}/prxs" - -FILES:${PN} += "/home/${FTPUSER}" - -RDEPENDS:${PN} += "perl" diff --git a/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb new file mode 100644 index 0000000000..686f1e5cdf --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb @@ -0,0 +1,145 @@ +SUMMARY = "Secure and configurable FTP server" +SECTION = "net" +HOMEPAGE = "http://www.proftpd.org" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184" + +SRCREV = "75aa739805a6e05eeb31189934a3d324e7862962" +BRANCH = "1.3.7" + +SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https \ + file://basic.conf.patch \ + file://proftpd-basic.init \ + file://default \ + file://close-RequireValidShell-check.patch \ + file://contrib.patch \ + file://build_fixup.patch \ + file://proftpd.service \ + " + +S = "${WORKDIR}/git" + +inherit autotools-brokensep useradd update-rc.d systemd multilib_script + +PACKAGECONFIG ??= "shadow \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ + static \ + " + +PACKAGECONFIG[curses] = "--enable-curses --enable-ncurses, --disable-curses --disable-ncurses, ncurses" +PACKAGECONFIG[openssl] = "--enable-openssl, --disable-openssl, openssl, openssl" +PACKAGECONFIG[pam] = "--enable-auth-pam, --disable-auth-pam, libpam, libpam" +PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6" +PACKAGECONFIG[shadow] = "--enable-shadow, --disable-shadow" +PACKAGECONFIG[pcre] = "--enable-pcre, --disable-pcre, libpcre " +PACKAGECONFIG[static] = "--enable-static=yes, --enable-static=no" + +# enable POSIX.1e capabilities +PACKAGECONFIG[cap] = "--enable-cap, --disable-cap, libcap, libcap" + +#enable support for POSIX ACLs +PACKAGECONFIG[acl] = "--enable-facl, --disable-facl" + +#enable proftpd controls via ftpdct +PACKAGECONFIG[ctrls] = "--enable-ctrls, --disable-crtls" + +#prevent proftpd from using its bundled getopt implementation. +PACKAGECONFIG[getopt] = "--with-getopt, --without-getopt" + +#do not strip debugging symbols from installed code +PACKAGECONFIG[strip] = "--enable-strip, --disable-strip" + +#enable SIA authentication support (Tru64) +PACKAGECONFIG[sia] = "--enable-sia, --disable-sia" +PACKAGECONFIG[sendfile] = "-enable-sendfile, --disable-sendfile" + +#enable Native Language Support (NLS) +PACKAGECONFIG[nls] = "--enable-nls, --disable-nls" + +#add mod_dso to core modules +PACKAGECONFIG[dso] = "--enable-dso, --disable-dso" +PACKAGECONFIG[largefile] = "--enable-largefile, --disable-largefile" + +#omit mod_auth_file from core modules +PACKAGECONFIG[auth] = "--enable-auth-file, --disable-auth-file" + +# proftpd uses libltdl which currently makes configuring using +# autotools.bbclass a pain... +do_configure () { + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + oe_runconf +} + +FTPUSER = "ftp" +FTPGROUP = "ftp" + +do_install () { + oe_runmake DESTDIR=${D} install + rmdir ${D}${libdir}/proftpd ${D}${datadir}/locale + [ -d ${D}${libexecdir} ] && rmdir ${D}${libexecdir} + sed -i '/ *User[ \t]*/s/ftp/${FTPUSER}/' ${D}${sysconfdir}/proftpd.conf + sed -i '/ *Group[ \t]*/s/ftp/${FTPGROUP}/' ${D}${sysconfdir}/proftpd.conf + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/proftpd-basic.init ${D}${sysconfdir}/init.d/proftpd + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/proftpd + sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/proftpd + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/proftpd + sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/proftpd + + install -d ${D}${sysconfdir}/default + install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/proftpd + + # create the pub directory + mkdir -p ${D}/home/${FTPUSER}/pub/ + chown -R ${FTPUSER}:${FTPGROUP} ${D}/home/${FTPUSER}/pub + if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then + # install proftpd pam configuration + install -d ${D}${sysconfdir}/pam.d + install -m 644 ${S}/contrib/dist/rpm/ftp.pamd ${D}${sysconfdir}/pam.d/proftpd + sed -i '/ftpusers/d' ${D}${sysconfdir}/pam.d/proftpd + # specify the user Authentication config + sed -i '/^MaxInstances/a\AuthPAM on\nAuthPAMConfig proftpd' \ + ${D}${sysconfdir}/proftpd.conf + fi + + install -d ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/proftpd.service ${D}/${systemd_unitdir}/system + sed -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + -i ${D}${systemd_unitdir}/system/*.service + + sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \ + -e 's|${STAGING_DIR_NATIVE}||g' \ + -e 's|-ffile-prefix-map=[^ ]*||g' \ + -e 's|-fdebug-prefix-map=[^ ]*||g' \ + -e 's|-fmacro-prefix-map=[^ ]*||g' \ + -i ${D}/${bindir}/prxs + + # ftpmail perl script, which reads the proftpd log file and sends + # automatic email notifications once an upload finishs, + # depends on an old perl Mail::Sendmail + # The Mail::Sendmail has not been maintained for almost 10 years + # Other distribution not ship with ftpmail, so do the same to + # avoid confusion about having it fails to run + rm -rf ${D}${bindir}/ftpmail + rm -rf ${D}${mandir}/man1/ftpmail.1 +} + +INITSCRIPT_NAME = "proftpd" +INITSCRIPT_PARAM = "defaults 85 15" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "proftpd.service" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM:${PN} = "--system ${FTPGROUP}" +USERADD_PARAM:${PN} = "--system -g ${FTPGROUP} --home-dir /var/lib/${FTPUSER} --no-create-home \ + --shell /bin/false ${FTPUSER}" + +MULTILIB_SCRIPTS = "${PN}:${bindir}/prxs" + +FILES:${PN} += "/home/${FTPUSER}" + +RDEPENDS:${PN} += "perl" diff --git a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.50.bb b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.50.bb index e29d0633ad..edc2af3a34 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.50.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.50.bb @@ -2,7 +2,7 @@ SUMMARY = "FTP Server with a strong focus on software security" DESCRIPTION = "Pure-FTPd is a free (BSD license), secure, production-quality and standard-conformant FTP server." HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd" SECTION = "net" -LICENSE = "BSD-0-Clause" +LICENSE = "0BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=a4496a14dea009df36c612707d455d02" DEPENDS = "libcap virtual/crypt" diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.15.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.15.bb index 5af00d6269..a1122a3cd4 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.15.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.15.bb @@ -7,7 +7,7 @@ enabled by default for simpler installation and high performance. \ " HOMEPAGE = "http://www.squid-cache.org" SECTION = "web" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" MIN_VER = "${@oe.utils.trim_version("${PV}", 2)}" diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb index 688add53f5..7c37fc1676 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb @@ -1,7 +1,7 @@ SUMMARY = "Virtual EtherDrive blade AoE target" SECTION = "admin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/aoetools/files/vblade/" diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb index 08238c1a3c..cce3e66adc 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb @@ -1,7 +1,7 @@ SUMMARY = "Very Secure FTP server" HOMEPAGE = "https://security.appspot.com/vsftpd.html" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271" DEPENDS = "libcap openssl" diff --git a/meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.4.0.bb b/meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.4.0.bb index 42f113d5f8..4299058315 100644 --- a/meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.4.0.bb +++ b/meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.4.0.bb @@ -4,7 +4,7 @@ DESCRIPTION = "This module provides access to the LDAP \ instead of C API. The module mainly acts as a wrapper for the \ OpenLDAP 2.x libraries. Errors will appear as exceptions." HOMEPAGE = "http://www.python-ldap.org/" -LICENSE = "PSF" +LICENSE = "PSF-2.0" LIC_FILES_CHKSUM = "file://LICENCE;md5=36ce9d726d0321b73c1521704d07db1b" DEPENDS = "python3 openldap cyrus-sasl" diff --git a/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb b/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb index d318c27c5a..0f66dfd784 100644 --- a/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb +++ b/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb @@ -9,7 +9,7 @@ well at a lot of other specific tasks that most other tools can't handle, like \ sending invalid frames, injecting your own 802.11 frames, combining technics \ (VLAN hopping+ARP cache poisoning, VOIP decoding on WEP encrypted channel, ...), etc." SECTION = "security" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb index b99c30cc9e..3e699d2ff6 100644 --- a/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb +++ b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "d59142e067cbd603aaf66151a04e9fa34330219680b8827c953d20821b UPSTREAM_CHECK_URI = "https://pagure.io/dlm/releases" UPSTREAM_CHECK_REGEX = "dlm-(?P\d+(\.\d+)+)" -LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" +LICENSE = "LGPL-2.0-or-later & GPL-2.0-only & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d" S = "${WORKDIR}/dlm-dlm-${PV}" diff --git a/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb index 28d740cb41..ad0a00e78a 100644 --- a/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb +++ b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.22.bb @@ -5,7 +5,7 @@ SUMMARY = "Kronosnet, often referred to as knet, is a network abstraction layer designed for High Availability use cases, where redundancy, security, \ fault tolerance and fast fail-over are the core requirements of your application." HOMEPAGE = "https://kronosnet.org/" -LICENSE = "GPL-2.0+ & LGPL-2.1" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa882bbe \ file://COPYING.libraries;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "libs" diff --git a/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb b/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb index 8b78433d73..bba11a8c64 100644 --- a/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb +++ b/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb @@ -1,7 +1,7 @@ SUMMARY = "IPTables based firewall scripts" HOMEPAGE = "http://rocky.eld.leidenuniv.nl/joomla/index.php?option=com_content&view=article&id=45&Itemid=63" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://gpl_license.txt;md5=11c7b65c4a4acb9d5175f7e9bf99c403" SRCREV = "a96b81da4a9b619e4045805f5f13a1e982c95663" diff --git a/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb b/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb index 0e009da029..de6a72e78a 100644 --- a/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb +++ b/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb @@ -1,6 +1,6 @@ SUMMARY = "Connection tracking userspace tools for Linux" SECTION = "net" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libnetfilter-conntrack libnetfilter-cttimeout \ diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb index fd837629b5..d522b514f6 100644 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb +++ b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb @@ -2,7 +2,7 @@ SUMMARY = "Filtering tool for a Linux-based bridging firewall" HOMEPAGE = "http://sourceforge.net/projects/ebtables/" DESCRIPTION = "Utility for basic Ethernet frame filtering on a Linux bridge, \ advanced logging, MAC DNAT/SNAT and brouting." -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e" SECTION = "net" diff --git a/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.15.bb b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.15.bb index 7af7dea7a1..0e928a30f8 100644 --- a/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.15.bb +++ b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.15.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Administration tool for IP sets" HOMEPAGE = "http://ipset.netfilter.org" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SECTION = "base" diff --git a/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb index 974035ccc7..d92c676fa9 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb +++ b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb @@ -2,7 +2,7 @@ SUMMARY = "libnetfilter_acct accounting infrastructure." DESCRIPTION = "libnetfilter_acct is the userspace library providing interface to extended accounting infrastructure." HOMEPAGE = "http://netfilter.org/projects/libnetfilter_acct/index.html" SECTION = "libs" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libnfnetlink libmnl" diff --git a/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.8.bb b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.8.bb index cd89433938..180f076039 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.8.bb +++ b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.8.bb @@ -2,7 +2,7 @@ SUMMARY = "Netfilter connection tracking library" DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter connection tracking state table" HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_conntrack/index.html" SECTION = "libs" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libmnl" diff --git a/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb index 92cb23d6e9..fea520d439 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb +++ b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Netfilter connection tracking helper library" DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter user-space helper infrastructure" HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_cthelper/index.html" SECTION = "libs" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libmnl" diff --git a/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb index ff32f3409d..dc87d9b123 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb +++ b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Netfilter connection tracking timeout library" DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter fine-grain connection tracking timeout infrastructure" SECTION = "libs" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libmnl" diff --git a/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.2.bb b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.2.bb index 03c0af59ac..699b096ae8 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.2.bb +++ b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Netfilter logging library" DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter log message (NFLOG)" HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_log/index.html" SECTION = "libs" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libmnl" SRCREV = "b0e4be94c0b8f68d4e912402b93a130063c34e17" diff --git a/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb index f806b0747e..580c29e1ae 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb +++ b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb @@ -2,7 +2,7 @@ SUMMARY = "Netfilter packet queue access library" DESCRIPTION = "Userspace library providing a programming interface (API) to access the Linux kernel netfilter packet queue" HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_queue/index.html" SECTION = "libs" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libmnl" diff --git a/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb b/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb index f7951ff8dd..64271c74d3 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb +++ b/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb @@ -6,7 +6,7 @@ nfnetlink_queue, nfnetlink_conntrack) and their respective users and/or \ management tools in userspace." HOMEPAGE = "http://www.netfilter.org/projects/libnfnetlink/index.html" SECTION = "libs" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.1.bb b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.1.bb index ec4619e7b9..44479638f1 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.1.bb +++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.1.bb @@ -1,5 +1,5 @@ SUMMARY = "Library for low-level interaction with nftables Netlink's API over libmnl" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26" SECTION = "libs" DEPENDS = "libmnl" diff --git a/meta-openembedded/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb b/meta-openembedded/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb index 3245455271..20a84121ee 100644 --- a/meta-openembedded/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb +++ b/meta-openembedded/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb @@ -1,6 +1,6 @@ SUMMARY = "nfacct is the command line tool to create/retrieve/delete accounting objects" HOMEPAGE = "http://netfilter.org/projects/nfacct/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" UPSTREAM_CHECK_URI = "ftp://ftp.netfilter.org/pub/nfacct/" diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch new file mode 100644 index 0000000000..65ab2dfd8c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch @@ -0,0 +1,39 @@ +From 18a08fb7f0443f8bde83393bd6f69e23a04246b3 Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Tue, 22 Feb 2022 00:56:36 +0100 +Subject: [PATCH] examples: compile with `make check' and add AM_CPPFLAGS + +Compile examples via `make check' like libnftnl does. Use AM_CPPFLAGS to +specify local headers via -I. + +Unfortunately, `make distcheck' did not catch this compile time error in +my system, since it was using the nftables/libnftables.h file of the +previous nftables release. + +Fixes: 5b364657a35f ("build: missing SUBIRS update") +Fixes: caf2a6ad2d22 ("examples: add libnftables example program") +Signed-off-by: Pablo Neira Ayuso + +Upstream-Status: Backport +[http://git.netfilter.org/nftables/commit/?id=18a08fb7f0443f8bde83393bd6f69e23a04246b3] + +Signed-off-by: Yi Zhao +--- + examples/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index c972170d..3b8b0b67 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,4 +1,6 @@ +-noinst_PROGRAMS = nft-buffer \ ++check_PROGRAMS = nft-buffer \ + nft-json-file + ++AM_CPPFLAGS = -I$(top_srcdir)/include ++ + LDADD = $(top_builddir)/src/libnftables.la +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.1.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.1.bb deleted file mode 100644 index 91df1547d9..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Netfilter Tables userspace utillites" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79" - -DEPENDS = "libmnl libnftnl bison-native \ - ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" - -# Ensure we reject the 0.099 version by matching at least two dots -UPSTREAM_CHECK_REGEX = "nftables-(?P\d+(\.\d+){2,}).tar.bz2" - -SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" -SRC_URI[sha256sum] = "3ceeba625818e81a0be293e9dd486c3ef799ebd92165270f1e57e9a201efa423" - -inherit autotools manpages pkgconfig - -PACKAGECONFIG ??= "python readline json" -PACKAGECONFIG[json] = "--with-json, --without-json, jansson" -PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" -PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" -PACKAGECONFIG[python] = "--enable-python --with-python-bin=${PYTHON}, --with-python-bin="", python3" -PACKAGECONFIG[readline] = "--with-cli=readline, --without-cli, readline" -PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} - -RRECOMMENDS:${PN} += "kernel-module-nf-tables" - -PACKAGES =+ "${PN}-python" -FILES:${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" -RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb new file mode 100644 index 0000000000..fd8e26ed1a --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb @@ -0,0 +1,34 @@ +SUMMARY = "Netfilter Tables userspace utillites" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d1a78fdd879a263a5e0b42d1fc565e79" + +DEPENDS = "libmnl libnftnl bison-native \ + ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" + +# Ensure we reject the 0.099 version by matching at least two dots +UPSTREAM_CHECK_REGEX = "nftables-(?P\d+(\.\d+){2,}).tar.bz2" + +SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \ + file://0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch \ + " + +SRC_URI[sha256sum] = "0b28a36ffcf4567b841de7bd3f37918b1fed27859eb48bdec51e1f7a83954c02" + +inherit autotools manpages pkgconfig + +PACKAGECONFIG ??= "python readline json" +PACKAGECONFIG[json] = "--with-json, --without-json, jansson" +PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" +PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" +PACKAGECONFIG[python] = "--enable-python --with-python-bin=${PYTHON}, --with-python-bin="", python3" +PACKAGECONFIG[readline] = "--with-cli=readline, --without-cli, readline" +PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} + +RRECOMMENDS:${PN} += "kernel-module-nf-tables" + +PACKAGES =+ "${PN}-python" +FILES:${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" +RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" diff --git a/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.4.1.bb b/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.4.1.bb new file mode 100644 index 0000000000..64cd1079bd --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.4.1.bb @@ -0,0 +1,36 @@ +SUMMARY = "Full-featured IRC plugin: multi-servers, proxy support, IPv6, SASL authentication, nicklist, DCC, and many other features" +HOMEPAE = "https://weechat.org/" +SECTION = "net" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +DEPENDS = "openssl zlib icu libgcrypt gnutls curl aspell" + +SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz \ + file://0001-use-pkg-config-for-gcrypt-instead.patch \ + " + +SRC_URI[sha256sum] = "7e088109ad5dfbcb08a9a6b1dd70ea8236093fed8a13ee9d9c98881d7b1aeae7" + +inherit cmake pkgconfig + +PACKAGECONFIG ??= " ncurses python" +PACKAGECONFIG[ncurses] = "-DENABLE_NCURSES=ON,-DENABLE_NCURSES=OFF,ncurses" +PACKAGECONFIG[python] = "-DENABLE_PYTHON=ON,-DENABLE_PYTHON=OFF,python3,python3" + +EXTRA_OECMAKE:append = " -DENABLE_PHP=OFF -DENABLE_TCL=OFF -DENABLE_LUA=OFF \ + -DENABLE_JAVASCRIPT=OFF -DENABLE_RUBY=OFF \ + -DENABLE_GUILE=OFF -DENABLE_PERL=OFF -DENABLE_ASPELL=ON \ + -DLIBDIR=${libdir}" + +do_configure:prepend(){ + # Make sure we get dependencies from recipe-sysroot + sed -i -e 's# /usr/bin# ${RECIPE_SYSROOT}/${bindir}/#g' ${S}/cmake/FindPerl.cmake + sed -i -e 's# /usr/local/bin##g' ${S}/cmake/FindPerl.cmake + sed -i -e 's# /usr/pkg/bin##g' ${S}/cmake/FindPerl.cmake +} + +do_install:append(){ + rm -rf ${D}/${datadir} +} + diff --git a/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.4.bb b/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.4.bb deleted file mode 100644 index ca404ebc87..0000000000 --- a/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.4.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Full-featured IRC plugin: multi-servers, proxy support, IPv6, SASL authentication, nicklist, DCC, and many other features" -HOMEPAE = "https://weechat.org/" -SECTION = "net" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" - -DEPENDS = "openssl zlib icu libgcrypt gnutls curl aspell" - -SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz \ - file://0001-use-pkg-config-for-gcrypt-instead.patch \ - " - -SRC_URI[sha256sum] = "7cd3dcc7029e888de49e13ebbcc3749586ff59c9d97f89f5eeb611067c7bb94c" - -inherit cmake pkgconfig - -PACKAGECONFIG ??= " ncurses python" -PACKAGECONFIG[ncurses] = "-DENABLE_NCURSES=ON,-DENABLE_NCURSES=OFF,ncurses" -PACKAGECONFIG[python] = "-DENABLE_PYTHON=ON,-DENABLE_PYTHON=OFF,python3,python3" - -EXTRA_OECMAKE:append = " -DENABLE_PHP=OFF -DENABLE_TCL=OFF -DENABLE_LUA=OFF -DENABLE_JAVASCRIPT=OFF -DENABLE_RUBY=OFF -DENABLE_GUILE=OFF -DENABLE_PERL=OFF -DENABLE_ASPELL=ON" - -do_configure:prepend(){ - # Make sure we get dependencies from recipe-sysroot - sed -i -e 's# /usr/bin# ${RECIPE_SYSROOT}/${bindir}/#g' ${S}/cmake/FindPerl.cmake - sed -i -e 's# /usr/local/bin##g' ${S}/cmake/FindPerl.cmake - sed -i -e 's# /usr/pkg/bin##g' ${S}/cmake/FindPerl.cmake -} - -do_install:append(){ - rm -rf ${D}/${datadir} -} - diff --git a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb index 724ef0c0d2..1517384eca 100644 --- a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb +++ b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb @@ -1,6 +1,6 @@ SUMMARY = "ZNC, an advanced IRC bouncer" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS = "openssl zlib icu" diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc index a3a7867c23..6fac24e3bd 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc @@ -6,7 +6,7 @@ TLS-based solutions like OpenVPN, while being more secure, more performant, \ and easier to use." SECTION = "networking" HOMEPAGE = "https://www.wireguard.io/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb index b0c5bbdac0..5f887b8868 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb @@ -40,6 +40,7 @@ EXTRA_OEMAKE = "INSTALL_PREFIX=${D} OTHERLDFLAGS='${LDFLAGS}' HOST_CPPFLAGS='${B PARALLEL_MAKE = "" CCACHE = "" +CLEANBROKEN = "1" TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-openembedded/meta-networking/recipes-protocols/nopoll/nopoll_0.4.6.b400.bb b/meta-openembedded/meta-networking/recipes-protocols/nopoll/nopoll_0.4.6.b400.bb index 8c57d29492..816e513a15 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/nopoll/nopoll_0.4.6.b400.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/nopoll/nopoll_0.4.6.b400.bb @@ -7,7 +7,7 @@ noPoll provides support for WebSocket (ws://) and TLS (secure) WebSocket (wss:// allowing message based (handler notified) programming or stream oriented access." HOMEPAGE = "http://www.aspl.es/nopoll/" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f0504124678c1b3158146e0630229298 \ " DEPENDS = "openssl" diff --git a/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc index 7968a44382..15eb65ad32 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc +++ b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc @@ -7,7 +7,7 @@ control and forwarding planes of a software-defined networking architecture.\ HOMEPAGE = "http://www.openflow.org" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=e870c934e2c3d6ccf085fd7cf0a1e2e2" diff --git a/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index 6ce15a282b..15cebf40f1 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -9,7 +9,7 @@ HOMEPAGE = "http://www.openl2tp.org/" SECTION = "net" # cli and usl use license LGPL-2.1 -LICENSE = "GPL-2.0 & LGPL-2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=e9d9259cbbf00945adc25a470c1d3585 \ file://LICENSE;md5=f8970abd5ea9be701a0deedf5afd77a5 \ file://cli/LICENSE;md5=9c1387a3c5213aa40671438af3e00793 \ diff --git a/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb b/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb index abfa713dc8..acde9c3659 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb @@ -2,7 +2,7 @@ SUMMARY = "Open-LLDP" DESCRIPTION = "Link Layer Discovery Protocol for Linux that includes support for DCBX" HOMEPAGE = "http://open-lldp.org/start" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8c2bc283e65df398ced5f5b747e78162" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb b/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb index 71046ce24c..0d26c338b9 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb @@ -6,7 +6,7 @@ DESCRIPTION = "PPTP Client is a Linux, FreeBSD, NetBSD \ cable and ADSL internet service providers." HOMEPAGE = "http://pptpclient.sourceforge.net" SECTION = "net" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit perlnative diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc index b3574a7ff6..d368311d13 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc @@ -9,7 +9,7 @@ HOMEPAGE = "http://www.nongnu.org/quagga/" SECTION = "net" -LICENSE = "GPL-2.0 & LGPL-2.0" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d \ file://COPYING.LIB;md5=01ef24401ded36cd8e5d18bfe947240c" diff --git a/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb index 363eeeb56e..846abca032 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb @@ -1,7 +1,7 @@ SUMMARY = "A user-mode PPPoE client and server suite for Linux" HOMEPAGE = "http://www.roaringpenguin.com/products/pppoe" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581" PR = "r10" diff --git a/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb b/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb index 09699f3329..8099fa5c6e 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb @@ -6,7 +6,7 @@ make to establish network connections and negotating them through a \ SOCKS server as necessary." HOMEPAGE = "http://sourceforge.net/projects/tsocks/" SECTION = "net" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" SRC_URI = "http://downloads.sourceforge.net/tsocks/tsocks-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb index d96a28eac9..08bab4a338 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.16.bb @@ -5,7 +5,7 @@ DEPENDS = "ppp virtual/kernel" PACKAGE_ARCH = "${MACHINE_ARCH}" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/xelerance/xl2tpd.git;branch=master;protocol=https" diff --git a/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb b/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb index 753d832982..4f8d4f6c6e 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb @@ -9,7 +9,7 @@ Addresses are assigned randomly by each host and, in case of collision, \ both hosts (are supposed to) renumber." AUTHOR = "Anand Kumria " HOMEPAGE = "http://www.progsoc.org/~wildfire/zeroconf/" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4 \ file://zeroconf.c;beginline=1;endline=13;md5=a5bada96e1e34b08eb7446b28e2630b2" SECTION = "net" diff --git a/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb b/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb index 676d2e567f..9c9e5ca7ad 100644 --- a/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb +++ b/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb @@ -6,7 +6,7 @@ The vblade program (storage target) exports a blockdevice using AoE. \ " HOMEPAGE = "http://sourceforge.net/projects/${BPN}" SECTION = "admin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" RRECOMMENDS:${PN} = "kernel-module-aoe" diff --git a/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb index a4eaa9ff34..898b69682d 100644 --- a/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Administration tool for arp packet filtering" SECTION = "net" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a" PV = "0.0.5+git${SRCPV}" diff --git a/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb b/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb index 85a7e59d57..cf0fc1c33d 100644 --- a/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Tools for ethernet bridging" HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37" diff --git a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.2.bb b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.2.bb index 609aaab880..57dd635dc3 100644 --- a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.2.bb @@ -27,7 +27,7 @@ the client program only." HOMEPAGE = "https://chrony.tuxfamily.org/" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.14.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.14.bb index 7821a120eb..d4cdda0f81 100644 --- a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.14.bb +++ b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A a package of utilities for doing and managing mounts of the Linux CIFS filesystem." HOMEPAGE = "http://wiki.samba.org/index.php/LinuxCIFS_utils" SECTION = "otherosfs" -LICENSE = "GPLv3 & LGPLv3" +LICENSE = "GPL-3.0-only & LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRCREV = "8c06dce7d596e478c20bc54bdcec87ad97f80a1b" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index cd51c07dc1..136c65d8fd 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc @@ -2,7 +2,7 @@ SUMMARY = "Lightweight, easy to configure DNS forwarder and DHCP server" HOMEPAGE = "http://www.thekelleys.org.uk/dnsmasq/doc.html" SECTION = "net" # GPLv3 was added in version 2.41 as license option -LICENSE = "GPLv2 | GPLv3" +LICENSE = "GPL-2.0-only | GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504" diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb index 1017f16add..d8c483191f 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb @@ -2,7 +2,7 @@ SUMMARY = "Dovecot is an open source IMAP and POP3 email server" HOMEPAGE = "https://www.dovecot.org/" DESCRIPTION = "Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like systems, written with security primarily in mind. Dovecot is an excellent choice for both small and large installations. It's fast, simple to set up, requires no special administration and it uses very little memory." SECTION = "mail" -LICENSE = "LGPLv2.1 & MIT" +LICENSE = "LGPL-2.1-only & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=2956560272e5b31d9d64f03111732048" SRC_URI = "http://dovecot.org/releases/2.3/dovecot-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb index 4cfb0c8047..a246464b29 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb @@ -5,7 +5,7 @@ Think of it as networked raid 1. It is a building block for\ setting up high availability (HA) clusters." HOMEPAGE = "http://www.drbd.org/" SECTION = "admin" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=${PV};protocol=https \ diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb index 05d42c75ef..0766f7f4bd 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.24-1.bb @@ -4,7 +4,7 @@ DESCRIPTION = "DRBD is a block device which is designed to build high \ block device via (a dedicated) network. You could see \ it as a network raid-1." HOMEPAGE = "http://oss.linbit.com/drbd/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" DEPENDS = "virtual/kernel" diff --git a/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp/0001-Fix-libESMTP-dependency-check.patch b/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp/0001-Fix-libESMTP-dependency-check.patch new file mode 100644 index 0000000000..92ac4b12ba --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp/0001-Fix-libESMTP-dependency-check.patch @@ -0,0 +1,44 @@ +From 63dbf8a9f04b34474021e8f0bf239b7446f10a7f Mon Sep 17 00:00:00 2001 +From: Jiaqing Zhao +Date: Thu, 3 Mar 2022 09:01:23 +0000 +Subject: [PATCH] Fix libESMTP dependency check + +Since libesmtp-1.1.0, libesmtp-config is removed, use pkg-config to +check for existence instead. + +Signed-off-by: Jiaqing Zhao +--- + configure.ac | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 64b19b4..83346a8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,6 +11,8 @@ AC_PROG_CC + + AC_HEADER_STDC + ++PKG_PROG_PKG_CONFIG ++ + dnl getopt needs this + AC_C_CONST + +@@ -30,11 +32,11 @@ then + AC_CHECK_HEADER(libesmtp.h, ,[AC_MSG_ERROR([libesmtp.h not found in $with_libesmtp])]) + fi + AC_MSG_CHECKING(for libESMTP) +-if libesmtp-config --version > /dev/null 2>&1 ++if $PKG_CONFIG --exists 'libesmtp-1.0' + then + AC_MSG_RESULT(yes) +- CFLAGS="$CFLAGS `libesmtp-config --cflags`" +- LIBS="$LIBS `libesmtp-config --libs`" ++ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags 'libesmtp-1.0'`" ++ LIBS="$LIBS `$PKG_CONFIG --libs 'libesmtp-1.0'`" + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(libESMTP library not found) +-- +2.32.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb b/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb index 110399a360..e60e1edd1f 100644 --- a/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb @@ -8,15 +8,17 @@ SECTION = "net" DEPENDS = "libesmtp" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \ + file://0001-Fix-libESMTP-dependency-check.patch \ + " # Have to set this or we get -L/lib in LDFLAGS EXTRA_OECONF = "--with-libesmtp=${STAGING_EXECPREFIXDIR}" -inherit autotools update-alternatives +inherit autotools update-alternatives pkgconfig ALTERNATIVE:${PN} = "sendmail mailq newaliases" # /usr/lib/sendmial is required by LSB core test diff --git a/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb b/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb index 6035ddfccd..99fcacd3ef 100644 --- a/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb @@ -1,6 +1,6 @@ SUMMARY = "A suite for man in the middle attacks" HOMEPAGE = "https://github.com/Ettercap/ettercap" -LICENSE = "GPL-2.0+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit cmake diff --git a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.23.bb b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.23.bb index 9599837644..e4ad0a39e1 100644 --- a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.23.bb +++ b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.23.bb @@ -5,7 +5,7 @@ and forwarding utility intended to be used over on-demand TCP/IP links (such as connections). It supports every remote-mail protocol now in use on the Internet: POP2, POP3, \ RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC." SECTION = "mail" -LICENSE = "GPLv2 & MIT" +LICENSE = "GPL-2.0-only & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c3a05d9b9d3784c824c9b92a648e1353" DEPENDS = "openssl" diff --git a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb index 2dfd8d5d4b..a35ec06795 100644 --- a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb @@ -1,6 +1,6 @@ SUMMARY = "fwknop - Single Packet Authorization" HOMEPAGE = "http://www.cipherdyne.org/fwknop/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ " inherit autotools-brokensep diff --git a/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb b/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb index 92051a8e70..d8288f9b49 100644 --- a/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb +++ b/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb @@ -6,7 +6,7 @@ SUMMARY = "GeoIP perl API library to access location database" DESCRIPTION = "perl library for country/city/organization to IP address or hostname mapping" HOMEPAGE = "http://www.maxmind.com/app/ip-location" SECTION = "libdevel" -LICENSE = "Artistic-1.0 | GPL-1.0+" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=e4f3ea6e9b28af88dc0321190a1f8250" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.12.bb b/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.12.bb index 8fe4fcbd24..429cd69d6d 100644 --- a/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.12.bb +++ b/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.12.bb @@ -31,7 +31,7 @@ SRC_URI[GeoLiteCity-dat.sha256sum] = "90db2e52195e3d1bcdb2c2789209006d09de5c7428 SRC_URI[GeoLiteCityv6-dat.md5sum] = "6734ccdc644fc0ba76eb276dce73d005" SRC_URI[GeoLiteCityv6-dat.sha256sum] = "c95a9d2643b7f53d7abeed2114388870e13fbbad4653f450a49efa7e4b86aca4" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad \ file://LICENSE;md5=0388276749a542b0d611601fa7c1dcc8 " diff --git a/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb b/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb index 9494bd36ca..9a0292eacc 100644 --- a/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb @@ -13,7 +13,7 @@ SRC_URI = "https://github.com/maxmind/geoipupdate/releases/download/v2.5.0/geoip SRC_URI[md5sum] = "28f633c49ec87ab01ad3c0fb0228a696" SRC_URI[sha256sum] = "5119fd0e338cd083e886228b26679c64bcbaade8a815be092aecf865a610ab26" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "\ file://ChangeLog.md;md5=11d2e31df0de2be3ccc3e2286c4dafcb \ diff --git a/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.2.bb b/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.2.bb index d9d726861a..156ea3c59b 100644 --- a/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/htpdate/htpdate_1.2.2.bb @@ -15,7 +15,7 @@ DESCRIPTION = "The HTTP Time Protocol (HTP) is used to synchronize a computer's HOMEPAGE = "http://www.vervest.org/htp/" -LICENSE = "GPL-2.0+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://htpdate.c;beginline=26;endline=30;md5=d7018a4d2c5a6eab392709a05e5e168a" SRC_URI = "http://www.vervest.org/htp/archive/c/htpdate-${PV}.tar.xz \ diff --git a/meta-openembedded/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb b/meta-openembedded/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb index 122dfc0001..d4f76850d3 100644 --- a/meta-openembedded/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb @@ -17,6 +17,8 @@ SRCREV = "2343fd6b5214b2ded2cdcf76de2bf60903bb90cd" S = "${WORKDIR}/git" +EXTRA_OEMAKE = "PLATFORM=linux" + do_configure[noexec] = "1" do_compile() { @@ -24,7 +26,7 @@ do_compile() { } do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${prefix} + oe_runmake install DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} } BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.13.bb b/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.13.bb index a2eb81fd5b..663685a3aa 100644 --- a/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.13.bb +++ b/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.13.bb @@ -2,7 +2,7 @@ SUMMARY = "Configure network interfaces for parallel routing" HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bonding" SECTION = "net" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://debian/copyright;md5=acc89812938cf9ad6b1debc37cea0253" inherit manpages diff --git a/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric_0.3.bb b/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric_0.3.bb index 4ee7c42a35..1e57a48970 100644 --- a/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric_0.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/ifmetric/ifmetric_0.3.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Set routing metrics for a network interface" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "http://0pointer.de/lennart/projects/ifmetric/ifmetric-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb b/meta-openembedded/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb index c71ecb32e9..517d781281 100644 --- a/meta-openembedded/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb +++ b/meta-openembedded/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.ex-parrot.com/pdw/iftop/" SECTION = "net" DEPENDS = "libpcap ncurses" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=76498170798db0f4f0fb685a225f702f" SRC_URI = "http://www.ex-parrot.com/pdw/iftop/download/iftop-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc_0.2.3.bb b/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc_0.2.3.bb index 1e6db5b7e4..efac3c86eb 100644 --- a/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc_0.2.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc_0.2.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/nmav/ipcalc" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb index 8fb116f576..01bde4a68d 100644 --- a/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb +++ b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.31.bb @@ -11,7 +11,7 @@ methods (NAT, tunneling, and direct routing), and eight load balancing algorithm locality-based least-connection, locality-based least-connection with replication, \ destination-hashing, and source-hashing)." SECTION = "net" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://README;beginline=40;endline=56;md5=b4e40069f15598d0e3fe2aa177e5ec77" DEPENDS += "libnl popt" diff --git a/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/include-topdir.patch b/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/include-topdir.patch deleted file mode 100644 index 90c4ce75e1..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/include-topdir.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Nurp libesmtp-1.0.6.org/crammd5/Makefile.am libesmtp-1.0.6/crammd5/Makefile.am ---- libesmtp-1.0.6.org/crammd5/Makefile.am 2010-08-08 23:45:57.000000000 +0800 -+++ libesmtp-1.0.6/crammd5/Makefile.am 2014-11-17 11:17:21.663624295 +0800 -@@ -2,7 +2,7 @@ - - libdir = @plugindir@ - --INCLUDES = -I@srcdir@ -+INCLUDES = -I@srcdir@ -I@srcdir@/../ - AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-cram-md5.la -diff -Nurp libesmtp-1.0.6.org/login/Makefile.am libesmtp-1.0.6/login/Makefile.am ---- libesmtp-1.0.6.org/login/Makefile.am 2010-08-08 23:45:56.000000000 +0800 -+++ libesmtp-1.0.6/login/Makefile.am 2014-11-17 11:17:54.339623018 +0800 -@@ -2,7 +2,7 @@ - - libdir = @plugindir@ - --INCLUDES = -I@srcdir@ -+INCLUDES = -I@srcdir@ -I@srcdir@/../ - - lib_LTLIBRARIES = sasl-login.la - AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ -diff -Nurp libesmtp-1.0.6.org/ntlm/Makefile.am libesmtp-1.0.6/ntlm/Makefile.am ---- libesmtp-1.0.6.org/ntlm/Makefile.am 2010-08-08 23:45:56.000000000 +0800 -+++ libesmtp-1.0.6/ntlm/Makefile.am 2014-11-17 11:18:10.551622385 +0800 -@@ -2,7 +2,7 @@ - - libdir = @plugindir@ - --INCLUDES = -I@srcdir@ -+INCLUDES = -I@srcdir@ -I@srcdir@/../ - AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-ntlm.la -diff -Nurp libesmtp-1.0.6.org/plain/Makefile.am libesmtp-1.0.6/plain/Makefile.am ---- libesmtp-1.0.6.org/plain/Makefile.am 2010-08-08 23:45:54.000000000 +0800 -+++ libesmtp-1.0.6/plain/Makefile.am 2014-11-17 11:18:33.355621494 +0800 -@@ -2,7 +2,7 @@ - - libdir = @plugindir@ - --INCLUDES = -I@srcdir@ -+INCLUDES = -I@srcdir@ -I@srcdir@/../ - AM_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-plain.la diff --git a/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/snprintf.patch b/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/snprintf.patch deleted file mode 100644 index d0d203eadb..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/snprintf.patch +++ /dev/null @@ -1,19 +0,0 @@ -Use HAVE_WORKING_SNPRINTF to check for snprintf() - -Upstream-Status: Pending - -Signed-off-by: Khem Raj - -Index: libesmtp-1.0.6/missing.h -=================================================================== ---- libesmtp-1.0.6.orig/missing.h -+++ libesmtp-1.0.6/missing.h -@@ -43,7 +43,7 @@ int strncasecmp (const char *a, const ch - void *memrchr (const void *a, int c, size_t len); - #endif - --#ifndef HAVE_SNPRINTF -+#ifndef HAVE_WORKING_SNPRINTF - #include - int snprintf(char *s, size_t n, const char *format, ...); - #endif diff --git a/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb b/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb deleted file mode 100644 index ed2a5d9044..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "SMTP client library" -DESCRIPTION = "LibESMTP is a library to manage posting \ -(or submission of) electronic mail using SMTP to a \ -preconfigured Mail Transport Agent (MTA) such as Exim or PostFix." -HOMEPAGE = "http://www.stafford.uklinux.net/libesmtp/" -LICENSE = "LGPLv2+" -SECTION = "libs" - -DEPENDS = "openssl" - -SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2 \ - file://include-topdir.patch \ - file://snprintf.patch \ - " -SRC_URI[md5sum] = "bf3915e627fd8f35524a8fdfeed979c8" -SRC_URI[sha256sum] = "d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b" - -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" - -inherit autotools binconfig - -EXTRA_OECONF = " \ - --with-auth-plugin-dir=${libdir}/esmtp-plugins \ - --enable-pthreads \ - --enable-debug \ - --enable-etrn \ - --disable-isoc \ - --disable-more-warnings \ - --disable-static \ -" - -FILES:${PN} = "${libdir}/lib*${SOLIBS} \ - ${libdir}/esmtp-plugins/*${SOLIBSDEV}" - -FILES:${PN}-dev += "${libdir}/esmtp-plugins/*.la" -FILES:${PN}-static += "${libdir}/esmtp-plugins/*.a" -FILES:${PN}-dbg += "${libdir}/esmtp-plugins/.debug/" diff --git a/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb b/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb new file mode 100644 index 0000000000..231c57260e --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.1.0.bb @@ -0,0 +1,32 @@ +SUMMARY = "SMTP client library" +DESCRIPTION = "LibESMTP is a library to manage posting \ +(or submission of) electronic mail using SMTP to a \ +preconfigured Mail Transport Agent (MTA) such as Exim or PostFix." +HOMEPAGE = "https://libesmtp.github.io/" +LICENSE = "LGPL-2.0-or-later" +SECTION = "libs" + +DEPENDS = "openssl" + +SRC_URI = "git://github.com/libesmtp/libESMTP.git;branch=master;protocol=https" +SRCREV = "1d0af244310a66943ab400be56b15a9087f181eb" + +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742 \ + file://COPYING.GPL;md5=393a5ca445f6965873eca0259a17f833" + +inherit meson pkgconfig + +EXTRA_OEMESON = " \ + -Dpthreads=enabled \ + -Dtls=enabled \ + -Dxdg=false \ + -Dlwres=disabled \ + -Dbdat=true \ + -Detrn=true \ + -Dxusr=true \ +" + +FILES:${PN} = "${libdir}/lib*${SOLIBS} \ + ${libdir}/esmtp-plugins-6.2.0/*${SOLIBSDEV}" diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.2.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.2.bb index d26acea408..a9c6794bf5 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.2.bb @@ -1,7 +1,7 @@ SUMMARY = "Hierarchical, reference counted memory pool system with destructors" HOMEPAGE = "http://ldb.samba.org" SECTION = "libs" -LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" +LICENSE = "LGPL-3.0-or-later & LGPL-2.1-or-later & GPL-3.0-or-later" DEPENDS += "libtdb libtalloc libtevent popt" RDEPENDS:pyldb += "python3" diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.3.bb b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.3.bb index 9b207609fc..b3f8b2ce25 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.3.bb @@ -1,7 +1,7 @@ SUMMARY = "Hierarchical, reference counted memory pool system with destructors" HOMEPAGE = "http://talloc.samba.org" SECTION = "libs" -LICENSE = "LGPL-3.0+ & GPL-3.0+" +LICENSE = "LGPL-3.0-or-later & GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6d5228bfa7825249 \ file://pytalloc.h;beginline=1;endline=18;md5=21ab13bd853679d7d47a1739cb3b7db6 \ " diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb index e7f7384025..2affcf754e 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb @@ -1,7 +1,7 @@ SUMMARY = "The tdb library" HOMEPAGE = "http://tdb.samba.org/" SECTION = "libs" -LICENSE = "LGPL-3.0+ & GPL-3.0+" +LICENSE = "LGPL-3.0-or-later & GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \ file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb index 78c0920955..732880e96c 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb @@ -1,7 +1,7 @@ SUMMARY = "Hierarchical, reference counted memory pool system with destructors" HOMEPAGE = "http://tevent.samba.org" SECTION = "libs" -LICENSE = "LGPLv3+" +LICENSE = "LGPL-3.0-or-later" DEPENDS += "libtalloc libtirpc" RDEPENDS:python3-tevent = "python3" diff --git a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index 538fca7843..effd7502ff 100644 --- a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb @@ -1,7 +1,7 @@ SUMMARY = "Drivers and tools to support ATM networking under Linux" HOMEPAGE = "http://linux-atm.sourceforge.net/" SECTION = "libs" -LICENSE = "GPL-2.0 & LGPL-2.0" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" DEPENDS = "flex flex-native" diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb index 5455560362..4a9d2f54d9 100644 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb +++ b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb @@ -1,7 +1,7 @@ SUMMARY = "The Linux Kernel Stream Control Transmission Protocol (lksctp) project" HOMEPAGE = "http://lksctp.org" SECTION = "net" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = " \ file://COPYING.lib;md5=0a1b79af951c42a9c8573533fbba9a92 \ diff --git a/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index cc6053ba96..baaff1f219 100644 --- a/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Utilities for managing the Linux LoWPAN stack" DESCRIPTION = "This is a set of utils to manage the Linux LoWPAN stack. \ The LoWPAN stack aims for IEEE 802.15.4-2003 (and for lesser extent IEEE 802.15.4-2006) compatibility." SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "flex-native bison-native libnl python" diff --git a/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.7.0.bb b/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.7.0.bb index f2b7ce953a..f965c0db1b 100644 --- a/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.7.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.7.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Tool to view/change network interface MAC addresses" DESCRIPTION = "A GNU/Linux utility for viewing/manipulating the MAC address of network interfaces." HOMEPAGE = "https://github.com/alobbs/macchanger" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "net" diff --git a/meta-openembedded/meta-networking/recipes-support/mctp/mctp_git.bb b/meta-openembedded/meta-networking/recipes-support/mctp/mctp_git.bb index 350c2722be..602724da34 100644 --- a/meta-openembedded/meta-networking/recipes-support/mctp/mctp_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/mctp/mctp_git.bb @@ -1,7 +1,7 @@ SUMMARY = "Management Component Control Protocol utilities" HOMEPAGE = "http://www.github.com/CodeConstruct/mctp" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=4cc91856b08b094b4f406a29dc61db21" diff --git a/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.95.bb b/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.95.bb index b5e2fae506..92f9c4bfc0 100644 --- a/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.95.bb +++ b/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.95.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.bitwizard.nl/mtr/" SECTION = "net" DEPENDS = "ncurses" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://ui/mtr.c;beginline=5;endline=16;md5=00a894a39d53726a27386534d1c4e468" diff --git a/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.20.bb b/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.20.bb index 589ac879c6..7b7f5cbfa2 100644 --- a/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.20.bb +++ b/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.20.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Network Block Device" HOMEPAGE = "http://nbd.sourceforge.net" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "glib-2.0" diff --git a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb index 4e67f6c91b..94f36f904a 100644 --- a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb +++ b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb @@ -3,7 +3,7 @@ DESCRIPTION = "libowfat is a library of general purpose APIs extracted from Dan Bernstein's software (libdjb), reimplemented and covered by the GNU \ General Public License Version 2 (no later versions)." HOMEPAGE = "http://www.fefe.de/libowfat" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" SRC_URI = "https://www.fefe.de/${BPN}/${BP}.tar.xz \ diff --git a/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb index a2f0ccc069..516beede5f 100644 --- a/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb @@ -3,7 +3,7 @@ DESCRIPTION = "ncp is a utility for copying files in a LAN. It has absolutely no security or integrity checking, no throttling, no features, except \ one: you don't have to type the coordinates of your peer." HOMEPAGE = "http://www.fefe.de/ncp" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" DEPENDS = "libowfat" diff --git a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb index 69b774a8f8..f5467794e6 100644 --- a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package includes some useful diagnostics tools for \ IPv6 networks, including ndisc6, rdisc6, tcptraceroute6 and traceroute6." SECTION = "net" HOMEPAGE = "http://www.remlab.net/ndisc6/" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" PV = "1.0.5" diff --git a/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb b/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb index fc09554975..54a4ea0b33 100644 --- a/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb @@ -1,5 +1,5 @@ require netcat.inc -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PR = "r3" 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 3b6880a38d..f60bb9f104 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 @@ -2,7 +2,7 @@ SUMMARY = "netcf" DESCRIPTION = "netcf is a cross-platform network configuration library." HOMEPAGE = "https://pagure.io/netcf" SECTION = "libs" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fb919cc88dbe06ec0b0bd50e001ccf1f" diff --git a/meta-openembedded/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb b/meta-openembedded/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb index 10e30044e8..004330e1b4 100644 --- a/meta-openembedded/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Netsniff-ng is a fast zero-copy analyzer, pcap capturing and replaying tool" HOMEPAGE = "http://netsniff-ng.org" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=9dd40dfb621eed702c0775577fbb7011" DEPENDS = "libpcap" diff --git a/meta-openembedded/meta-networking/recipes-support/nis/nis.inc b/meta-openembedded/meta-networking/recipes-support/nis/nis.inc index 3ae0f7e95a..56b7ab0d69 100644 --- a/meta-openembedded/meta-networking/recipes-support/nis/nis.inc +++ b/meta-openembedded/meta-networking/recipes-support/nis/nis.inc @@ -6,7 +6,7 @@ DESCRIPTION = "NIS Server and Tools" HOMEPAGE = "http://www.linux-nis.org/nis/" SECTION = "net" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" inherit autotools gettext pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_4.2.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_4.2.bb index 352d2d2426..13c3398c2b 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_4.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_4.2.bb @@ -5,7 +5,7 @@ inspection. Based on OpenDPI it includes ntop extensions" SECTION = "libdevel" DEPENDS = "libpcap json-c" RDEPENDS:${PN} += " libpcap" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" SRCREV = "8b5c6af71b562549f8416b31803daae223e09f46" diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb index 1c74845cc9..dca929b574 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb @@ -8,7 +8,7 @@ SECTION = "console/network" DEPENDS = "curl libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq" RDEPENDS:${PN} = "bash redis" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRCREV = "d3ce78948e8d81dc1e2c5298ce556f9f2247aac1" diff --git a/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb b/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb index 677b031a9f..115b51e96c 100644 --- a/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb @@ -6,7 +6,7 @@ across an interconnecting network to a destination system, either transferring \ data for a specified time interval, or alternatively transferring a specified \ number of bytes." HOMEPAGE = "http://www.nuttcp.net/Welcome%20Page.html" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" SECTION = "net" LIC_FILES_CHKSUM = "file://${BP}.c;beginline=4;endline=30;md5=496a7c0bb83c07ff528d226bf85e05c5" diff --git a/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.101.bb b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.101.bb index b3d1bdcd0e..f2a084d635 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.101.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.101.bb @@ -7,7 +7,7 @@ Storage Name Service (iSNS). The distribution includes the iSNS server, \ supporting persisten storage of registrations, isnsadm, a command line \ utility for managing nodes, and isnsdd, a corresponding discovery daemon." HOMEPAGE = "http://github.com/gonzoleeman/open-isns/" -LICENSE = "GPLv2+ & LGPLv2+" +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785" SECTION = "net" diff --git a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb index e37e9eee74..a3e090fbd5 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.3.5.bb @@ -17,12 +17,12 @@ for better management of and seamless user interactions with guests.\ " SECTION = "vmware-tools" -LICENSE = "LGPL-2.0 & GPL-2.0 & BSD & CDDL-1.0" +LICENSE = "LGPL-2.0-only & GPL-2.0-only & BSD & CDDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=559317809c5444fb39ceaf6ac45c43ac" LICENSE:modules/freebsd/vmblock = "BSD" -LICENSE:modules/freebsd/vmmemctl = "GPL-2.0" -LICENSE:modules/freebsd/vmxnet = "GPL-2.0" -LICENSE:modules/linux = "GPL-2.0" +LICENSE:modules/freebsd/vmmemctl = "GPL-2.0-only" +LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only" +LICENSE:modules/linux = "GPL-2.0-only" LICENSE:modules/solaris = "CDDL-1.0" SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=master \ diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb index 99fa9ba770..c61303b81e 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.32.bb @@ -16,7 +16,7 @@ DEPENDS = " \ readline \ " -LICENSE = "GPLv2 & LGPLv2.1 & BSD-3-Clause" +LICENSE = "GPL-2.0-only & LGPL-2.1-only & BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.5.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.5.bb deleted file mode 100644 index 6c4514eb90..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.5.bb +++ /dev/null @@ -1,75 +0,0 @@ -SUMMARY = "A full-featured SSL VPN solution via tun device." -HOMEPAGE = "https://openvpn.net/" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=377a495e6f12b2a3adcee797e59540b8" -DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" - -inherit autotools systemd update-rc.d - -SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ - file://openvpn \ - file://openvpn@.service \ - file://openvpn-volatile.conf" - -UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" - -SRC_URI[sha256sum] = "7500df4734173bce2e95b5039079119dacaff121650b2b6ca76d2dc68bdac1c5" - -# CVE-2020-7224 and CVE-2020-27569 are for Aviatrix OpenVPN client, not for openvpn. -CVE_CHECK_IGNORE += "CVE-2020-7224 CVE-2020-27569" - -SYSTEMD_SERVICE:${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" -SYSTEMD_AUTO_ENABLE = "disable" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME:${PN} = "openvpn" -INITSCRIPT_PARAMS:${PN} = "start 10 2 3 4 5 . stop 70 0 1 6 ." - -CFLAGS += "-fno-inline" - -# I want openvpn to be able to read password from file (hrw) -EXTRA_OECONF += "--enable-iproute2" -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" - -# Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host. -EXTRA_OECONF += "IPROUTE=${base_sbindir}/ip" - -do_install:append() { - install -d ${D}/${sysconfdir}/init.d - install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d - - install -d ${D}/${sysconfdir}/openvpn - install -d ${D}/${sysconfdir}/openvpn/sample - install -m 755 ${S}/sample/sample-config-files/loopback-server ${D}${sysconfdir}/openvpn/sample/loopback-server.conf - install -m 755 ${S}/sample/sample-config-files/loopback-client ${D}${sysconfdir}/openvpn/sample/loopback-client.conf - install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys - install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system/openvpn@loopback-server.service - install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system/openvpn@loopback-client.service - - install -d ${D}/${localstatedir} - install -d ${D}/${localstatedir}/lib - install -d -m 710 ${D}/${localstatedir}/lib/openvpn - - install -d ${D}${sysconfdir}/tmpfiles.d - install -m 0644 ${WORKDIR}/openvpn-volatile.conf ${D}${sysconfdir}/tmpfiles.d/openvpn.conf - sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${sysconfdir}/tmpfiles.d/openvpn.conf - fi -} - -PACKAGES =+ " ${PN}-sample " - -RRECOMMENDS:${PN} = "kernel-module-tun" - -FILES:${PN}-dbg += "${libdir}/openvpn/plugins/.debug" -FILES:${PN} += "${systemd_unitdir}/system/openvpn@.service \ - ${sysconfdir}/tmpfiles.d \ - " -FILES:${PN}-sample += "${systemd_unitdir}/system/openvpn@loopback-server.service \ - ${systemd_unitdir}/system/openvpn@loopback-client.service \ - ${sysconfdir}/openvpn/sample/" diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.6.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.6.bb new file mode 100644 index 0000000000..218e72b7a8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.6.bb @@ -0,0 +1,75 @@ +SUMMARY = "A full-featured SSL VPN solution via tun device." +HOMEPAGE = "https://openvpn.net/" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b76abd82c14ee01cc34c4ff5e3627b89" +DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" + +inherit autotools systemd update-rc.d + +SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ + file://openvpn \ + file://openvpn@.service \ + file://openvpn-volatile.conf" + +UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" + +SRC_URI[sha256sum] = "333a7ef3d5b317968aca2c77bdc29aa7c6d6bb3316eb3f79743b59c53242ad3d" + +# CVE-2020-7224 and CVE-2020-27569 are for Aviatrix OpenVPN client, not for openvpn. +CVE_CHECK_IGNORE += "CVE-2020-7224 CVE-2020-27569" + +SYSTEMD_SERVICE:${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" +SYSTEMD_AUTO_ENABLE = "disable" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME:${PN} = "openvpn" +INITSCRIPT_PARAMS:${PN} = "start 10 2 3 4 5 . stop 70 0 1 6 ." + +CFLAGS += "-fno-inline" + +# I want openvpn to be able to read password from file (hrw) +EXTRA_OECONF += "--enable-iproute2" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" + +# Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host. +EXTRA_OECONF += "IPROUTE=${base_sbindir}/ip" + +do_install:append() { + install -d ${D}/${sysconfdir}/init.d + install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d + + install -d ${D}/${sysconfdir}/openvpn + install -d ${D}/${sysconfdir}/openvpn/sample + install -m 755 ${S}/sample/sample-config-files/loopback-server ${D}${sysconfdir}/openvpn/sample/loopback-server.conf + install -m 755 ${S}/sample/sample-config-files/loopback-client ${D}${sysconfdir}/openvpn/sample/loopback-client.conf + install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys + install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system + install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system/openvpn@loopback-server.service + install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system/openvpn@loopback-client.service + + install -d ${D}/${localstatedir} + install -d ${D}/${localstatedir}/lib + install -d -m 710 ${D}/${localstatedir}/lib/openvpn + + install -d ${D}${sysconfdir}/tmpfiles.d + install -m 0644 ${WORKDIR}/openvpn-volatile.conf ${D}${sysconfdir}/tmpfiles.d/openvpn.conf + sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${sysconfdir}/tmpfiles.d/openvpn.conf + fi +} + +PACKAGES =+ " ${PN}-sample " + +RRECOMMENDS:${PN} = "kernel-module-tun" + +FILES:${PN}-dbg += "${libdir}/openvpn/plugins/.debug" +FILES:${PN} += "${systemd_unitdir}/system/openvpn@.service \ + ${sysconfdir}/tmpfiles.d \ + " +FILES:${PN}-sample += "${systemd_unitdir}/system/openvpn@loopback-server.service \ + ${systemd_unitdir}/system/openvpn@loopback-client.service \ + ${sysconfdir}/openvpn/sample/" diff --git a/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb b/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb index 7fde88c447..c2c4335910 100644 --- a/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb +++ b/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb @@ -1,5 +1,5 @@ SUMMARY = "PHY interface tool for Linux" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" PV = "2+git${SRCPV}" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_39.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_39.0.bb index 48434aa584..5fb72c7acb 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_39.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_39.0.bb @@ -10,7 +10,7 @@ SRCREV = "b2fedc4b1b891afd2c26ebfd21f9e440e83c28ff" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md -LICENSE = "BSD-2-Clause | GPLv2" +LICENSE = "BSD-2-Clause | GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb b/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb index 90e7fec52d..9de4cc699a 100644 --- a/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb +++ b/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb @@ -2,7 +2,7 @@ SUMMARY = "RULI stands for Resolver User Layer Interface It's a library built on HOMEPAGE = "http://www.nongnu.org/ruli/" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS = "liboop" diff --git a/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.4.bb b/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.4.bb index 21a3c44264..649e6d4e8e 100644 --- a/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.5.4.bb @@ -2,7 +2,7 @@ SUMMARY = "Static Multicast Routing Daemon" DESCRIPTION = "SMCRoute is a daemon and command line tool to manipulate the multicast routing table in the UNIX kernel." HOMEPAGE = "http://troglobit.github.io/smcroute.html" SECTION = "net" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRCREV = "9b6e397595a154c84a329c55bed21e0c43e89ee6" diff --git a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb index c9f95b0125..d9083bcbe8 100644 --- a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb @@ -10,7 +10,7 @@ environment - not only on its computer-server machine, but also from \ anywhere on the Internet and using a wide variety of machine \ architectures." -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" PV = "0.14.2+git${SRCPV}" diff --git a/meta-openembedded/meta-networking/recipes-support/spice/usbredir_0.9.0.bb b/meta-openembedded/meta-networking/recipes-support/spice/usbredir_0.9.0.bb index 5245f95f5c..452491023e 100644 --- a/meta-openembedded/meta-networking/recipes-support/spice/usbredir_0.9.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/spice/usbredir_0.9.0.bb @@ -1,6 +1,6 @@ SUMMARY = "usbredir libraries and utilities" -LICENSE = "GPLv2+ & LGPLv2.1+" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=4b54a1fd55a448865a0b32d41598759d \ " diff --git a/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb b/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb index decac0c2b3..b0e921d423 100644 --- a/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb +++ b/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb @@ -1,6 +1,6 @@ SUMMARY = "extremely simple MTA to get mail off the system to a mail hub" HOMEPAGE = "http://packages.qa.debian.org/s/ssmtp.html" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e" SRC_URI = "${DEBIAN_MIRROR}/main/s/${BPN}/${BPN}_${PV}.orig.tar.bz2 \ diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb index 686cdb677e..babfe17d29 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.4.bb @@ -3,7 +3,7 @@ Linux operating system." SUMMARY = "strongSwan is an OpenSource IPsec implementation" HOMEPAGE = "http://www.strongswan.org" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "flex-native flex bison-native" DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', '', d)}" diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.59.bb b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.59.bb deleted file mode 100644 index 9321070bc8..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.59.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Program for providing universal TLS/SSL tunneling service" -DESCRIPTION = "SSL encryption wrapper between remote client and local (inetd-startable) or remote server." -HOMEPAGE = "https://www.stunnel.org/" -SECTION = "net" -# Note: Linking stunnel statically or dynamically with other modules is making -# a combined work based on stunnel. Thus, the terms and conditions of the GNU -# General Public License cover the whole combination. -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING.md;md5=223b26c62f5e7c5c8656d6c133edd5ec" - -DEPENDS = "autoconf-archive libnsl2 openssl" - -SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz \ - file://fix-openssl-no-des.patch \ -" - -SRC_URI[sha256sum] = "137776df6be8f1701f1cd590b7779932e123479fb91e5192171c16798815ce9f" - -inherit autotools - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} libwrap" - -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[libwrap] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" -PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" - -EXTRA_OECONF += "--with-ssl='${STAGING_EXECPREFIXDIR}' --disable-fips" - -# When cross compiling, configure defaults to nobody, but provides no option to change it. -EXTRA_OEMAKE += "DEFAULT_GROUP='nogroup'" - -# stunnel3 is a Perl wrapper to allow use of the legacy stunnel 3.x commandline -# syntax with stunnel >= 4.05 -PACKAGES =+ "stunnel3" -FILES:stunnel3 = "${bindir}/stunnel3" -RDEPENDS:stunnel3 += "${PN} perl" diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.63.bb b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.63.bb new file mode 100644 index 0000000000..325737e8c9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.63.bb @@ -0,0 +1,33 @@ +SUMMARY = "Program for providing universal TLS/SSL tunneling service" +DESCRIPTION = "SSL encryption wrapper between remote client and local (inetd-startable) or remote server." +HOMEPAGE = "https://www.stunnel.org/" +SECTION = "net" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING.md;md5=d8a2866ad5ebf3a2d2ce27279472875a" + +DEPENDS = "autoconf-archive libnsl2 openssl" + +SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \ + file://fix-openssl-no-des.patch \ +" + +SRC_URI[sha256sum] = "c74c4e15144a3ae34b8b890bb31c909207301490bd1e51bfaaa5ffeb0a994617" + +inherit autotools bash-completion pkgconfig + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} libwrap" + +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[libwrap] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" + +EXTRA_OECONF += "--with-ssl='${STAGING_EXECPREFIXDIR}' --disable-fips" + +# When cross compiling, configure defaults to nobody, but provides no option to change it. +EXTRA_OEMAKE += "DEFAULT_GROUP='nogroup'" + +# stunnel3 is a Perl wrapper to allow use of the legacy stunnel 3.x commandline +# syntax with stunnel >= 4.05 +PACKAGES =+ "stunnel3" +FILES:stunnel3 = "${bindir}/stunnel3" +RDEPENDS:stunnel3 += "${PN} perl" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.1.bb b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.1.bb index f65956b630..56db66b8eb 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://tcpreplay.appneta.com/" SECTION = "net" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8" SRC_URI = "https://github.com/appneta/tcpreplay/releases/download/v${PV}/tcpreplay-${PV}.tar.gz" diff --git a/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.0.bb b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.0.bb index f20013b192..388f7aecbb 100644 --- a/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Lightweight http(s) proxy daemon" HOMEPAGE = "https://tinyproxy.github.io/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb index 82077db546..9cac204998 100644 --- a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb @@ -7,7 +7,7 @@ tool. If you're having network connectivity problems, traceroute will \ show you where the trouble is coming from along the route." SECTION = "net" HOMEPAGE = "http://traceroute.sourceforge.net/" -LICENSE = "GPL-2.0+ & LGPL-2.1+" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" diff --git a/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl.inc b/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl.inc index 1c11823dd5..07e6dc217d 100644 --- a/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl.inc +++ b/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl.inc @@ -1,6 +1,6 @@ SUMMARY = "Tool for controlling the Linux TUN/TAP driver" SECTION = "net" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://tunctl.c;beginline=1;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999" SRC_URI = "${SOURCEFORGE_MIRROR}/tunctl/tunctl-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-networking/recipes-support/uftp/uftp_5.0.bb b/meta-openembedded/meta-networking/recipes-support/uftp/uftp_5.0.bb index 4eeb62d102..301e0fa607 100644 --- a/meta-openembedded/meta-networking/recipes-support/uftp/uftp_5.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/uftp/uftp_5.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Encrypted UDP based FTP with multicast" HOMEPAGE = "https://sourceforge.net/projects/uftp-multicast" SECTION = "libs/network" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/uftp-multicast/files/source-tar/" diff --git a/meta-openembedded/meta-networking/recipes-support/vnstat/vnstat_2.6.bb b/meta-openembedded/meta-networking/recipes-support/vnstat/vnstat_2.6.bb index a7e008e55e..cf3f41c5a1 100644 --- a/meta-openembedded/meta-networking/recipes-support/vnstat/vnstat_2.6.bb +++ b/meta-openembedded/meta-networking/recipes-support/vnstat/vnstat_2.6.bb @@ -1,6 +1,6 @@ DESCRIPTION = "vnStat is a console-based network traffic monitor for Linux and BSD that keeps a log of network traffic for the selected interface(s)." HOMEPAGE = "https://humdi.net/vnstat/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SECTION = "net" DEPENDS = "gd sqlite3" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.11.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.11.bb index 6fee972b2c..f1dba227ac 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.11.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "wireshark - a popular network protocol analyzer" HOMEPAGE = "http://www.wireshark.org" SECTION = "net" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares" diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index 93f3dc5807..88715d5e82 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -21,7 +21,7 @@ BBFILE_PATTERN_openembedded-layer := "^${LAYERDIR}/" # choosing carefully how this layer interacts with all of the # other layers. -BBFILE_PRIORITY_openembedded-layer = "6" +BBFILE_PRIORITY_openembedded-layer = "5" # only activates content when identified layers are present, # to ensure yocto compatibility check pass diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb index 52dab107b5..90d6880905 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb @@ -2,7 +2,7 @@ SUMMARY = "Openbox configuration tool" AUTHOR = "Siegfried Gevatter" HOMEPAGE = "https://launchpad.net/openbox-xdgmenu/" SECTION = "x11/wm" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" DEPENDS = " \ gnome-menus \ diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb index f55247d9ed..7bca24cc0a 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb @@ -8,7 +8,7 @@ can thus be used to access devices which have memory mapped registers. \ \ In i2c mode rwmem accesses an i2c peripheral by sending i2c messages to it." -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS += "python3 python3-pybind11" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb index f3070c5d2a..c8929b75a3 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb @@ -5,7 +5,7 @@ DESCRIPTION:append:lirc-remotes = " This package contains some config files for DESCRIPTION:append:lirc-nslu2example = " This package contains a working config for RC5 remotes and a modified NSLU2." HOMEPAGE = "http://www.lirc.org" SECTION = "console/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" DEPENDS = "libxslt-native alsa-lib libftdi libusb1 libusb-compat jack portaudio-v19 python3-pyyaml python3-setuptools-native" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb index 46ca77f208..76a931666d 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb @@ -3,7 +3,7 @@ shipped with this package can be used to acquire various kinds of system stats." SUMMARY = "Drivers for character-based LCD displays" HOMEPAGE = "http://lcdproc.org" SECTION = "utils" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" DEPENDS = "ncurses lirc" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb index 544c15421b..9f85532064 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb @@ -6,7 +6,7 @@ libraries and applications in a virtual memory system." HOMEPAGE = "http://www.selenic.com/smem/" SECTION = "Applications/System" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" HG_CHANGESET = "98273ce331bb" diff --git a/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend index 359067cda3..b71b7e4f8a 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +++ b/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend @@ -1,6 +1,2 @@ -RDEPENDS:packagegroup-meta-oe-devtools += "\ - valijson \ -" - RDEPENDS:packagegroup-meta-oe-support:append:x86 = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'filesystems-layer', ' open-vm-tools', '', d)}" RDEPENDS:packagegroup-meta-oe-support:append:x86-64 = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'filesystems-layer', ' open-vm-tools', '', d)}" diff --git a/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb b/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb deleted file mode 100644 index 1d3daa1443..0000000000 --- a/meta-openembedded/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.6.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Header-only C++ library for JSON Schema validation" -HOMEPAGE = "https://github.com/tristanpenman/valijson" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=015106c62262b2383f6c72063f0998f2" - -SRC_URI = "git://github.com/tristanpenman/valijson.git;branch=master;protocol=https" -SRCREV = "2dfc7499a31b84edef71189f4247919268ebc74e" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DINSTALL_HEADERS=1 -DBUILD_TESTS=0" - -DEPENDS = "curlpp" - -# valijson is a header only C++ library, so the main package will be empty. -RDEPENDS:${PN}-dev = "" - -BBCLASSEXTEND = "native nativesdk" - -do_install() { - install -d ${D}${includedir}/compat - install -d ${D}${includedir}/valijson - install -d ${D}${includedir}/valijson/adapters - install -d ${D}${includedir}/valijson/constraints - install -d ${D}${includedir}/valijson/internal - install -d ${D}${includedir}/valijson/utils - - install -m 0644 ${S}/include/compat/* ${D}${includedir}/compat - install -D -m 0644 ${S}/include/valijson/*.hpp -t ${D}${includedir}/valijson - install -D -m 0644 ${S}/include/valijson/adapters/*.hpp -t ${D}${includedir}/valijson/adapters - install -D -m 0644 ${S}/include/valijson/constraints/*.hpp -t ${D}${includedir}/valijson/constraints - install -D -m 0644 ${S}/include/valijson/internal/*.hpp -t ${D}${includedir}/valijson/internal - install -D -m 0644 ${S}/include/valijson/utils/*.hpp -t ${D}${includedir}/valijson/utils -} diff --git a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/debsums/debsums_2.2.2.bb b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/debsums/debsums_2.2.2.bb index 8c53af4cf6..252db1994e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/debsums/debsums_2.2.2.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/debsums/debsums_2.2.2.bb @@ -7,7 +7,7 @@ archive." DESCRIPTION:${PN}-cron = "Cron scripts to control automatic system integrity \ checking via debsums." SECTION = "base" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://debian/copyright;md5=770d751553e6559e9eaefd2e11ccf7e9" SRC_URI = "http://snapshot.debian.org/archive/debian/20170530T212108Z/pool/main/d/debsums/debsums_2.2.2.tar.xz" diff --git a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb index 464d82f4c8..f30822b06e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Tools to provide a way to get Platform Reliability, Availability and Serviceability (RAS) reports made via the Kernel tracing events" HOMEPAGE = "http://git.infradead.org/users/mchehab/rasdaemon.git" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d3070efe0afa3dc41608bd82c00bb0dc" SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master;protocol=https \ diff --git a/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++_1.04.bb b/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++_1.04.bb index 91387176b8..c305aadd02 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++_1.04.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++_1.04.bb @@ -1,7 +1,7 @@ SUMMARY = "Tests large file IO and creation/deletion of small files" HOMEPAGE = "http://www.coker.com.au/bonnie++/" SECTION = "benchmark/tests" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://copyright.txt;md5=cd4dde95a6b9d122f0a9150ae9cc3ee0" SRC_URI = "http://www.coker.com.au/bonnie++/${BPN}_${PV}.tgz \ diff --git a/meta-openembedded/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb index 517958b152..32f51fee49 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb @@ -2,7 +2,7 @@ SUMMARY = "The dbench (disk) and tbench (TCP) benchmarks" SUMMARY:dbench = "Filesystem load benchmark" SUMMARY:tbench = "TCP load benchmark" HOMEPAGE = "http://samba.org/ftp/tridge/dbench/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "popt" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.29.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.29.bb index 54e2f332b1..72479ce503 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.29.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.29.bb @@ -7,7 +7,7 @@ job descriptions in a simple-to-understand text format. Several example job \ files are included. fio displays all sorts of I/O performance information." HOMEPAGE = "http://freecode.com/projects/fio" SECTION = "console/tests" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libaio zlib coreutils-native" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 2a8ce54c83..47d927397c 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -4,7 +4,7 @@ It uses only the subset of the OpenGL 2.0 API that is compatible with OpenGL ES HOMEPAGE = "https://github.com/glmark2/glmark2" BUGTRACKER = "https://github.com/glmark2/glmark2/issues" -LICENSE = "GPLv3+ & SGIv1" +LICENSE = "GPL-3.0-or-later & SGI-1" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.SGI;beginline=5;md5=269cdab4af6748677acce51d9aa13552" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch index 739fd20fc5..09e3d9ca9c 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch @@ -1,4 +1,4 @@ -From cc4499cd4cfcb655fc44c3f3571eee20663dafde Mon Sep 17 00:00:00 2001 +From 4801363fbff12bf1019aaf90142981702cecff92 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Wed, 3 Feb 2021 20:44:34 +0000 Subject: [PATCH] configure.ac: check for CPP prog @@ -10,22 +10,20 @@ Absence of check for CPP_PROG causes following build errors: Upstream-Status: Pending Signed-off-by: Andrey Zhizhikin + --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac -index 939cf0a..f75b398 100644 +index 53a4db4..3462b3e 100644 --- a/configure.ac +++ b/configure.ac -@@ -47,6 +47,7 @@ AC_CANONICAL_HOST +@@ -48,6 +48,7 @@ AC_CANONICAL_HOST # Checks for tools: c compiler, ranlib (used for creating static libraries), # symlinks and libtool AC_PROG_CC +AC_PROG_CPP AC_PROG_RANLIB AC_PROG_LN_S - AC_PROG_LIBTOOL --- -2.17.1 - + LT_INIT diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch index 959e29389c..7870261ee6 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch @@ -1,4 +1,4 @@ -From 3ae408402635ea21ad90cd722c99ae3334376c91 Mon Sep 17 00:00:00 2001 +From 155ae12f7809e387a379703d8c09f227e430336d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 14 Jul 2017 13:00:16 -0700 Subject: [PATCH] Remove -pg from profile_CFLAGS @@ -7,12 +7,13 @@ musl fails to link with missing gcrt1.o Signed-off-by: Khem Raj Signed-off-by: Mingli Yu + --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 5be8562..3881aa6 100644 +index 11d3e17..4058cff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -58,9 +58,9 @@ if ENABLE_PROFILING @@ -27,6 +28,3 @@ index 5be8562..3881aa6 100644 endif # Specify the sources and various flags for the test cases --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.11.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.11.bb new file mode 100644 index 0000000000..a6af23aec9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.11.bb @@ -0,0 +1,32 @@ +SUMMARY = "Network benchmark tool" +DESCRIPTION = "\ +iperf is a tool for active measurements of the maximum achievable bandwidth \ +on IP networks. It supports tuning of various parameters related to timing, \ +protocols, and buffers. For each test it reports the bandwidth, loss, and \ +other parameters." + +HOMEPAGE = "http://software.es.net/iperf/" +SECTION = "console/network" +BUGTRACKER = "https://github.com/esnet/iperf/issues" +AUTHOR = "ESNET , Lawrence Berkeley National Laboratory " + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=68ae8cfc577a2c8c51bb51e9628e80b7" + +SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \ + file://0002-Remove-pg-from-profile_CFLAGS.patch \ + file://0001-configure.ac-check-for-CPP-prog.patch \ + " + +SRCREV = "76bd67f6e90e239a7686202d2b1b595159826d24" + +S = "${WORKDIR}/git" + +inherit autotools + +PACKAGECONFIG ?= "openssl" + +PACKAGECONFIG[lksctp] = "ac_cv_header_netinet_sctp_h=yes,ac_cv_header_netinet_sctp_h=no,lksctp-tools" +PACKAGECONFIG[openssl] = "--with-openssl=${RECIPE_SYSROOT}${prefix},--without-openssl,openssl" + +CFLAGS += "-D_GNU_SOURCE" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb deleted file mode 100644 index 47bf4d5015..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Network benchmark tool" -DESCRIPTION = "\ -iperf is a tool for active measurements of the maximum achievable bandwidth \ -on IP networks. It supports tuning of various parameters related to timing, \ -protocols, and buffers. For each test it reports the bandwidth, loss, and \ -other parameters." -HOMEPAGE = "http://software.es.net/iperf/" -SECTION = "console/network" -BUGTRACKER = "https://github.com/esnet/iperf/issues" -AUTHOR = "ESNET , Lawrence Berkeley National Laboratory " -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b7fb682e9941a49f1214dcd7441410d7" - -SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \ - file://0002-Remove-pg-from-profile_CFLAGS.patch \ - file://0001-configure.ac-check-for-CPP-prog.patch \ - " - -SRCREV = "1f8fb13297f3e3e40169ebcd12e171167e394473" - -S = "${WORKDIR}/git" - -inherit autotools - -PACKAGECONFIG ?= "openssl" - -PACKAGECONFIG[lksctp] = "ac_cv_header_netinet_sctp_h=yes,ac_cv_header_netinet_sctp_h=no,lksctp-tools" -PACKAGECONFIG[openssl] = "--with-openssl=${RECIPE_SYSROOT}${prefix},--without-openssl,openssl" - -CFLAGS += "-D_GNU_SOURCE" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index b0e7475bdb..80af9873b1 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -1,6 +1,6 @@ SUMMARY = "A library which provides easy access to huge pages of memory" HOMEPAGE = "https://github.com/libhugetlbfs/libhugetlbfs" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "sysfsutils" 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 7d141d8c7e..2046b13f4b 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 @@ -1,7 +1,7 @@ SUMMARY = "Tools for performance analysis" HOMEPAGE = "http://lmbench.sourceforge.net/" SECTION = "console/utils" -LICENSE = "GPLv2 & GPL-2.0-with-lmbench-restriction" +LICENSE = "GPL-2.0-only & GPL-2.0-with-lmbench-restriction" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ file://COPYING-2;md5=8e9aee2ccc75d61d107e43794a25cdf9" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/mbw/mbw_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/mbw/mbw_git.bb index 3738036a88..52b9399508 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/mbw/mbw_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/mbw/mbw_git.bb @@ -1,7 +1,7 @@ SUMMARY = "MBW determines the copy memory bandwidth available to userspace programs" HOMEPAGE = "http://github.com/raas/mbw" SECTION = "console/tests" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://mbw.spec;beginline=1;endline=10;md5=bbb77813272134a5c461f71abe945bef" SRC_URI = "git://github.com/raas/${BPN}.git;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.1.bb b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.1.bb index 1628a0519b..9df450cbaa 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.1.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Utility to test for faulty memory subsystem" HOMEPAGE = "http://pyropus.ca/software/memtester/" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.1.bb b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.1.bb index a83e09d2bd..6d181a5bb5 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Phoronix Test Suite" DESCRIPTION = "The Phoronix Test Suite is designed to carry out both qualitative \ and quantitative benchmarks in a clean, reproducible, and easy-to-use manner." -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "console/tests" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb b/meta-openembedded/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb index f21af4b80d..9722323478 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/qperf/qperf_0.4.11.bb @@ -2,7 +2,7 @@ SUMMARY = "Measure socket and RDMA performance" DESCRIPTION = "qperf measures bandwidth and latency between two nodes." HOMEPAGE = "https://github.com/linux-rdma/qperf" AUTHOR = "Johann George" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" inherit autotools-brokensep diff --git a/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb index a0df05c942..629b123042 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb @@ -1,5 +1,5 @@ SUMMARY = "Small collection of benchmarks for storage I/O" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b529aaa6a0c50f15d29f89609b5c22f3" SRCREV = "f97f1ae321d1fb8111a2c638075702ed2512ff07" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb b/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb index 46b6788a8f..22c634af05 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb @@ -1,7 +1,7 @@ SUMMARY = "System performance benchmark" HOMEPAGE = "http://github.com/akopytov/sysbench" SECTION = "console/tests" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb b/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb index c9e2958a6b..5efddfcc93 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb @@ -1,6 +1,6 @@ SUMMARY = "Threaded I/O tester" HOMEPAGE = "http://sourceforge.net/projects/tiobench/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" PR = "r1" diff --git a/meta-openembedded/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb b/meta-openembedded/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb index bc9669d0f3..b392581ecb 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Acpitool is a Linux ACPI client. It simply reads /proc/acpi or /sys/class entries \ and presents the output in a meaningfull, human-readable format." HOMEPAGE = "http://freeunix.dyndns.org:8088/site2/acpitool.shtml" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BP}.tar.bz2 \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb b/meta-openembedded/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb index 2edb7c396b..5d1c5ba7e4 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb @@ -3,7 +3,7 @@ SUMMARY = "Simple utility for swapping an fbtft-based device as the console." HOMEPAGE = "https://gitlab.com/pibox/con2fbmap" -LICENSE = "GPL-3.0" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "console/utils" DEPENDS = "" diff --git a/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb b/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb index ff41459968..1304ba9e03 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb @@ -4,7 +4,7 @@ inherit gettext DEPENDS = "libtool-cross" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRCREV = "a2f0c39d5f21596bb9f5223e895c0ff210b265d0" diff --git a/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb index 5d616496fb..455859ec86 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb @@ -1,12 +1,16 @@ SUMMARY = "Userspace helper for Linux kernel EDAC drivers" HOMEPAGE = "https://github.com/grondo/edac-utils" +DESCRIPTION = "EDAC (Error Detection and Correction) is a set of Linux kernel \ +modules that handle reporting of hardware-related errors. Currently \ +these modules mainly handle detection of ECC memory errors for many \ +x86 and x86-64 chipsets and PCI bus parity errors." SECTION = "Applications/System" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " sysfsutils" -SRCREV = "f9aa96205f610de39a79ff43c7478b7ef02e3138" +SRCREV = "1c57818ecee186aa47af0342149577df5302c022" PV = "0.18+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb index 1d06132144..bdc3ca084c 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb @@ -1,5 +1,5 @@ DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" HOMEPAGE = "http://flashrom.org" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.2.bb b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.2.bb index b88db2e53c..bcad2416cd 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.2.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.2.bb @@ -1,5 +1,5 @@ SUMMARY = "EFI executable for fwupd" -LICENSE = "LGPL-2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.3.bb b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.3.bb deleted file mode 100644 index b02e8caa27..0000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.3.bb +++ /dev/null @@ -1,121 +0,0 @@ -SUMMARY = "A simple daemon to allow session software to update firmware" -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "glib-2.0 libxmlb json-glib sqlite3 libjcat gcab vala-native" - -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ - file://run-ptest" -SRC_URI[sha256sum] = "109dacc16ed0db71eb08b852e96b070b8c2c53516a3071b9d0683acd8ecd42d9" - -UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" - -# Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages - -GIDOCGEN_MESON_OPTION = 'docs' -GIDOCGEN_MESON_ENABLE_FLAG = 'docgen' -GIDOCGEN_MESON_DISABLE_FLAG = 'none' - -PACKAGECONFIG ??= "curl gnutls gudev gusb \ - ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth polkit', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \ - ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'plugin_uefi_capsule plugin_uefi_pk', '', d)} \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests plugin_dummy', '', d)} \ - hsi \ - plugin_acpi_phat \ - plugin_amt \ - plugin_bcm57xx \ - plugin_emmc \ - plugin_ep963x \ - plugin_fastboot \ - plugin_flashrom \ - plugin_intel_spi \ - plugin_logitech_bulkcontroller \ - plugin_modem_manager \ - plugin_msr \ - plugin_nitrokey \ - plugin_nvme \ - plugin_parade_lspcon \ - plugin_pixart_rf \ - plugin_platform_integrity \ - plugin_realtek_mst \ - plugin_redfish \ - plugin_synaptics_mst \ - plugin_synaptics_rmi \ - plugin_thunderbolt \ - plugin_upower \ - sqlite" - -PACKAGECONFIG[bluetooth] = "-Dbluez=true,-Dbluez=false" -PACKAGECONFIG[compat-cli] = "-Dcompat_cli=true,-Dcompat_cli=false" -PACKAGECONFIG[consolekit] = "-Dconsolekit=true,-Dconsolekit=false,consolekit" -PACKAGECONFIG[curl] = "-Dcurl=true,-Dcurl=false,curl" -PACKAGECONFIG[firmware-packager] = "-Dfirmware-packager=true,-Dfirmware-packager=false" -PACKAGECONFIG[fish-completion] = "-Dfish_completion=true,-Dfish_completion=false" -PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" -PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" -PACKAGECONFIG[gusb] = "-Dgusb=true,-Dgusb=false,libgusb" -PACKAGECONFIG[hsi] = "-Dhsi=true,-Dhsi=false" -PACKAGECONFIG[libarchive] = "-Dlibarchive=true,-Dlibarchive=false,libarchive" -PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" -PACKAGECONFIG[metainfo] = "-Dmetainfo=true,-Dmetainfo=false" -PACKAGECONFIG[offline] = "-Doffline=true,-Doffline=false" -PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit" -PACKAGECONFIG[sqlite] = "-Dsqlite=true,-Dsqlite=false,sqlite3" -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" -PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gcab-native" - - -# TODO plugins-all meta-option that expands to all plugin_*? -PACKAGECONFIG[plugin_acpi_phat] = "-Dplugin_acpi_phat=true,-Dplugin_acpi_phat=false" -PACKAGECONFIG[plugin_amt] = "-Dplugin_amt=true,-Dplugin_amt=false" -PACKAGECONFIG[plugin_bcm57xx] = "-Dplugin_bcm57xx=true,-Dplugin_bcm57xx=false" -PACKAGECONFIG[plugin_cfu] = "-Dplugin_cfu=true,-Dplugin_cfu=false" -PACKAGECONFIG[plugin_dell] = "-Dplugin_dell=true,-Dplugin_dell=false,libsmbios" -PACKAGECONFIG[plugin_dummy] = "-Dplugin_dummy=true,-Dplugin_dummy=false" -PACKAGECONFIG[plugin_emmc] = "-Dplugin_emmc=true,-Dplugin_emmc=false" -PACKAGECONFIG[plugin_ep963x] = "-Dplugin_ep963x=true,-Dplugin_ep963x=false" -PACKAGECONFIG[plugin_fastboot] = "-Dplugin_fastboot=true,-Dplugin_fastboot=false" -PACKAGECONFIG[plugin_flashrom] = "-Dplugin_flashrom=true,-Dplugin_flashrom=false,flashrom" -PACKAGECONFIG[plugin_intel_spi] = "-Dplugin_intel_spi=true -Dlzma=true,-Dplugin_intel_spi=false -Dlzma=false,xz" -PACKAGECONFIG[plugin_logitech_bulkcontroller] = "-Dplugin_logitech_bulkcontroller=true,-Dplugin_logitech_bulkcontroller=false,protobuf-c-native protobuf-c" -PACKAGECONFIG[plugin_modem_manager] = "-Dplugin_modem_manager=true,-Dplugin_modem_manager=false,libqmi modemmanager" -PACKAGECONFIG[plugin_msr] = "-Dplugin_msr=true,-Dplugin_msr=false,cpuid" -PACKAGECONFIG[plugin_nitrokey] = "-Dplugin_nitrokey=true,-Dplugin_nitrokey=false" -PACKAGECONFIG[plugin_nvme] = "-Dplugin_nvme=true,-Dplugin_nvme=false" -PACKAGECONFIG[plugin_parade_lspcon] = "-Dplugin_parade_lspcon=true,-Dplugin_parade_lspcon=false" -PACKAGECONFIG[plugin_pixart_rf] = "-Dplugin_pixart_rf=true,-Dplugin_pixart_rf=false" -PACKAGECONFIG[plugin_platform_integrity] = "-Dplugin_platform_integrity=true,-Dplugin_platform_integrity=false" -PACKAGECONFIG[plugin_powerd] = "-Dplugin_powerd=true,-Dplugin_powerd=false" -PACKAGECONFIG[plugin_realtek_mst] = "-Dplugin_realtek_mst=true,-Dplugin_realtek_mst=false" -PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=true,-Dplugin_redfish=false" -PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=true,-Dplugin_synaptics_mst=false" -PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=true,-Dplugin_synaptics_rmi=false" -PACKAGECONFIG[plugin_thunderbolt] = "-Dplugin_thunderbolt=true,-Dplugin_thunderbolt=false" -PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=true,-Dplugin_tpm=false,tpm2-tss" -# Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported -PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=true -Dplugin_uefi_capsule_splash=false,-Dplugin_uefi_capsule=false,efivar fwupd-efi" -PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=true,-Dplugin_uefi_pk=false" -PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=true,-Dplugin_upower=false" - -# Always disable these plugins on non-x86 platforms as they don't compile or are useless -DISABLE_NON_X86 = "plugin_amt plugin_intel_spi plugin_msr plugin_thunderbolt" -DISABLE_NON_X86:x86 = "" -DISABLE_NON_X86:x86-64 = "" -PACKAGECONFIG:remove = "${DISABLE_NON_X86}" - -FILES:${PN} += "${libdir}/fwupd-plugins-* \ - ${systemd_unitdir} \ - ${datadir}/fish \ - ${datadir}/metainfo \ - ${datadir}/icons \ - ${datadir}/dbus-1 \ - ${datadir}/polkit-1 \ - ${nonarch_libdir}/modules-load.d" - -FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \ - ${datadir}/installed-tests/" -RDEPENDS:${PN}-ptest += "gnome-desktop-testing" diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb new file mode 100644 index 0000000000..53f1720b04 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb @@ -0,0 +1,127 @@ +SUMMARY = "A simple daemon to allow session software to update firmware" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "glib-2.0 libxmlb json-glib sqlite3 libjcat gcab vala-native" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://run-ptest" +SRC_URI[sha256sum] = "7ebe1514acb688d2649cecc392db929094da3f03cfc98a9c0faccabb084912fa" + +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" + +# Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages + +GIDOCGEN_MESON_OPTION = 'docs' +GIDOCGEN_MESON_ENABLE_FLAG = 'docgen' +GIDOCGEN_MESON_DISABLE_FLAG = 'none' + +PACKAGECONFIG ??= "curl gnutls gudev gusb \ + ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth polkit', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'plugin_uefi_capsule plugin_uefi_pk', '', d)} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests plugin_dummy', '', d)} \ + hsi \ + plugin_acpi_phat \ + plugin_amt \ + plugin_bcm57xx \ + plugin_emmc \ + plugin_ep963x \ + plugin_fastboot \ + plugin_flashrom \ + plugin_gpio \ + plugin_intel_spi \ + plugin_logitech_bulkcontroller \ + plugin_modem_manager \ + plugin_msr \ + plugin_nitrokey \ + plugin_nvme \ + plugin_parade_lspcon \ + plugin_pixart_rf \ + plugin_platform_integrity \ + plugin_realtek_mst \ + plugin_redfish \ + plugin_synaptics_mst \ + plugin_synaptics_rmi \ + plugin_scsi \ + plugin_thunderbolt \ + plugin_uf2 \ + plugin_upower \ + sqlite" + +PACKAGECONFIG[bluetooth] = "-Dbluez=true,-Dbluez=false" +PACKAGECONFIG[compat-cli] = "-Dcompat_cli=true,-Dcompat_cli=false" +PACKAGECONFIG[consolekit] = "-Dconsolekit=true,-Dconsolekit=false,consolekit" +PACKAGECONFIG[curl] = "-Dcurl=true,-Dcurl=false,curl" +PACKAGECONFIG[firmware-packager] = "-Dfirmware-packager=true,-Dfirmware-packager=false" +PACKAGECONFIG[fish-completion] = "-Dfish_completion=true,-Dfish_completion=false" +PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" +PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" +PACKAGECONFIG[gusb] = "-Dgusb=true,-Dgusb=false,libgusb" +PACKAGECONFIG[hsi] = "-Dhsi=true,-Dhsi=false" +PACKAGECONFIG[libarchive] = "-Dlibarchive=true,-Dlibarchive=false,libarchive" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" +PACKAGECONFIG[metainfo] = "-Dmetainfo=true,-Dmetainfo=false" +PACKAGECONFIG[offline] = "-Doffline=true,-Doffline=false" +PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit" +PACKAGECONFIG[sqlite] = "-Dsqlite=true,-Dsqlite=false,sqlite3" +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gcab-native" + + +# TODO plugins-all meta-option that expands to all plugin_*? +PACKAGECONFIG[plugin_acpi_phat] = "-Dplugin_acpi_phat=true,-Dplugin_acpi_phat=false" +PACKAGECONFIG[plugin_amt] = "-Dplugin_amt=true,-Dplugin_amt=false" +PACKAGECONFIG[plugin_bcm57xx] = "-Dplugin_bcm57xx=true,-Dplugin_bcm57xx=false" +PACKAGECONFIG[plugin_cfu] = "-Dplugin_cfu=true,-Dplugin_cfu=false" +PACKAGECONFIG[plugin_dell] = "-Dplugin_dell=true,-Dplugin_dell=false,libsmbios" +PACKAGECONFIG[plugin_dummy] = "-Dplugin_dummy=true,-Dplugin_dummy=false" +PACKAGECONFIG[plugin_emmc] = "-Dplugin_emmc=true,-Dplugin_emmc=false" +PACKAGECONFIG[plugin_ep963x] = "-Dplugin_ep963x=true,-Dplugin_ep963x=false" +PACKAGECONFIG[plugin_fastboot] = "-Dplugin_fastboot=true,-Dplugin_fastboot=false" +PACKAGECONFIG[plugin_flashrom] = "-Dplugin_flashrom=true,-Dplugin_flashrom=false,flashrom" +PACKAGECONFIG[plugin_gpio] = "-Dplugin_gpio=true,-Dplugin_gpio" +PACKAGECONFIG[plugin_intel_spi] = "-Dplugin_intel_spi=true -Dlzma=true,-Dplugin_intel_spi=false -Dlzma=false,xz" +PACKAGECONFIG[plugin_logitech_bulkcontroller] = "-Dplugin_logitech_bulkcontroller=true,-Dplugin_logitech_bulkcontroller=false,protobuf-c-native protobuf-c" +PACKAGECONFIG[plugin_modem_manager] = "-Dplugin_modem_manager=true,-Dplugin_modem_manager=false,libqmi modemmanager" +PACKAGECONFIG[plugin_msr] = "-Dplugin_msr=true,-Dplugin_msr=false,cpuid" +PACKAGECONFIG[plugin_nitrokey] = "-Dplugin_nitrokey=true,-Dplugin_nitrokey=false" +PACKAGECONFIG[plugin_nvme] = "-Dplugin_nvme=true,-Dplugin_nvme=false" +PACKAGECONFIG[plugin_parade_lspcon] = "-Dplugin_parade_lspcon=true,-Dplugin_parade_lspcon=false" +PACKAGECONFIG[plugin_pixart_rf] = "-Dplugin_pixart_rf=true,-Dplugin_pixart_rf=false" +PACKAGECONFIG[plugin_platform_integrity] = "-Dplugin_platform_integrity=true,-Dplugin_platform_integrity=false" +PACKAGECONFIG[plugin_powerd] = "-Dplugin_powerd=true,-Dplugin_powerd=false" +PACKAGECONFIG[plugin_realtek_mst] = "-Dplugin_realtek_mst=true,-Dplugin_realtek_mst=false" +PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=true,-Dplugin_redfish=false" +PACKAGECONFIG[plugin_scsi] = "-Dplugin_scsi=true,-Dplugin_scsi=false" +PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=true,-Dplugin_synaptics_mst=false" +PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=true,-Dplugin_synaptics_rmi=false" +PACKAGECONFIG[plugin_thunderbolt] = "-Dplugin_thunderbolt=true,-Dplugin_thunderbolt=false" +PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=true,-Dplugin_tpm=false,tpm2-tss" +# Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported +PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=true -Dplugin_uefi_capsule_splash=false,-Dplugin_uefi_capsule=false,efivar fwupd-efi" +PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=true,-Dplugin_uefi_pk=false" +PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=true,-Dplugin_uf2=false" +PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=true,-Dplugin_upower=false" + +# Always disable these plugins on non-x86 platforms as they don't compile or are useless +DISABLE_NON_X86 = "plugin_amt plugin_intel_spi plugin_msr plugin_thunderbolt" +DISABLE_NON_X86:x86 = "" +DISABLE_NON_X86:x86-64 = "" +PACKAGECONFIG:remove = "${DISABLE_NON_X86}" + +FILES:${PN} += "${libdir}/fwupd-plugins-* \ + ${systemd_unitdir} \ + ${datadir}/fish \ + ${datadir}/metainfo \ + ${datadir}/icons \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ + ${nonarch_libdir}/modules-load.d" + +FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \ + ${datadir}/installed-tests/" +RDEPENDS:${PN}-ptest += "gnome-desktop-testing" diff --git a/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb index ebd034ac14..fa1bb928ca 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb @@ -5,7 +5,7 @@ such as phones and laptops." HOMEPAGE = "http://irda.sourceforge.net/" BUGTRACKER = "http://sourceforge.net/p/irda/bugs/" SECTION = "base" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://irdadump/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://smcinit/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://man/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb index f1c859dda2..dbfd1e7bc0 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb @@ -5,7 +5,7 @@ DESCRIPTION = "The utilities are designed primarily to be used on storage server " HOMEPAGE = "https://github.com/intel/ledmon" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ " diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb index 038f0c6742..25ab44f75e 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb @@ -1,7 +1,7 @@ SUMMARY = "lm_sensors configuration files" DESCRIPTION = "Hardware health monitoring configuration files" HOMEPAGE = "http://www.lm-sensors.org/" -LICENSE = "MIT-X" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index 55e303f0d5..f821cdaf4a 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Hardware health monitoring applications" HOMEPAGE = "https://hwmon.wiki.kernel.org/" -LICENSE = "GPLv2+ & LGPLv2.1+" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" diff --git a/meta-openembedded/meta-oe/recipes-bsp/lsscsi/lsscsi_0.31.bb b/meta-openembedded/meta-oe/recipes-bsp/lsscsi/lsscsi_0.31.bb index 2c96de163b..54faaa384b 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lsscsi/lsscsi_0.31.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lsscsi/lsscsi_0.31.bb @@ -1,6 +1,6 @@ SUMMARY = "The lsscsi command lists information about SCSI devices in Linux" HOMEPAGE = "http://sg.danny.cz/scsi/lsscsi.html" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" SECTION = "base" LIC_FILES_CHKSUM="file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb index 7f087da7ce..1055fa42a9 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb @@ -2,7 +2,7 @@ SUMMARY = "NVMe management command line interface" AUTHOR = "Stefan Wiehler " HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" DEPENDS = "util-linux" PV .= "+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb index 3ffbf6f597..42dfcd1e5b 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb @@ -2,7 +2,7 @@ SUMMARY = "Linux kernel userland utilities for the PCMCIA subsystem" HOMEPAGE = "https://www.kernel.org/pub/linux/utils/kernel/pcmcia/" SECTION = "kernel/userland" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "udev sysfsutils flex-native bison-native" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb index ce78fdeb19..aa52f62572 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb @@ -1,6 +1,6 @@ SUMMARY = "GNU All Mobile Managment Utilities" SECTION = "console/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" HOMEPAGE = "https://wammu.eu/" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb index 3fe4c9404c..1ba7dd4afc 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Bluetooth library with attribute support" SECTION = "libs/network" -LICENSE = "GPL-2.0+ | BSD-3-Clause" +LICENSE = "GPL-2.0-or-later | BSD-3-Clause" LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=6;md5=71fdd2be76b4e95fe28324a70d4981c5" DEPENDS = "bluez5 glib-2.0" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.3.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.3.1.bb index 876cf1375d..a6e0075538 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.3.1.bb @@ -1,6 +1,6 @@ SUMMARY = "A library to abstract stream I/O like serial port, TCP, telnet, etc" HOMEPAGE = "https://github.com/cminyard/gensio" -LICENSE = "GPL-2.0 & LGPL-2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ " diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb index 3e6a01de87..62651bc308 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ifplugd is a Linux daemon which will automatically configure your ethernet device \ when a cable is plugged in and automatically unconfigure it if the cable is pulled." HOMEPAGE = "http://0pointer.de/lennart/projects/ifplugd/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libdaemon" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.2.3.bb b/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.2.3.bb index bb476ca717..b0fde5ed14 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.2.3.bb @@ -1,6 +1,6 @@ SUMMARY = "ncurses IRC client" DESCRIPTION = "Irssi is an ncurses IRC client" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=55fdc1113306167d6ea2561404ce02f8" DEPENDS = "glib-2.0 ncurses openssl" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.24.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.24.bb deleted file mode 100644 index 6ee2651afe..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.24.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Wireless daemon for Linux" -HOMEPAGE = "https://iwd.wiki.kernel.org/" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" - -DEPENDS = "ell" - -SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ - file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ - " -SRC_URI[sha256sum] = "61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224" - -inherit autotools manpages pkgconfig python3native systemd - -PACKAGECONFIG ??= " \ - client \ - monitor \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ -" -PACKAGECONFIG[client] = "--enable-client,--disable-client,readline" -PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor" -PACKAGECONFIG[manpages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" -PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" -PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" -PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" - -EXTRA_OECONF = "--enable-external-ell" - -SYSTEMD_SERVICE:${PN} = " \ - iwd.service \ - ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ -" - -do_configure:prepend() { - install -d ${S}/build-aux -} - -do_install:append() { - # If client and monitor are disabled, bindir is empty, causing a QA error - rmdir --ignore-fail-on-non-empty ${D}/${bindir} -} - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${nonarch_libdir}/modules-load.d \ - ${systemd_unitdir}/network \ -" - -RDEPENDS:${PN} = "dbus" - -RRECOMMENDS:${PN} = "\ - kernel-module-pkcs7-message \ - kernel-module-pkcs8-key-parser \ - kernel-module-x509-key-parser \ -" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.26.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.26.bb new file mode 100644 index 0000000000..6248850413 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.26.bb @@ -0,0 +1,55 @@ +SUMMARY = "Wireless daemon for Linux" +HOMEPAGE = "https://iwd.wiki.kernel.org/" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" + +DEPENDS = "ell" + +SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ + file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ + " +SRC_URI[sha256sum] = "0ff4541c2b7f14ec010c3cbd1f02350f1b58cb0c103412db22550e90d8040d6b" + +inherit autotools manpages pkgconfig python3native systemd + +PACKAGECONFIG ??= " \ + client \ + monitor \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" +PACKAGECONFIG[client] = "--enable-client,--disable-client,readline" +PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor" +PACKAGECONFIG[manpages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" +PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" +PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" + +EXTRA_OECONF = "--enable-external-ell" + +SYSTEMD_SERVICE:${PN} = " \ + iwd.service \ + ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ +" + +do_configure:prepend() { + install -d ${S}/build-aux +} + +do_install:append() { + # If client and monitor are disabled, bindir is empty, causing a QA error + rmdir --ignore-fail-on-non-empty ${D}/${bindir} +} + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${nonarch_libdir}/modules-load.d \ + ${systemd_unitdir}/network \ +" + +RDEPENDS:${PN} = "dbus" + +RRECOMMENDS:${PN} = "\ + kernel-module-pkcs7-message \ + kernel-module-pkcs8-key-parser \ + kernel-module-x509-key-parser \ +" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.33.bb b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.33.bb index 528b4e8b19..346e78b1de 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.33.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.33.bb @@ -1,7 +1,7 @@ SUMMARY = "A full-featured and high-performance event loop that is loosely \ modelled after libevent." HOMEPAGE = "http://software.schmorp.de/pkg/libev.html" -LICENSE = "BSD-2-Clause | GPL-2.0+" +LICENSE = "BSD-2-Clause | GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6ad416afd040c90698edcdf1cbee347" SRC_URI = "http://dist.schmorp.de/libev/Attic/${BP}.tar.gz" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb index 4d873d4d90..41b8d94a03 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.3.0.bb @@ -1,5 +1,5 @@ SUMMARY = "A protocol library to access an iPhone or iPod Touch in Linux" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "\ file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7 \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.26.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.26.2.bb index 5cd2a7e074..66d55f9c0e 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.26.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.26.2.bb @@ -1,7 +1,7 @@ SUMMARY = "libmbim is library for talking to WWAN devices by MBIM protocol" DESCRIPTION = "libmbim is a glib-based library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol" HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libmbim/" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.18.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.18.bb index 7e3f91a419..8a27cf9b90 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.18.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.18.bb @@ -6,7 +6,7 @@ Protocol (MTP) in the form of a library suitable primarily for POSIX \ compliant operating systems" SUMMARY = "libmtp is an Initiator implementation of the Media Transfer Protocol (MTP)" HOMEPAGE = "http://libmtp.sourceforge.net/" -LICENSE = "LGPL-2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "\ file://COPYING;md5=0448d3676bc0de00406af227d341a4d1 \ file://src/ptp.c;beginline=3;endline=22;md5=303cc4422fd549ef8689aded20434a9a \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb index 06fd0f769a..4d4d3e51cd 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb @@ -1,6 +1,6 @@ SUMMARY = "Library for IPv6 Neighbor Discovery Protocol" HOMEPAGE = "http://libndp.org/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://github.com/jpirko/libndp;branch=master;protocol=https \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch new file mode 100644 index 0000000000..e345d28031 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/files/0001-build-use-python3-everywhere.patch @@ -0,0 +1,33 @@ +From 189528e879e4099b44aae26a2af0cb16aaa96db6 Mon Sep 17 00:00:00 2001 +From: goapunk +Date: Mon, 13 Sep 2021 13:45:41 +0200 +Subject: [PATCH] build: use python3 everywhere + +--- + build-aux/qmi-codegen/qmi-codegen | 2 +- + examples/simple-tester-python/simple-tester-python | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build-aux/qmi-codegen/qmi-codegen b/build-aux/qmi-codegen/qmi-codegen +index 1fea7c1..1092c8e 100755 +--- a/build-aux/qmi-codegen/qmi-codegen ++++ b/build-aux/qmi-codegen/qmi-codegen +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + # + # This program is free software; you can redistribute it and/or modify it under +diff --git a/examples/simple-tester-python/simple-tester-python b/examples/simple-tester-python/simple-tester-python +index af9065a..a35e505 100755 +--- a/examples/simple-tester-python/simple-tester-python ++++ b/examples/simple-tester-python/simple-tester-python +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- + # + # This program is free software; you can redistribute it and/or modify it under +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb index dee36d7b45..4807244a58 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb @@ -2,7 +2,7 @@ SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol" DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \ devices which speak the Qualcomm MSM Interface (QMI) protocol" HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = " \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ @@ -10,12 +10,23 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "glib-2.0 glib-2.0-native" -inherit autotools pkgconfig bash-completion gobject-introspection +inherit meson pkgconfig bash-completion gobject-introspection -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" +SRCREV ?= "f6c2feaf199e0f129a0bde8c5e6cba5f2117b564" +# patch 0001 is on main branch upstream +SRC_URI = "\ + git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-30 \ + file://0001-build-use-python3-everywhere.patch \ +" -SRC_URI[sha256sum] = "00d7da30a4f8d1185f37cba289cfaf1dfcd04a58f2f76d6acfdf5b85312d6ed6" +S = "${WORKDIR}/git" PACKAGECONFIG ??= "udev mbim" -PACKAGECONFIG[udev] = ",--without-udev,libgudev" -PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" +PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,libgudev" +PACKAGECONFIG[mbim] = "-Dmbim_qmux=true,-Dmbim_qmux=false,libmbim" +PACKAGECONFIG[qrtr] = "-Dqrtr=true,-Dqrtr=false,libqrtr-glib" + +EXTRA_OEMESON = " \ + -Dgtk_doc=false \ + -Dman=false \ +" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb new file mode 100644 index 0000000000..7bac3117cd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "library to use and manage the QRTR bus" +DESCRIPTION = "libqrtr-glib is a glib-based library to use and manage the QRTR (Qualcomm IPC Router) bus" +HOMEPAGE = "https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib" + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://LICENSES/LGPL-2.1-or-later.txt;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git;protocol=https;branch=qrtr-1-2" + +PV = "1.2.2+git${SRCPV}" +SRCREV = "8991f0e93713ebf4da48ae4f23940ead42f64c8c" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig gobject-introspection + +DEPENDS = "glib-2.0" + +EXTRA_OEMESON = " \ + -Dgtk_doc=false \ +" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb index 1c3419c6d9..2fa24b29b3 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "libTorrent is a BitTorrent library written in C++ for *nix, \ with a focus on high performance and good code." HOMEPAGE = "http://libtorrent.rakshasa.no/" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "zlib libsigc++-2.0 openssl cppunit" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.1.bb index f3dc5d15d4..9c0f56e736 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux" HOMEPAGE = "http://linuxptp.sourceforge.net/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v3.1/linuxptp-${PV}.tgz \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb b/meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb index 4f1430b9ec..7b5eecf54d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol." HOMEPAGE = "http://www.loudmouth-project.org/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=c4f38aef94828f6b280e00d1173be689" DEPENDS = "glib-2.0 libcheck openssl libidn" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch new file mode 100644 index 0000000000..7c3e7750af --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch @@ -0,0 +1,68 @@ +From f7a3292c1c753b29384e216693f51a4213fea7d0 Mon Sep 17 00:00:00 2001 +From: "Bruce A. Johnson" +Date: Wed, 22 Dec 2021 14:24:02 -0500 +Subject: [PATCH 1/2] core: switch bash shell scripts to use /bin/sh for use + w/Busybox. + +Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/483 +--- + data/fcc-unlock/105b | 2 +- + data/fcc-unlock/1199 | 2 +- + data/fcc-unlock/1eac | 2 +- + test/mmcli-test-sms | 2 +- + tools/tests/test-wrapper.sh.in | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/data/fcc-unlock/105b b/data/fcc-unlock/105b +index 21fe5329..f276050f 100644 +--- a/data/fcc-unlock/105b ++++ b/data/fcc-unlock/105b +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # SPDX-License-Identifier: CC0-1.0 + # 2021 Aleksander Morgado +diff --git a/data/fcc-unlock/1199 b/data/fcc-unlock/1199 +index 0109c6ab..e1d3804c 100644 +--- a/data/fcc-unlock/1199 ++++ b/data/fcc-unlock/1199 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # SPDX-License-Identifier: CC0-1.0 + # 2021 Aleksander Morgado +diff --git a/data/fcc-unlock/1eac b/data/fcc-unlock/1eac +index 1068d9c2..d9342852 100644 +--- a/data/fcc-unlock/1eac ++++ b/data/fcc-unlock/1eac +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # SPDX-License-Identifier: CC0-1.0 + # 2021 Aleksander Morgado +diff --git a/test/mmcli-test-sms b/test/mmcli-test-sms +index 18e0a7b4..7136ee0d 100755 +--- a/test/mmcli-test-sms ++++ b/test/mmcli-test-sms +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + print_usage () { + echo "usage: $0 [MODEM INDEX] [all|ucs2|gsm7|data] [NUMBER]" +diff --git a/tools/tests/test-wrapper.sh.in b/tools/tests/test-wrapper.sh.in +index d64ea4cb..fcdb56de 100644 +--- a/tools/tests/test-wrapper.sh.in ++++ b/tools/tests/test-wrapper.sh.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # For debugging behavior of test-modemmanager-service.py, you can modify + # this line to add --log-file option +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/files/0002-fcc-unlock-Make-scripts-POSIX-shell-compatible.patch b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/files/0002-fcc-unlock-Make-scripts-POSIX-shell-compatible.patch new file mode 100644 index 0000000000..d911d54ce4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/files/0002-fcc-unlock-Make-scripts-POSIX-shell-compatible.patch @@ -0,0 +1,100 @@ +From ddf634b92bf96b35f521db6da329628b4525c2eb Mon Sep 17 00:00:00 2001 +From: Sven Schwermer +Date: Fri, 25 Feb 2022 21:37:13 +0100 +Subject: [PATCH 2/2] fcc-unlock: Make scripts POSIX shell compatible + +This allows us to not rely on bash which may not be available on +constrained systems, e.g. Yocto-built embedded systems. The scripts now +pass shellcheck. + +Signed-off-by: Sven Schwermer +--- + data/fcc-unlock/105b | 8 ++++---- + data/fcc-unlock/1199 | 6 +++--- + data/fcc-unlock/1eac | 8 ++++---- + 3 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/data/fcc-unlock/105b b/data/fcc-unlock/105b +index f276050f..772c90f4 100644 +--- a/data/fcc-unlock/105b ++++ b/data/fcc-unlock/105b +@@ -15,20 +15,20 @@ shift + # second and next arguments are control port names + for PORT in "$@"; do + # match port type in Linux 5.14 and newer +- grep -q MBIM /sys/class/wwan/${PORT}/type 2>/dev/null && { ++ grep -q MBIM "/sys/class/wwan/$PORT/type" 2>/dev/null && { + MBIM_PORT=$PORT + break + } + # match port name in Linux 5.13 +- [[ $PORT == *"MBIM"* ]] && { ++ echo "$PORT" | grep -q MBIM && { + MBIM_PORT=$PORT + break + } + done + + # fail if no MBIM port exposed +-[ -n "${MBIM_PORT}" ] || exit 2 ++[ -n "$MBIM_PORT" ] || exit 2 + + # run qmicli operation over MBIM +-qmicli --device-open-proxy --device=/dev/${MBIM_PORT} --dms-foxconn-set-fcc-authentication=0 ++qmicli --device-open-proxy --device="/dev/$MBIM_PORT" --dms-foxconn-set-fcc-authentication=0 + exit $? +diff --git a/data/fcc-unlock/1199 b/data/fcc-unlock/1199 +index e1d3804c..6dbf8d1b 100644 +--- a/data/fcc-unlock/1199 ++++ b/data/fcc-unlock/1199 +@@ -19,15 +19,15 @@ shift + # second and next arguments are control port names + for PORT in "$@"; do + # match port name +- [[ $PORT == *"cdc-wdm"* ]] && { ++ echo "$PORT" | grep -q cdc-wdm && { + CDC_WDM_PORT=$PORT + break + } + done + + # fail if no cdc-wdm port exposed +-[ -n "${CDC_WDM_PORT}" ] || exit 2 ++[ -n "$CDC_WDM_PORT" ] || exit 2 + + # run qmicli operation +-qmicli --device-open-proxy --device=/dev/${CDC_WDM_PORT} --dms-set-fcc-authentication ++qmicli --device-open-proxy --device="/dev/$CDC_WDM_PORT" --dms-set-fcc-authentication + exit $? +diff --git a/data/fcc-unlock/1eac b/data/fcc-unlock/1eac +index d9342852..44ce46d7 100644 +--- a/data/fcc-unlock/1eac ++++ b/data/fcc-unlock/1eac +@@ -15,20 +15,20 @@ shift + # second and next arguments are control port names + for PORT in "$@"; do + # match port type in Linux 5.14 and newer +- grep -q MBIM /sys/class/wwan/${PORT}/type 2>/dev/null && { ++ grep -q MBIM "/sys/class/wwan/$PORT/type" 2>/dev/null && { + MBIM_PORT=$PORT + break + } + # match port name in Linux 5.13 +- [[ $PORT == *"MBIM"* ]] && { ++ echo "$PORT" | grep -q MBIM && { + MBIM_PORT=$PORT + break + } + done + + # fail if no MBIM port exposed +-[ -n "${MBIM_PORT}" ] || exit 2 ++[ -n "$MBIM_PORT" ] || exit 2 + + # run mbimcli operation +-mbimcli --device-open-proxy --device=/dev/${MBIM_PORT} --quectel-set-radio-state=on ++mbimcli --device-open-proxy --device="/dev/$MBIM_PORT" --quectel-set-radio-state=on + exit $? +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb deleted file mode 100644 index 5aaa55c7af..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" -DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" -LICENSE = "GPL-2.0 & LGPL-2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -inherit gnomebase gettext systemd vala gobject-introspection bash-completion - -DEPENDS = "glib-2.0 libgudev libxslt-native" - -SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" -SRC_URI[sha256sum] = "21fdfaf94171261ad9d99771894f5ade4bc39ef3d1ff1d421054d14713e97880" -S = "${WORKDIR}/ModemManager-${PV}" - -PACKAGECONFIG ??= "mbim qmi \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ -" - -PACKAGECONFIG[at] = "--with-at-command-via-dbus" -PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," -PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" -# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. -PACKAGECONFIG[mbim] = "--with-mbim,--without-mbim,libmbim" -# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. -PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" - -EXTRA_OECONF = " \ - --with-udev-base-dir=${nonarch_base_libdir}/udev \ -" - -FILES:${PN} += " \ - ${datadir}/icons \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${datadir}/ModemManager \ - ${libdir}/ModemManager \ - ${systemd_unitdir}/system \ -" - -FILES:${PN}-dev += " \ - ${libdir}/ModemManager/*.la \ -" - -FILES:${PN}-staticdev += " \ - ${libdir}/ModemManager/*.a \ -" - -FILES:${PN}-dbg += "${libdir}/ModemManager/.debug" - -SYSTEMD_SERVICE:${PN} = "ModemManager.service" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.18.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.18.6.bb new file mode 100644 index 0000000000..14d9942c02 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.18.6.bb @@ -0,0 +1,62 @@ +SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" +DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gettext systemd gobject-introspection bash-completion + +DEPENDS = "glib-2.0 libgudev libxslt-native dbus" + +SRCREV ?= "a7bcf2036b34d5043dbc33fee7d98bae5859c4d3" + +# Patches 0001, 0002 will be in ModemManager > 1.18.6 +SRC_URI = " \ + git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=mm-1-18 \ + file://0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch \ + file://0002-fcc-unlock-Make-scripts-POSIX-shell-compatible.patch \ +" + +S = "${WORKDIR}/git" + +# strict, permissive +MODEMMANAGER_POLKIT_TYPE ??= "permissive" + +PACKAGECONFIG ??= "vala mbim qmi \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ +" + +PACKAGECONFIG[at] = "-Dat_command_via_dbus=true" +PACKAGECONFIG[systemd] = " \ + -Dsystemdsystemunitdir=${systemd_unitdir}/system/, \ + -Dsystemdsystemunitdir=no -Dsystemd_journal=false -Dsystemd_suspend_resume=false \ +" +PACKAGECONFIG[polkit] = "-Dpolkit=${MODEMMANAGER_POLKIT_TYPE},-Dpolkit=no,polkit" +# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. +PACKAGECONFIG[mbim] = "-Dmbim=true,-Dmbim=false -Dplugin_dell=disabled -Dplugin_foxconn=disabled,libmbim" +# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. +PACKAGECONFIG[qmi] = "-Dqmi=true,-Dqmi=false,libqmi" +PACKAGECONFIG[qrtr] = "-Dqrtr=true,-Dqrtr=false,libqrtr-glib" +PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)} + +EXTRA_OEMESON = " \ + -Dudevdir=${nonarch_base_libdir}/udev \ + -Dqrtr=false \ +" + +FILES:${PN} += " \ + ${datadir}/icons \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${datadir}/ModemManager \ + ${libdir}/ModemManager \ + ${systemd_unitdir}/system \ +" + +SYSTEMD_SERVICE:${PN} = "ModemManager.service" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb index 220c0a8861..0921db5e01 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb @@ -9,7 +9,7 @@ editing of user keystrokes. Mosh is a replacement for SSH. It's more \ robust and responsive, especially over Wi-Fi, cellular, and \ long-distance links." HOMEPAGE = "http://mosh.mit.edu" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb index a181ef0e13..b2a204403e 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb @@ -1,5 +1,5 @@ DESCRIPTION = "obex-data-server is a D-Bus service providing high-level OBEX client and server side functionality" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "gtk+ dbus-glib dbus-glib-native imagemagick openobex bluez5" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb index 420d563acd..7348274948 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Openobex project is an open source implementation of the \ Object Exchange (OBEX) protocol." HOMEPAGE = "http://openobex.triq.net" SECTION = "libs" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " diff --git a/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb index 9c9c5965ed..f7a98fb61e 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb @@ -1,5 +1,5 @@ DESCRIPTION = "A tool for transfer files to/from any OBEX enabled device" -LICENSE = "GPLv2 & PD & LGPLv2.1" +LICENSE = "GPL-2.0-only & PD & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LGPL-2.1.txt;md5=4fbd65380cdd255951079008b364516c \ file://GPL-2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://License.txt;md5=fcbddc3c1debed80dd80da2d3e5f0dc1 \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch new file mode 100644 index 0000000000..7cf9a8b121 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch @@ -0,0 +1,49 @@ +From 2a0dd2b300242230faa92cf8e26ccd70231bc9ef Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 19 Mar 2022 23:37:58 -0700 +Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_BINDIR + +This ensures the install paths are not hardcoded. + +Signed-off-by: Khem Raj +--- + cmake/CMakeLists.txt | 4 ++-- + src/samples/CMakeLists.txt | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index a9f8908..7eadc60 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -11,7 +11,7 @@ export(EXPORT ${package_name} + FILE "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Targets.cmake" + NAMESPACE ${package_name}::) + +-install(EXPORT ${package_name} DESTINATION lib/cmake/${package_name} ++install(EXPORT ${package_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} + FILE ${package_name}Targets.cmake + NAMESPACE ${package_name}::) + +@@ -19,4 +19,4 @@ install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" + FindPahoMqttC.cmake + "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" +- DESTINATION lib/cmake/${package_name}) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}) +diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt +index 953f5dc..d26729a 100644 +--- a/src/samples/CMakeLists.txt ++++ b/src/samples/CMakeLists.txt +@@ -103,7 +103,7 @@ endif() + + ## install binaries + install(TARGETS ${INSTALL_TARGETS} EXPORT PahoMqttCppSamples +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + +-- +2.35.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb index b5a6ac29c3..a9e16fa045 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb @@ -11,8 +11,9 @@ LIC_FILES_CHKSUM = " \ file://about.html;md5=dcde438d73cf42393da9d40fabc0c9bc \ " -SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=http;branch=master;protocol=https" - +SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=http;branch=master;protocol=https \ + file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch \ +" SRCREV = "33921c8b68b351828650c36816e7ecf936764379" DEPENDS = "openssl paho-mqtt-c" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_1.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_1.0.bb index ac0e8b7686..c9c0738abe 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_1.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Radio enable/disable command line utility" HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/rfkill" SECTION = "base" -LICENSE = "BSD-0-Clause" +LICENSE = "0BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=c6036d0eb7edbfced28c4160e5d3fa94" SRC_URI = "http://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb index 0f3b5e2971..7879324cc6 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Torrent client" HOMEPAGE = "http://libtorrent.rakshasa.no/" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.5.bb index 63b97d20ba..79d54038eb 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.5.bb @@ -2,7 +2,7 @@ SUMMARY = "A serial to network proxy" SECTION = "console/network" HOMEPAGE = "http://sourceforge.net/projects/ser2net/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f" DEPENDS = "gensio libyaml" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb b/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb index ca40957531..9e54968633 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb @@ -1,7 +1,7 @@ SUMMARY = "SMS Gateway software" DESCRIPTION = "The SMS Server Tools 3 is a SMS Gateway software which can send and receive short messages through GSM modems and mobile phones." SECTION = "console/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=4d21efa1bb2a186360dde4035f860682" HOMEPAGE = "http://smstools3.kekekasvi.com" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb index e070d1b533..1891eae40d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb @@ -2,7 +2,7 @@ SUMMARY = "Telepathy Framework glib-base helper library" DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection managers" HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" DEPENDS = "glib-2.0 dbus hostpython-runtime-native dbus-native dbus-glib libxslt-native" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BP}.tar.gz" SRC_URI[md5sum] = "cbeb0a24acc26e7f095be281c324da69" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb index a8190a480a..039cfc3a89 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Telepathy IRC connection manager" DESCRIPTION = "Telepathy implementation of the Internet Relay Chat protocols." HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" DEPENDS = "glib-2.0 dbus telepathy-glib openssl libxslt-native" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb index e81ec741a1..735db1441e 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Transmission is a fast, easy, and free BitTorrent client" SECTION = "network" HOMEPAGE = "https://transmissionbt.com/" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=73f535ddffcf2a0d3af4f381f84f9b33" DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb index a74b157929..3f4f846f9e 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "This daemon is in charge of multiplexing connections over USB to an iPhone or iPod touch." HOMEPAGE = "https://github.com/libimobiledevice/usbmuxd" -LICENSE = "GPLv3 & GPLv2 & LGPLv2.1" +LICENSE = "GPL-3.0-only & GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=ebb5c50ab7cab4baeffba14977030c07 \ file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb index c41a1738c5..99e3ccacac 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb @@ -1,7 +1,7 @@ HOMEPAGE = "http://www.alumnit.ca/wiki/?WvDial" DESCRIPTION = "WvDial is a program that makes it easy to connect your Linux workstation to the Internet." -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" inherit pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb index 5ff8496b83..d73c64661f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb @@ -1,7 +1,7 @@ HOMEPAGE = "http://alumnit.ca/wiki/index.php?page=WvStreams" SUMMARY = "WvStreams is a network programming library in C++" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605" DEPENDS = "zlib openssl (>= 0.9.8) dbus readline" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_5.2.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_5.2.6.bb index b5ab15df48..66c80758ce 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_5.2.6.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_5.2.6.bb @@ -17,7 +17,7 @@ organisations with a few servers and for large companies with a \ multitude of servers." HOMEPAGE = "http://www.zabbix.com/" SECTION = "Applications/Internet" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=300e938ad303147fede2294ed78fe02e" DEPENDS = "libevent libpcre openldap virtual/libiconv zlib" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb index 72fd561dd3..697bc47137 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb @@ -1,6 +1,6 @@ DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like a concurrency framework" HOMEPAGE = "http://www.zeromq.org" -LICENSE = "LGPLv3+" +LICENSE = "LGPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1" PACKAGECONFIG ??= "libsodium" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb index 1524f096f8..487681c92d 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb @@ -2,7 +2,7 @@ SUMMARY = "D-Bus wrapper in C++ for dbus" HOMEPAGE = "https://dbus-cxx.github.io/" BUGTRACKER = "https://github.com/libsigcplusplus/libsigcplusplus/issues" SECTION = "base" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https \ diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb index f40b48836a..d096cd618e 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb @@ -1,5 +1,5 @@ SUMMARY = "dbus forwarding daemon" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://dbus-daemon-proxy.c;endline=19;md5=41df6d21fe1c97d6a1cc22a5bf374cba" DEPENDS = "dbus dbus-glib" SRCREV = "1226a0a1374628ff191f6d8a56000be5e53e7608" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb b/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb index 999a0c0063..8e8f544e8e 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb @@ -2,7 +2,7 @@ SUMMARY = "DBus-C++ Library" DESCRIPTION = "DBus-c++ attempts to provide a C++ API for D-BUS. The library has a glib and an Ecore mainloop integration. It also offers an optional own main loop." HOMEPAGE = "http://dbus-cplusplus.sourceforge.net" SECTION = "base" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DEPENDS = "dbus expat glib-2.0 libpcre" diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc b/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc index 948e18da4d..824787083a 100644 --- a/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc +++ b/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc @@ -1,6 +1,6 @@ DESCRIPTION = "emlog is a Linux kernel module that makes it easy to access the \ most recent (and only the most recent) output from a process" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=http;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.70.0.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.70.0.bb index 357cf4f752..278cfd87bf 100644 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.70.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.70.0.bb @@ -1,7 +1,7 @@ SUMMARY = "C++ bindings for the glib library" HOMEPAGE = "http://www.gtkmm.org/" SECTION = "libs" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb index 2097ce84fc..f554a73fa6 100644 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb @@ -1,7 +1,7 @@ SUMMARY = "C++ bindings for the glib library" HOMEPAGE = "http://www.gtkmm.org/" SECTION = "libs" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" diff --git a/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb b/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb index b8818c1f31..9733749628 100644 --- a/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb @@ -1,7 +1,7 @@ SUMMARY = "Platform independent Near Field Communication (NFC) library" DESCRIPTION = "libnfc is a library which allows userspace application access \ to NFC devices." -LICENSE = "LGPLv3" +LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" SECTION = "libs" diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.7.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.7.bb index 8736d44b73..84494b8ac4 100644 --- a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.7.bb +++ b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.7.bb @@ -1,6 +1,6 @@ SUMMARY = "A library for loose coupling of C++ method calls" SECTION = "libs" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" DEPENDS = "mm-common" diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.2.0.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.2.0.bb index 3726dd0b2b..9318a30544 100644 --- a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.2.0.bb @@ -1,6 +1,6 @@ SUMMARY = "A library for loose coupling of C++ method calls" SECTION = "libs" -LICENSE = "LGPLv3" +LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=959bffe2993816eb32ec4bc1ec1d5875" DEPENDS = "mm-common" diff --git a/meta-openembedded/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb index 9c3b3e9ad8..c0f0b2e130 100644 --- a/meta-openembedded/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "C++ wrapper for libxml library" HOMEPAGE = "http://libxmlplusplus.sourceforge.net" BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml%2B%2B" SECTION = "libs" -LICENSE = "LGPL-2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 " SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" diff --git a/meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.42.1.bb b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.42.1.bb index 6065333d9a..f75568a1d9 100644 --- a/meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.42.1.bb +++ b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.42.1.bb @@ -3,7 +3,7 @@ DESCRIPTION = "C++ wrapper for libxml library" HOMEPAGE = "http://libxmlplusplus.sourceforge.net" BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml%2B%2B" SECTION = "libs" -LICENSE = "LGPL-2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 " SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" diff --git a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb index b39784e241..07c5cc9394 100644 --- a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb @@ -1,5 +1,5 @@ SUMMARY = "Mickey's DBus Introspection and Interaction Utility V2" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07" DEPENDS = "readline" diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb index cee56fd55a..33969ff7a2 100644 --- a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb @@ -1,5 +1,5 @@ SUMMARY = "Common GNOME build files for C++ bindings" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-meson-Use-pkg-config-to-detect-iniparser.patch b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-meson-Use-pkg-config-to-detect-iniparser.patch new file mode 100644 index 0000000000..ee172c3a69 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-meson-Use-pkg-config-to-detect-iniparser.patch @@ -0,0 +1,41 @@ +From 44516eee75696c84849c0f7aa632e2456b101813 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 26 Mar 2022 00:57:03 -0700 +Subject: [PATCH] meson: Use pkg-config to detect iniparser + +Add iniparser dependency to util subdir + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + meson.build | 2 +- + util/meson.build | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 42e11aa..4209320 100644 +--- a/meson.build ++++ b/meson.build +@@ -160,7 +160,7 @@ cc = meson.get_compiler('c') + + # keyutils and iniparser lack pkgconfig + keyutils = cc.find_library('keyutils', required : get_option('keyutils')) +-iniparser = cc.find_library('iniparser', required : true) ++iniparser = dependency('iniparser', required : true) + + conf = configuration_data() + check_headers = [ +diff --git a/util/meson.build b/util/meson.build +index 784b279..8e9ae9a 100644 +--- a/util/meson.build ++++ b/util/meson.build +@@ -12,5 +12,6 @@ util = static_library('util', [ + 'iomem.c', + ], + include_directories : root_inc, ++ dependencies : iniparser, + ) + util_dep = declare_dependency(link_with : util) +-- +2.35.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-util-Correct-path-to-iniparser.h.patch b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-util-Correct-path-to-iniparser.h.patch new file mode 100644 index 0000000000..fe2612ce94 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-util-Correct-path-to-iniparser.h.patch @@ -0,0 +1,28 @@ +From c212d228c25cb583f52a6d31e9f0ec7bc1f9c506 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 26 Mar 2022 01:10:02 -0700 +Subject: [PATCH] util: Correct path to iniparser.h + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + util/parse-configs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/parse-configs.c b/util/parse-configs.c +index c834a07..1b7ffa6 100644 +--- a/util/parse-configs.c ++++ b/util/parse-configs.c +@@ -4,7 +4,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +-- +2.35.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v69.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v69.bb deleted file mode 100644 index b848ca63c5..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v69.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "libnvdimm utility library" -DESCRIPTION = "Utility library for managing the libnvdimm \ -(non-volatile memory device) sub-system in the Linux kernel. \ -The LIBNVDIMM subsystem provides support for three types of \ -NVDIMMs, namely,PMEM, BLK, and NVDIMM devices that can \ -simultaneously support both PMEM and BLK mode access." -HOMEPAGE = "https://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git/tree/Documentation/nvdimm/nvdimm.txt?h=libnvdimm-for-next" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=e66651809cac5da60c8b80e9e4e79e08" - -inherit autotools-brokensep pkgconfig bash-completion systemd - -SRCREV = "ea62d6d53bf6f806c4841e97a370201e18446860" -SRC_URI = "git://github.com/pmem/ndctl.git;branch=master;protocol=https" - -UPSTREAM_CHECK_GITTAGREGEX = "(?Pv\d+(\.\d+)*)" - -DEPENDS = "kmod udev json-c keyutils" - -S = "${WORKDIR}/git" - -EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" -PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd" - -do_configure:prepend() { - ${S}/autogen.sh -} - -SYSTEMD_SERVICE:${PN} = "ndctl-monitor.service" -SYSTEMD_AUTO_ENABLE:${PN} = "disable" - -FILES:${PN} += "${datadir}/daxctl/daxctl.conf" diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb new file mode 100644 index 0000000000..c88d392970 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb @@ -0,0 +1,35 @@ +SUMMARY = "libnvdimm utility library" +DESCRIPTION = "Utility library for managing the libnvdimm \ +(non-volatile memory device) sub-system in the Linux kernel. \ +The LIBNVDIMM subsystem provides support for three types of \ +NVDIMMs, namely,PMEM, BLK, and NVDIMM devices that can \ +simultaneously support both PMEM and BLK mode access." +HOMEPAGE = "https://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git/tree/Documentation/nvdimm/nvdimm.txt?h=libnvdimm-for-next" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & MIT & CC0-1.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=74a614eac8b2657a4b8e6607421a0883" + +inherit meson pkgconfig bash-completion systemd + +SRCREV = "dd58d43458943d20ff063850670bf54a5242c9c5" +SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https \ + file://0001-util-Correct-path-to-iniparser.h.patch \ + file://0001-meson-Use-pkg-config-to-detect-iniparser.patch" + +UPSTREAM_CHECK_GITTAGREGEX = "(?Pv\d+(\.\d+)*)" + +DEPENDS = "kmod udev json-c keyutils iniparser" + +S = "${WORKDIR}/git" + +EXTRA_OECONF += "-Ddestructive=enabled" + +PACKAGECONFIG ??= "tests ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" +PACKAGECONFIG[tests] = "-Dtest=enabled, -Dtest=disabled," +PACKAGECONFIG[docs] = "-Ddocs=enabled -Dasciidoctor=enabled,-Ddocs=disabled -Dasciidoctor=disabled, asciidoc-native" + +SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" +SYSTEMD_SERVICE:${PN} = "ndctl-monitor.service daxdev-reconfigure@.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" + +FILES:${PN} += "${datadir}/daxctl/daxctl.conf " diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb index 5a0776c266..8a712602cc 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb @@ -1,13 +1,13 @@ SUMMARY = "OpenCL API C++ bindings" DESCRIPTION = "OpenCL API C++ bindings from Khronos" -SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https;branch=master" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https;branch=main" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -PV = "2.0.15+git${SRCPV}" -SRCREV = "f7237f3799009d856935e1eecfd7c9301fe522b4" +PV = "2.0.16+git${SRCPV}" +SRCREV = "1df82b9749739f2681081092ae163bb0f0d40f66" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb index f77bf46d24..5e8e6f07fa 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-headers_git.bb @@ -5,12 +5,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "base" S = "${WORKDIR}/git" -# v2020.12.18 -SRCREV = "c57ba81c460ee97b6b9d0b8d18faf5ba6883114b" -SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=master;protocol=https" +PV = "v2022.01.04+git${SRCPV}" +SRCREV = "59ac4dc2f282286d8db83143686cfe37ec658b84" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https" do_configure[noexec] = "1" do_compile[noexec] = "1" +ALLOW_EMPTY:${PN} = "1" do_install () { install -d ${D}${includedir}/CL/ diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb index 45b1ad5494..67437732d8 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-icd-loader_git.bb @@ -1,30 +1,36 @@ -SUMMARY = "OpenCL ICD Loader" +SUMMARY = "OpenCL ICD Loader" DESCRIPTION = "OpenCL compute ICD Loader from Khronos Group" -LICENSE = "Apache-2.0" +LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SECTION = "base" +inherit pkgconfig cmake + DEPENDS += "opencl-headers" -inherit pkgconfig cmake +PROVIDES = "virtual/opencl-icd" S = "${WORKDIR}/git" -PV = "2020.12.18+git${SRCPV}" -SRCREV = "1d5315c3ed30d026acb79a1aa53a276fc833ffa7" -SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=master;protocol=https" - -do_install () { - install -d ${D}${bindir} - install -m 0755 ${B}/test/loader_test/icd_loader_test ${D}${bindir}/ - chrpath -d ${D}${bindir}/icd_loader_test - install -d ${D}${libdir} - install -m 0644 ${B}/test/log/libIcdLog.so ${D}${libdir}/ - install -m 0644 ${B}/test/driver_stub/libOpenCLDriverStub.so ${D}${libdir}/ - chrpath -d ${D}${libdir}/libOpenCLDriverStub.so - install -m 0644 ${B}/libOpenCL.so.1.2 ${D}${libdir}/ - cd ${D}${libdir} - ln -s libOpenCL.so.1.2 libOpenCL.so.1 - ln -s libOpenCL.so.1 libOpenCL.so +PV = "v2022.01.04+git${SRCPV}" +SRCREV = "169f05d026e65948b30cfe2200595fda92198cf7" +SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=main;protocol=https" + +EXTRA_OECMAKE:append = " \ + -DOPENCL_ICD_LOADER_HEADERS_DIR=${STAGING_INCDIR} \ +" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${B}/test/loader_test/icd_loader_test ${D}${bindir}/ + chrpath -d ${D}${bindir}/icd_loader_test + install -d ${D}${libdir} + install -m 0644 ${B}/test/log/libIcdLog.so ${D}${libdir}/ + install -m 0644 ${B}/test/driver_stub/libOpenCLDriverStub.so ${D}${libdir}/ + chrpath -d ${D}${libdir}/libOpenCLDriverStub.so + install -m 0644 ${B}/libOpenCL.so.1.2 ${D}${libdir}/ + cd ${D}${libdir} + ln -s libOpenCL.so.1.2 libOpenCL.so.1 + ln -s libOpenCL.so.1 libOpenCL.so } PACKAGES = "opencl-icd-loader opencl-icd-loader-dev" @@ -32,13 +38,13 @@ PACKAGES += "libicdlog libicdlog-dbg" PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" FILES:${PN} = " \ - ${bindir}/icd_loader_test \ - ${libdir}/libOpenCLDriverStub.so \ - ${libdir}/libOpenCL.so.1.2 \ + ${bindir}/icd_loader_test \ + ${libdir}/libOpenCLDriverStub.so \ + ${libdir}/libOpenCL.so.1.2 \ + ${libdir}/libOpenCL.so.1 \ " FILES:${PN}-dev = " \ - ${libdir}/libOpenCL.so \ - ${libdir}/libOpenCL.so.1 \ + ${libdir}/libOpenCL.so \ " FILES:libicdlog = "${libdir}/libIcdLog.so" 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 d7076c211a..08d9e91704 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 @@ -223,6 +223,7 @@ RDEPENDS:packagegroup-meta-oe-dbs ="\ soci \ sqlite \ " +RDEPENDS:packagegroup-meta-oe-dbs:remove:libc-musl:powerpc = "rocksdb" RDEPENDS:packagegroup-meta-oe-dbs-python2 ="\ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'mysql-python', '', d), "", d)} \ @@ -303,6 +304,7 @@ RDEPENDS:packagegroup-meta-oe-devtools ="\ squashfs-tools-ng \ uftrace \ unifex \ + valijson \ libxerces-c \ xerces-c-samples \ xmlrpc-c \ @@ -446,7 +448,7 @@ RDEPENDS:packagegroup-meta-oe-extended:remove:mipsarch = "upm mraa minifi-cpp ti RDEPENDS:packagegroup-meta-oe-extended:remove:mips = "sysdig" RDEPENDS:packagegroup-meta-oe-extended:remove:powerpc = "upm mraa minifi-cpp" RDEPENDS:packagegroup-meta-oe-extended:remove:powerpc64 = "upm mraa minifi-cpp" -RDEPENDS:packagegroup-meta-oe-extended:remove:powerpc64le = "upm mraa" +RDEPENDS:packagegroup-meta-oe-extended:remove:powerpc64le = "upm mraa sysdig" RDEPENDS:packagegroup-meta-oe-extended:remove:riscv64 = "upm libleak libyang mraa sysdig tiptop" RDEPENDS:packagegroup-meta-oe-extended:remove:riscv32 = "upm libleak libyang mraa sysdig tiptop" @@ -759,6 +761,7 @@ RDEPENDS:packagegroup-meta-oe-support ="\ gpm \ gsoap \ hdf5 \ + hstr \ htop \ hunspell-dictionaries \ hunspell \ @@ -948,6 +951,7 @@ RDEPENDS:packagegroup-meta-oe-support:remove:riscv32 = "gperftools uim" RDEPENDS:packagegroup-meta-oe-support:remove:powerpc = "ssiapi tbb" RDEPENDS:packagegroup-meta-oe-support:remove:powerpc64le = "ssiapi" RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl = "pcp" +RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl:powerpc = "gsl" RDEPENDS:packagegroup-meta-oe-test ="\ bats \ diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb index 7d76ab76f0..143ffa10d1 100644 --- a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.5.bb @@ -8,7 +8,7 @@ DESCRIPTION = "Plymouth is an application that runs very early in the boot proce HOMEPAGE = "http://www.freedesktop.org/wiki/Software/Plymouth" SECTION = "base" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" diff --git a/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb b/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb index c230a25348..00b87bbd8b 100644 --- a/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb +++ b/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb @@ -1,7 +1,7 @@ SUMMARY = "Proxy libintl" HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/" SECTION = "libs" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://src/proxy-libintl/COPYING.LIB.txt;md5=bc400bc21422f9a92e76ec2c5167ca2e" PR = "r1" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb index 8b89a98413..6d72eb64b3 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_250.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "libsystemd static library built specifically as an integral compo SECTION = "libs" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" inherit meson pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_1.1.0.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_1.1.0.bb index 1064b85b37..01f66c3f23 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_1.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_1.1.0.bb @@ -1,7 +1,7 @@ SUMMARY = "sdbus-c++ native tools" DESCRIPTION = "Native interface code generator for development with sdbus-c++" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=1803fa9c2c3ce8cb06b4861d75310742" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb index 79373f8e03..39f0b4c560 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.0.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "High-level C++ D-Bus library designed to provide easy-to-use yet SECTION = "libs" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1803fa9c2c3ce8cb06b4861d75310742" inherit cmake pkgconfig systemd ptest @@ -21,7 +21,7 @@ SRCREV = "65782bbf435d91e5eb6af9ddab110df406a824a9" SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master" SRC_URI += "file://run-ptest" -EXTRA_OECMAKE = "-DBUILD_CODE_GEN=ON \ +EXTRA_OECMAKE = "-DBUILD_CODE_GEN=OFF \ -DBUILD_DOC=ON \ -DBUILD_DOXYGEN_DOC=OFF" diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.5.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.5.bb index 69ac8b58d4..705f531f10 100644 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.5.bb +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.5.bb @@ -2,7 +2,7 @@ SUMMARY = "Toybox combines common utilities together into a single executable." HOMEPAGE = "http://www.landley.net/toybox/" DEPENDS = "attr virtual/crypt" -LICENSE = "BSD-0-Clause" +LICENSE = "0BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=78659a599b9325da368f2f1eb88f19c7" inherit cml1 update-alternatives diff --git a/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb b/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb index 249a6ef542..a529032aad 100644 --- a/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb @@ -1,6 +1,6 @@ SUMMARY = "A user tool to support sleeping some number of microseconds" SECTION = "base" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" S = "${WORKDIR}" diff --git a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb index 89e92d62f4..c95a5b2d32 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.5.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}/git" DEPENDS = "openssl" -EXTRA_OEMAKE:append = "PREFIX=${prefix} USE_SHARED_LIB=1" +EXTRA_OEMAKE:append = "PREFIX=${prefix} LIBDIR=${libdir} USE_SHARED_LIB=1" # We want to statically link the binary to libfsverity on native Windows EXTRA_OEMAKE:remove:mingw32:class-nativesdk = "USE_SHARED_LIB=1" EXTRA_OEMAKE:remove:mingw32:class-native = "USE_SHARED_LIB=1" diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb index 1bd587f0bc..8ff5ddd175 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Linux Kernel Crypto API User Space Interface Library" HOMEPAGE = "http://www.chronox.de/libkcapi.html" -LICENSE = "BSD-3-Clause | GPL-2.0" +LICENSE = "BSD-3-Clause | GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=80c467906eb826339c7f09e61808ed23" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb b/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb index 0c5fc93190..50cdf229e6 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb @@ -1,6 +1,6 @@ SUMMARY = "Replacement for the old crypt() package and crypt(1) command, with extensions" HOMEPAGE = "http://mcrypt.sourceforge.net/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff" DEPENDS = "libtool" diff --git a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.28.bb b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.28.bb index ca78e5ef3c..68ae94bdbe 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.28.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.28.bb @@ -9,7 +9,7 @@ slot, supporting session expiration and much more all using a simple API." HOMEPAGE = "https://github.com/OpenSC/pkcs11-helper" SECTION = "Development/Libraries" -LICENSE = "GPLv2 & BSD-3-Clause" +LICENSE = "GPL-2.0-only & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://COPYING;md5=30f10d22cfb1ba98ccd714a41ad3311a \ file://COPYING.GPL;md5=8a71d0475d08eee76d8b6d0c6dbec543 \ diff --git a/meta-openembedded/meta-oe/recipes-dbs/libdbi/libdbi.inc b/meta-openembedded/meta-oe/recipes-dbs/libdbi/libdbi.inc index cea2838e36..0aba91b5db 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/libdbi/libdbi.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/libdbi/libdbi.inc @@ -4,7 +4,7 @@ DESCRIPTION = "Database Independent Abstraction Layer for C" HOMEPAGE = "http://libdbi.sourceforge.net/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" SECTION = "libs" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.6.4.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.6.4.bb deleted file mode 100644 index e38726d3f9..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.6.4.bb +++ /dev/null @@ -1,20 +0,0 @@ -require mariadb.inc -inherit native - -PROVIDES += "mysql5-native" -DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native" - -RDEPENDS:${PN} = "" -PACKAGES = "" -EXTRA_OEMAKE = "" - -do_install() { - oe_runmake 'DESTDIR=${D}' install - - install -d ${D}${bindir} - install -m 0755 sql/gen_lex_hash ${D}${bindir}/ - install -m 0755 sql/gen_lex_token ${D}${bindir}/ - install -m 0755 extra/comp_err ${D}${bindir}/ - install -m 0755 scripts/comp_sql ${D}${bindir}/ -} - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.7.3.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.7.3.bb new file mode 100644 index 0000000000..e38726d3f9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.7.3.bb @@ -0,0 +1,20 @@ +require mariadb.inc +inherit native + +PROVIDES += "mysql5-native" +DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native" + +RDEPENDS:${PN} = "" +PACKAGES = "" +EXTRA_OEMAKE = "" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + + install -d ${D}${bindir} + install -m 0755 sql/gen_lex_hash ${D}${bindir}/ + install -m 0755 sql/gen_lex_token ${D}${bindir}/ + install -m 0755 extra/comp_err ${D}${bindir}/ + install -m 0755 scripts/comp_sql ${D}${bindir}/ +} + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 51e6ddbf71..855f124834 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -1,7 +1,7 @@ SUMMARY = "A robust, scalable, and reliable SQL server" HOMEPAGE = "http://mariadb.org" SECTION = "libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b1becf0cfa3366e0f4d854d1d264f311" SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ @@ -12,7 +12,6 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://mysql-systemd-start \ file://configure.cmake-fix-valgrind.patch \ file://support-files-CMakeLists.txt-fix-do_populate_sysroot.patch \ - file://c11_atomics.patch \ file://fix-arm-atomic.patch \ file://0001-Fix-library-LZ4-lookup.patch \ file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ @@ -20,11 +19,12 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://ssize_t.patch \ file://mm_malloc.patch \ file://sys_futex.patch \ - file://0001-MDEV-25785-Add-support-for-OpenSSL-3.0.patch \ + file://mariadb-openssl3.patch \ + file://clang-64bit-atomics.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "75bf9b147a95d38160d01a73b098d50a1960563b46d16a235971fff64d99643c" +SRC_URI[sha256sum] = "da286919ffc9c913282202349709b6ba4ebcd342815e8dae0aa6b6bd8f515cd4" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -62,17 +62,19 @@ FILES:${PN}-setupdb = "${sysconfdir}/init.d/install_db \ ${bindir}/mysql-systemd-start \ " -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} openssl" PACKAGECONFIG:class-native = "" PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind" PACKAGECONFIG[krb5] = ", ,krb5" PACKAGECONFIG[zstd] = "-DWITH_ROCKSDB_ZSTD=ON,-DWITH_ROCKSDB_ZSTD=OFF,zstd" +PACKAGECONFIG[openssl] = "-DWITH_SSL='system',-DWITH_SSL='bundled',openssl" # MariaDB doesn't link properly with gold # https://mariadb.atlassian.net/browse/MDEV-5982 TARGET_CFLAGS += "-fuse-ld=bfd" LDFLAGS += " -pthread" + BUILD_CFLAGS += "-fuse-ld=bfd" BUILD_CXXFLAGS += "-fuse-ld=bfd" @@ -203,7 +205,7 @@ RDEPENDS:${PN}-client = "perl perl-module-getopt-long perl-module-file-temp \ RDEPENDS:${PN}-server = "perl perl-module-getopt-long perl-module-data-dumper \ perl-module-file-basename perl-module-file-path perl-module-sys-hostname \ perl-module-file-copy perl-module-file-temp perl-module-posix \ - ${PN}-client ${PN}-setupdb libdbi-perl libdbd-mysql-perl" + ${PN}-client ${PN}-setupdb libdbi-perl libdbd-mysql-perl lzo" RDEPENDS:${PN}-leftovers = "perl perl-module-cwd perl-module-benchmark perl-module-getopt-long \ perl-module-posix perl-module-data-dumper perl-module-sigtrap perl-module-threads \ perl-module-threads-shared perl-module-io-socket perl-module-sys-hostname perl-module-file-copy \ diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch index 0cf0560e11..6d9352fe86 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-library-LZ4-lookup.patch @@ -1,30 +1,31 @@ -From 1d7612b063eb1fc7bf97bc27b13e1de596748aa1 Mon Sep 17 00:00:00 2001 +From f15fbdf1244ca9ce01c5507660a86d685ed88bcf Mon Sep 17 00:00:00 2001 From: Sumit Garg -Date: Wed, 8 Jan 2020 04:58:30 +0000 +Date: Mon, 21 Mar 2022 15:08:40 +0800 Subject: [PATCH] Fix library LZ4 lookup. Signed-off-by: Sumit Garg +Signed-off-by: Mingli Yu --- cmake/FindLZ4.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake/FindLZ4.cmake b/cmake/FindLZ4.cmake -index e97dd63e2b0..2f4694e727c 100644 +index eebd859..094241c 100644 --- a/cmake/FindLZ4.cmake +++ b/cmake/FindLZ4.cmake @@ -1,5 +1,10 @@ --find_path(LZ4_INCLUDE_DIR NAMES lz4.h) +-find_path(LZ4_INCLUDE_DIRS NAMES lz4.h) -find_library(LZ4_LIBRARIES NAMES lz4) +find_path(LZ4_INCLUDE_DIR -+ NAMES lz4.h ++ NAMES lz4.h + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) + +find_library(LZ4_LIBRARIES + NAMES lz4 + NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) - include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS( + if(LZ4_INCLUDE_DIRS AND EXISTS "${LZ4_INCLUDE_DIRS}/lz4.h") + file(STRINGS "${LZ4_INCLUDE_DIRS}/lz4.h" LZ4_H REGEX "^#define LZ4_VERSION_[MR]") -- -2.17.1 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-25785-Add-support-for-OpenSSL-3.0.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-25785-Add-support-for-OpenSSL-3.0.patch deleted file mode 100644 index ab6811c0f5..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-25785-Add-support-for-OpenSSL-3.0.patch +++ /dev/null @@ -1,381 +0,0 @@ -From 1b238e343506b43825092941d4cd294d9b866bef Mon Sep 17 00:00:00 2001 -From: Vladislav Vaintroub -Date: Mon, 8 Nov 2021 18:48:19 +0100 -Subject: [PATCH] MDEV-25785 Add support for OpenSSL 3.0 - -Summary of changes - -- MD_CTX_SIZE is increased - -- EVP_CIPHER_CTX_buf_noconst(ctx) does not work anymore, points - to nobody knows where. The assumption made previously was that - (since the function does not seem to be documented) - was that it points to the last partial source block. - Add own partial block buffer for NOPAD encryption instead - -- SECLEVEL in CipherString in openssl.cnf - had been downgraded to 0, from 1, to make TLSv1.0 and TLSv1.1 possible - (according to https://github.com/openssl/openssl/blob/openssl-3.0.0/NEWS.md - even though the manual for SSL_CTX_get_security_level claims that it - should not be necessary) - -- Workaround Ssl_cipher_list issue, it now returns TLSv1.3 ciphers, - in addition to what was set in --ssl-cipher - -- ctx_buf buffer now must be aligned to 16 bytes with openssl( - previously with WolfSSL only), ot crashes will happen - -- updated aes-t , to be better debuggable - using function, rather than a huge multiline macro - added test that does "nopad" encryption piece-wise, to test - replacement of EVP_CIPHER_CTX_buf_noconst - -Upstream-Status: Backport [https://github.com/MariaDB/server/commit/1b238e343506b43825092941d4cd294d9b866bef] - -Signed-off-by: Mingli Yu ---- - cmake/ssl.cmake | 8 ++ - include/ssl_compat.h | 3 +- - mysql-test/lib/openssl.cnf | 2 +- - mysql-test/main/ssl_cipher.result | 6 +- - mysql-test/main/ssl_cipher.test | 2 +- - mysys_ssl/my_crypt.cc | 46 +++++++----- - unittest/mysys/aes-t.c | 121 ++++++++++++++++++++++-------- - 7 files changed, 133 insertions(+), 55 deletions(-) - -diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake -index 7c2488be8bd..1bd46bc0f39 100644 ---- a/cmake/ssl.cmake -+++ b/cmake/ssl.cmake -@@ -139,6 +139,13 @@ MACRO (MYSQL_CHECK_SSL) - SET(SSL_INTERNAL_INCLUDE_DIRS "") - SET(SSL_DEFINES "-DHAVE_OPENSSL") - -+ # Silence "deprecated in OpenSSL 3.0" -+ IF((NOT OPENSSL_VERSION) # 3.0 not determined by older cmake -+ OR NOT(OPENSSL_VERSION VERSION_LESS "3.0.0")) -+ SET(SSL_DEFINES "${SSL_DEFINES} -DOPENSSL_API_COMPAT=0x10100000L") -+ SET(CMAKE_REQUIRED_DEFINITIONS -DOPENSSL_API_COMPAT=0x10100000L) -+ ENDIF() -+ - SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) - SET(CMAKE_REQUIRED_LIBRARIES ${SSL_LIBRARIES}) - SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) -@@ -152,6 +159,7 @@ MACRO (MYSQL_CHECK_SSL) - HAVE_X509_check_host) - SET(CMAKE_REQUIRED_INCLUDES) - SET(CMAKE_REQUIRED_LIBRARIES) -+ SET(CMAKE_REQUIRED_DEFINITIONS) - ELSE() - IF(WITH_SSL STREQUAL "system") - MESSAGE(FATAL_ERROR "Cannot find appropriate system libraries for SSL. Use WITH_SSL=bundled to enable SSL support") -diff --git a/include/ssl_compat.h b/include/ssl_compat.h -index 9f4b6be8d95..affa9f2a448 100644 ---- a/include/ssl_compat.h -+++ b/include/ssl_compat.h -@@ -24,7 +24,7 @@ - #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) - #define ERR_remove_state(X) ERR_clear_error() - #define EVP_CIPHER_CTX_SIZE 176 --#define EVP_MD_CTX_SIZE 48 -+#define EVP_MD_CTX_SIZE 72 - #undef EVP_MD_CTX_init - #define EVP_MD_CTX_init(X) do { memset((X), 0, EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0) - #undef EVP_CIPHER_CTX_init -@@ -74,7 +74,6 @@ - #endif - - #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) --#define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf) - #define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt) - #define EVP_CIPHER_CTX_SIZE sizeof(EVP_CIPHER_CTX) - -diff --git a/mysql-test/lib/openssl.cnf b/mysql-test/lib/openssl.cnf -index b9ab37ac3a1..7cd6f748af2 100644 ---- a/mysql-test/lib/openssl.cnf -+++ b/mysql-test/lib/openssl.cnf -@@ -9,4 +9,4 @@ ssl_conf = ssl_section - system_default = system_default_section - - [system_default_section] --CipherString = ALL:@SECLEVEL=1 -+CipherString = ALL:@SECLEVEL=0 -diff --git a/mysql-test/main/ssl_cipher.result b/mysql-test/main/ssl_cipher.result -index 930d384eda9..66d817b7b41 100644 ---- a/mysql-test/main/ssl_cipher.result -+++ b/mysql-test/main/ssl_cipher.result -@@ -61,8 +61,8 @@ connect ssl_con,localhost,root,,,,,SSL; - SHOW STATUS LIKE 'Ssl_cipher'; - Variable_name Value - Ssl_cipher AES128-SHA --SHOW STATUS LIKE 'Ssl_cipher_list'; --Variable_name Value --Ssl_cipher_list AES128-SHA -+SELECT VARIABLE_VALUE like '%AES128-SHA%' FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher_list'; -+VARIABLE_VALUE like '%AES128-SHA%' -+1 - disconnect ssl_con; - connection default; -diff --git a/mysql-test/main/ssl_cipher.test b/mysql-test/main/ssl_cipher.test -index 36549d76d02..d4cdcffb276 100644 ---- a/mysql-test/main/ssl_cipher.test -+++ b/mysql-test/main/ssl_cipher.test -@@ -98,6 +98,6 @@ let $restart_parameters=--ssl-cipher=AES128-SHA; - source include/restart_mysqld.inc; - connect (ssl_con,localhost,root,,,,,SSL); - SHOW STATUS LIKE 'Ssl_cipher'; --SHOW STATUS LIKE 'Ssl_cipher_list'; -+SELECT VARIABLE_VALUE like '%AES128-SHA%' FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher_list'; - disconnect ssl_con; - connection default; -diff --git a/mysys_ssl/my_crypt.cc b/mysys_ssl/my_crypt.cc -index e512eee9066..4d7ebc7bd27 100644 ---- a/mysys_ssl/my_crypt.cc -+++ b/mysys_ssl/my_crypt.cc -@@ -29,11 +29,7 @@ - #include - #include - --#ifdef HAVE_WOLFSSL - #define CTX_ALIGN 16 --#else --#define CTX_ALIGN 0 --#endif - - class MyCTX - { -@@ -100,8 +96,9 @@ class MyCTX_nopad : public MyCTX - { - public: - const uchar *key; -- uint klen, buf_len; -+ uint klen, source_tail_len; - uchar oiv[MY_AES_BLOCK_SIZE]; -+ uchar source_tail[MY_AES_BLOCK_SIZE]; - - MyCTX_nopad() : MyCTX() { } - ~MyCTX_nopad() { } -@@ -112,7 +109,7 @@ class MyCTX_nopad : public MyCTX - compile_time_assert(MY_AES_CTX_SIZE >= sizeof(MyCTX_nopad)); - this->key= key; - this->klen= klen; -- this->buf_len= 0; -+ this->source_tail_len= 0; - if (ivlen) - memcpy(oiv, iv, ivlen); - DBUG_ASSERT(ivlen == 0 || ivlen == sizeof(oiv)); -@@ -123,26 +120,41 @@ class MyCTX_nopad : public MyCTX - return res; - } - -+ /** Update last partial source block, stored in source_tail array. */ -+ void update_source_tail(const uchar* src, uint slen) -+ { -+ if (!slen) -+ return; -+ uint new_tail_len= (source_tail_len + slen) % MY_AES_BLOCK_SIZE; -+ if (new_tail_len) -+ { -+ if (slen + source_tail_len < MY_AES_BLOCK_SIZE) -+ { -+ memcpy(source_tail + source_tail_len, src, slen); -+ } -+ else -+ { -+ DBUG_ASSERT(slen > new_tail_len); -+ memcpy(source_tail, src + slen - new_tail_len, new_tail_len); -+ } -+ } -+ source_tail_len= new_tail_len; -+ } -+ - int update(const uchar *src, uint slen, uchar *dst, uint *dlen) - { -- buf_len+= slen; -+ update_source_tail(src, slen); - return MyCTX::update(src, slen, dst, dlen); - } - - int finish(uchar *dst, uint *dlen) - { -- buf_len %= MY_AES_BLOCK_SIZE; -- if (buf_len) -+ if (source_tail_len) - { -- uchar *buf= EVP_CIPHER_CTX_buf_noconst(ctx); - /* - Not much we can do, block ciphers cannot encrypt data that aren't - a multiple of the block length. At least not without padding. - Let's do something CTR-like for the last partial block. -- -- NOTE this assumes that there are only buf_len bytes in the buf. -- If OpenSSL will change that, we'll need to change the implementation -- of this class too. - */ - uchar mask[MY_AES_BLOCK_SIZE]; - uint mlen; -@@ -154,10 +166,10 @@ class MyCTX_nopad : public MyCTX - return rc; - DBUG_ASSERT(mlen == sizeof(mask)); - -- for (uint i=0; i < buf_len; i++) -- dst[i]= buf[i] ^ mask[i]; -+ for (uint i=0; i < source_tail_len; i++) -+ dst[i]= source_tail[i] ^ mask[i]; - } -- *dlen= buf_len; -+ *dlen= source_tail_len; - return MY_AES_OK; - } - }; -diff --git a/unittest/mysys/aes-t.c b/unittest/mysys/aes-t.c -index 34704e06749..cbec2760941 100644 ---- a/unittest/mysys/aes-t.c -+++ b/unittest/mysys/aes-t.c -@@ -21,27 +21,96 @@ - #include - #include - --#define DO_TEST(mode, nopad, slen, fill, dlen, hash) \ -- SKIP_BLOCK_IF(mode == 0xDEADBEAF, nopad ? 4 : 5, #mode " not supported") \ -- { \ -- memset(src, fill, src_len= slen); \ -- ok(my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_ENCRYPT, \ -- src, src_len, dst, &dst_len, \ -- key, sizeof(key), iv, sizeof(iv)) == MY_AES_OK, \ -- "encrypt " #mode " %u %s", src_len, nopad ? "nopad" : "pad"); \ -- if (!nopad) \ -- ok (dst_len == my_aes_get_size(mode, src_len), "my_aes_get_size");\ -- my_md5(md5, (char*)dst, dst_len); \ -- ok(dst_len == dlen && memcmp(md5, hash, sizeof(md5)) == 0, "md5"); \ -- ok(my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_DECRYPT, \ -- dst, dst_len, ddst, &ddst_len, \ -- key, sizeof(key), iv, sizeof(iv)) == MY_AES_OK, \ -- "decrypt " #mode " %u", dst_len); \ -- ok(ddst_len == src_len && memcmp(src, ddst, src_len) == 0, "memcmp"); \ -+ -+/** Test streaming encryption, bytewise update.*/ -+static int aes_crypt_bytewise(enum my_aes_mode mode, int flags, const unsigned char *src, -+ unsigned int slen, unsigned char *dst, unsigned int *dlen, -+ const unsigned char *key, unsigned int klen, -+ const unsigned char *iv, unsigned int ivlen) -+{ -+ /* Allocate context on odd address on stack, in order to -+ catch misalignment errors.*/ -+ void *ctx= (char *)alloca(MY_AES_CTX_SIZE+1)+1; -+ -+ int res1, res2; -+ uint d1= 0, d2; -+ uint i; -+ -+ if ((res1= my_aes_crypt_init(ctx, mode, flags, key, klen, iv, ivlen))) -+ return res1; -+ for (i= 0; i < slen; i++) -+ { -+ uint tmp_d1=0; -+ res1= my_aes_crypt_update(ctx, src+i,1, dst, &tmp_d1); -+ if (res1) -+ return res1; -+ d1+= tmp_d1; -+ dst+= tmp_d1; -+ } -+ res2= my_aes_crypt_finish(ctx, dst, &d2); -+ *dlen= d1 + d2; -+ return res1 ? res1 : res2; -+} -+ -+ -+#ifndef HAVE_EncryptAes128Ctr -+const uint MY_AES_CTR=0xDEADBEAF; -+#endif -+#ifndef HAVE_EncryptAes128Gcm -+const uint MY_AES_GCM=0xDEADBEAF; -+#endif -+ -+#define MY_AES_UNSUPPORTED(x) (x == 0xDEADBEAF) -+ -+static void do_test(uint mode, const char *mode_str, int nopad, uint slen, -+ char fill, size_t dlen, const char *hash) -+{ -+ uchar key[16]= {1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6}; -+ uchar iv[16]= {2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7}; -+ uchar src[1000], dst[1100], dst2[1100], ddst[1000]; -+ uchar md5[MY_MD5_HASH_SIZE]; -+ uint src_len, dst_len, dst_len2, ddst_len; -+ int result; -+ -+ if (MY_AES_UNSUPPORTED(mode)) -+ { -+ skip(nopad?7:6, "%s not supported", mode_str); -+ return; -+ } -+ memset(src, fill, src_len= slen); -+ result= my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_ENCRYPT, src, src_len, -+ dst, &dst_len, key, sizeof(key), iv, sizeof(iv)); -+ ok(result == MY_AES_OK, "encrypt %s %u %s", mode_str, src_len, -+ nopad ? "nopad" : "pad"); -+ -+ if (nopad) -+ { -+ result= aes_crypt_bytewise(mode, nopad | ENCRYPTION_FLAG_ENCRYPT, src, -+ src_len, dst2, &dst_len2, key, sizeof(key), -+ iv, sizeof(iv)); -+ ok(result == MY_AES_OK, "encrypt bytewise %s %u", mode_str, src_len); -+ /* Compare with non-bytewise encryption result*/ -+ ok(dst_len == dst_len2 && memcmp(dst, dst2, dst_len) == 0, -+ "memcmp bytewise %s %u", mode_str, src_len); -+ } -+ else -+ { -+ int dst_len_real= my_aes_get_size(mode, src_len); -+ ok(dst_len_real= dst_len, "my_aes_get_size"); - } -+ my_md5(md5, (char *) dst, dst_len); -+ ok(dst_len == dlen, "md5 len"); -+ ok(memcmp(md5, hash, sizeof(md5)) == 0, "md5"); -+ result= my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_DECRYPT, -+ dst, dst_len, ddst, &ddst_len, key, sizeof(key), iv, -+ sizeof(iv)); -+ -+ ok(result == MY_AES_OK, "decrypt %s %u", mode_str, dst_len); -+ ok(ddst_len == src_len && memcmp(src, ddst, src_len) == 0, "memcmp"); -+} - --#define DO_TEST_P(M,S,F,D,H) DO_TEST(M,0,S,F,D,H) --#define DO_TEST_N(M,S,F,D,H) DO_TEST(M,ENCRYPTION_FLAG_NOPAD,S,F,D,H) -+#define DO_TEST_P(M, S, F, D, H) do_test(M, #M, 0, S, F, D, H) -+#define DO_TEST_N(M, S, F, D, H) do_test(M, #M, ENCRYPTION_FLAG_NOPAD, S, F, D, H) - - /* useful macro for debugging */ - #define PRINT_MD5() \ -@@ -53,25 +122,15 @@ - printf("\"\n"); \ - } while(0); - --#ifndef HAVE_EncryptAes128Ctr --const uint MY_AES_CTR=0xDEADBEAF; --#endif --#ifndef HAVE_EncryptAes128Gcm --const uint MY_AES_GCM=0xDEADBEAF; --#endif - - int - main(int argc __attribute__((unused)),char *argv[]) - { -- uchar key[16]= {1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6}; -- uchar iv[16]= {2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7}; -- uchar src[1000], dst[1100], ddst[1000]; -- uchar md5[MY_MD5_HASH_SIZE]; -- uint src_len, dst_len, ddst_len; - - MY_INIT(argv[0]); - -- plan(87); -+ plan(122); -+ - DO_TEST_P(MY_AES_ECB, 200, '.', 208, "\xd8\x73\x8e\x3a\xbc\x66\x99\x13\x7f\x90\x23\x52\xee\x97\x6f\x9a"); - DO_TEST_P(MY_AES_ECB, 128, '?', 144, "\x19\x58\x33\x85\x4c\xaa\x7f\x06\xd1\xb2\xec\xd7\xb7\x6a\xa9\x5b"); - DO_TEST_P(MY_AES_CBC, 159, '%', 160, "\x4b\x03\x18\x3d\xf1\xa7\xcd\xa1\x46\xb3\xc6\x8a\x92\xc0\x0f\xc9"); --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch deleted file mode 100644 index 1c76ab3918..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 976468458d53d8bb71acf48ddfc852a60557acb9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= -Date: Thu, 23 Jul 2020 00:02:21 -0700 -Subject: [PATCH] Link with libatomic to enable C11 atomics support - - Some architectures (mips) require libatomic to support proper - atomic operations. Check first if support is available without - linking, otherwise use the library. - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Signed-off-by: Mingli Yu ---- - configure.cmake | 20 +++++++++++++++++++- - mysys/CMakeLists.txt | 4 ++++ - sql/CMakeLists.txt | 4 ++++ - 3 files changed, 27 insertions(+), 1 deletion(-) - -diff --git a/configure.cmake b/configure.cmake -index 4fc324a9..23a2ea91 100644 ---- a/configure.cmake -+++ b/configure.cmake -@@ -862,7 +862,25 @@ int main() - long long int *ptr= &var; - return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); - }" --HAVE_GCC_C11_ATOMICS) -+HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC) -+IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC) -+ SET(HAVE_GCC_C11_ATOMICS True) -+ELSE() -+ SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) -+ LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") -+ CHECK_CXX_SOURCE_COMPILES(" -+ int main() -+ { -+ long long int var= 1; -+ long long int *ptr= &var; -+ return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); -+ }" -+ HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) -+ IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) -+ SET(HAVE_GCC_C11_ATOMICS True) -+ ENDIF() -+ SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES}) -+ENDIF() - - IF(WITH_VALGRIND) - SET(HAVE_valgrind 1) -diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt -index 6aab788f..91b9c393 100644 ---- a/mysys/CMakeLists.txt -+++ b/mysys/CMakeLists.txt -@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} - ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO}) - DTRACE_INSTRUMENT(mysys) - -+IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) -+ TARGET_LINK_LIBRARIES(mysys atomic) -+ENDIF() -+ - IF(HAVE_BFD_H) - TARGET_LINK_LIBRARIES(mysys bfd) - ENDIF(HAVE_BFD_H) -diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt -index b9cd418f..d42e5017 100644 ---- a/sql/CMakeLists.txt -+++ b/sql/CMakeLists.txt -@@ -222,6 +222,10 @@ ELSE() - SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) - ENDIF() - -+IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) -+ TARGET_LINK_LIBRARIES(sql atomic) -+ENDIF() -+ - IF(MSVC OR CMAKE_SYSTEM_NAME MATCHES AIX) - SET(libs_to_export_symbols sql mysys dbug strings) - # Create shared library of already compiled object --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/clang-64bit-atomics.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/clang-64bit-atomics.patch new file mode 100644 index 0000000000..cdc2947b7b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/clang-64bit-atomics.patch @@ -0,0 +1,178 @@ +Prevent Clang from emitting atomic libcalls + +Clang expects 8-byte alignment for some 64-bit atomic operations +in some 32-bit targets. Native instruction lock cmpxchg8b (for x86) +should only require 4-byte alignment. + +This patch tries to add 8-byte alignents to data needing atomic ops +which helps clang to not generate the libatomic calls but emit +builtins directly. + +Upstream-Status: Submitted[https://jira.mariadb.org/browse/MDEV-28162] +Signed-off-by: Khem Raj + +--- a/include/my_atomic.h ++++ b/include/my_atomic.h +@@ -115,6 +115,16 @@ + #include "atomic/gcc_builtins.h" + #endif + ++#include ++ ++# ifdef __GNUC__ ++typedef __attribute__((__aligned__(8))) int64 ATOMIC_I64; ++typedef __attribute__((__aligned__(8))) uint64 ATOMIC_U64; ++# else ++typedef int64 ATOMIC_I64; ++typedef uint64 ATOMIC_U64; ++# endif ++ + #if SIZEOF_LONG == 4 + #define my_atomic_addlong(A,B) my_atomic_add32((int32*) (A), (B)) + #define my_atomic_loadlong(A) my_atomic_load32((int32*) (A)) +@@ -123,12 +133,12 @@ + #define my_atomic_faslong(A,B) my_atomic_fas32((int32*) (A), (B)) + #define my_atomic_caslong(A,B,C) my_atomic_cas32((int32*) (A), (int32*) (B), (C)) + #else +-#define my_atomic_addlong(A,B) my_atomic_add64((int64*) (A), (B)) +-#define my_atomic_loadlong(A) my_atomic_load64((int64*) (A)) +-#define my_atomic_loadlong_explicit(A,O) my_atomic_load64_explicit((int64*) (A), (O)) +-#define my_atomic_storelong(A,B) my_atomic_store64((int64*) (A), (B)) +-#define my_atomic_faslong(A,B) my_atomic_fas64((int64*) (A), (B)) +-#define my_atomic_caslong(A,B,C) my_atomic_cas64((int64*) (A), (int64*) (B), (C)) ++#define my_atomic_addlong(A,B) my_atomic_add64((ATOMIC_I64*) (A), (B)) ++#define my_atomic_loadlong(A) my_atomic_load64((ATOMIC_I64*) (A)) ++#define my_atomic_loadlong_explicit(A,O) my_atomic_load64_explicit((ATOMIC_I64*) (A), (O)) ++#define my_atomic_storelong(A,B) my_atomic_store64((ATOMIC_I64*) (A), (B)) ++#define my_atomic_faslong(A,B) my_atomic_fas64((ATOMIC_I64*) (A), (B)) ++#define my_atomic_caslong(A,B,C) my_atomic_cas64((ATOMIC_I64*) (A), (ATOMIC_I64*) (B), (C)) + #endif + + #ifndef MY_MEMORY_ORDER_SEQ_CST +--- a/storage/perfschema/pfs_atomic.h ++++ b/storage/perfschema/pfs_atomic.h +@@ -41,7 +41,7 @@ public: + } + + /** Atomic load. */ +- static inline int64 load_64(int64 *ptr) ++ static inline int64 load_64(ATOMIC_I64 *ptr) + { + return my_atomic_load64(ptr); + } +@@ -53,9 +53,9 @@ public: + } + + /** Atomic load. */ +- static inline uint64 load_u64(uint64 *ptr) ++ static inline uint64 load_u64(ATOMIC_U64 *ptr) + { +- return (uint64) my_atomic_load64((int64*) ptr); ++ return (uint64) my_atomic_load64((ATOMIC_I64*) ptr); + } + + /** Atomic store. */ +@@ -65,7 +65,7 @@ public: + } + + /** Atomic store. */ +- static inline void store_64(int64 *ptr, int64 value) ++ static inline void store_64(ATOMIC_I64 *ptr, int64 value) + { + my_atomic_store64(ptr, value); + } +@@ -77,9 +77,9 @@ public: + } + + /** Atomic store. */ +- static inline void store_u64(uint64 *ptr, uint64 value) ++ static inline void store_u64(ATOMIC_U64 *ptr, uint64 value) + { +- my_atomic_store64((int64*) ptr, (int64) value); ++ my_atomic_store64((ATOMIC_I64*) ptr, (int64) value); + } + + /** Atomic add. */ +@@ -89,7 +89,7 @@ public: + } + + /** Atomic add. */ +- static inline int64 add_64(int64 *ptr, int64 value) ++ static inline int64 add_64(ATOMIC_I64 *ptr, int64 value) + { + return my_atomic_add64(ptr, value); + } +@@ -101,9 +101,9 @@ public: + } + + /** Atomic add. */ +- static inline uint64 add_u64(uint64 *ptr, uint64 value) ++ static inline uint64 add_u64(ATOMIC_U64 *ptr, uint64 value) + { +- return (uint64) my_atomic_add64((int64*) ptr, (int64) value); ++ return (uint64) my_atomic_add64((ATOMIC_I64*) ptr, (int64) value); + } + + /** Atomic compare and swap. */ +@@ -114,7 +114,7 @@ public: + } + + /** Atomic compare and swap. */ +- static inline bool cas_64(int64 *ptr, int64 *old_value, ++ static inline bool cas_64(ATOMIC_I64 *ptr, ATOMIC_I64 *old_value, + int64 new_value) + { + return my_atomic_cas64(ptr, old_value, new_value); +@@ -129,10 +129,10 @@ public: + } + + /** Atomic compare and swap. */ +- static inline bool cas_u64(uint64 *ptr, uint64 *old_value, ++ static inline bool cas_u64(ATOMIC_U64 *ptr, ATOMIC_U64 *old_value, + uint64 new_value) + { +- return my_atomic_cas64((int64*) ptr, (int64*) old_value, ++ return my_atomic_cas64((ATOMIC_I64*) ptr, (ATOMIC_I64*) old_value, + (uint64) new_value); + } + }; +--- a/sql/sql_class.h ++++ b/sql/sql_class.h +@@ -1049,7 +1049,7 @@ static inline void update_global_memory_ + (longlong) global_status_var.global_memory_used, + size)); + // workaround for gcc 4.2.4-1ubuntu4 -fPIE (from DEB_BUILD_HARDENING=1) +- int64 volatile * volatile ptr= &global_status_var.global_memory_used; ++ ATOMIC_I64 volatile * volatile ptr= &global_status_var.global_memory_used; + my_atomic_add64_explicit(ptr, size, MY_MEMORY_ORDER_RELAXED); + } + +--- a/storage/innobase/include/srv0mon.h ++++ b/storage/innobase/include/srv0mon.h +@@ -49,7 +49,7 @@ enum monitor_running_status { + typedef enum monitor_running_status monitor_running_t; + + /** Monitor counter value type */ +-typedef int64_t mon_type_t; ++typedef ATOMIC_I64 mon_type_t; + + /** Two monitor structures are defined in this file. One is + "monitor_value_t" which contains dynamic counter values for each +@@ -568,7 +568,7 @@ Use MONITOR_INC if appropriate mutex pro + if (enabled) { \ + ib_uint64_t value; \ + value = my_atomic_add64_explicit( \ +- (int64*) &MONITOR_VALUE(monitor), 1, \ ++ (ATOMIC_I64*) &MONITOR_VALUE(monitor), 1, \ + MY_MEMORY_ORDER_RELAXED) + 1; \ + /* Note: This is not 100% accurate because of the \ + inherent race, we ignore it due to performance. */ \ +@@ -585,7 +585,7 @@ Use MONITOR_DEC if appropriate mutex pro + if (enabled) { \ + ib_uint64_t value; \ + value = my_atomic_add64_explicit( \ +- (int64*) &MONITOR_VALUE(monitor), -1, \ ++ (ATOMIC_I64*) &MONITOR_VALUE(monitor), -1, \ + MY_MEMORY_ORDER_RELAXED) - 1; \ + /* Note: This is not 100% accurate because of the \ + inherent race, we ignore it due to performance. */ \ diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mariadb-openssl3.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mariadb-openssl3.patch new file mode 100644 index 0000000000..db123e4a10 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mariadb-openssl3.patch @@ -0,0 +1,385 @@ +From c80991c79f701dac42c630af4bd39593b0c7efb4 Mon Sep 17 00:00:00 2001 +From: Vladislav Vaintroub +Date: Mon, 8 Nov 2021 18:48:19 +0100 +Subject: [PATCH] MDEV-25785 Add support for OpenSSL 3.0 + +Summary of changes + +- MD_CTX_SIZE is increased + +- EVP_CIPHER_CTX_buf_noconst(ctx) does not work anymore, points + to nobody knows where. The assumption made previously was that + (since the function does not seem to be documented) + was that it points to the last partial source block. + Add own partial block buffer for NOPAD encryption instead + +- SECLEVEL in CipherString in openssl.cnf + had been downgraded to 0, from 1, to make TLSv1.0 and TLSv1.1 possible + +- Workaround Ssl_cipher_list issue, it now returns TLSv1.3 ciphers, + in addition to what was set in --ssl-cipher + +- ctx_buf buffer now must be aligned to 16 bytes with openssl( + previously with WolfSSL only), ot crashes will happen + +- updated aes-t , to be better debuggable + using function, rather than a huge multiline macro + added test that does "nopad" encryption piece-wise, to test + replacement of EVP_CIPHER_CTX_buf_noconst + +Patch from Fedora https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-openssl3.patch + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + cmake/ssl.cmake | 19 ++++- + include/ssl_compat.h | 3 +- + mysql-test/lib/openssl.cnf | 2 +- + mysql-test/main/ssl_cipher.result | 6 +- + mysql-test/main/ssl_cipher.test | 2 +- + mysys_ssl/my_crypt.cc | 46 +++++++----- + unittest/mysys/aes-t.c | 121 ++++++++++++++++++++++-------- + 7 files changed, 141 insertions(+), 58 deletions(-) + + +--- a/cmake/ssl.cmake ++++ b/cmake/ssl.cmake +@@ -118,7 +118,7 @@ MACRO (MYSQL_CHECK_SSL) + ENDIF() + FIND_PACKAGE(OpenSSL) + SET_PACKAGE_PROPERTIES(OpenSSL PROPERTIES TYPE RECOMMENDED) +- IF(OPENSSL_FOUND AND OPENSSL_VERSION AND OPENSSL_VERSION VERSION_LESS "3.0.0") ++ IF(OPENSSL_FOUND) + SET(OPENSSL_LIBRARY ${OPENSSL_SSL_LIBRARY}) + INCLUDE(CheckSymbolExists) + SET(SSL_SOURCES "") +@@ -139,9 +139,20 @@ MACRO (MYSQL_CHECK_SSL) + SET(SSL_INTERNAL_INCLUDE_DIRS "") + SET(SSL_DEFINES "-DHAVE_OPENSSL") + ++ FOREACH(x INCLUDES LIBRARIES DEFINITIONS) ++ SET(SAVE_CMAKE_REQUIRED_${x} ${CMAKE_REQUIRED_${x}}) ++ ENDFOREACH() ++ ++ # Silence "deprecated in OpenSSL 3.0" ++ IF((NOT OPENSSL_VERSION) # 3.0 not determined by older cmake ++ OR NOT(OPENSSL_VERSION VERSION_LESS "3.0.0")) ++ SET(SSL_DEFINES "${SSL_DEFINES} -DOPENSSL_API_COMPAT=0x10100000L") ++ SET(CMAKE_REQUIRED_DEFINITIONS -DOPENSSL_API_COMPAT=0x10100000L) ++ ENDIF() ++ + SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) + SET(CMAKE_REQUIRED_LIBRARIES ${SSL_LIBRARIES}) +- SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) ++ + CHECK_SYMBOL_EXISTS(ERR_remove_thread_state "openssl/err.h" + HAVE_ERR_remove_thread_state) + CHECK_SYMBOL_EXISTS(EVP_aes_128_ctr "openssl/evp.h" +@@ -150,8 +161,10 @@ MACRO (MYSQL_CHECK_SSL) + HAVE_EncryptAes128Gcm) + CHECK_SYMBOL_EXISTS(X509_check_host "openssl/x509v3.h" + HAVE_X509_check_host) +- SET(CMAKE_REQUIRED_INCLUDES) +- SET(CMAKE_REQUIRED_LIBRARIES) ++ ++ FOREACH(x INCLUDES LIBRARIES DEFINITIONS) ++ SET(CMAKE_REQUIRED_${x} ${SAVE_CMAKE_REQUIRED_${x}}) ++ ENDFOREACH() + ELSE() + IF(WITH_SSL STREQUAL "system") + MESSAGE(FATAL_ERROR "Cannot find appropriate system libraries for SSL. Use WITH_SSL=bundled to enable SSL support") +--- a/include/ssl_compat.h ++++ b/include/ssl_compat.h +@@ -24,7 +24,7 @@ + #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) + #define ERR_remove_state(X) ERR_clear_error() + #define EVP_CIPHER_CTX_SIZE 176 +-#define EVP_MD_CTX_SIZE 48 ++#define EVP_MD_CTX_SIZE 72 + #undef EVP_MD_CTX_init + #define EVP_MD_CTX_init(X) do { memset((X), 0, EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0) + #undef EVP_CIPHER_CTX_init +@@ -77,7 +77,6 @@ + #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) + #endif + +-#define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf) + #define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt) + #define EVP_CIPHER_CTX_SIZE sizeof(EVP_CIPHER_CTX) + +--- a/mysql-test/lib/openssl.cnf ++++ b/mysql-test/lib/openssl.cnf +@@ -9,4 +9,4 @@ ssl_conf = ssl_section + system_default = system_default_section + + [system_default_section] +-CipherString = ALL:@SECLEVEL=1 ++CipherString = ALL:@SECLEVEL=0 +--- a/mysql-test/main/ssl_cipher.result ++++ b/mysql-test/main/ssl_cipher.result +@@ -61,8 +61,8 @@ connect ssl_con,localhost,root,,,,,SSL; + SHOW STATUS LIKE 'Ssl_cipher'; + Variable_name Value + Ssl_cipher AES128-SHA +-SHOW STATUS LIKE 'Ssl_cipher_list'; +-Variable_name Value +-Ssl_cipher_list AES128-SHA ++SELECT VARIABLE_VALUE like '%AES128-SHA%' FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher_list'; ++VARIABLE_VALUE like '%AES128-SHA%' ++1 + disconnect ssl_con; + connection default; +--- a/mysql-test/main/ssl_cipher.test ++++ b/mysql-test/main/ssl_cipher.test +@@ -98,6 +98,6 @@ let $restart_parameters=--ssl-cipher=AES + source include/restart_mysqld.inc; + connect (ssl_con,localhost,root,,,,,SSL); + SHOW STATUS LIKE 'Ssl_cipher'; +-SHOW STATUS LIKE 'Ssl_cipher_list'; ++SELECT VARIABLE_VALUE like '%AES128-SHA%' FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher_list'; + disconnect ssl_con; + connection default; +--- a/mysys_ssl/my_crypt.cc ++++ b/mysys_ssl/my_crypt.cc +@@ -29,11 +29,7 @@ + #include + #include + +-#ifdef HAVE_WOLFSSL + #define CTX_ALIGN 16 +-#else +-#define CTX_ALIGN 0 +-#endif + + class MyCTX + { +@@ -100,8 +96,9 @@ class MyCTX_nopad : public MyCTX + { + public: + const uchar *key; +- uint klen, buf_len; ++ uint klen, source_tail_len; + uchar oiv[MY_AES_BLOCK_SIZE]; ++ uchar source_tail[MY_AES_BLOCK_SIZE]; + + MyCTX_nopad() : MyCTX() { } + ~MyCTX_nopad() { } +@@ -112,7 +109,7 @@ public: + compile_time_assert(MY_AES_CTX_SIZE >= sizeof(MyCTX_nopad)); + this->key= key; + this->klen= klen; +- this->buf_len= 0; ++ this->source_tail_len= 0; + if (ivlen) + memcpy(oiv, iv, ivlen); + DBUG_ASSERT(ivlen == 0 || ivlen == sizeof(oiv)); +@@ -123,26 +120,41 @@ public: + return res; + } + ++ /** Update last partial source block, stored in source_tail array. */ ++ void update_source_tail(const uchar* src, uint slen) ++ { ++ if (!slen) ++ return; ++ uint new_tail_len= (source_tail_len + slen) % MY_AES_BLOCK_SIZE; ++ if (new_tail_len) ++ { ++ if (slen + source_tail_len < MY_AES_BLOCK_SIZE) ++ { ++ memcpy(source_tail + source_tail_len, src, slen); ++ } ++ else ++ { ++ DBUG_ASSERT(slen > new_tail_len); ++ memcpy(source_tail, src + slen - new_tail_len, new_tail_len); ++ } ++ } ++ source_tail_len= new_tail_len; ++ } ++ + int update(const uchar *src, uint slen, uchar *dst, uint *dlen) + { +- buf_len+= slen; ++ update_source_tail(src, slen); + return MyCTX::update(src, slen, dst, dlen); + } + + int finish(uchar *dst, uint *dlen) + { +- buf_len %= MY_AES_BLOCK_SIZE; +- if (buf_len) ++ if (source_tail_len) + { +- uchar *buf= EVP_CIPHER_CTX_buf_noconst(ctx); + /* + Not much we can do, block ciphers cannot encrypt data that aren't + a multiple of the block length. At least not without padding. + Let's do something CTR-like for the last partial block. +- +- NOTE this assumes that there are only buf_len bytes in the buf. +- If OpenSSL will change that, we'll need to change the implementation +- of this class too. + */ + uchar mask[MY_AES_BLOCK_SIZE]; + uint mlen; +@@ -154,10 +166,10 @@ public: + return rc; + DBUG_ASSERT(mlen == sizeof(mask)); + +- for (uint i=0; i < buf_len; i++) +- dst[i]= buf[i] ^ mask[i]; ++ for (uint i=0; i < source_tail_len; i++) ++ dst[i]= source_tail[i] ^ mask[i]; + } +- *dlen= buf_len; ++ *dlen= source_tail_len; + return MY_AES_OK; + } + }; +--- a/unittest/mysys/aes-t.c ++++ b/unittest/mysys/aes-t.c +@@ -21,27 +21,96 @@ + #include + #include + +-#define DO_TEST(mode, nopad, slen, fill, dlen, hash) \ +- SKIP_BLOCK_IF(mode == 0xDEADBEAF, nopad ? 4 : 5, #mode " not supported") \ +- { \ +- memset(src, fill, src_len= slen); \ +- ok(my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_ENCRYPT, \ +- src, src_len, dst, &dst_len, \ +- key, sizeof(key), iv, sizeof(iv)) == MY_AES_OK, \ +- "encrypt " #mode " %u %s", src_len, nopad ? "nopad" : "pad"); \ +- if (!nopad) \ +- ok (dst_len == my_aes_get_size(mode, src_len), "my_aes_get_size");\ +- my_md5(md5, (char*)dst, dst_len); \ +- ok(dst_len == dlen && memcmp(md5, hash, sizeof(md5)) == 0, "md5"); \ +- ok(my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_DECRYPT, \ +- dst, dst_len, ddst, &ddst_len, \ +- key, sizeof(key), iv, sizeof(iv)) == MY_AES_OK, \ +- "decrypt " #mode " %u", dst_len); \ +- ok(ddst_len == src_len && memcmp(src, ddst, src_len) == 0, "memcmp"); \ ++ ++/** Test streaming encryption, bytewise update.*/ ++static int aes_crypt_bytewise(enum my_aes_mode mode, int flags, const unsigned char *src, ++ unsigned int slen, unsigned char *dst, unsigned int *dlen, ++ const unsigned char *key, unsigned int klen, ++ const unsigned char *iv, unsigned int ivlen) ++{ ++ /* Allocate context on odd address on stack, in order to ++ catch misalignment errors.*/ ++ void *ctx= (char *)alloca(MY_AES_CTX_SIZE+1)+1; ++ ++ int res1, res2; ++ uint d1= 0, d2; ++ uint i; ++ ++ if ((res1= my_aes_crypt_init(ctx, mode, flags, key, klen, iv, ivlen))) ++ return res1; ++ for (i= 0; i < slen; i++) ++ { ++ uint tmp_d1=0; ++ res1= my_aes_crypt_update(ctx, src+i,1, dst, &tmp_d1); ++ if (res1) ++ return res1; ++ d1+= tmp_d1; ++ dst+= tmp_d1; ++ } ++ res2= my_aes_crypt_finish(ctx, dst, &d2); ++ *dlen= d1 + d2; ++ return res1 ? res1 : res2; ++} ++ ++ ++#ifndef HAVE_EncryptAes128Ctr ++const uint MY_AES_CTR=0xDEADBEAF; ++#endif ++#ifndef HAVE_EncryptAes128Gcm ++const uint MY_AES_GCM=0xDEADBEAF; ++#endif ++ ++#define MY_AES_UNSUPPORTED(x) (x == 0xDEADBEAF) ++ ++static void do_test(uint mode, const char *mode_str, int nopad, uint slen, ++ char fill, size_t dlen, const char *hash) ++{ ++ uchar key[16]= {1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6}; ++ uchar iv[16]= {2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7}; ++ uchar src[1000], dst[1100], dst2[1100], ddst[1000]; ++ uchar md5[MY_MD5_HASH_SIZE]; ++ uint src_len, dst_len, dst_len2, ddst_len; ++ int result; ++ ++ if (MY_AES_UNSUPPORTED(mode)) ++ { ++ skip(nopad?7:6, "%s not supported", mode_str); ++ return; ++ } ++ memset(src, fill, src_len= slen); ++ result= my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_ENCRYPT, src, src_len, ++ dst, &dst_len, key, sizeof(key), iv, sizeof(iv)); ++ ok(result == MY_AES_OK, "encrypt %s %u %s", mode_str, src_len, ++ nopad ? "nopad" : "pad"); ++ ++ if (nopad) ++ { ++ result= aes_crypt_bytewise(mode, nopad | ENCRYPTION_FLAG_ENCRYPT, src, ++ src_len, dst2, &dst_len2, key, sizeof(key), ++ iv, sizeof(iv)); ++ ok(result == MY_AES_OK, "encrypt bytewise %s %u", mode_str, src_len); ++ /* Compare with non-bytewise encryption result*/ ++ ok(dst_len == dst_len2 && memcmp(dst, dst2, dst_len) == 0, ++ "memcmp bytewise %s %u", mode_str, src_len); + } ++ else ++ { ++ int dst_len_real= my_aes_get_size(mode, src_len); ++ ok(dst_len_real= dst_len, "my_aes_get_size"); ++ } ++ my_md5(md5, (char *) dst, dst_len); ++ ok(dst_len == dlen, "md5 len"); ++ ok(memcmp(md5, hash, sizeof(md5)) == 0, "md5"); ++ result= my_aes_crypt(mode, nopad | ENCRYPTION_FLAG_DECRYPT, ++ dst, dst_len, ddst, &ddst_len, key, sizeof(key), iv, ++ sizeof(iv)); ++ ++ ok(result == MY_AES_OK, "decrypt %s %u", mode_str, dst_len); ++ ok(ddst_len == src_len && memcmp(src, ddst, src_len) == 0, "memcmp"); ++} + +-#define DO_TEST_P(M,S,F,D,H) DO_TEST(M,0,S,F,D,H) +-#define DO_TEST_N(M,S,F,D,H) DO_TEST(M,ENCRYPTION_FLAG_NOPAD,S,F,D,H) ++#define DO_TEST_P(M, S, F, D, H) do_test(M, #M, 0, S, F, D, H) ++#define DO_TEST_N(M, S, F, D, H) do_test(M, #M, ENCRYPTION_FLAG_NOPAD, S, F, D, H) + + /* useful macro for debugging */ + #define PRINT_MD5() \ +@@ -53,25 +122,15 @@ + printf("\"\n"); \ + } while(0); + +-#ifndef HAVE_EncryptAes128Ctr +-const uint MY_AES_CTR=0xDEADBEAF; +-#endif +-#ifndef HAVE_EncryptAes128Gcm +-const uint MY_AES_GCM=0xDEADBEAF; +-#endif + + int + main(int argc __attribute__((unused)),char *argv[]) + { +- uchar key[16]= {1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6}; +- uchar iv[16]= {2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7}; +- uchar src[1000], dst[1100], ddst[1000]; +- uchar md5[MY_MD5_HASH_SIZE]; +- uint src_len, dst_len, ddst_len; + + MY_INIT(argv[0]); + +- plan(87); ++ plan(122); ++ + DO_TEST_P(MY_AES_ECB, 200, '.', 208, "\xd8\x73\x8e\x3a\xbc\x66\x99\x13\x7f\x90\x23\x52\xee\x97\x6f\x9a"); + DO_TEST_P(MY_AES_ECB, 128, '?', 144, "\x19\x58\x33\x85\x4c\xaa\x7f\x06\xd1\xb2\xec\xd7\xb7\x6a\xa9\x5b"); + DO_TEST_P(MY_AES_CBC, 159, '%', 160, "\x4b\x03\x18\x3d\xf1\xa7\xcd\xa1\x46\xb3\xc6\x8a\x92\xc0\x0f\xc9"); diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.6.4.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.6.4.bb deleted file mode 100644 index 04dfb42234..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.6.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -require mariadb.inc - -inherit qemu - -DEPENDS += "qemu-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" - -PROVIDES += "mysql5 libmysqlclient" - -RPROVIDES:${PN} += "mysql5" -RREPLACES:${PN} += "mysql5" -RCONFLICTS:${PN} += "mysql5" - -RPROVIDES:${PN}-dbg += "mysql5-dbg" -RREPLACES:${PN}-dbg += "mysql5-dbg" -RCONFLICTS:${PN}-dbg += "mysql5-dbg" - -RPROVIDES:${PN}-leftovers += "mysql5-leftovers" -RREPLACES:${PN}-leftovers += "mysql5-leftovers" -RCONFLICTS:${PN}-leftovers += "mysql5-leftovers" - -RPROVIDES:${PN}-client += "mysql5-client" -RREPLACES:${PN}-client += "mysql5-client" -RCONFLICTS:${PN}-client += "mysql5-client" - -RPROVIDES:${PN}-server += "mysql5-server" -RREPLACES:${PN}-server += "mysql5-server" -RCONFLICTS:${PN}-server += "mysql5-server" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.7.3.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.7.3.bb new file mode 100644 index 0000000000..c800c4c56c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.7.3.bb @@ -0,0 +1,28 @@ +require mariadb.inc + +inherit qemu + +DEPENDS += "qemu-native bison-native boost libpcre2 curl ncurses \ + zlib libaio libedit libevent libxml2 gnutls fmt lzo" + +PROVIDES += "mysql5 libmysqlclient" + +RPROVIDES:${PN} += "mysql5" +RREPLACES:${PN} += "mysql5" +RCONFLICTS:${PN} += "mysql5" + +RPROVIDES:${PN}-dbg += "mysql5-dbg" +RREPLACES:${PN}-dbg += "mysql5-dbg" +RCONFLICTS:${PN}-dbg += "mysql5-dbg" + +RPROVIDES:${PN}-leftovers += "mysql5-leftovers" +RREPLACES:${PN}-leftovers += "mysql5-leftovers" +RCONFLICTS:${PN}-leftovers += "mysql5-leftovers" + +RPROVIDES:${PN}-client += "mysql5-client" +RREPLACES:${PN}-client += "mysql5-client" +RCONFLICTS:${PN}-client += "mysql5-client" + +RPROVIDES:${PN}-server += "mysql5-server" +RREPLACES:${PN}-server += "mysql5-server" +RCONFLICTS:${PN}-server += "mysql5-server" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb index cd46586512..15f6b6fb9a 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb @@ -1,7 +1,7 @@ SUMMARY = "Python interface to MySQL" HOMEPAGE = "https://github.com/farcepest/MySQLdb1" SECTION = "devel/python" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "mysql5" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc index 257d27b112..00c0107469 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -18,7 +18,7 @@ DESCRIPTION = "\ this package if you're installing the postgresql-server package. \ " HOMEPAGE = "http://www.postgresql.com" -LICENSE = "BSD-0-Clause" +LICENSE = "0BSD" DEPENDS = "libnsl2 readline tzcode-native" ARM_INSTRUCTION_SET = "arm" diff --git a/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb index 6e1c8ab4a0..b0fc35eb97 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb @@ -1,6 +1,6 @@ require ${PN}.inc -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692" SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions/src/${BPN}-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb index a5f6d8344a..2ad2d38a53 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb @@ -1,7 +1,7 @@ SUMMARY = "RocksDB an embeddable, persistent key-value store" DESCRIPTION = "RocksDB is library that provides an embeddable, persistent key-value store for fast storage." HOMEPAGE = "http://rocksdb.org/" -LICENSE = "(Apache-2.0 | GPL-2.0) & BSD-3-Clause" +LICENSE = "(Apache-2.0 | GPL-2.0-only) & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" @@ -22,6 +22,7 @@ SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=htt SRC_URI:append:riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" SRC_URI:append:mips = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" +SRC_URI:append:powerpc = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" SRC_URI:remove:toolchain-clang:riscv32 = "file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" S = "${WORKDIR}/git" @@ -51,3 +52,7 @@ do_install:append() { } LDFLAGS:append:riscv64 = " -pthread" + +# Need toku_time_now() implemented for ppc/musl +# see utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +COMPATIBLE_HOST:libc-musl:powerpc = "null" diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch deleted file mode 100644 index 126b79261c..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch +++ /dev/null @@ -1,87 +0,0 @@ -From c9250af98f48e4aa734cab0e2f5ae1f780c05ad0 Mon Sep 17 00:00:00 2001 -From: Zang Ruochen -Date: Fri, 11 Jun 2021 10:53:37 +0900 -Subject: [PATCH] Export of internal Abseil changes - --- -cf88f9cf40eab54c06bca7f20795352ec23bb583 by Derek Mauro : - -Fixes build with latest glibc -Fixes #952 - -PiperOrigin-RevId: 371693908 - --- -99bcd0f4a747ce7a401e23c745adf34d0ec5131b by Samuel Benzaquen : - -Add support for std::string_view in StrFormat even when -absl::string_view != std::string_view. - -PiperOrigin-RevId: 371693633 - --- -e35463572149a6c2d4a0d439b9300ce03fd6b96d by Abseil Team : - -Cmake builds should only install pkg-config when explicitly requested. - -PiperOrigin-RevId: 371403419 -GitOrigin-RevId: cf88f9cf40eab54c06bca7f20795352ec23bb583 -Change-Id: I4360a18c638a4d901ff44ab1e0a9d8f321c302ea - -Signed-off-by: Zang Ruochen ---- - CMake/AbseilHelpers.cmake | 3 ++- - absl/strings/internal/str_format/arg.h | 8 ++++++++ - absl/strings/internal/str_format/convert_test.cc | 3 +++ - 3 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake -index 54fb8df3..a32b94d5 100644 ---- a/CMake/AbseilHelpers.cmake -+++ b/CMake/AbseilHelpers.cmake -@@ -141,7 +141,8 @@ function(absl_cc_library) - endif() - - # Generate a pkg-config file for every library: -- if(_build_type STREQUAL "static" OR _build_type STREQUAL "shared") -+ if((_build_type STREQUAL "static" OR _build_type STREQUAL "shared") -+ AND ABSL_ENABLE_INSTALL) - if(NOT ABSL_CC_LIB_TESTONLY) - if(absl_VERSION) - set(PC_VERSION "${absl_VERSION}") -diff --git a/absl/strings/internal/str_format/arg.h b/absl/strings/internal/str_format/arg.h -index 7040c866..3c91be70 100644 ---- a/absl/strings/internal/str_format/arg.h -+++ b/absl/strings/internal/str_format/arg.h -@@ -122,6 +122,14 @@ StringConvertResult FormatConvertImpl(const std::string& v, - StringConvertResult FormatConvertImpl(string_view v, - FormatConversionSpecImpl conv, - FormatSinkImpl* sink); -+#if defined(ABSL_HAVE_STD_STRING_VIEW) && !defined(ABSL_USES_STD_STRING_VIEW) -+inline StringConvertResult FormatConvertImpl(std::string_view v, -+ FormatConversionSpecImpl conv, -+ FormatSinkImpl* sink) { -+ return FormatConvertImpl(absl::string_view(v.data(), v.size()), conv, sink); -+} -+#endif // ABSL_HAVE_STD_STRING_VIEW && !ABSL_USES_STD_STRING_VIEW -+ - ArgConvertResult - FormatConvertImpl(const char* v, const FormatConversionSpecImpl conv, -diff --git a/absl/strings/internal/str_format/convert_test.cc b/absl/strings/internal/str_format/convert_test.cc -index 926283cf..91e03609 100644 ---- a/absl/strings/internal/str_format/convert_test.cc -+++ b/absl/strings/internal/str_format/convert_test.cc -@@ -229,6 +229,9 @@ TEST_F(FormatConvertTest, BasicString) { - TestStringConvert(static_cast("hello")); - TestStringConvert(std::string("hello")); - TestStringConvert(string_view("hello")); -+#if defined(ABSL_HAVE_STD_STRING_VIEW) -+ TestStringConvert(std::string_view("hello")); -+#endif // ABSL_HAVE_STD_STRING_VIEW - } - - TEST_F(FormatConvertTest, NullString) { --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch index a4937e1b33..95210565c2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch @@ -31,13 +31,14 @@ Signed-off-by: Khem Raj #ifdef __GLIBC__ --- a/absl/base/internal/unscaledcycleclock.h +++ b/absl/base/internal/unscaledcycleclock.h -@@ -46,7 +46,7 @@ +@@ -46,7 +46,8 @@ // The following platforms have an implementation of a hardware counter. #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ -- defined(__powerpc__) || defined(__ppc__) || \ -+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ - defined(_M_IX86) || defined(_M_X64) +- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ ++ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ ++ defined(__riscv) || \ + defined(_M_IX86) || defined(_M_X64) #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 #else --- a/absl/debugging/internal/examine_stack.cc @@ -61,13 +62,13 @@ Signed-off-by: Khem Raj +#elif defined(__powerpc__) && defined(__GLIBC__) return reinterpret_cast(context->uc_mcontext.uc_regs->gregs[32]); +#elif defined(__powerpc__) -+ return reinterpret_cast(((struct pt_regs *)context->uc_regs)->gregs[32]); ++ return reinterpret_cast((context->uc_regs)->gregs[32]); #elif defined(__riscv) return reinterpret_cast(context->uc_mcontext.__gregs[REG_PC]); #elif defined(__s390__) && !defined(__s390x__) --- a/absl/debugging/internal/stacktrace_config.h +++ b/absl/debugging/internal/stacktrace_config.h -@@ -55,7 +55,7 @@ +@@ -59,7 +59,7 @@ #elif defined(__i386__) || defined(__x86_64__) #define ABSL_STACKTRACE_INL_HEADER \ "absl/debugging/internal/stacktrace_x86-inl.inc" diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb index 37d5d81238..82124c1083 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -7,14 +7,13 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" -PV = "20210324.2+git${SRCPV}" -SRCREV = "278e0a071885a22dcd2fd1b5576cc44757299343" -BRANCH = "lts_2021_03_24" +PV = "20211102.0+git${SRCPV}" +SRCREV = "215105818dfde3174fe799600bb0f3cae233d0bf" +BRANCH = "lts_2021_11_02" SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ file://0001-absl-always-use-asm-sgidefs.h.patch \ file://0002-Remove-maes-option-from-cross-compilation.patch \ file://abseil-ppc-fixes.patch \ - file://0001-Export-of-internal-Abseil-changes.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch new file mode 100644 index 0000000000..05973aaaf2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/core/0014-add-u3-ss-descriptor-support-for-adb.patch @@ -0,0 +1,342 @@ +From dae9a11f3a158357966399aef97c48b5f16934d9 Mon Sep 17 00:00:00 2001 +From: Jiacheng Liu +Date: Sat, 24 Jul 2021 11:01:18 +0800 +Subject: [PATCH] android-tools: adb: add u3 ss descriptor support + +Porting u3 Superspeed descriptor support to open-embedded android-tools package. +This patch origins from the the patch in android project [1], but has been +modified for backporting to android-tools_5.1.1.r37. + +[1] https://android.googlesource.com/platform/system/core/+/d6ee9f26a5163af4121f4380264fcbd4e6851a17%5E%21 + +Signed-off-by: Macpaul Lin +Signed-off-by: Jiacheng Liu +--- + adb/usb_linux_client.c | 275 +++++++++++++++++++++++++++++++---------- + 1 file changed, 207 insertions(+), 68 deletions(-) + +diff --git a/adb/usb_linux_client.c b/adb/usb_linux_client.c +index 6e8b5bb..884e85e 100644 +--- a/adb/usb_linux_client.c ++++ b/adb/usb_linux_client.c +@@ -31,8 +31,10 @@ + #define TRACE_TAG TRACE_USB + #include "adb.h" + ++#define USB_EXT_PROP_UNICODE 1 + #define MAX_PACKET_SIZE_FS 64 + #define MAX_PACKET_SIZE_HS 512 ++#define MAX_PACKET_SIZE_SS 1024 + + #if __BYTE_ORDER == __LITTLE_ENDIAN + # define cpu_to_le16(x) (x) +@@ -62,74 +64,185 @@ struct usb_handle + int bulk_in; /* "in" from the host's perspective => sink for adbd */ + }; + +-static const struct { +- struct usb_functionfs_descs_head header; +- struct { +- struct usb_interface_descriptor intf; +- struct usb_endpoint_descriptor_no_audio source; +- struct usb_endpoint_descriptor_no_audio sink; +- } __attribute__((packed)) fs_descs, hs_descs; +-} __attribute__((packed)) descriptors = { +- .header = { +- .magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC), +- .length = cpu_to_le32(sizeof(descriptors)), +- .fs_count = 3, +- .hs_count = 3, ++struct func_desc { ++ struct usb_interface_descriptor intf; ++ struct usb_endpoint_descriptor_no_audio source; ++ struct usb_endpoint_descriptor_no_audio sink; ++} __attribute__((packed)); ++ ++struct ss_func_desc { ++ struct usb_interface_descriptor intf; ++ struct usb_endpoint_descriptor_no_audio source; ++ struct usb_ss_ep_comp_descriptor source_comp; ++ struct usb_endpoint_descriptor_no_audio sink; ++ struct usb_ss_ep_comp_descriptor sink_comp; ++} __attribute__((packed)); ++ ++struct desc_v1 { ++ struct usb_functionfs_descs_head_v1 { ++ __le32 magic; ++ __le32 length; ++ __le32 fs_count; ++ __le32 hs_count; ++ } __attribute__((packed)) header; ++ struct func_desc fs_descs, hs_descs; ++} __attribute__((packed)); ++ ++struct usb_os_desc_ext_prop { ++ uint32_t dwSize; ++ uint32_t dwPropertyDataType; ++ ++ // Property name and value are transmitted as UTF-16, but the kernel only ++ // accepts ASCII values and performs the conversion for us. ++ uint16_t wPropertyNameLength; ++ char bPropertyName[20]; ++ ++ uint32_t dwPropertyDataLength; ++ char bProperty[39]; ++} __attribute__((packed)) os_desc_guid = { ++ .dwSize = sizeof(struct usb_os_desc_ext_prop), ++ .dwPropertyDataType = cpu_to_le32(USB_EXT_PROP_UNICODE), ++ .wPropertyNameLength = cpu_to_le16(20), ++ .bPropertyName = "DeviceInterfaceGUID", ++ .dwPropertyDataLength = cpu_to_le32(39), ++ .bProperty = "{F72FE0D4-CBCB-407D-8814-9ED673D0DD6B}", ++}; ++ ++struct usb_ext_prop_values { ++ struct usb_os_desc_ext_prop guid; ++} __attribute__((packed)); ++ ++struct desc_v2 { ++ struct usb_functionfs_descs_head_v2 header; ++ // The rest of the structure depends on the flags in the header. ++ __le32 fs_count; ++ __le32 hs_count; ++ __le32 ss_count; ++ __le32 os_count; ++ struct func_desc fs_descs, hs_descs; ++ struct ss_func_desc ss_descs; ++ struct usb_os_desc_header os_header; ++ struct usb_ext_compat_desc os_desc; ++ struct usb_os_desc_header os_prop_header; ++ struct usb_ext_prop_values os_prop_values; ++} __attribute__((packed)); ++ ++static struct func_desc fs_descriptors = { ++ .intf = { ++ .bLength = sizeof(fs_descriptors.intf), ++ .bDescriptorType = USB_DT_INTERFACE, ++ .bInterfaceNumber = 0, ++ .bNumEndpoints = 2, ++ .bInterfaceClass = ADB_CLASS, ++ .bInterfaceSubClass = ADB_SUBCLASS, ++ .bInterfaceProtocol = ADB_PROTOCOL, ++ .iInterface = 1, /* first string from the provided table */ ++ }, ++ .source = { ++ .bLength = sizeof(fs_descriptors.source), ++ .bDescriptorType = USB_DT_ENDPOINT, ++ .bEndpointAddress = 1 | USB_DIR_OUT, ++ .bmAttributes = USB_ENDPOINT_XFER_BULK, ++ .wMaxPacketSize = MAX_PACKET_SIZE_FS, ++ }, ++ .sink = { ++ .bLength = sizeof(fs_descriptors.sink), ++ .bDescriptorType = USB_DT_ENDPOINT, ++ .bEndpointAddress = 2 | USB_DIR_IN, ++ .bmAttributes = USB_ENDPOINT_XFER_BULK, ++ .wMaxPacketSize = MAX_PACKET_SIZE_FS, ++ }, ++}; ++ ++static struct func_desc hs_descriptors = { ++ .intf = { ++ .bLength = sizeof(hs_descriptors.intf), ++ .bDescriptorType = USB_DT_INTERFACE, ++ .bInterfaceNumber = 0, ++ .bNumEndpoints = 2, ++ .bInterfaceClass = ADB_CLASS, ++ .bInterfaceSubClass = ADB_SUBCLASS, ++ .bInterfaceProtocol = ADB_PROTOCOL, ++ .iInterface = 1, /* first string from the provided table */ ++ }, ++ .source = { ++ .bLength = sizeof(hs_descriptors.source), ++ .bDescriptorType = USB_DT_ENDPOINT, ++ .bEndpointAddress = 1 | USB_DIR_OUT, ++ .bmAttributes = USB_ENDPOINT_XFER_BULK, ++ .wMaxPacketSize = MAX_PACKET_SIZE_HS, ++ }, ++ .sink = { ++ .bLength = sizeof(hs_descriptors.sink), ++ .bDescriptorType = USB_DT_ENDPOINT, ++ .bEndpointAddress = 2 | USB_DIR_IN, ++ .bmAttributes = USB_ENDPOINT_XFER_BULK, ++ .wMaxPacketSize = MAX_PACKET_SIZE_HS, ++ }, ++}; ++ ++static struct ss_func_desc ss_descriptors = { ++ .intf = { ++ .bLength = sizeof(ss_descriptors.intf), ++ .bDescriptorType = USB_DT_INTERFACE, ++ .bInterfaceNumber = 0, ++ .bNumEndpoints = 2, ++ .bInterfaceClass = ADB_CLASS, ++ .bInterfaceSubClass = ADB_SUBCLASS, ++ .bInterfaceProtocol = ADB_PROTOCOL, ++ .iInterface = 1, /* first string from the provided table */ ++ }, ++ .source = { ++ .bLength = sizeof(ss_descriptors.source), ++ .bDescriptorType = USB_DT_ENDPOINT, ++ .bEndpointAddress = 1 | USB_DIR_OUT, ++ .bmAttributes = USB_ENDPOINT_XFER_BULK, ++ .wMaxPacketSize = MAX_PACKET_SIZE_SS, ++ }, ++ .source_comp = { ++ .bLength = sizeof(ss_descriptors.source_comp), ++ .bDescriptorType = USB_DT_SS_ENDPOINT_COMP, ++ .bMaxBurst = 4, + }, +- .fs_descs = { +- .intf = { +- .bLength = sizeof(descriptors.fs_descs.intf), +- .bDescriptorType = USB_DT_INTERFACE, +- .bInterfaceNumber = 0, +- .bNumEndpoints = 2, +- .bInterfaceClass = ADB_CLASS, +- .bInterfaceSubClass = ADB_SUBCLASS, +- .bInterfaceProtocol = ADB_PROTOCOL, +- .iInterface = 1, /* first string from the provided table */ +- }, +- .source = { +- .bLength = sizeof(descriptors.fs_descs.source), +- .bDescriptorType = USB_DT_ENDPOINT, +- .bEndpointAddress = 1 | USB_DIR_OUT, +- .bmAttributes = USB_ENDPOINT_XFER_BULK, +- .wMaxPacketSize = MAX_PACKET_SIZE_FS, +- }, +- .sink = { +- .bLength = sizeof(descriptors.fs_descs.sink), +- .bDescriptorType = USB_DT_ENDPOINT, +- .bEndpointAddress = 2 | USB_DIR_IN, +- .bmAttributes = USB_ENDPOINT_XFER_BULK, +- .wMaxPacketSize = MAX_PACKET_SIZE_FS, +- }, ++ .sink = { ++ .bLength = sizeof(ss_descriptors.sink), ++ .bDescriptorType = USB_DT_ENDPOINT, ++ .bEndpointAddress = 2 | USB_DIR_IN, ++ .bmAttributes = USB_ENDPOINT_XFER_BULK, ++ .wMaxPacketSize = MAX_PACKET_SIZE_SS, + }, +- .hs_descs = { +- .intf = { +- .bLength = sizeof(descriptors.hs_descs.intf), +- .bDescriptorType = USB_DT_INTERFACE, +- .bInterfaceNumber = 0, +- .bNumEndpoints = 2, +- .bInterfaceClass = ADB_CLASS, +- .bInterfaceSubClass = ADB_SUBCLASS, +- .bInterfaceProtocol = ADB_PROTOCOL, +- .iInterface = 1, /* first string from the provided table */ +- }, +- .source = { +- .bLength = sizeof(descriptors.hs_descs.source), +- .bDescriptorType = USB_DT_ENDPOINT, +- .bEndpointAddress = 1 | USB_DIR_OUT, +- .bmAttributes = USB_ENDPOINT_XFER_BULK, +- .wMaxPacketSize = MAX_PACKET_SIZE_HS, +- }, +- .sink = { +- .bLength = sizeof(descriptors.hs_descs.sink), +- .bDescriptorType = USB_DT_ENDPOINT, +- .bEndpointAddress = 2 | USB_DIR_IN, +- .bmAttributes = USB_ENDPOINT_XFER_BULK, +- .wMaxPacketSize = MAX_PACKET_SIZE_HS, +- }, ++ .sink_comp = { ++ .bLength = sizeof(ss_descriptors.sink_comp), ++ .bDescriptorType = USB_DT_SS_ENDPOINT_COMP, ++ .bMaxBurst = 4, + }, + }; + ++struct usb_ext_compat_desc os_desc_compat = { ++ .bFirstInterfaceNumber = 0, ++ .Reserved1 = cpu_to_le32(1), ++ .CompatibleID = { 'W', 'I', 'N', 'U', 'S', 'B', '\0', '\0'}, ++ .SubCompatibleID = {0}, ++ .Reserved2 = {0}, ++}; ++ ++static struct usb_os_desc_header os_desc_header = { ++ .interface = cpu_to_le32(0), ++ .dwLength = cpu_to_le32(sizeof(os_desc_header) + sizeof(os_desc_compat)), ++ .bcdVersion = cpu_to_le32(1), ++ .wIndex = cpu_to_le32(4), ++ .bCount = cpu_to_le32(1), ++ .Reserved = cpu_to_le32(0), ++}; ++ ++static struct usb_os_desc_header os_prop_header = { ++ .interface = cpu_to_le32(0), ++ .dwLength = cpu_to_le32(sizeof(os_desc_header) + sizeof(struct usb_ext_prop_values)), ++ .bcdVersion = cpu_to_le32(1), ++ .wIndex = cpu_to_le32(5), ++ .wCount = cpu_to_le16(1), ++}; ++ + #define STR_INTERFACE_ "ADB Interface" + + static const struct { +@@ -151,8 +264,6 @@ static const struct { + }, + }; + +- +- + static void *usb_adb_open_thread(void *x) + { + struct usb_handle *usb = (struct usb_handle *)x; +@@ -270,6 +381,24 @@ static void usb_adb_init() + static void init_functionfs(struct usb_handle *h) + { + ssize_t ret; ++ struct desc_v1 v1_descriptor = {}; ++ struct desc_v2 v2_descriptor = {}; ++ ++ v2_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC_V2); ++ v2_descriptor.header.length = cpu_to_le32(sizeof(v2_descriptor)); ++ v2_descriptor.header.flags = FUNCTIONFS_HAS_FS_DESC | FUNCTIONFS_HAS_HS_DESC | ++ FUNCTIONFS_HAS_SS_DESC | FUNCTIONFS_HAS_MS_OS_DESC; ++ v2_descriptor.fs_count = 3; ++ v2_descriptor.hs_count = 3; ++ v2_descriptor.ss_count = 5; ++ v2_descriptor.os_count = 2; ++ v2_descriptor.fs_descs = fs_descriptors; ++ v2_descriptor.hs_descs = hs_descriptors; ++ v2_descriptor.ss_descs = ss_descriptors; ++ v2_descriptor.os_header = os_desc_header; ++ v2_descriptor.os_desc = os_desc_compat; ++ v2_descriptor.os_prop_header = os_prop_header; ++ v2_descriptor.os_prop_values.guid = os_desc_guid; + + if (h->control < 0) { // might have already done this before + D("OPENING %s\n", USB_FFS_ADB_EP0); +@@ -279,10 +408,20 @@ static void init_functionfs(struct usb_handle *h) + goto err; + } + +- ret = adb_write(h->control, &descriptors, sizeof(descriptors)); ++ ret = adb_write(h->control, &v2_descriptor, sizeof(v2_descriptor)); + if (ret < 0) { +- D("[ %s: write descriptors failed: errno=%d ]\n", USB_FFS_ADB_EP0, errno); +- goto err; ++ D("[ %s: write v2_descriptor failed: errno=%d ]\n", USB_FFS_ADB_EP0, errno); ++ v1_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC); ++ v1_descriptor.header.length = cpu_to_le32(sizeof(v1_descriptor)); ++ v1_descriptor.header.fs_count = 3; ++ v1_descriptor.header.hs_count = 3; ++ v1_descriptor.fs_descs = fs_descriptors; ++ v1_descriptor.hs_descs = hs_descriptors; ++ ret = adb_write(h->control, &v1_descriptor, sizeof(v1_descriptor)); ++ if (ret < 0) { ++ D("[ %s: failed to write USB descriptors]\n", USB_FFS_ADB_EP0); ++ goto err; ++ } + } + + ret = adb_write(h->control, &strings, sizeof(strings)); +-- +2.18.0 + 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 1195b7d9a3..8f28abbd19 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 @@ -1,6 +1,6 @@ DESCRIPTION = "Different utilities from Android" SECTION = "console/utils" -LICENSE = "Apache-2.0 & GPL-2.0 & BSD-2-Clause & BSD-3-Clause" +LICENSE = "Apache-2.0 & GPL-2.0-only & BSD-2-Clause & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \ file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ @@ -40,6 +40,7 @@ SRC_URI = " \ file://core/0012-Fix-implicit-declaration-of-stlcat-strlcopy-function.patch;patchdir=system/core \ file://core/adb_libssl_11.diff;patchdir=system/core \ file://core/0013-adb-Support-riscv64.patch;patchdir=system/core \ + file://core/0014-add-u3-ss-descriptor-support-for-adb.patch;patchdir=system/core \ file://extras/0001-ext4_utils-remove-selinux-extensions.patch;patchdir=system/extras \ file://extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch;patchdir=system/extras \ file://libselinux/0001-Remove-bionic-specific-calls.patch;patchdir=external/libselinux \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb b/meta-openembedded/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb index fff0f5e3cf..21d1356f7b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb @@ -6,8 +6,8 @@ SECTION = "devel" HOMEPAGE = "http://www.gnu.org/software/autoconf/" -LICENSE = "GPLv3" -LICENSE = "GPLv2 & GPLv3" +LICENSE = "GPL-3.0-only" +LICENSE = "GPL-2.0-only & GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f" SRC_URI = " \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.9.1.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.9.1.bb index 36004c53d6..d14bd843ef 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.9.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.9.1.bb @@ -14,6 +14,7 @@ S = "${WORKDIR}/git/c++" inherit cmake CXXFLAGS:append:mips = " -latomic" +CXXFLAGS:append:powerpc = " -latomic" CXXFLAGS:append:riscv32 = " -latomic" EXTRA_OECMAKE += "\ diff --git a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb index 99e09bfc62..c5a0030823 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb @@ -2,7 +2,7 @@ SUMMARY = "curses-based interface to GDB" DESCRIPTION = "cgdb is a lightweight curses (terminal-based) interface to the GNU Debugger (GDB)." HOMEPAGE = "http://cgdb.github.io/" SECTION = "devel" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "flex-native readline ncurses" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.92.bb b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.92.bb index 2b9f29969b..766d34f69c 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.92.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.92.bb @@ -2,7 +2,7 @@ SUMMARY = "Count blank lines, comment lines, and physical lines of source code \ in many programming languages." AUTHOR = "Al Danial" -LICENSE="GPL-2.0" +LICENSE="GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" SRC_URI = "https://github.com/AlDanial/cloc/releases/download/v${PV}/${BP}.tar.gz" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20211129.bb b/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20211129.bb index d1f1250923..3218ba652a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20211129.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20211129.bb @@ -4,7 +4,7 @@ from the CPUID instruction, and also determines the exact model of CPU(s). \ It supports Intel, AMD, and VIA CPUs, as well as older Transmeta, Cyrix, \ UMC, NexGen, Rise, and SiS CPUs" HOMEPAGE="http://www.etallen.com/cpuid.html" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20211114.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20211114.0.bb index cde7c7a0ef..504cc24325 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20211114.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20211114.0.bb @@ -9,7 +9,7 @@ DESCRIPTION = "Universal Ctags is a multilanguage reimplementation of the \ HOMEPAGE = "https://ctags.io/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages diff --git a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index ddb93a0400..a82387a705 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -1,5 +1,5 @@ SUMMARY = "A text-based user interface plugin of dnf for user to manage packages. " -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb index 7070c1f2d6..92fea981e1 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Doxygen is the de facto standard tool for generating documentation from annotated C++ sources." HOMEPAGE = "http://www.doxygen.org/" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "flex-native bison-native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch new file mode 100644 index 0000000000..cd417e0d7b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins/0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch @@ -0,0 +1,32 @@ +From b2187b45f61ce362a9d58d9081d66daddb4e577f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 20 Mar 2022 15:54:14 -0700 +Subject: [PATCH] geany.m4: Do not tinker with pkg-config paths + +OE sets up these paths correctly w.r.t. target sysroot + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj +--- + build/geany.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/build/geany.m4 ++++ b/build/geany.m4 +@@ -32,7 +32,8 @@ AC_DEFUN([GP_CHECK_GEANY], + [ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + +- GP_GEANY_PKG_CONFIG_PATH_PUSH ++ dnl GP_GEANY_PKG_CONFIG_PATH_PUSH ++ AC_REQUIRE([_GP_GEANY_LIBDIR]) + + PKG_CHECK_MODULES([GEANY], [geany >= $1]) + geanypluginsdir=$geany_libdir/geany +@@ -40,5 +41,5 @@ AC_DEFUN([GP_CHECK_GEANY], + AC_SUBST([geanypluginsdir]) + AC_SUBST([GEANY_VERSION]) + +- GP_GEANY_PKG_CONFIG_PATH_POP ++ dnl GP_GEANY_PKG_CONFIG_PATH_POP + ]) diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb index bb419c976a..fa4cccca03 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.38.bb @@ -1,8 +1,8 @@ DESCRIPTION = "A fast and lightweight IDE" HOMEPAGE = "http://plugins.geany.org/" -LICENSE_DEFAULT = "GPLv2" -LICENSE = "${LICENSE_DEFAULT} & BSD-2-Clause & GPLv3" +LICENSE_DEFAULT = "GPL-2.0-only" +LICENSE = "${LICENSE_DEFAULT} & BSD-2-Clause & GPL-3.0-only" python () { for plugin in d.getVar('PLUGINS').split(): @@ -32,6 +32,7 @@ SRC_URI = " \ https://plugins.geany.org/${BPN}/${BP}.tar.bz2 \ file://0001-Use-pkg-config-to-find-gpgme.patch \ file://0001-git-changebar-Adjust-structs-for-libgit2-1.4.x.patch \ + file://0001-geany.m4-Do-not-tinker-with-pkg-config-paths.patch \ " SRC_URI[sha256sum] = "1c578a7ebb390aa8882f195acd3d8da3ceb73925d291b28dec90cd3e5fd20586" @@ -60,7 +61,7 @@ FILES:${PN}-codenav = "${libdir}/geany/codenav.so" PLUGINS += "${PN}-commander" LIC_FILES_CHKSUM += "file://commander/COPYING;md5=d32239bcb673463ab874e80d47fae504" -LICENSE:${PN}-commander = "GPLv3" +LICENSE:${PN}-commander = "GPL-3.0-only" FILES:${PN}-commander = "${libdir}/geany/commander.so" # | checking whether the GTK version in use is compatible with plugin Debugger... no @@ -86,7 +87,7 @@ FILES:${PN}-geanyctags = "${libdir}/geany/geanyctags.so" PLUGINS += "${PN}-geanydoc" LIC_FILES_CHKSUM += "file://geanydoc/COPYING;md5=d32239bcb673463ab874e80d47fae504" -LICENSE:${PN}-geanydoc = "GPLv3" +LICENSE:${PN}-geanydoc = "GPL-3.0-only" FILES:${PN}-geanydoc = "${libdir}/geany/geanydoc.so" PLUGINS += "${PN}-geanyextrasel" @@ -121,7 +122,7 @@ FILES:${PN}-geanypg = "${libdir}/geany/geanypg.so" PLUGINS += "${PN}-geanyprj" LIC_FILES_CHKSUM += "file://geanyprj/COPYING;md5=d32239bcb673463ab874e80d47fae504" -LICENSE:${PN}-geanyprj = "GPLv3" +LICENSE:${PN}-geanyprj = "GPL-3.0-only" FILES:${PN}-geanyprj = "${libdir}/geany/geanyprj.so" #PLUGINS += "${PN}-geanypy" @@ -138,7 +139,7 @@ FILES:${PN}-geniuspaste = "${libdir}/geany/geniuspaste.so ${datadir}/${PN}/geniu PLUGINS += "${PN}-git-changebar" LIC_FILES_CHKSUM += "file://git-changebar/COPYING;md5=d32239bcb673463ab874e80d47fae504" -LICENSE:${PN}-git-changebar = "GPLv3" +LICENSE:${PN}-git-changebar = "GPL-3.0-only" FILES:${PN}-git-changebar = "${datadir}/${BPN}/git-changebar ${libdir}/geany/git-changebar.so" PLUGINS += "${PN}-keyrecord" @@ -179,7 +180,7 @@ LIC_FILES_CHKSUM += "file://pairtaghighlighter/COPYING;md5=d6d927525a612b3a8dbeb FILES:${PN}-pairtaghighlighter = "${libdir}/geany/pairtaghighlighter.so" PLUGINS += "${PN}-pohelper" -LICENSE:${PN}-pohelper = "GPLv3" +LICENSE:${PN}-pohelper = "GPL-3.0-only" LIC_FILES_CHKSUM += "file://pohelper/COPYING;md5=d32239bcb673463ab874e80d47fae504" FILES:${PN}-pohelper = "${datadir}/${BPN}/pohelper ${libdir}/geany/pohelper.so" diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.38.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.38.bb index 33d0870eb9..d75e3b57fb 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.38.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.38.bb @@ -1,6 +1,6 @@ SUMMARY = "A fast and lightweight IDE" HOMEPAGE = "http://www.geany.org/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=bd7b2c994af21d318bd2cd3b3f80c2d5" DEPENDS = "gtk+3 libxml-parser-perl-native python3-docutils-native intltool-native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.2.bb b/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.2.bb index 6417771104..c7f98fac98 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.2.bb @@ -1,6 +1,6 @@ SUMMARY = "Glade - A User Interface Designer" HOMEPAGE = "http://www.gnu.org/software/gnash" -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \ file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475" diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.41.1.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.41.1.bb deleted file mode 100644 index 925907e173..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.41.1.bb +++ /dev/null @@ -1,87 +0,0 @@ -DESCRIPTION = "A high performance, open source, general-purpose RPC framework. \ -Provides gRPC libraries for multiple languages written on top of shared C core library \ -(C++, Node.js, Python, Ruby, Objective-C, PHP, C#)" -HOMEPAGE = "https://github.com/grpc/grpc" -SECTION = "libs" -LICENSE = "Apache-2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -DEPENDS = "c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2 abseil-cpp re2" -DEPENDS:append:class-target = " googletest grpc-native " -DEPENDS:append:class-nativesdk = " grpc-native " - -PACKAGE_BEFORE_PN = "${PN}-compiler" - -RDEPENDS:${PN}-compiler = "${PN}" -RDEPENDS:${PN}-dev:class_native += "${PN}-compiler" -# Configuration above allows to cross-compile gRPC applications -# In order to compile applications on the target, use the dependency below -# Both dependencies are mutually exclusive -# RDEPENDS:${PN}-dev += "${PN}-compiler" - -S = "${WORKDIR}/git" -SRCREV_grpc = "635693ce624f3b3a89e5a764f0664958ef08b2b9" -BRANCH = "v1.41.x" -SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ - file://0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch \ - file://0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch \ - " -# Fixes build with older compilers 4.8 especially on ubuntu 14.04 -CXXFLAGS:append:class-native = " -Wl,--no-as-needed" - -inherit cmake pkgconfig - -EXTRA_OECMAKE = " \ - -DgRPC_CARES_PROVIDER=package \ - -DgRPC_ZLIB_PROVIDER=package \ - -DgRPC_SSL_PROVIDER=package \ - -DgRPC_PROTOBUF_PROVIDER=package \ - -DgRPC_ABSL_PROVIDER=package \ - -DgRPC_RE2_PROVIDER=package \ - -DgRPC_INSTALL=ON \ - -DCMAKE_CROSSCOMPILING=ON \ - -DgRPC_INSTALL_LIBDIR=${baselib} \ - -DgRPC_INSTALL_CMAKEDIR=${baselib}/cmake/${BPN} \ - " - -PACKAGECONFIG ??= "cpp shared" -PACKAGECONFIG_class-target ?= "shared" -PACKAGECONFIG[cpp] = "-DgRPC_BUILD_GRPC_CPP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF" -PACKAGECONFIG[csharp] = "-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF" -PACKAGECONFIG[node] = "-DgRPC_BUILD_GRPC_NODE_PLUGIN=ON,-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF" -PACKAGECONFIG[objective-c] = "-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=ON,-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF" -PACKAGECONFIG[php] = "-DgRPC_BUILD_GRPC_PHP_PLUGIN=ON,-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF" -PACKAGECONFIG[python] = "-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON,-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF" -PACKAGECONFIG[ruby] = "-DgRPC_BUILD_GRPC_RUBY_PLUGIN=ON,-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF" -PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF,protobuf-lite" -PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," - -do_configure:prepend() { - sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt -} - -do_configure:prepend:mipsarch() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -do_configure:prepend:powerpc() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -do_configure:prepend:riscv64() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -do_configure:prepend:riscv32() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -do_configure:prepend:toolchain-clang:x86() { - sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt -} - -BBCLASSEXTEND = "native nativesdk" - -SYSROOT_DIRS_IGNORE:append:class-target = " ${baselib}/cmake/grpc" - -FILES:${PN}-compiler += "${bindir}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.0.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.0.bb new file mode 100644 index 0000000000..d25a01cf34 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.0.bb @@ -0,0 +1,88 @@ +DESCRIPTION = "A high performance, open source, general-purpose RPC framework. \ +Provides gRPC libraries for multiple languages written on top of shared C core library \ +(C++, Node.js, Python, Ruby, Objective-C, PHP, C#)" +HOMEPAGE = "https://github.com/grpc/grpc" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6e4cf218112648d22420a84281b68b88" + +DEPENDS = "c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2 abseil-cpp re2" +DEPENDS:append:class-target = " googletest grpc-native " +DEPENDS:append:class-nativesdk = " grpc-native " + +PACKAGE_BEFORE_PN = "${PN}-compiler" + +RDEPENDS:${PN}-compiler = "${PN}" +RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" +# Configuration above allows to cross-compile gRPC applications +# In order to compile applications on the target, use the dependency below +# Both dependencies are mutually exclusive +# RDEPENDS:${PN}-dev += "${PN}-compiler" + +S = "${WORKDIR}/git" +SRCREV_grpc = "494b08ada4009ead0d0b70e44d354be72f9c283a" +BRANCH = "v1.45.x" +SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ + file://0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch \ + " +# Fixes build with older compilers 4.8 especially on ubuntu 14.04 +CXXFLAGS:append:class-native = " -Wl,--no-as-needed" + +inherit cmake pkgconfig + +EXTRA_OECMAKE = " \ + -DgRPC_CARES_PROVIDER=package \ + -DgRPC_ZLIB_PROVIDER=package \ + -DgRPC_SSL_PROVIDER=package \ + -DgRPC_PROTOBUF_PROVIDER=package \ + -DgRPC_ABSL_PROVIDER=package \ + -DgRPC_RE2_PROVIDER=package \ + -DgRPC_INSTALL=ON \ + -DCMAKE_CROSSCOMPILING=ON \ + -DgRPC_INSTALL_LIBDIR=${baselib} \ + -DgRPC_INSTALL_CMAKEDIR=${baselib}/cmake/${BPN} \ + " + +PACKAGECONFIG ??= "cpp shared" +PACKAGECONFIG[cpp] = "-DgRPC_BUILD_GRPC_CPP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF" +PACKAGECONFIG[csharp] = "-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF" +PACKAGECONFIG[node] = "-DgRPC_BUILD_GRPC_NODE_PLUGIN=ON,-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF" +PACKAGECONFIG[objective-c] = "-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=ON,-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF" +PACKAGECONFIG[php] = "-DgRPC_BUILD_GRPC_PHP_PLUGIN=ON,-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF" +PACKAGECONFIG[python] = "-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON,-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF" +PACKAGECONFIG[ruby] = "-DgRPC_BUILD_GRPC_RUBY_PLUGIN=ON,-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF" +PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF,protobuf-lite" +PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," + +do_configure:prepend() { + sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt +} + +do_configure:prepend:mipsarch() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + +do_configure:prepend:powerpc() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + +do_configure:prepend:riscv64() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + +do_configure:prepend:riscv32() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + +do_configure:prepend:toolchain-clang:x86() { + sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt +} + +BBCLASSEXTEND = "native nativesdk" + +SYSROOT_DIRS_IGNORE:append:class-target = " ${baselib}/cmake/grpc" + +FILES:${PN}-compiler += " \ + ${bindir} \ + ${libdir}/libgrpc_plugin_support${SOLIBS} \ + " diff --git a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.8.bb b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.8.bb index 47d872a400..30d17c84b3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.8.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/iipeace/guider" BUGTRACKER = "https://github.com/iipeace/guider/issues" AUTHOR = "Peace Lee " -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" PV = "3.9.8+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb index fad42e3994..29937e26d0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb @@ -4,7 +4,7 @@ events with stack traces. Dedicated analysis tools then allow you to interpret \ the heap memory profile to find hotspots to reduce memory, leaks, allocation \ hotspots and temporary allocations" HOMEPAGE = "https://phabricator.kde.org/source/heaptrack/" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "zlib boost libunwind elfutils" diff --git a/meta-openembedded/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb b/meta-openembedded/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb index 9768a6e716..8e7b0ba5a0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb @@ -1,4 +1,4 @@ -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "gdk-pixbuf popt" diff --git a/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb b/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb index 27a0f4441d..0f6bbb4d54 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb @@ -20,7 +20,7 @@ built-in raw socket interface of the Linux kernel, so it can be used \ on a wide variety of supported network cards." HOMEPAGE = "https://fedorahosted.org/iptraf-ng/" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=e2b3850593b899b1a17594ed4cc4c731" DEPENDS = "ncurses" diff --git a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-cmake-Use-GNUInstallDirs.patch b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-cmake-Use-GNUInstallDirs.patch new file mode 100644 index 0000000000..4b1184a394 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-cmake-Use-GNUInstallDirs.patch @@ -0,0 +1,46 @@ +From e0b1ad02c678513412aba95a1b2fb4005c3c0452 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 19 Mar 2022 22:40:49 -0700 +Subject: [PATCH] cmake: Use GNUInstallDirs + +This helps it make it platform independent, some platforms e.g. +ppc64/linux use /usr/lib64 for system libraries + +Upstream-Status: Submitted [https://github.com/pboettch/json-schema-validator/pull/197] +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c4cc218..594dc5f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,11 +122,13 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + endif() + endif() + ++include(GNUInstallDirs) ++ + if(JSON_VALIDATOR_INSTALL) + install(TARGETS nlohmann_json_schema_validator + EXPORT ${PROJECT_NAME}Targets +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION ${LIBDIR} ++ ARCHIVE DESTINATION ${LIBDIR} + RUNTIME DESTINATION bin) + + install(FILES src/nlohmann/json-schema.hpp +@@ -155,7 +157,7 @@ if(JSON_VALIDATOR_INSTALL) + # Set Up the Project Targets and Config Files for CMake + + # Set the install path to the cmake config files +- set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_PREFIX}/lib/cmake/${PROJECT_NAME}) ++ set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) + + # Create the ConfigVersion file + include(CMakePackageConfigHelpers) # write_basic_package_version_file +-- +2.35.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb index 4a8de5f3b0..00d26d7b34 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb @@ -2,7 +2,9 @@ SUMMARY = "JSON schema validator for JSON for Modern C++" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c441d022da1b1663c70181a32225d006" -SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=master;protocol=https" +SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=master;protocol=https \ + file://0001-cmake-Use-GNUInstallDirs.patch \ + " SRCREV = "27fc1d094503623dfe39365ba82581507524545c" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb index 53e49f57b7..169500f6b4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb @@ -8,7 +8,7 @@ kconfig infrastructure, ready for use by third-party projects. \ The kconfig-frontends package provides the kconfig parser, as well as all \ the frontends" HOMEPAGE = "https://gitlab.com/ymorin/kconfig-frontends" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408" SECTION = "devel" DEPENDS += "ncurses flex-native gperf-native bison-native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.5.bb b/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.5.bb index c0d7ea3487..adf73d4914 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.5.bb @@ -5,7 +5,7 @@ SECTION = "libs" DEPENDS = "glib-2.0" BBCLASSEXTEND = "native" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" PE = "1" diff --git a/meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb index 2dc3776e81..2a1234c57e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb @@ -4,7 +4,7 @@ Unicode Standard Annex #14 (UAX #14). East_Asian_Width informative \ properties defined by Annex #11 (UAX #11) may be concerned to determin \ breaking positions. This package also implements "default" Grapheme \ Cluster segmentation described in Annex #29 (UAX #29)." -LICENSE = "Artistic-1.0 | GPLv1+" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=5b122a36d0f6dc55279a0ebc69f3c60b" SRC_URI = "git://github.com/hatukanezumi/sombok.git;protocol=https;branch=master \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb index 872bdb63a0..b2898c9c7f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "C utility functions for OpenWrt" SECTION = "libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "\ file://avl.c;endline=39;md5=00810155fed3d604816ec5814523d60a \ file://avl-cmp.c;endline=15;md5=1603e6094b432a5f3f320877a06f41b5 \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb b/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb index a26fac9924..8b3608a248 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb @@ -6,7 +6,7 @@ SUMMARY = "Hardware lister" HOMEPAGE = "http://ezix.org/project/wiki/HardwareLiSter" SECTION = "console/tools" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" 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 b6fb1dcdd2..ad58428718 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -6,7 +6,7 @@ It can also intercept and print the system calls executed by the program.\ " HOMEPAGE = "http://ltrace.org/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" PE = "1" diff --git a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb index d4ff06b677..3f3939eeb4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Just-In-Time Compiler for Lua" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=abe9020de9c00909317d02d5c803810e" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=23d6278200de9b48fd1439f80507cba8" HOMEPAGE = "http://luajit.org" SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ @@ -10,7 +10,7 @@ SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ # Set PV to a version tag and date (YYMMDD) associated with SRCREV if it is later. PV = "2.1.0~beta3-210112" -SRCREV = "ec6edc5c39c25e4eb3fca51b753f9995e97215da" +SRCREV = "43ebb949a249a16c49d232ad24dc9127cc4302bb" S = "${WORKDIR}/git" @@ -92,7 +92,7 @@ FILES:${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES:luajit-common = "${datadir}/${BPN}-${PV}" -# mips64/ppc/ppc64/riscv64 is not supported in this release +# mips64/ppc/ppc64/riscv64/riscv32 is not supported in this release COMPATIBLE_HOST:mipsarchn32 = "null" COMPATIBLE_HOST:mipsarchn64 = "null" COMPATIBLE_HOST:powerpc = "null" diff --git a/meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb b/meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb index f6578ca093..a71bbebf70 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/luaposix/luaposix_35.1.bb @@ -20,7 +20,7 @@ do_compile() { } do_install() { - ${S}/build-aux/luke PREFIX=${D}${prefix} install + ${S}/build-aux/luke PREFIX=${D}${prefix} INST_LIBDIR=${D}${libdir}/lua/${LUA_VERSION} install } FILES:${PN} = "${datadir}/lua/${LUA_VERSION} \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/memstat/memstat_1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/memstat/memstat_1.0.bb index 1deb25ab92..7e0ff54dc5 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/memstat/memstat_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/memstat/memstat_1.0.bb @@ -6,7 +6,7 @@ is used and which 'old' libs are loaded. \ HOMEPAGE = "http://memstattool.sourceforge.net/" SECTION = "devtool" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" S = "${WORKDIR}/memstattool" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.5.bb b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.5.bb index ae978aea93..8049434109 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_5.5.bb @@ -1,7 +1,7 @@ SUMMARY = "The Mercurial distributed SCM" HOMEPAGE = "http://mercurial.selenic.com/" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "python3 python3-native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb deleted file mode 100644 index 25b199f572..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.0.2.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "MessagePack implementation for C and C++" -DESCRIPTION = "MessagePack is an efficient binary serialization format. It's like JSON. but fast and small" -HOMEPAGE = "http://msgpack.org/index.html" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ - file://COPYING;md5=0639c4209b6f2abf1437c813b208f2d3 \ - file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ - " - -PV .= "+git${SRCPV}" - -SRC_URI = "git://github.com/msgpack/msgpack-c;branch=cpp_master;protocol=https \ - " -SRCREV = "3bdbf0d2ee75d46d71afa691a594777d89a22cf7" - -DEPENDS += "boost" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -RDEPENDS:${PN}-dev = "" - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.1.1.bb b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.1.1.bb new file mode 100644 index 0000000000..fd08bf85cc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_4.1.1.bb @@ -0,0 +1,21 @@ +SUMMARY = "MessagePack implementation for C and C++" +DESCRIPTION = "MessagePack is an efficient binary serialization format. It's like JSON. but fast and small" +HOMEPAGE = "http://msgpack.org/index.html" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ + file://COPYING;md5=0639c4209b6f2abf1437c813b208f2d3 \ + file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ + " + +SRC_URI = "https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/msgpack-cxx-${PV}.tar.gz" +SRC_URI[sha256sum] = "8115c5edcf20bc1408c798a6bdaec16c1e52b1c34859d4982a0fb03300438f0b" + +S = "${WORKDIR}/msgpack-cxx-${PV}" + +DEPENDS += "boost" + +inherit cmake pkgconfig + +RDEPENDS:${PN}-dev = "" + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb b/meta-openembedded/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb index e4701afa87..05220c2492 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb @@ -1,6 +1,6 @@ SUMMARY = "utilies to read and write Intel model-specific registers" HOMEPAGE = "https://01.org/msr-tools" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=11;md5=678a3928c856042424c734f4a7586e65" SECTION = "devel" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.10.5.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.10.5.bb index a69c5c7e58..0cf6fd36bc 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.10.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.10.5.bb @@ -4,6 +4,8 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588" +CVE_PRODUCT = "json-for-modern-cpp" + SRC_URI = "git://github.com/nlohmann/json.git;nobranch=1;protocol=https \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-crypto-fix-build-without-scrypt.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-crypto-fix-build-without-scrypt.patch deleted file mode 100644 index 3a2719af34..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-crypto-fix-build-without-scrypt.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 048203c97009c907ff3891f6ffa8f375fcf1045c Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Tue, 26 Oct 2021 08:34:39 -0700 -Subject: [PATCH] crypto: fix build without scrypt - -* add missing semicolon to fix: - In file included from ../src/node_crypto.h:47, - from ../src/node.cc:46: - ../src/crypto/crypto_scrypt.h:80:2: - error: expected ';' after struct definition - 80 | } - | ^ - | ; - - and fix typo in the comment - -Signed-off-by: Martin Jansa -Upstream-Status: Submitted [https://github.com/nodejs/node/pull/40613] - ---- - src/crypto/crypto_scrypt.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/crypto/crypto_scrypt.h b/src/crypto/crypto_scrypt.h -index 4ca888e31d..3d185637f4 100644 ---- a/src/crypto/crypto_scrypt.h -+++ b/src/crypto/crypto_scrypt.h -@@ -77,8 +77,8 @@ struct ScryptJob { - static void Initialize( - Environment* env, - v8::Local target) {} --} --#endif // !OPENSSL_NO_SCRIPT -+}; -+#endif // !OPENSSL_NO_SCRYPT - - } // namespace crypto - } // namespace node diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch index 2e66a02828..4d238c03f4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0005-add-openssl-legacy-provider-option.patch @@ -20,8 +20,8 @@ Hash { } Co-authored-by: Richard Lau - -Refs: https://github.com/nodejs/node/issues/40455 +Signed-off-by: Signed-off-by: Andrej Valek +Upstream-Status: Backport [https://github.com/nodejs/node/issues/40455] --- doc/api/cli.md | 10 ++++++++++ src/crypto/crypto_util.cc | 10 ++++++++++ @@ -34,7 +34,7 @@ diff --git a/doc/api/cli.md b/doc/api/cli.md index 74057706bf8d..608b9cdeddf1 100644 --- a/doc/api/cli.md +++ b/doc/api/cli.md -@@ -652,6 +652,14 @@ Load an OpenSSL configuration file on startup. Among other uses, this can be +@@ -687,6 +687,14 @@ Load an OpenSSL configuration file on startup. Among other uses, this can be used to enable FIPS-compliant crypto if Node.js is built against FIPS-enabled OpenSSL. @@ -47,9 +47,9 @@ index 74057706bf8d..608b9cdeddf1 100644 +[providers readme][]. + ### `--pending-deprecation` + - - --![](http://defunkt.github.com/pystache/images/logo_phillips.png "mustachioed, monocled snake by David Phillips") -+[![ci](https://github.com/sarnold/pystache/actions/workflows/ci.yml/badge.svg)](https://github.com/sarnold/pystache/actions/workflows/ci.yml) -+[![Conda](https://github.com/sarnold/pystache/actions/workflows/conda.yml/badge.svg)](https://github.com/sarnold/pystache/actions/workflows/conda.yml) -+[![Wheels](https://github.com/sarnold/pystache/actions/workflows/wheels.yml/badge.svg)](https://github.com/sarnold/pystache/actions/workflows/wheels.yml) -+[![Release](https://github.com/sarnold/pystache/actions/workflows/release.yml/badge.svg)](https://github.com/sarnold/pystache/actions/workflows/release.yml) -+[![Python](https://img.shields.io/badge/python-3.6+-blue.svg)](https://www.python.org/downloads/) - --![](https://secure.travis-ci.org/defunkt/pystache.png "Travis CI current build status") -+[![Latest release](https://img.shields.io/github/v/release/sarnold/pystache?include_prereleases)](https://github.com/sarnold/pystache/releases/latest) -+[![License](https://img.shields.io/github/license/sarnold/pystache)](https://github.com/sarnold/pystache/blob/master/LICENSE) -+[![Maintainability](https://api.codeclimate.com/v1/badges/a8fa1bf4638bfc6581b6/maintainability)](https://codeclimate.com/github/sarnold/pystache/maintainability) -+[![codecov](https://codecov.io/gh/sarnold/pystache/branch/master/graph/badge.svg?token=5PZNMZBI6K)](https://codecov.io/gh/sarnold/pystache) - --[Pystache](http://defunkt.github.com/pystache) is a Python -+ -+ -+This updated fork of Pystache is currently tested on Python 3.6+ and in -+Conda, on Linux, Macos, and Windows (Python 2.7 support has been removed). -+ -+![](gh/images/logo_phillips_small.png "mustachioed, monocled snake by David Phillips") -+ -+[Pystache](http://sarnold.github.com/pystache) is a Python - implementation of [Mustache](http://mustache.github.com/). Mustache is a - framework-agnostic, logic-free templating system inspired by - [ctemplate](http://code.google.com/p/google-ctemplate/) and -@@ -27,10 +41,10 @@ provides a good introduction to Mustache's syntax. For a more complete - (and more current) description of Mustache's behavior, see the official - [Mustache spec](https://github.com/mustache/spec). - --Pystache is [semantically versioned](http://semver.org) and can be found --on [PyPI](http://pypi.python.org/pypi/pystache). This version of --Pystache passes all tests in [version --1.1.2](https://github.com/mustache/spec/tree/v1.1.2) of the spec. -+Pystache is [semantically versioned](http://semver.org) and older versions -+can still be found on [PyPI](http://pypi.python.org/pypi/pystache). This -+version of Pystache now passes all tests in [version -+1.1.3](https://github.com/mustache/spec/tree/v1.1.3) of the spec. - - - Requirements -@@ -38,41 +52,25 @@ Requirements - - Pystache is tested with-- - --- Python 2.4 (requires simplejson [version -- 2.0.9](http://pypi.python.org/pypi/simplejson/2.0.9) or earlier) --- Python 2.5 (requires -- [simplejson](http://pypi.python.org/pypi/simplejson/)) --- Python 2.6 --- Python 2.7 --- Python 3.1 --- Python 3.2 --- Python 3.3 --- [PyPy](http://pypy.org/) -+- Python 3.6 -+- Python 3.7 -+- Python 3.8 -+- Python 3.9 -+- Conda (py36-py39) - - [Distribute](http://packages.python.org/distribute/) (the setuptools fork) --is recommended over [setuptools](http://pypi.python.org/pypi/setuptools), --and is required in some cases (e.g. for Python 3 support). --If you use [pip](http://www.pip-installer.org/), you probably already satisfy --this requirement. -+is no longer required over [setuptools](http://pypi.python.org/pypi/setuptools), -+as the current packaging is now PEP517-compliant. - - JSON support is needed only for the command-line interface and to run --the spec tests. We require simplejson for earlier versions of Python --since Python's [json](http://docs.python.org/library/json.html) module --was added in Python 2.6. -- --For Python 2.4 we require an earlier version of simplejson since --simplejson stopped officially supporting Python 2.4 in simplejson --version 2.1.0. Earlier versions of simplejson can be installed manually, --as follows: -+the spec tests; PyYAML can still be used (see the Develop section). - -- pip install 'simplejson<2.1.0' -- --Official support for Python 2.4 will end with Pystache version 0.6.0. -+Official support for Python 2 will end with Pystache version 0.6.0. - - Install It - ---------- - -- pip install pystache -+ pip install -U pystache -f https://github.com/sarnold/pystache/releases/ - - And test it-- - -@@ -85,12 +83,12 @@ Use It - ------ - - >>> import pystache -- >>> print pystache.render('Hi {{person}}!', {'person': 'Mom'}) -+ >>> print(pystache.render('Hi {{person}}!', {'person': 'Mom'})) - Hi Mom! - - You can also create dedicated view classes to hold your view logic. - --Here's your view class (in .../examples/readme.py): -+Here's your view class (in ../pystache/tests/examples/readme.py): - - class SayHello(object): - def to(self): -@@ -109,7 +107,7 @@ directory as your class definition): - Pull it together: - - >>> renderer = pystache.Renderer() -- >>> print renderer.render(hello) -+ >>> print(renderer.render(hello)) - Hello, Pizza! - - For greater control over rendering (e.g. to specify a custom template -@@ -117,22 +115,22 @@ directory), use the `Renderer` class like above. One can pass attributes - to the Renderer class constructor or set them on a Renderer instance. To - customize template loading on a per-view basis, subclass `TemplateSpec`. - See the docstrings of the --[Renderer](https://github.com/defunkt/pystache/blob/master/pystache/renderer.py) -+[Renderer](https://github.com/sarnold/pystache/blob/master/pystache/renderer.py) - class and --[TemplateSpec](https://github.com/defunkt/pystache/blob/master/pystache/template_spec.py) -+[TemplateSpec](https://github.com/sarnold/pystache/blob/master/pystache/template_spec.py) - class for more information. - - You can also pre-parse a template: - - >>> parsed = pystache.parse(u"Hey {{#who}}{{.}}!{{/who}}") -- >>> print parsed -- [u'Hey ', _SectionNode(key=u'who', index_begin=12, index_end=18, parsed=[_EscapeNode(key=u'.'), u'!'])] -+ >>> print(parsed) -+ ['Hey ', _SectionNode(key='who', index_begin=12, index_end=18, parsed=[_EscapeNode(key='.'), '!'])] - - And then: - -- >>> print renderer.render(parsed, {'who': 'Pops'}) -+ >>> print(renderer.render(parsed, {'who': 'Pops'})) - Hey Pops! -- >>> print renderer.render(parsed, {'who': 'you'}) -+ >>> print(renderer.render(parsed, {'who': 'you'})) - Hey you! - - Python 3 -@@ -194,15 +192,16 @@ To test from a source distribution (without installing)-- - python test_pystache.py - - To test Pystache with multiple versions of Python (with a single --command!), you can use [tox](http://pypi.python.org/pypi/tox): -+command!) and different platforms, you can use [tox](http://pypi.python.org/pypi/tox): -+ -+ pip install tox -+ tox -e setup - -- pip install 'virtualenv<1.8' # Version 1.8 dropped support for Python 2.4. -- pip install 'tox<1.4' # Version 1.4 dropped support for Python 2.4. -- tox -+To run tests on multiple versions with coverage, run: - --If you do not have all Python versions listed in `tox.ini`-- -+ tox -e py38-linux,py39-linux # for example - -- tox -e py26,py32 # for example -+(substitute your platform above, eg, macos or windows) - - The source distribution tests also include doctests and tests from the - Mustache spec. To include tests from the Mustache spec in your test -@@ -217,57 +216,33 @@ parses the json files. To install PyYAML-- - - pip install pyyaml - -+Once the submodule is available, you can run the full test set with: -+ -+ tox -e setup . ext/spec/specs -+ - To run a subset of the tests, you can use - [nose](http://somethingaboutorange.com/mrl/projects/nose/0.11.1/testing.html): - - pip install nose - nosetests --tests pystache/tests/test_context.py:GetValueTests.test_dictionary__key_present - --### Using Python 3 with Pystache from source -- --Pystache is written in Python 2 and must be converted to Python 3 prior to --using it with Python 3. The installation process (and tox) do this --automatically. - --To convert the code to Python 3 manually (while using Python 3)-- -+Mailing List (old) -+------------------ - -- python setup.py build -- --This writes the converted code to a subdirectory called `build`. --By design, Python 3 builds --[cannot](https://bitbucket.org/tarek/distribute/issue/292/allow-use_2to3-with-python-2) --be created from Python 2. -- --To convert the code without using setup.py, you can use --[2to3](http://docs.python.org/library/2to3.html) as follows (two steps)-- -- -- 2to3 --write --nobackups --no-diffs --doctests_only pystache -- 2to3 --write --nobackups --no-diffs pystache -- --This converts the code (and doctests) in place. -- --To `import pystache` from a source distribution while using Python 3, be --sure that you are importing from a directory containing a converted --version of the code (e.g. from the `build` directory after converting), --and not from the original (unconverted) source directory. Otherwise, you will --get a syntax error. You can help prevent this by not running the Python --IDE from the project directory when importing Pystache while using Python 3. -- -- --Mailing List -------------- -- --There is a [mailing list](http://librelist.com/browser/pystache/). Note -+There is(was) a [mailing list](http://librelist.com/browser/pystache/). Note - that there is a bit of a delay between posting a message and seeing it - appear in the mailing list archive. - - Credits - ------- - -- >>> context = { 'author': 'Chris Wanstrath', 'maintainer': 'Chris Jerdonek' } -- >>> print pystache.render("Author: {{author}}\nMaintainer: {{maintainer}}", context) -+ >>> import pystache -+ >>> context = { 'author': 'Chris Wanstrath', 'maintainer': 'Chris Jerdonek','refurbisher': 'Steve Arnold' } -+ >>> print(pystache.render("Author: {{author}}\nMaintainer: {{maintainer}}\nRefurbisher: {{refurbisher}}", context)) - Author: Chris Wanstrath - Maintainer: Chris Jerdonek -+ Refurbisher: Steve Arnold - - Pystache logo by [David Phillips](http://davidphillips.us/) is licensed - under a [Creative Commons Attribution-ShareAlike 3.0 Unported -diff --git a/TODO.md b/TODO.md -index cd82417..76853a4 100644 ---- a/TODO.md -+++ b/TODO.md -@@ -6,11 +6,10 @@ In development branch: - * Figure out a way to suppress center alignment of images in reST output. - * Add a unit test for the change made in 7ea8e7180c41. This is with regard - to not requiring spec tests when running tests from a downloaded sdist. --* End support for Python 2.4. --* Add Python 3.3 to tox file (after deprecating 2.4). -+* End support for Python 2.7 (done as of 03/03/21 - SA) -+* Release 0.6.0 on github, make a pypi account (SA) - * Turn the benchmarking script at pystache/tests/benchmark.py into a command - in pystache/commands, or make it a subcommand of one of the existing - commands (i.e. using a command argument). - * Provide support for logging in at least one of the commands. --* Make sure command parsing to pystache-test doesn't break with Python 2.4 and earlier. - * Combine pystache-test with the main command. -diff --git a/conda/meta.yaml b/conda/meta.yaml -new file mode 100644 -index 0000000..e7f4fd9 ---- /dev/null -+++ b/conda/meta.yaml -@@ -0,0 +1,50 @@ -+{% set name = "pystache" %} -+{% set version = "0.6.0.dev0" %} -+ -+package: -+ name: {{ name|lower }} -+ version: {{ version }} -+ -+source: -+ path: .. -+ -+build: -+ number: 0 -+ script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vvv -+ noarch: python -+ entry_points: -+ - pystache = pystache.commands.render:main -+ - pystache-test = pystache.commands.test:main -+ -+requirements: -+ build: -+ - python -+ - setuptools -+ -+ run: -+ - python -+ -+test: -+ imports: -+ - pystache -+ - pystache.commands -+ - pystache.tests -+ - pystache.tests.data -+ - pystache.tests.data.locator -+ - pystache.tests.examples -+ -+ commands: -+ - pystache --help -+ - pystache-test -+ -+ -+about: -+ home: https://github.com/sarnold/pystache -+ license: MIT -+ license_family: MIT -+ license_file: LICENSE -+ summary: Mustache for Python -+ -+extra: -+ recipe-maintainers: -+ - sarnold -diff --git a/pyproject.toml b/pyproject.toml -new file mode 100644 -index 0000000..2f21011 ---- /dev/null -+++ b/pyproject.toml -@@ -0,0 +1,3 @@ -+[build-system] -+requires = ["setuptools>=40.8.0", "wheel"] -+build-backend = "setuptools.build_meta" -diff --git a/pystache/__init__.py b/pystache/__init__.py -index 4cf2434..5edc1c5 100644 ---- a/pystache/__init__.py -+++ b/pystache/__init__.py -@@ -10,4 +10,4 @@ from pystache.init import parse, render, Renderer, TemplateSpec - - __all__ = ['parse', 'render', 'Renderer', 'TemplateSpec'] - --__version__ = '0.5.4' # Also change in setup.py. -+__version__ = '0.6.0' -diff --git a/pystache/commands/render.py b/pystache/commands/render.py -index 1a9c309..9c913e7 100644 ---- a/pystache/commands/render.py -+++ b/pystache/commands/render.py -@@ -22,7 +22,7 @@ except: - from sys import exc_info - ex_type, ex_value, tb = exc_info() - new_ex = Exception("%s: %s" % (ex_type.__name__, ex_value)) -- raise new_ex.__class__, new_ex, tb -+ raise new_ex.__class__(new_ex).with_traceback(tb) - - # The optparse module is deprecated in Python 2.7 in favor of argparse. - # However, argparse is not available in Python 2.6 and earlier. -@@ -88,7 +88,7 @@ def main(sys_argv=sys.argv): - context = json.loads(context) - - rendered = renderer.render(template, context) -- print rendered -+ print(rendered) - - - if __name__=='__main__': -diff --git a/pystache/common.py b/pystache/common.py -index fb266dd..0e9b091 100644 ---- a/pystache/common.py -+++ b/pystache/common.py -@@ -5,17 +5,12 @@ Exposes functionality needed throughout the project. - - """ - --from sys import version_info - - def _get_string_types(): -- # TODO: come up with a better solution for this. One of the issues here -- # is that in Python 3 there is no common base class for unicode strings -- # and byte strings, and 2to3 seems to convert all of "str", "unicode", -- # and "basestring" to Python 3's "str". -- if version_info < (3, ): -- return basestring -- # The latter evaluates to "bytes" in Python 3 -- even after conversion by 2to3. -- return (unicode, type(u"a".encode('utf-8'))) -+ """ -+ Return the Python3 string type (no more python2) -+ """ -+ return (str, type("a".encode('utf-8'))) - - - _STRING_TYPES = _get_string_types() -diff --git a/pystache/defaults.py b/pystache/defaults.py -index bcfdf4c..2fab0e0 100644 ---- a/pystache/defaults.py -+++ b/pystache/defaults.py -@@ -39,7 +39,7 @@ STRING_ENCODING = sys.getdefaultencoding() - FILE_ENCODING = sys.getdefaultencoding() - - # The delimiters to start with when parsing. --DELIMITERS = (u'{{', u'}}') -+DELIMITERS = ('{{', '}}') - - # How to handle missing tags when rendering a template. - MISSING_TAGS = MissingTags.ignore -diff --git a/pystache/loader.py b/pystache/loader.py -index d4a7e53..ea01d17 100644 ---- a/pystache/loader.py -+++ b/pystache/loader.py -@@ -6,6 +6,7 @@ This module provides a Loader class for locating and reading templates. - """ - - import os -+import platform - import sys - - from pystache import common -@@ -24,7 +25,7 @@ def _make_to_unicode(): - """ - if encoding is None: - encoding = defaults.STRING_ENCODING -- return unicode(s, encoding, defaults.DECODE_ERRORS) -+ return str(s, encoding, defaults.DECODE_ERRORS) - return to_unicode - - -@@ -86,7 +87,7 @@ class Loader(object): - def _make_locator(self): - return Locator(extension=self.extension) - -- def unicode(self, s, encoding=None): -+ def str(self, s, encoding=None): - """ - Convert a string to unicode using the given encoding, and return it. - -@@ -104,8 +105,8 @@ class Loader(object): - Defaults to None. - - """ -- if isinstance(s, unicode): -- return unicode(s) -+ if isinstance(s, str): -+ return str(s) - - return self.to_unicode(s, encoding) - -@@ -118,8 +119,9 @@ class Loader(object): - - if encoding is None: - encoding = self.file_encoding -- -- return self.unicode(b, encoding) -+ if platform.system() == "Windows": -+ return self.str(b, encoding).replace('\r', '') -+ return self.str(b, encoding) - - def load_file(self, file_name): - """ -diff --git a/pystache/parsed.py b/pystache/parsed.py -index 372d96c..75d417d 100644 ---- a/pystache/parsed.py -+++ b/pystache/parsed.py -@@ -41,10 +41,10 @@ class ParsedTemplate(object): - """ - # We avoid use of the ternary operator for Python 2.4 support. - def get_unicode(node): -- if type(node) is unicode: -+ if type(node) is str: - return node - return node.render(engine, context) -- parts = map(get_unicode, self._parse_tree) -+ parts = list(map(get_unicode, self._parse_tree)) - s = ''.join(parts) - -- return unicode(s) -+ return str(s) -diff --git a/pystache/parser.py b/pystache/parser.py -index c6a171f..1afd50a 100644 ---- a/pystache/parser.py -+++ b/pystache/parser.py -@@ -11,8 +11,8 @@ from pystache import defaults - from pystache.parsed import ParsedTemplate - - --END_OF_LINE_CHARACTERS = [u'\r', u'\n'] --NON_BLANK_RE = re.compile(ur'^(.)', re.M) -+END_OF_LINE_CHARACTERS = ['\r', '\n'] -+NON_BLANK_RE = re.compile(r'^(.)', re.M) - - - # TODO: add some unit tests for this. -@@ -30,12 +30,12 @@ def parse(template, delimiters=None): - - Examples: - -- >>> parsed = parse(u"Hey {{#who}}{{name}}!{{/who}}") -- >>> print str(parsed).replace('u', '') # This is a hack to get the test to pass both in Python 2 and 3. -+ >>> parsed = parse("Hey {{#who}}{{name}}!{{/who}}") -+ >>> print(str(parsed).replace('u', '')) # This is an old hack. - ['Hey ', _SectionNode(key='who', index_begin=12, index_end=21, parsed=[_EscapeNode(key='name'), '!'])] - - """ -- if type(template) is not unicode: -+ if type(template) is not str: - raise Exception("Template is not unicode: %s" % type(template)) - parser = _Parser(delimiters) - return parser.parse(template) -@@ -94,7 +94,7 @@ class _CommentNode(object): - return _format(self) - - def render(self, engine, context): -- return u'' -+ return '' - - - class _ChangeNode(object): -@@ -106,7 +106,7 @@ class _ChangeNode(object): - return _format(self) - - def render(self, engine, context): -- return u'' -+ return '' - - - class _EscapeNode(object): -@@ -147,7 +147,7 @@ class _PartialNode(object): - def render(self, engine, context): - template = engine.resolve_partial(self.key) - # Indent before rendering. -- template = re.sub(NON_BLANK_RE, self.indent + ur'\1', template) -+ template = re.sub(NON_BLANK_RE, self.indent + r'\1', template) - - return engine.render(template, context) - -@@ -168,7 +168,7 @@ class _InvertedNode(object): - # Note that lambdas are considered truthy for inverted sections - # per the spec. - if data: -- return u'' -+ return '' - return self.parsed_section.render(engine, context) - - -@@ -218,7 +218,7 @@ class _SectionNode(object): - parts.append(self.parsed.render(engine, context)) - context.pop() - -- return unicode(''.join(parts)) -+ return str(''.join(parts)) - - - class _Parser(object): -diff --git a/pystache/renderengine.py b/pystache/renderengine.py -index c797b17..2f1e341 100644 ---- a/pystache/renderengine.py -+++ b/pystache/renderengine.py -@@ -160,7 +160,7 @@ class RenderEngine(object): - if not is_string(val): - # In case the template is an integer, for example. - val = self.to_str(val) -- if type(val) is not unicode: -+ if type(val) is not str: - val = self.literal(val) - return self.render(val, context, delimiters) - -diff --git a/pystache/renderer.py b/pystache/renderer.py -index ff6a90c..064f040 100644 ---- a/pystache/renderer.py -+++ b/pystache/renderer.py -@@ -32,7 +32,7 @@ class Renderer(object): - >>> partials = {'partial': 'Hello, {{thing}}!'} - >>> renderer = Renderer(partials=partials) - >>> # We apply print to make the test work in Python 3 after 2to3. -- >>> print renderer.render('{{>partial}}', {'thing': 'world'}) -+ >>> print(renderer.render('{{>partial}}', {'thing': 'world'})) - Hello, world! - - To customize string coercion (e.g. to render False values as ''), one can -@@ -130,7 +130,7 @@ class Renderer(object): - if string_encoding is None: - string_encoding = defaults.STRING_ENCODING - -- if isinstance(search_dirs, basestring): -+ if isinstance(search_dirs, str): - search_dirs = [search_dirs] - - self._context = None -@@ -177,16 +177,16 @@ class Renderer(object): - """ - # We type-check to avoid "TypeError: decoding Unicode is not supported". - # We avoid the Python ternary operator for Python 2.4 support. -- if isinstance(s, unicode): -+ if isinstance(s, str): - return s -- return self.unicode(s) -+ return self.str(s) - - def _to_unicode_hard(self, s): - """ - Convert a basestring to a string with type unicode (not subclass). - - """ -- return unicode(self._to_unicode_soft(s)) -+ return str(self._to_unicode_soft(s)) - - def _escape_to_unicode(self, s): - """ -@@ -195,9 +195,9 @@ class Renderer(object): - Returns a unicode string (not subclass). - - """ -- return unicode(self.escape(self._to_unicode_soft(s))) -+ return str(self.escape(self._to_unicode_soft(s))) - -- def unicode(self, b, encoding=None): -+ def str(self, b, encoding=None): - """ - Convert a byte string to unicode, using string_encoding and decode_errors. - -@@ -222,7 +222,7 @@ class Renderer(object): - - # TODO: Wrap UnicodeDecodeErrors with a message about setting - # the string_encoding and decode_errors attributes. -- return unicode(b, encoding, self.decode_errors) -+ return str(b, encoding, self.decode_errors) - - def _make_loader(self): - """ -@@ -230,7 +230,7 @@ class Renderer(object): - - """ - return Loader(file_encoding=self.file_encoding, extension=self.file_extension, -- to_unicode=self.unicode, search_dirs=self.search_dirs) -+ to_unicode=self.str, search_dirs=self.search_dirs) - - def _make_load_template(self): - """ -@@ -299,7 +299,7 @@ class Renderer(object): - try: - return load_partial(name) - except TemplateNotFoundError: -- return u'' -+ return '' - - return resolve_partial - -@@ -316,7 +316,7 @@ class Renderer(object): - try: - return context_get(stack, name) - except KeyNotFoundError: -- return u'' -+ return '' - - return resolve_context - -diff --git a/pystache/specloader.py b/pystache/specloader.py -index 3a77d4c..a82d52a 100644 ---- a/pystache/specloader.py -+++ b/pystache/specloader.py -@@ -83,7 +83,7 @@ class SpecLoader(object): - - """ - if spec.template is not None: -- return self.loader.unicode(spec.template, spec.template_encoding) -+ return self.loader.str(spec.template, spec.template_encoding) - - path = self._find(spec) - -diff --git a/pystache/tests/benchmark.py b/pystache/tests/benchmark.py -index d46e973..6cb54f8 100755 ---- a/pystache/tests/benchmark.py -+++ b/pystache/tests/benchmark.py -@@ -13,6 +13,13 @@ tests/benchmark.py 10000 - import sys - from timeit import Timer - -+try: -+ import chevron as pystache -+ print('Using module: chevron') -+except (ImportError): -+ import pystache -+ print('Using module: pystache') -+ - import pystache - - # TODO: make the example realistic. -@@ -76,17 +83,17 @@ def main(sys_argv): - args = sys_argv[1:] - count = int(args[0]) - -- print "Benchmarking: %sx" % count -- print -+ print("Benchmarking: %sx" % count) -+ print() - - for example in examples: - - test = make_test_function(example) - - t = Timer(test,) -- print min(t.repeat(repeat=3, number=count)) -+ print(min(t.repeat(repeat=3, number=count))) - -- print "Done" -+ print("Done") - - - if __name__ == '__main__': -diff --git a/pystache/tests/common.py b/pystache/tests/common.py -index 222e14f..12b76b5 100644 ---- a/pystache/tests/common.py -+++ b/pystache/tests/common.py -@@ -72,8 +72,8 @@ def _find_files(root_dir, should_include): - # http://docs.python.org/library/os.html#os.walk - for dir_path, dir_names, file_names in os.walk(root_dir): - new_paths = [os.path.join(dir_path, file_name) for file_name in file_names] -- new_paths = filter(is_module, new_paths) -- new_paths = filter(should_include, new_paths) -+ new_paths = list(filter(is_module, new_paths)) -+ new_paths = list(filter(should_include, new_paths)) - paths.extend(new_paths) - - return paths -@@ -183,7 +183,7 @@ class AssertExceptionMixin: - try: - callable(*args, **kwds) - raise Exception("Expected exception: %s: %s" % (exception_type, repr(msg))) -- except exception_type, err: -+ except exception_type as err: - self.assertEqual(str(err), msg) - - -@@ -228,10 +228,10 @@ class Attachable(object): - """ - def __init__(self, **kwargs): - self.__args__ = kwargs -- for arg, value in kwargs.iteritems(): -+ for arg, value in kwargs.items(): - setattr(self, arg, value) - - def __repr__(self): - return "%s(%s)" % (self.__class__.__name__, - ", ".join("%s=%s" % (k, repr(v)) -- for k, v in self.__args__.iteritems())) -+ for k, v in self.__args__.items())) -diff --git a/pystache/tests/examples/unicode_output.py b/pystache/tests/examples/unicode_output.py -index da0e1d2..7bdea36 100644 ---- a/pystache/tests/examples/unicode_output.py -+++ b/pystache/tests/examples/unicode_output.py -@@ -8,4 +8,4 @@ TODO: add a docstring. - class UnicodeOutput(object): - - def name(self): -- return u'Henri Poincaré' -+ return 'Henri Poincaré' -diff --git a/pystache/tests/main.py b/pystache/tests/main.py -index 8af6b2e..17f2fb2 100644 ---- a/pystache/tests/main.py -+++ b/pystache/tests/main.py -@@ -88,7 +88,7 @@ def main(sys_argv): - - """ - # TODO: use logging module -- print "pystache: running tests: argv: %s" % repr(sys_argv) -+ print("pystache: running tests: argv: %s" % repr(sys_argv)) - - should_source_exist = False - spec_test_dir = None -@@ -131,11 +131,9 @@ def main(sys_argv): - module_names = _discover_test_modules(PACKAGE_DIR) - sys_argv.extend(module_names) - if project_dir is not None: -- # Add the current module for unit tests contained here (e.g. -- # to include SetupTests). -+ # Add the current module for unit tests contained here - sys_argv.append(__name__) - -- SetupTests.project_dir = project_dir - - extra_tests = make_extra_tests(project_dir, spec_test_dir) - test_program_class = make_test_program_class(extra_tests) -@@ -166,25 +164,3 @@ def _discover_test_modules(package_dir): - raise Exception("No unit-test modules found--\n in %s" % package_dir) - - return names -- -- --class SetupTests(TestCase): -- -- """Tests about setup.py.""" -- -- project_dir = None -- -- def test_version(self): -- """ -- Test that setup.py's version matches the package's version. -- -- """ -- original_path = list(sys.path) -- -- sys.path.insert(0, self.project_dir) -- -- try: -- from setup import VERSION -- self.assertEqual(VERSION, pystache.__version__) -- finally: -- sys.path = original_path -diff --git a/pystache/tests/spectesting.py b/pystache/tests/spectesting.py -index ec8a08d..2dd57e8 100644 ---- a/pystache/tests/spectesting.py -+++ b/pystache/tests/spectesting.py -@@ -37,7 +37,7 @@ except ImportError: - from sys import exc_info - ex_type, ex_value, tb = exc_info() - new_ex = Exception("%s: %s" % (ex_type.__name__, ex_value)) -- raise new_ex.__class__, new_ex, tb -+ raise new_ex.__class__(new_ex).with_traceback(tb) - file_extension = 'json' - parser = json - else: -@@ -62,7 +62,7 @@ def get_spec_tests(spec_test_dir): - - """ - # TODO: use logging module instead. -- print "pystache: spec tests: using %s" % _get_parser_info() -+ print("pystache: spec tests: using %s" % _get_parser_info()) - - cases = [] - -@@ -103,7 +103,7 @@ def _read_spec_tests(path): - - """ - b = common.read(path) -- u = unicode(b, encoding=FILE_ENCODING) -+ u = str(b, encoding=FILE_ENCODING) - spec_data = parse(u) - tests = spec_data['tests'] - -@@ -133,7 +133,7 @@ def _convert_children(node): - return - # Otherwise, node is a dict, so attempt the conversion. - -- for key in node.keys(): -+ for key in list(node.keys()): - val = node[key] - - if not isinstance(val, dict) or val.get('__tag__') != 'code': -@@ -158,9 +158,9 @@ def _deserialize_spec_test(data, file_path): - context = data['data'] - description = data['desc'] - # PyYAML seems to leave ASCII strings as byte strings. -- expected = unicode(data['expected']) -+ expected = str(data['expected']) - # TODO: switch to using dict.get(). -- partials = data.has_key('partials') and data['partials'] or {} -+ partials = 'partials' in data and data['partials'] or {} - template = data['template'] - test_name = data['name'] - -@@ -237,8 +237,8 @@ def parse(u): - value = loader.construct_mapping(node) - return eval(value['python'], {}) - -- yaml.add_constructor(u'!code', code_constructor) -- return yaml.load(u) -+ yaml.add_constructor('!code', code_constructor) -+ return yaml.full_load(u) - - - class SpecTestBase(unittest.TestCase, AssertStringMixin): -diff --git a/pystache/tests/test___init__.py b/pystache/tests/test___init__.py -index eae42c1..63d2c3b 100644 ---- a/pystache/tests/test___init__.py -+++ b/pystache/tests/test___init__.py -@@ -6,9 +6,9 @@ Tests of __init__.py. - """ - - # Calling "import *" is allowed only at the module level. --GLOBALS_INITIAL = globals().keys() -+GLOBALS_INITIAL = list(globals().keys()) - from pystache import * --GLOBALS_PYSTACHE_IMPORTED = globals().keys() -+GLOBALS_PYSTACHE_IMPORTED = list(globals().keys()) - - import unittest - -diff --git a/pystache/tests/test_commands.py b/pystache/tests/test_commands.py -index 2529d25..34fe8ba 100644 ---- a/pystache/tests/test_commands.py -+++ b/pystache/tests/test_commands.py -@@ -39,7 +39,7 @@ class CommandsTestCase(unittest.TestCase): - - """ - actual = self.callScript("Hi {{thing}}", '{"thing": "world"}') -- self.assertEqual(actual, u"Hi world\n") -+ self.assertEqual(actual, "Hi world\n") - - def tearDown(self): - sys.stdout = ORIGINAL_STDOUT -diff --git a/pystache/tests/test_defaults.py b/pystache/tests/test_defaults.py -index c78ea7c..5399bb0 100644 ---- a/pystache/tests/test_defaults.py -+++ b/pystache/tests/test_defaults.py -@@ -31,37 +31,37 @@ class DefaultsConfigurableTestCase(unittest.TestCase, AssertStringMixin): - self.saved[e] = getattr(pystache.defaults, e) - - def tearDown(self): -- for key, value in self.saved.items(): -+ for key, value in list(self.saved.items()): - setattr(pystache.defaults, key, value) - - def test_tag_escape(self): - """Test that changes to defaults.TAG_ESCAPE take effect.""" -- template = u"{{foo}}" -+ template = "{{foo}}" - context = {'foo': '<'} - actual = pystache.render(template, context) -- self.assertString(actual, u"<") -+ self.assertString(actual, "<") - - pystache.defaults.TAG_ESCAPE = lambda u: u - actual = pystache.render(template, context) -- self.assertString(actual, u"<") -+ self.assertString(actual, "<") - - def test_delimiters(self): - """Test that changes to defaults.DELIMITERS take effect.""" -- template = u"[[foo]]{{foo}}" -+ template = "[[foo]]{{foo}}" - context = {'foo': 'FOO'} - actual = pystache.render(template, context) -- self.assertString(actual, u"[[foo]]FOO") -+ self.assertString(actual, "[[foo]]FOO") - - pystache.defaults.DELIMITERS = ('[[', ']]') - actual = pystache.render(template, context) -- self.assertString(actual, u"FOO{{foo}}") -+ self.assertString(actual, "FOO{{foo}}") - - def test_missing_tags(self): - """Test that changes to defaults.MISSING_TAGS take effect.""" -- template = u"{{foo}}" -+ template = "{{foo}}" - context = {} - actual = pystache.render(template, context) -- self.assertString(actual, u"") -+ self.assertString(actual, "") - - pystache.defaults.MISSING_TAGS = 'strict' - self.assertRaises(pystache.context.KeyNotFoundError, -diff --git a/pystache/tests/test_examples.py b/pystache/tests/test_examples.py -index 5c9f74d..9f93de3 100644 ---- a/pystache/tests/test_examples.py -+++ b/pystache/tests/test_examples.py -@@ -7,15 +7,15 @@ TODO: add a docstring. - - import unittest - --from examples.comments import Comments --from examples.double_section import DoubleSection --from examples.escaped import Escaped --from examples.unescaped import Unescaped --from examples.template_partial import TemplatePartial --from examples.delimiters import Delimiters --from examples.unicode_output import UnicodeOutput --from examples.unicode_input import UnicodeInput --from examples.nested_context import NestedContext -+from .examples.comments import Comments -+from .examples.double_section import DoubleSection -+from .examples.escaped import Escaped -+from .examples.unescaped import Unescaped -+from .examples.template_partial import TemplatePartial -+from .examples.delimiters import Delimiters -+from .examples.unicode_output import UnicodeOutput -+from .examples.unicode_input import UnicodeInput -+from .examples.nested_context import NestedContext - from pystache import Renderer - from pystache.tests.common import EXAMPLES_DIR - from pystache.tests.common import AssertStringMixin -@@ -29,34 +29,34 @@ class TestView(unittest.TestCase, AssertStringMixin): - self.assertString(actual, expected) - - def test_comments(self): -- self._assert(Comments(), u"

A Comedy of Errors

") -+ self._assert(Comments(), "

A Comedy of Errors

") - - def test_double_section(self): -- self._assert(DoubleSection(), u"* first\n* second\n* third") -+ self._assert(DoubleSection(), "* first\n* second\n* third") - - def test_unicode_output(self): - renderer = Renderer() - actual = renderer.render(UnicodeOutput()) -- self.assertString(actual, u'

Name: Henri Poincaré

') -+ self.assertString(actual, '

Name: Henri Poincaré

') - - def test_unicode_input(self): - renderer = Renderer() - actual = renderer.render(UnicodeInput()) -- self.assertString(actual, u'abcdé') -+ self.assertString(actual, 'abcdé') - - def test_escaping(self): -- self._assert(Escaped(), u"

Bear > Shark

") -+ self._assert(Escaped(), "

Bear > Shark

") - - def test_literal(self): - renderer = Renderer() - actual = renderer.render(Unescaped()) -- self.assertString(actual, u"

Bear > Shark

") -+ self.assertString(actual, "

Bear > Shark

") - - def test_template_partial(self): - renderer = Renderer(search_dirs=EXAMPLES_DIR) - actual = renderer.render(TemplatePartial(renderer=renderer)) - -- self.assertString(actual, u"""

Welcome

-+ self.assertString(actual, """

Welcome

- Again, Welcome!""") - - def test_template_partial_extension(self): -@@ -65,7 +65,7 @@ Again, Welcome!""") - view = TemplatePartial(renderer=renderer) - - actual = renderer.render(view) -- self.assertString(actual, u"""Welcome -+ self.assertString(actual, """Welcome - ------- - - ## Again, Welcome! ##""") -@@ -73,7 +73,7 @@ Again, Welcome!""") - def test_delimiters(self): - renderer = Renderer() - actual = renderer.render(Delimiters()) -- self.assertString(actual, u"""\ -+ self.assertString(actual, """\ - * It worked the first time. - * And it worked the second time. - * Then, surprisingly, it worked the third time. -@@ -82,7 +82,7 @@ Again, Welcome!""") - def test_nested_context(self): - renderer = Renderer() - actual = renderer.render(NestedContext(renderer)) -- self.assertString(actual, u"one and foo and two") -+ self.assertString(actual, "one and foo and two") - - def test_nested_context_is_available_in_view(self): - renderer = Renderer() -@@ -91,7 +91,7 @@ Again, Welcome!""") - view.template = '{{#herp}}{{#derp}}{{nested_context_in_view}}{{/derp}}{{/herp}}' - - actual = renderer.render(view) -- self.assertString(actual, u'it works!') -+ self.assertString(actual, 'it works!') - - def test_partial_in_partial_has_access_to_grand_parent_context(self): - renderer = Renderer(search_dirs=EXAMPLES_DIR) -diff --git a/pystache/tests/test_loader.py b/pystache/tests/test_loader.py -index f2c2187..315daff 100644 ---- a/pystache/tests/test_loader.py -+++ b/pystache/tests/test_loader.py -@@ -55,23 +55,23 @@ class LoaderTests(unittest.TestCase, AssertStringMixin, SetupDefaults): - - def test_init__to_unicode__default(self): - loader = Loader() -- self.assertRaises(TypeError, loader.to_unicode, u"abc") -+ self.assertRaises(TypeError, loader.to_unicode, "abc") - - decode_errors = defaults.DECODE_ERRORS - string_encoding = defaults.STRING_ENCODING - -- nonascii = u'abcdé'.encode('utf-8') -+ nonascii = 'abcdé'.encode('utf-8') - - loader = Loader() - self.assertRaises(UnicodeDecodeError, loader.to_unicode, nonascii) - - defaults.DECODE_ERRORS = 'ignore' - loader = Loader() -- self.assertString(loader.to_unicode(nonascii), u'abcd') -+ self.assertString(loader.to_unicode(nonascii), 'abcd') - - defaults.STRING_ENCODING = 'utf-8' - loader = Loader() -- self.assertString(loader.to_unicode(nonascii), u'abcdé') -+ self.assertString(loader.to_unicode(nonascii), 'abcdé') - - - def _get_path(self, filename): -@@ -83,9 +83,9 @@ class LoaderTests(unittest.TestCase, AssertStringMixin, SetupDefaults): - - """ - loader = Loader() -- actual = loader.unicode("foo") -+ actual = loader.str("foo") - -- self.assertString(actual, u"foo") -+ self.assertString(actual, "foo") - - def test_unicode__basic__input_unicode(self): - """ -@@ -93,24 +93,24 @@ class LoaderTests(unittest.TestCase, AssertStringMixin, SetupDefaults): - - """ - loader = Loader() -- actual = loader.unicode(u"foo") -+ actual = loader.str("foo") - -- self.assertString(actual, u"foo") -+ self.assertString(actual, "foo") - - def test_unicode__basic__input_unicode_subclass(self): - """ - Test unicode(): default arguments with unicode-subclass input. - - """ -- class UnicodeSubclass(unicode): -+ class UnicodeSubclass(str): - pass - -- s = UnicodeSubclass(u"foo") -+ s = UnicodeSubclass("foo") - - loader = Loader() -- actual = loader.unicode(s) -+ actual = loader.str(s) - -- self.assertString(actual, u"foo") -+ self.assertString(actual, "foo") - - def test_unicode__to_unicode__attribute(self): - """ -@@ -119,16 +119,16 @@ class LoaderTests(unittest.TestCase, AssertStringMixin, SetupDefaults): - """ - loader = Loader() - -- non_ascii = u'abcdé'.encode('utf-8') -- self.assertRaises(UnicodeDecodeError, loader.unicode, non_ascii) -+ non_ascii = 'abcdé'.encode('utf-8') -+ self.assertRaises(UnicodeDecodeError, loader.str, non_ascii) - - def to_unicode(s, encoding=None): - if encoding is None: - encoding = 'utf-8' -- return unicode(s, encoding) -+ return str(s, encoding) - - loader.to_unicode = to_unicode -- self.assertString(loader.unicode(non_ascii), u"abcdé") -+ self.assertString(loader.str(non_ascii), "abcdé") - - def test_unicode__encoding_argument(self): - """ -@@ -137,12 +137,12 @@ class LoaderTests(unittest.TestCase, AssertStringMixin, SetupDefaults): - """ - loader = Loader() - -- non_ascii = u'abcdé'.encode('utf-8') -+ non_ascii = 'abcdé'.encode('utf-8') - -- self.assertRaises(UnicodeDecodeError, loader.unicode, non_ascii) -+ self.assertRaises(UnicodeDecodeError, loader.str, non_ascii) - -- actual = loader.unicode(non_ascii, encoding='utf-8') -- self.assertString(actual, u'abcdé') -+ actual = loader.str(non_ascii, encoding='utf-8') -+ self.assertString(actual, 'abcdé') - - # TODO: check the read() unit tests. - def test_read(self): -@@ -153,7 +153,7 @@ class LoaderTests(unittest.TestCase, AssertStringMixin, SetupDefaults): - loader = Loader() - path = self._get_path('ascii.mustache') - actual = loader.read(path) -- self.assertString(actual, u'ascii: abc') -+ self.assertString(actual, 'ascii: abc') - - def test_read__file_encoding__attribute(self): - """ -@@ -167,7 +167,7 @@ class LoaderTests(unittest.TestCase, AssertStringMixin, SetupDefaults): - - loader.file_encoding = 'utf-8' - actual = loader.read(path) -- self.assertString(actual, u'non-ascii: é') -+ self.assertString(actual, 'non-ascii: é') - - def test_read__encoding__argument(self): - """ -@@ -180,7 +180,7 @@ class LoaderTests(unittest.TestCase, AssertStringMixin, SetupDefaults): - self.assertRaises(UnicodeDecodeError, loader.read, path) - - actual = loader.read(path, encoding='utf-8') -- self.assertString(actual, u'non-ascii: é') -+ self.assertString(actual, 'non-ascii: é') - - def test_read__to_unicode__attribute(self): - """ -diff --git a/pystache/tests/test_pystache.py b/pystache/tests/test_pystache.py -index 5447f8d..cf5d6af 100644 ---- a/pystache/tests/test_pystache.py -+++ b/pystache/tests/test_pystache.py -@@ -71,14 +71,14 @@ class PystacheTests(unittest.TestCase): - template = "{{#stats}}({{key}} & {{value}}){{/stats}}" - stats = [] - stats.append({'key': 123, 'value': ['something']}) -- stats.append({'key': u"chris", 'value': 0.900}) -+ stats.append({'key': "chris", 'value': 0.900}) - context = { 'stats': stats } - self._assert_rendered(self.non_strings_expected, template, context) - - def test_unicode(self): - template = 'Name: {{name}}; Age: {{age}}' -- context = {'name': u'Henri Poincaré', 'age': 156 } -- self._assert_rendered(u'Name: Henri Poincaré; Age: 156', template, context) -+ context = {'name': 'Henri Poincaré', 'age': 156} -+ self._assert_rendered('Name: Henri Poincaré; Age: 156', template, context) - - def test_sections(self): - template = """
    {{#users}}
  • {{name}}
    • {{/users}}
""" -diff --git a/pystache/tests/test_renderengine.py b/pystache/tests/test_renderengine.py -index db916f7..ed604c5 100644 ---- a/pystache/tests/test_renderengine.py -+++ b/pystache/tests/test_renderengine.py -@@ -33,11 +33,11 @@ def mock_literal(s): - s: a byte string or unicode string. - - """ -- if isinstance(s, unicode): -+ if isinstance(s, str): - # Strip off unicode super classes, if present. -- u = unicode(s) -+ u = str(s) - else: -- u = unicode(s, encoding='ascii') -+ u = str(s, encoding='ascii') - - # We apply upper() to make sure we are actually using our custom - # function in the tests -@@ -94,17 +94,17 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - engine = kwargs.get('engine', self._engine()) - - if partials is not None: -- engine.resolve_partial = lambda key: unicode(partials[key]) -+ engine.resolve_partial = lambda key: str(partials[key]) - - context = ContextStack(*context) - - # RenderEngine.render() only accepts unicode template strings. -- actual = engine.render(unicode(template), context) -+ actual = engine.render(str(template), context) - - self.assertString(actual=actual, expected=expected) - - def test_render(self): -- self._assert_render(u'Hi Mom', 'Hi {{person}}', {'person': 'Mom'}) -+ self._assert_render('Hi Mom', 'Hi {{person}}', {'person': 'Mom'}) - - def test__resolve_partial(self): - """ -@@ -112,10 +112,10 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - - """ - engine = self._engine() -- partials = {'partial': u"{{person}}"} -+ partials = {'partial': "{{person}}"} - engine.resolve_partial = lambda key: partials[key] - -- self._assert_render(u'Hi Mom', 'Hi {{>partial}}', {'person': 'Mom'}, engine=engine) -+ self._assert_render('Hi Mom', 'Hi {{>partial}}', {'person': 'Mom'}, engine=engine) - - def test__literal(self): - """ -@@ -125,13 +125,13 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - engine = self._engine() - engine.literal = lambda s: s.upper() - -- self._assert_render(u'BAR', '{{{foo}}}', {'foo': 'bar'}, engine=engine) -+ self._assert_render('BAR', '{{{foo}}}', {'foo': 'bar'}, engine=engine) - - def test_literal__sigil(self): - template = "

{{& thing}}

" - context = {'thing': 'Bear > Giraffe'} - -- expected = u"

Bear > Giraffe

" -+ expected = "

Bear > Giraffe

" - - self._assert_render(expected, template, context) - -@@ -143,7 +143,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - engine = self._engine() - engine.escape = lambda s: "**" + s - -- self._assert_render(u'**bar', '{{foo}}', {'foo': 'bar'}, engine=engine) -+ self._assert_render('**bar', '{{foo}}', {'foo': 'bar'}, engine=engine) - - def test__escape_does_not_call_literal(self): - """ -@@ -157,7 +157,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = 'literal: {{{foo}}} escaped: {{foo}}' - context = {'foo': 'bar'} - -- self._assert_render(u'literal: BAR escaped: **bar', template, context, engine=engine) -+ self._assert_render('literal: BAR escaped: **bar', template, context, engine=engine) - - def test__escape_preserves_unicode_subclasses(self): - """ -@@ -167,7 +167,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - variable value is markupsafe.Markup when escaping. - - """ -- class MyUnicode(unicode): -+ class MyUnicode(str): - pass - - def escape(s): -@@ -182,7 +182,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = '{{foo1}} {{foo2}}' - context = {'foo1': MyUnicode('bar'), 'foo2': 'bar'} - -- self._assert_render(u'**bar bar**', template, context, engine=engine) -+ self._assert_render('**bar bar**', template, context, engine=engine) - - # Custom to_str for testing purposes. - def _to_str(self, val): -@@ -197,9 +197,9 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = '{{value}}' - context = {'value': None} - -- self._assert_render(u'None', template, context, engine=engine) -+ self._assert_render('None', template, context, engine=engine) - engine.to_str = self._to_str -- self._assert_render(u'', template, context, engine=engine) -+ self._assert_render('', template, context, engine=engine) - - def test_to_str__lambda(self): - """Test the to_str attribute for a lambda.""" -@@ -207,9 +207,9 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = '{{value}}' - context = {'value': lambda: None} - -- self._assert_render(u'None', template, context, engine=engine) -+ self._assert_render('None', template, context, engine=engine) - engine.to_str = self._to_str -- self._assert_render(u'', template, context, engine=engine) -+ self._assert_render('', template, context, engine=engine) - - def test_to_str__section_list(self): - """Test the to_str attribute for a section list.""" -@@ -217,9 +217,9 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = '{{#list}}{{.}}{{/list}}' - context = {'list': [None, None]} - -- self._assert_render(u'NoneNone', template, context, engine=engine) -+ self._assert_render('NoneNone', template, context, engine=engine) - engine.to_str = self._to_str -- self._assert_render(u'', template, context, engine=engine) -+ self._assert_render('', template, context, engine=engine) - - def test_to_str__section_lambda(self): - # TODO: add a test for a "method with an arity of 1". -@@ -239,7 +239,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = '{{text}} {{int}} {{{int}}}' - context = {'int': 100, 'text': 'foo'} - -- self._assert_render(u'FOO 100 100', template, context, engine=engine) -+ self._assert_render('FOO 100 100', template, context, engine=engine) - - def test_tag__output_not_interpolated(self): - """ -@@ -248,7 +248,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - """ - template = '{{template}}: {{planet}}' - context = {'template': '{{planet}}', 'planet': 'Earth'} -- self._assert_render(u'{{planet}}: Earth', template, context) -+ self._assert_render('{{planet}}: Earth', template, context) - - def test_tag__output_not_interpolated__section(self): - """ -@@ -257,7 +257,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - """ - template = '{{test}}' - context = {'test': '{{#hello}}'} -- self._assert_render(u'{{#hello}}', template, context) -+ self._assert_render('{{#hello}}', template, context) - - ## Test interpolation with "falsey" values - # -@@ -268,17 +268,17 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - def test_interpolation__falsey__zero(self): - template = '{{.}}' - context = 0 -- self._assert_render(u'0', template, context) -+ self._assert_render('0', template, context) - - def test_interpolation__falsey__none(self): - template = '{{.}}' - context = None -- self._assert_render(u'None', template, context) -+ self._assert_render('None', template, context) - - def test_interpolation__falsey__zero(self): - template = '{{.}}' - context = False -- self._assert_render(u'False', template, context) -+ self._assert_render('False', template, context) - - # Built-in types: - # -@@ -310,7 +310,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - Check tag interpolation with a built-in type: string. - - """ -- self._assert_builtin_type('abc', 'upper', 'ABC', u'xyz') -+ self._assert_builtin_type('abc', 'upper', 'ABC', 'xyz') - - def test_interpolation__built_in_type__integer(self): - """ -@@ -324,7 +324,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - # - # we need to resort to built-in attributes (double-underscored) on - # the integer type. -- self._assert_builtin_type(15, '__neg__', -15, u'999') -+ self._assert_builtin_type(15, '__neg__', -15, '999') - - def test_interpolation__built_in_type__list(self): - """ -@@ -338,7 +338,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - - template = '{{#section}}{{%s}}{{/section}}' % attr_name - context = {'section': item, attr_name: 7} -- self._assert_render(u'7', template, context) -+ self._assert_render('7', template, context) - - # This test is also important for testing 2to3. - def test_interpolation__nonascii_nonunicode(self): -@@ -347,8 +347,8 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - - """ - template = '{{nonascii}}' -- context = {'nonascii': u'abcdé'.encode('utf-8')} -- self._assert_render(u'abcdé', template, context) -+ context = {'nonascii': 'abcdé'.encode('utf-8')} -+ self._assert_render('abcdé', template, context) - - def test_implicit_iterator__literal(self): - """ -@@ -358,7 +358,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = """{{#test}}{{{.}}}{{/test}}""" - context = {'test': ['<', '>']} - -- self._assert_render(u'<>', template, context) -+ self._assert_render('<>', template, context) - - def test_implicit_iterator__escaped(self): - """ -@@ -368,7 +368,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = """{{#test}}{{.}}{{/test}}""" - context = {'test': ['<', '>']} - -- self._assert_render(u'<>', template, context) -+ self._assert_render('<>', template, context) - - def test_literal__in_section(self): - """ -@@ -378,7 +378,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = '{{#test}}1 {{{less_than}}} 2{{/test}}' - context = {'test': {'less_than': '<'}} - -- self._assert_render(u'1 < 2', template, context) -+ self._assert_render('1 < 2', template, context) - - def test_literal__in_partial(self): - """ -@@ -389,11 +389,11 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - partials = {'partial': '1 {{{less_than}}} 2'} - context = {'less_than': '<'} - -- self._assert_render(u'1 < 2', template, context, partials=partials) -+ self._assert_render('1 < 2', template, context, partials=partials) - - def test_partial(self): - partials = {'partial': "{{person}}"} -- self._assert_render(u'Hi Mom', 'Hi {{>partial}}', {'person': 'Mom'}, partials=partials) -+ self._assert_render('Hi Mom', 'Hi {{>partial}}', {'person': 'Mom'}, partials=partials) - - def test_partial__context_values(self): - """ -@@ -406,7 +406,9 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - partials = {'partial': 'unescaped: {{{foo}}} escaped: {{foo}}'} - context = {'foo': '<'} - -- self._assert_render(u'unescaped: < escaped: <', template, context, engine=engine, partials=partials) -+ self._assert_render( -+ 'unescaped: < escaped: <', -+ template, context, engine=engine, partials=partials) - - ## Test cases related specifically to lambdas. - -@@ -417,8 +419,8 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - - """ - template = '{{#nonascii}}{{.}}{{/nonascii}}' -- context = {'nonascii': u'abcdé'.encode('utf-8')} -- self._assert_render(u'abcdé', template, context) -+ context = {'nonascii': 'abcdé'.encode('utf-8')} -+ self._assert_render('abcdé', template, context) - - # This test is also important for testing 2to3. - def test_lambda__returning_nonascii_nonunicode(self): -@@ -427,8 +429,8 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - - """ - template = '{{lambda}}' -- context = {'lambda': lambda: u'abcdé'.encode('utf-8')} -- self._assert_render(u'abcdé', template, context) -+ context = {'lambda': lambda: 'abcdé'.encode('utf-8')} -+ self._assert_render('abcdé', template, context) - - ## Test cases related specifically to sections. - -@@ -440,7 +442,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = '{{/section}}' - try: - self._assert_render(None, template) -- except ParsingError, err: -+ except ParsingError as err: - self.assertEqual(str(err), "Section end tag mismatch: section != None") - - def test_section__end_tag_mismatch(self): -@@ -451,7 +453,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = '{{#section_start}}{{/section_end}}' - try: - self._assert_render(None, template) -- except ParsingError, err: -+ except ParsingError as err: - self.assertEqual(str(err), "Section end tag mismatch: section_end != section_start") - - def test_section__context_values(self): -@@ -464,7 +466,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = '{{#test}}unescaped: {{{foo}}} escaped: {{foo}}{{/test}}' - context = {'test': {'foo': '<'}} - -- self._assert_render(u'unescaped: < escaped: <', template, context, engine=engine) -+ self._assert_render('unescaped: < escaped: <', template, context, engine=engine) - - def test_section__context_precedence(self): - """ -@@ -473,7 +475,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - """ - template = '{{entree}} : {{#vegetarian}}{{entree}}{{/vegetarian}}' - context = {'entree': 'chicken', 'vegetarian': {'entree': 'beans and rice'}} -- self._assert_render(u'chicken : beans and rice', template, context) -+ self._assert_render('chicken : beans and rice', template, context) - - def test_section__list_referencing_outer_context(self): - """ -@@ -491,7 +493,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - - template = "{{#list}}{{greeting}} {{name}}, {{/list}}" - -- self._assert_render(u"Hi Al, Hi Bob, ", template, context) -+ self._assert_render("Hi Al, Hi Bob, ", template, context) - - def test_section__output_not_interpolated(self): - """ -@@ -500,7 +502,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - """ - template = '{{#section}}{{template}}{{/section}}: {{planet}}' - context = {'section': True, 'template': '{{planet}}', 'planet': 'Earth'} -- self._assert_render(u'{{planet}}: Earth', template, context) -+ self._assert_render('{{planet}}: Earth', template, context) - - # TODO: have this test case added to the spec. - def test_section__string_values_not_lists(self): -@@ -511,7 +513,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = '{{#section}}foo{{/section}}' - context = {'section': '123'} - # If strings were interpreted as lists, this would give "foofoofoo". -- self._assert_render(u'foo', template, context) -+ self._assert_render('foo', template, context) - - def test_section__nested_truthy(self): - """ -@@ -525,7 +527,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - """ - template = '| A {{#bool}}B {{#bool}}C{{/bool}} D{{/bool}} E |' - context = {'bool': True} -- self._assert_render(u'| A B C D E |', template, context) -+ self._assert_render('| A B C D E |', template, context) - - def test_section__nested_with_same_keys(self): - """ -@@ -537,16 +539,16 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - # Start with an easier, working case. - template = '{{#x}}{{#z}}{{y}}{{/z}}{{/x}}' - context = {'x': {'z': {'y': 1}}} -- self._assert_render(u'1', template, context) -+ self._assert_render('1', template, context) - - template = '{{#x}}{{#x}}{{y}}{{/x}}{{/x}}' - context = {'x': {'x': {'y': 1}}} -- self._assert_render(u'1', template, context) -+ self._assert_render('1', template, context) - - def test_section__lambda(self): - template = '{{#test}}Mom{{/test}}' - context = {'test': (lambda text: 'Hi %s' % text)} -- self._assert_render(u'Hi Mom', template, context) -+ self._assert_render('Hi Mom', template, context) - - # This test is also important for testing 2to3. - def test_section__lambda__returning_nonascii_nonunicode(self): -@@ -555,8 +557,8 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - - """ - template = '{{#lambda}}{{/lambda}}' -- context = {'lambda': lambda text: u'abcdé'.encode('utf-8')} -- self._assert_render(u'abcdé', template, context) -+ context = {'lambda': lambda text: 'abcdé'.encode('utf-8')} -+ self._assert_render('abcdé', template, context) - - def test_section__lambda__returning_nonstring(self): - """ -@@ -565,7 +567,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - """ - template = '{{#lambda}}foo{{/lambda}}' - context = {'lambda': lambda text: len(text)} -- self._assert_render(u'3', template, context) -+ self._assert_render('3', template, context) - - def test_section__iterable(self): - """ -@@ -575,10 +577,10 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = '{{#iterable}}{{.}}{{/iterable}}' - - context = {'iterable': (i for i in range(3))} # type 'generator' -- self._assert_render(u'012', template, context) -+ self._assert_render('012', template, context) - -- context = {'iterable': xrange(4)} # type 'xrange' -- self._assert_render(u'0123', template, context) -+ context = {'iterable': range(4)} # type 'xrange' -+ self._assert_render('0123', template, context) - - d = {'foo': 0, 'bar': 0} - # We don't know what order of keys we'll be given, but from the -@@ -586,8 +588,8 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - # "If items(), keys(), values(), iteritems(), iterkeys(), and - # itervalues() are called with no intervening modifications to - # the dictionary, the lists will directly correspond." -- expected = u''.join(d.keys()) -- context = {'iterable': d.iterkeys()} # type 'dictionary-keyiterator' -+ expected = ''.join(list(d.keys())) -+ context = {'iterable': iter(d.keys())} # type 'dictionary-keyiterator' - self._assert_render(expected, template, context) - - def test_section__lambda__tag_in_output(self): -@@ -605,7 +607,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - """ - template = '{{#test}}Hi {{person}}{{/test}}' - context = {'person': 'Mom', 'test': (lambda text: text + " :)")} -- self._assert_render(u'Hi Mom :)', template, context) -+ self._assert_render('Hi Mom :)', template, context) - - def test_section__lambda__list(self): - """ -@@ -621,7 +623,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - 'lambdas': [lambda text: "~{{%s}}~" % text, - lambda text: "#{{%s}}#" % text]} - -- self._assert_render(u'<~bar~#bar#>', template, context) -+ self._assert_render('<~bar~#bar#>', template, context) - - def test_section__lambda__mixed_list(self): - """ -@@ -636,7 +638,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - context = {'foo': 'bar', - 'lambdas': [lambda text: "~{{%s}}~" % text, 1]} - -- self._assert_render(u'<~bar~foo>', template, context) -+ self._assert_render('<~bar~foo>', template, context) - - def test_section__lambda__not_on_context_stack(self): - """ -@@ -653,7 +655,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - """ - context = {'foo': 'bar', 'lambda': (lambda text: "{{.}}")} - template = '{{#foo}}{{#lambda}}blah{{/lambda}}{{/foo}}' -- self._assert_render(u'bar', template, context) -+ self._assert_render('bar', template, context) - - def test_section__lambda__no_reinterpolation(self): - """ -@@ -670,15 +672,15 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - """ - template = '{{#planet}}{{#lambda}}dot{{/lambda}}{{/planet}}' - context = {'planet': 'Earth', 'dot': '~{{.}}~', 'lambda': (lambda text: "#{{%s}}#" % text)} -- self._assert_render(u'#~{{.}}~#', template, context) -+ self._assert_render('#~{{.}}~#', template, context) - - def test_comment__multiline(self): - """ - Check that multiline comments are permitted. - - """ -- self._assert_render(u'foobar', 'foo{{! baz }}bar') -- self._assert_render(u'foobar', 'foo{{! \nbaz }}bar') -+ self._assert_render('foobar', 'foo{{! baz }}bar') -+ self._assert_render('foobar', 'foo{{! \nbaz }}bar') - - def test_custom_delimiters__sections(self): - """ -@@ -689,7 +691,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - """ - template = '{{=[[ ]]=}}[[#foo]]bar[[/foo]]' - context = {'foo': True} -- self._assert_render(u'bar', template, context) -+ self._assert_render('bar', template, context) - - def test_custom_delimiters__not_retroactive(self): - """ -@@ -698,7 +700,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - Test case for issue #35: https://github.com/defunkt/pystache/issues/35 - - """ -- expected = u' {{foo}} ' -+ expected = ' {{foo}} ' - self._assert_render(expected, '{{=$ $=}} {{foo}} ') - self._assert_render(expected, '{{=$ $=}} {{foo}} $={{ }}=$') # was yielding u' '. - -@@ -713,7 +715,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - template = 'Hello, {{person.name}}. I see you are {{person.details.age}}.' - person = Attachable(name='Biggles', details={'age': 42}) - context = {'person': person} -- self._assert_render(u'Hello, Biggles. I see you are 42.', template, context) -+ self._assert_render('Hello, Biggles. I see you are 42.', template, context) - - def test_dot_notation__multiple_levels(self): - """ -@@ -722,7 +724,7 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - """ - template = """Hello, Mr. {{person.name.lastname}}. - I see you're back from {{person.travels.last.country.city}}.""" -- expected = u"""Hello, Mr. Pither. -+ expected = """Hello, Mr. Pither. - I see you're back from Cornwall.""" - context = {'person': {'name': {'firstname': 'unknown', 'lastname': 'Pither'}, - 'travels': {'last': {'country': {'city': 'Cornwall'}}}, -@@ -758,10 +760,10 @@ class RenderTests(unittest.TestCase, AssertStringMixin, AssertExceptionMixin): - context = {'a': {'b': 'A.B'}, 'c': {'a': 'A'} } - - template = '{{a.b}}' -- self._assert_render(u'A.B', template, context) -+ self._assert_render('A.B', template, context) - - template = '{{#c}}{{a}}{{/c}}' -- self._assert_render(u'A', template, context) -+ self._assert_render('A', template, context) - - template = '{{#c}}{{a.b}}{{/c}}' - self.assertException(KeyNotFoundError, "Key %(unicode)s'a.b' not found: missing %(unicode)s'b'" % -diff --git a/pystache/tests/test_renderer.py b/pystache/tests/test_renderer.py -index 0dbe0d9..e0d2448 100644 ---- a/pystache/tests/test_renderer.py -+++ b/pystache/tests/test_renderer.py -@@ -10,7 +10,7 @@ import os - import sys - import unittest - --from examples.simple import Simple -+from .examples.simple import Simple - from pystache import Renderer - from pystache import TemplateSpec - from pystache.common import TemplateNotFoundError -@@ -33,7 +33,7 @@ def _make_renderer(): - def mock_unicode(b, encoding=None): - if encoding is None: - encoding = 'ascii' -- u = unicode(b, encoding=encoding) -+ u = str(b, encoding=encoding) - return u.upper() - - -@@ -197,13 +197,13 @@ class RendererTests(unittest.TestCase, AssertStringMixin): - - """ - renderer = self._renderer() -- b = u"é".encode('utf-8') -+ b = "é".encode('utf-8') - - renderer.string_encoding = "ascii" -- self.assertRaises(UnicodeDecodeError, renderer.unicode, b) -+ self.assertRaises(UnicodeDecodeError, renderer.str, b) - - renderer.string_encoding = "utf-8" -- self.assertEqual(renderer.unicode(b), u"é") -+ self.assertEqual(renderer.str(b), "é") - - def test_unicode__decode_errors(self): - """ -@@ -212,14 +212,14 @@ class RendererTests(unittest.TestCase, AssertStringMixin): - """ - renderer = self._renderer() - renderer.string_encoding = "ascii" -- b = u"déf".encode('utf-8') -+ b = "déf".encode('utf-8') - - renderer.decode_errors = "ignore" -- self.assertEqual(renderer.unicode(b), "df") -+ self.assertEqual(renderer.str(b), "df") - - renderer.decode_errors = "replace" - # U+FFFD is the official Unicode replacement character. -- self.assertEqual(renderer.unicode(b), u'd\ufffd\ufffdf') -+ self.assertEqual(renderer.str(b), u'd\ufffd\ufffdf') - - ## Test the _make_loader() method. - -@@ -243,7 +243,7 @@ class RendererTests(unittest.TestCase, AssertStringMixin): - renderer = self._renderer() - renderer.file_encoding = 'enc' - renderer.file_extension = 'ext' -- renderer.unicode = unicode_ -+ renderer.str = unicode_ - - loader = renderer._make_loader() - -@@ -260,12 +260,12 @@ class RendererTests(unittest.TestCase, AssertStringMixin): - """ - renderer = self._renderer() - rendered = renderer.render('foo') -- self.assertEqual(type(rendered), unicode) -+ self.assertEqual(type(rendered), str) - - def test_render__unicode(self): - renderer = self._renderer() -- actual = renderer.render(u'foo') -- self.assertEqual(actual, u'foo') -+ actual = renderer.render('foo') -+ self.assertEqual(actual, 'foo') - - def test_render__str(self): - renderer = self._renderer() -@@ -274,8 +274,8 @@ class RendererTests(unittest.TestCase, AssertStringMixin): - - def test_render__non_ascii_character(self): - renderer = self._renderer() -- actual = renderer.render(u'Poincaré') -- self.assertEqual(actual, u'Poincaré') -+ actual = renderer.render('Poincaré') -+ self.assertEqual(actual, 'Poincaré') - - def test_render__context(self): - """ -@@ -326,7 +326,7 @@ class RendererTests(unittest.TestCase, AssertStringMixin): - - """ - renderer = _make_renderer() -- template = u"déf".encode("utf-8") -+ template = "déf".encode("utf-8") - - # Check that decode_errors and string_encoding are both respected. - renderer.decode_errors = 'ignore' -@@ -334,7 +334,7 @@ class RendererTests(unittest.TestCase, AssertStringMixin): - self.assertEqual(renderer.render(template), "df") - - renderer.string_encoding = 'utf_8' -- self.assertEqual(renderer.render(template), u"déf") -+ self.assertEqual(renderer.render(template), "déf") - - def test_make_resolve_partial(self): - """ -@@ -347,7 +347,7 @@ class RendererTests(unittest.TestCase, AssertStringMixin): - - actual = resolve_partial('foo') - self.assertEqual(actual, 'bar') -- self.assertEqual(type(actual), unicode, "RenderEngine requires that " -+ self.assertEqual(type(actual), str, "RenderEngine requires that " - "resolve_partial return unicode strings.") - - def test_make_resolve_partial__unicode(self): -@@ -362,7 +362,7 @@ class RendererTests(unittest.TestCase, AssertStringMixin): - self.assertEqual(resolve_partial("partial"), "foo") - - # Now with a value that is already unicode. -- renderer.partials = {'partial': u'foo'} -+ renderer.partials = {'partial': 'foo'} - resolve_partial = renderer._make_resolve_partial() - # If the next line failed, we would get the following error: - # TypeError: decoding Unicode is not supported -@@ -373,7 +373,7 @@ class RendererTests(unittest.TestCase, AssertStringMixin): - data_dir = get_data_path() - renderer = Renderer(search_dirs=data_dir) - actual = renderer.render_name("say_hello", to='foo') -- self.assertString(actual, u"Hello, foo") -+ self.assertString(actual, "Hello, foo") - - def test_render_path(self): - """ -@@ -412,7 +412,7 @@ class RendererTests(unittest.TestCase, AssertStringMixin): - - spec = Spec() - actual = renderer.render(spec) -- self.assertString(actual, u'hello, world') -+ self.assertString(actual, 'hello, world') - - def test_render__view(self): - """ -@@ -484,7 +484,7 @@ class Renderer_MakeRenderEngineTests(unittest.TestCase, AssertStringMixin, Asser - Check that resolve_partial returns unicode (and not a subclass). - - """ -- class MyUnicode(unicode): -+ class MyUnicode(str): - pass - - renderer = Renderer() -@@ -495,12 +495,12 @@ class Renderer_MakeRenderEngineTests(unittest.TestCase, AssertStringMixin, Asser - - actual = engine.resolve_partial('str') - self.assertEqual(actual, "foo") -- self.assertEqual(type(actual), unicode) -+ self.assertEqual(type(actual), str) - - # Check that unicode subclasses are not preserved. - actual = engine.resolve_partial('subclass') - self.assertEqual(actual, "abc") -- self.assertEqual(type(actual), unicode) -+ self.assertEqual(type(actual), str) - - def test__resolve_partial__not_found(self): - """ -@@ -512,7 +512,7 @@ class Renderer_MakeRenderEngineTests(unittest.TestCase, AssertStringMixin, Asser - engine = renderer._make_render_engine() - resolve_partial = engine.resolve_partial - -- self.assertString(resolve_partial('foo'), u'') -+ self.assertString(resolve_partial('foo'), '') - - def test__resolve_partial__not_found__missing_tags_strict(self): - """ -@@ -539,7 +539,7 @@ class Renderer_MakeRenderEngineTests(unittest.TestCase, AssertStringMixin, Asser - engine = renderer._make_render_engine() - resolve_partial = engine.resolve_partial - -- self.assertString(resolve_partial('foo'), u'') -+ self.assertString(resolve_partial('foo'), '') - - def test__resolve_partial__not_found__partials_dict__missing_tags_strict(self): - """ -@@ -566,12 +566,12 @@ class Renderer_MakeRenderEngineTests(unittest.TestCase, AssertStringMixin, Asser - - """ - renderer = self._make_renderer() -- renderer.unicode = mock_unicode -+ renderer.str = mock_unicode - - engine = renderer._make_render_engine() - literal = engine.literal - -- b = u"foo".encode("ascii") -+ b = "foo".encode("ascii") - self.assertEqual(literal(b), "FOO") - - def test__literal__handles_unicode(self): -@@ -585,7 +585,7 @@ class Renderer_MakeRenderEngineTests(unittest.TestCase, AssertStringMixin, Asser - engine = renderer._make_render_engine() - literal = engine.literal - -- self.assertEqual(literal(u"foo"), "foo") -+ self.assertEqual(literal("foo"), "foo") - - def test__literal__returns_unicode(self): - """ -@@ -598,16 +598,16 @@ class Renderer_MakeRenderEngineTests(unittest.TestCase, AssertStringMixin, Asser - engine = renderer._make_render_engine() - literal = engine.literal - -- self.assertEqual(type(literal("foo")), unicode) -+ self.assertEqual(type(literal("foo")), str) - -- class MyUnicode(unicode): -+ class MyUnicode(str): - pass - - s = MyUnicode("abc") - - self.assertEqual(type(s), MyUnicode) -- self.assertTrue(isinstance(s, unicode)) -- self.assertEqual(type(literal(s)), unicode) -+ self.assertTrue(isinstance(s, str)) -+ self.assertEqual(type(literal(s)), str) - - ## Test the engine's escape attribute. - -@@ -630,12 +630,12 @@ class Renderer_MakeRenderEngineTests(unittest.TestCase, AssertStringMixin, Asser - - """ - renderer = Renderer() -- renderer.unicode = mock_unicode -+ renderer.str = mock_unicode - - engine = renderer._make_render_engine() - escape = engine.escape - -- b = u"foo".encode('ascii') -+ b = "foo".encode('ascii') - self.assertEqual(escape(b), "FOO") - - def test__escape__has_access_to_original_unicode_subclass(self): -@@ -644,16 +644,16 @@ class Renderer_MakeRenderEngineTests(unittest.TestCase, AssertStringMixin, Asser - - """ - renderer = Renderer() -- renderer.escape = lambda s: unicode(type(s).__name__) -+ renderer.escape = lambda s: str(type(s).__name__) - - engine = renderer._make_render_engine() - escape = engine.escape - -- class MyUnicode(unicode): -+ class MyUnicode(str): - pass - -- self.assertEqual(escape(u"foo".encode('ascii')), unicode.__name__) -- self.assertEqual(escape(u"foo"), unicode.__name__) -+ self.assertEqual(escape("foo".encode('ascii')), str.__name__) -+ self.assertEqual(escape("foo"), str.__name__) - self.assertEqual(escape(MyUnicode("foo")), MyUnicode.__name__) - - def test__escape__returns_unicode(self): -@@ -667,17 +667,17 @@ class Renderer_MakeRenderEngineTests(unittest.TestCase, AssertStringMixin, Asser - engine = renderer._make_render_engine() - escape = engine.escape - -- self.assertEqual(type(escape("foo")), unicode) -+ self.assertEqual(type(escape("foo")), str) - - # Check that literal doesn't preserve unicode subclasses. -- class MyUnicode(unicode): -+ class MyUnicode(str): - pass - - s = MyUnicode("abc") - - self.assertEqual(type(s), MyUnicode) -- self.assertTrue(isinstance(s, unicode)) -- self.assertEqual(type(escape(s)), unicode) -+ self.assertTrue(isinstance(s, str)) -+ self.assertEqual(type(escape(s)), str) - - ## Test the missing_tags attribute. - -@@ -706,7 +706,7 @@ class Renderer_MakeRenderEngineTests(unittest.TestCase, AssertStringMixin, Asser - stack = ContextStack({'foo': 'bar'}) - - self.assertEqual('bar', engine.resolve_context(stack, 'foo')) -- self.assertString(u'', engine.resolve_context(stack, 'missing')) -+ self.assertString('', engine.resolve_context(stack, 'missing')) - - def test__resolve_context__missing_tags_strict(self): - """ -diff --git a/pystache/tests/test_simple.py b/pystache/tests/test_simple.py -index 07b059f..b88bf35 100644 ---- a/pystache/tests/test_simple.py -+++ b/pystache/tests/test_simple.py -@@ -2,11 +2,11 @@ import unittest - - import pystache - from pystache import Renderer --from examples.nested_context import NestedContext --from examples.complex import Complex --from examples.lambdas import Lambdas --from examples.template_partial import TemplatePartial --from examples.simple import Simple -+from .examples.nested_context import NestedContext -+from .examples.complex import Complex -+from .examples.lambdas import Lambdas -+from .examples.template_partial import TemplatePartial -+from .examples.simple import Simple - - from pystache.tests.common import EXAMPLES_DIR - from pystache.tests.common import AssertStringMixin -@@ -20,7 +20,7 @@ class TestSimple(unittest.TestCase, AssertStringMixin): - view.template = '{{#foo}}{{thing1}} and {{thing2}} and {{outer_thing}}{{/foo}}{{^foo}}Not foo!{{/foo}}' - - actual = renderer.render(view) -- self.assertString(actual, u"one and foo and two") -+ self.assertString(actual, "one and foo and two") - - def test_looping_and_negation_context(self): - template = '{{#item}}{{header}}: {{name}} {{/item}}{{^item}} Shouldnt see me{{/item}}' -@@ -40,7 +40,7 @@ class TestSimple(unittest.TestCase, AssertStringMixin): - - renderer = Renderer() - actual = renderer.render(view) -- self.assertString(actual, u'bar != bar. oh, it does!') -+ self.assertString(actual, 'bar != bar. oh, it does!') - - def test_rendering_partial(self): - renderer = Renderer(search_dirs=EXAMPLES_DIR) -@@ -49,11 +49,11 @@ class TestSimple(unittest.TestCase, AssertStringMixin): - view.template = '{{>inner_partial}}' - - actual = renderer.render(view) -- self.assertString(actual, u'Again, Welcome!') -+ self.assertString(actual, 'Again, Welcome!') - - view.template = '{{#looping}}{{>inner_partial}} {{/looping}}' - actual = renderer.render(view) -- self.assertString(actual, u"Again, Welcome! Again, Welcome! Again, Welcome! ") -+ self.assertString(actual, "Again, Welcome! Again, Welcome! Again, Welcome! ") - - def test_non_existent_value_renders_blank(self): - view = Simple() -@@ -77,7 +77,7 @@ class TestSimple(unittest.TestCase, AssertStringMixin): - view = TemplatePartial(renderer=renderer) - - actual = renderer.render(view) -- self.assertString(actual, u"""Welcome -+ self.assertString(actual, """Welcome - ------- - - ## Again, Welcome! ##""") -diff --git a/pystache/tests/test_specloader.py b/pystache/tests/test_specloader.py -index cacc0fc..dcdc55f 100644 ---- a/pystache/tests/test_specloader.py -+++ b/pystache/tests/test_specloader.py -@@ -9,11 +9,11 @@ import os.path - import sys - import unittest - --import examples --from examples.simple import Simple --from examples.complex import Complex --from examples.lambdas import Lambdas --from examples.inverted import Inverted, InvertedLists -+from . import examples -+from .examples.simple import Simple -+from .examples.complex import Complex -+from .examples.lambdas import Lambdas -+from .examples.inverted import Inverted, InvertedLists - from pystache import Renderer - from pystache import TemplateSpec - from pystache.common import TemplateNotFoundError -@@ -70,7 +70,7 @@ class ViewTestCase(unittest.TestCase, AssertStringMixin): - renderer2 = Renderer(search_dirs=EXAMPLES_DIR) - - actual = renderer1.render(spec) -- self.assertString(actual, u"Partial: ") -+ self.assertString(actual, "Partial: ") - - actual = renderer2.render(spec) - self.assertEqual(actual, "Partial: No tags...") -@@ -79,7 +79,7 @@ class ViewTestCase(unittest.TestCase, AssertStringMixin): - renderer = Renderer() - actual = renderer.render(Simple()) - -- self.assertString(actual, u"Hi pizza!") -+ self.assertString(actual, "Hi pizza!") - - def test_non_callable_attributes(self): - view = Simple() -@@ -92,7 +92,7 @@ class ViewTestCase(unittest.TestCase, AssertStringMixin): - def test_complex(self): - renderer = Renderer() - actual = renderer.render(Complex()) -- self.assertString(actual, u"""\ -+ self.assertString(actual, """\ -

Colors

-
    -
  • red
    • -@@ -111,7 +111,7 @@ class ViewTestCase(unittest.TestCase, AssertStringMixin): - - renderer = Renderer() - actual = renderer.render(view) -- self.assertString(actual, u'nopqrstuvwxyz') -+ self.assertString(actual, 'nopqrstuvwxyz') - - def test_higher_order_lambda(self): - view = Lambdas() -@@ -119,7 +119,7 @@ class ViewTestCase(unittest.TestCase, AssertStringMixin): - - renderer = Renderer() - actual = renderer.render(view) -- self.assertString(actual, u'abcdefghijklmnopqrstuvwxyz') -+ self.assertString(actual, 'abcdefghijklmnopqrstuvwxyz') - - def test_partials_with_lambda(self): - view = Lambdas() -@@ -127,7 +127,7 @@ class ViewTestCase(unittest.TestCase, AssertStringMixin): - - renderer = Renderer(search_dirs=EXAMPLES_DIR) - actual = renderer.render(view) -- self.assertEqual(actual, u'nopqrstuvwxyz') -+ self.assertEqual(actual, 'nopqrstuvwxyz') - - def test_hierarchical_partials_with_lambdas(self): - view = Lambdas() -@@ -135,12 +135,12 @@ class ViewTestCase(unittest.TestCase, AssertStringMixin): - - renderer = Renderer(search_dirs=EXAMPLES_DIR) - actual = renderer.render(view) -- self.assertString(actual, u'nopqrstuvwxyznopqrstuvwxyz') -+ self.assertString(actual, 'nopqrstuvwxyznopqrstuvwxyz') - - def test_inverted(self): - renderer = Renderer() - actual = renderer.render(Inverted()) -- self.assertString(actual, u"""one, two, three, empty list""") -+ self.assertString(actual, """one, two, three, empty list""") - - def test_accessing_properties_on_parent_object_from_child_objects(self): - parent = Thing() -@@ -152,12 +152,12 @@ class ViewTestCase(unittest.TestCase, AssertStringMixin): - renderer = Renderer() - actual = renderer.render(view, {'parent': parent}) - -- self.assertString(actual, u'derp') -+ self.assertString(actual, 'derp') - - def test_inverted_lists(self): - renderer = Renderer() - actual = renderer.render(InvertedLists()) -- self.assertString(actual, u"""one, two, three, empty list""") -+ self.assertString(actual, """one, two, three, empty list""") - - - def _make_specloader(): -@@ -176,7 +176,7 @@ def _make_specloader(): - """ - if encoding is None: - encoding = 'ascii' -- return unicode(s, encoding, 'strict') -+ return str(s, encoding, 'strict') - - loader = Loader(file_encoding='ascii', to_unicode=to_unicode) - return SpecLoader(loader=loader) -@@ -222,7 +222,7 @@ class SpecLoaderTests(unittest.TestCase, AssertIsMixin, AssertStringMixin, - custom.template = "abc" - - spec_loader = self._make_specloader() -- self._assert_template(spec_loader, custom, u"abc") -+ self._assert_template(spec_loader, custom, "abc") - - def test_load__template__type_unicode(self): - """ -@@ -230,10 +230,10 @@ class SpecLoaderTests(unittest.TestCase, AssertIsMixin, AssertStringMixin, - - """ - custom = TemplateSpec() -- custom.template = u"abc" -+ custom.template = "abc" - - spec_loader = self._make_specloader() -- self._assert_template(spec_loader, custom, u"abc") -+ self._assert_template(spec_loader, custom, "abc") - - def test_load__template__unicode_non_ascii(self): - """ -@@ -241,10 +241,10 @@ class SpecLoaderTests(unittest.TestCase, AssertIsMixin, AssertStringMixin, - - """ - custom = TemplateSpec() -- custom.template = u"é" -+ custom.template = "é" - - spec_loader = self._make_specloader() -- self._assert_template(spec_loader, custom, u"é") -+ self._assert_template(spec_loader, custom, "é") - - def test_load__template__with_template_encoding(self): - """ -@@ -252,14 +252,14 @@ class SpecLoaderTests(unittest.TestCase, AssertIsMixin, AssertStringMixin, - - """ - custom = TemplateSpec() -- custom.template = u'é'.encode('utf-8') -+ custom.template = 'é'.encode('utf-8') - - spec_loader = self._make_specloader() - -- self.assertRaises(UnicodeDecodeError, self._assert_template, spec_loader, custom, u'é') -+ self.assertRaises(UnicodeDecodeError, self._assert_template, spec_loader, custom, 'é') - - custom.template_encoding = 'utf-8' -- self._assert_template(spec_loader, custom, u'é') -+ self._assert_template(spec_loader, custom, 'é') - - # TODO: make this test complete. - def test_load__template__correct_loader(self): -@@ -279,10 +279,10 @@ class SpecLoaderTests(unittest.TestCase, AssertIsMixin, AssertStringMixin, - self.encoding = None - - # Overrides the existing method. -- def unicode(self, s, encoding=None): -+ def str(self, s, encoding=None): - self.s = s - self.encoding = encoding -- return u"foo" -+ return "foo" - - loader = MockLoader() - custom_loader = SpecLoader() -@@ -293,7 +293,7 @@ class SpecLoaderTests(unittest.TestCase, AssertIsMixin, AssertStringMixin, - view.template_encoding = "encoding-foo" - - # Check that our unicode() above was called. -- self._assert_template(custom_loader, view, u'foo') -+ self._assert_template(custom_loader, view, 'foo') - self.assertEqual(loader.s, "template-foo") - self.assertEqual(loader.encoding, "encoding-foo") - -@@ -410,7 +410,7 @@ class TemplateSpecTests(unittest.TestCase, AssertPathsMixin): - loader = self._make_loader() - actual = loader.load(custom) - -- self.assertEqual(type(actual), unicode) -+ self.assertEqual(type(actual), str) - self.assertEqual(actual, expected) - - def test_get_template(self): -@@ -420,7 +420,7 @@ class TemplateSpecTests(unittest.TestCase, AssertPathsMixin): - """ - view = SampleView() - -- self._assert_get_template(view, u"ascii: abc") -+ self._assert_get_template(view, "ascii: abc") - - def test_get_template__template_encoding(self): - """ -@@ -432,4 +432,4 @@ class TemplateSpecTests(unittest.TestCase, AssertPathsMixin): - self.assertRaises(UnicodeDecodeError, self._assert_get_template, view, 'foo') - - view.template_encoding = 'utf-8' -- self._assert_get_template(view, u"non-ascii: é") -+ self._assert_get_template(view, "non-ascii: é") -diff --git a/setup.cfg b/setup.cfg -index 861a9f5..f6f1279 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -1,5 +1,71 @@ --[egg_info] --tag_build = --tag_date = 0 --tag_svn_revision = 0 -+[metadata] -+name = pystache -+version = attr: pystache.__version__ -+author = Chris Wanstrath -+author_email = chris@ozmm.org -+maintainer = Steve Arnold -+maintainer_email = nerdboy@gentoo.org -+description = Mustache for Python -+url = https://github.com/sarnold/pystache -+license = MIT -+license_files = LICENSE -+classifiers = -+ Development Status :: 4 - Beta -+ Intended Audience :: Developers -+ License :: OSI Approved :: MIT License -+ Programming Language :: Python :: 3 -+ Programming Language :: Python :: 3.6 -+ Programming Language :: Python :: 3.7 -+ Programming Language :: Python :: 3.8 -+ Programming Language :: Python :: 3.9 - -+[options] -+python_requires = >=3.6 -+zip_safe = True -+include_package_data = True -+packages = find: -+ -+[options.package_data] -+* = *.mustache, *.txt -+ -+[options.entry_points] -+console_scripts = -+ pystache=pystache.commands.render:main -+ pystache-test=pystache.commands.test:main -+ -+[options.extras_require] -+test = -+ nose -+ -+cov = -+ coverage -+ -+[bdist_wheel] -+universal = 0 -+ -+[check-manifest] -+ignore = -+ .codeclimate.yml -+ .gitattributes -+ .coveragerc -+ .gitignore -+ .pep8speaks.yml -+ codecov.yml -+ -+[flake8] -+exclude = -+ .git, -+ __pycache__, -+ build, -+ dist -+ -+max-line-length = 110 -+ -+[nosetests] -+traverse-namespace = 1 -+verbosity = 3 -+with-coverage = 1 -+with-doctest = 1 -+doctest-extension = rst -+cover-package = pystache -+cover-xml = 1 -diff --git a/setup.py b/setup.py -index 0d99aae..f0b7d7f 100644 ---- a/setup.py -+++ b/setup.py -@@ -28,7 +28,7 @@ it on the PyPI project page. If PyPI finds any issues, it will render it - instead as plain-text, which we do not want. - - To check in advance that PyPI will accept and parse the reST file as HTML, --you can use the rst2html program installed by the docutils package -+you can use the rst2html.py program installed by the docutils package - (http://docutils.sourceforge.net/). To install docutils: - - $ pip install docutils -@@ -89,30 +89,7 @@ import os - import shutil - import sys - -- --py_version = sys.version_info -- --# distutils does not seem to support the following setup() arguments. --# It displays a UserWarning when setup() is passed those options: --# --# * entry_points --# * install_requires --# --# distribute works with Python 2.3.5 and above: --# --# http://packages.python.org/distribute/setuptools.html#building-and-distributing-packages-with-distribute --# --if py_version < (2, 3, 5): -- # TODO: this might not work yet. -- import distutils as dist -- from distutils import core -- setup = core.setup --else: -- import setuptools as dist -- setup = dist.setup -- -- --VERSION = '0.5.4' # Also change in pystache/__init__.py. -+from setuptools import setup - - FILE_ENCODING = 'utf-8' - -@@ -126,22 +103,6 @@ TEMP_EXTENSION = '.temp' - - PREP_COMMAND = 'prep' - --CLASSIFIERS = ( -- 'Development Status :: 4 - Beta', -- 'License :: OSI Approved :: MIT License', -- 'Programming Language :: Python', -- 'Programming Language :: Python :: 2', -- 'Programming Language :: Python :: 2.4', -- 'Programming Language :: Python :: 2.5', -- 'Programming Language :: Python :: 2.6', -- 'Programming Language :: Python :: 2.7', -- 'Programming Language :: Python :: 3', -- 'Programming Language :: Python :: 3.1', -- 'Programming Language :: Python :: 3.2', -- 'Programming Language :: Python :: 3.3', -- 'Programming Language :: Python :: Implementation :: PyPy', --) -- - # Comments in reST begin with two dots. - RST_LONG_DESCRIPTION_INTRO = """\ - .. Do not edit this file. This file is auto-generated for PyPI by setup.py -@@ -221,7 +182,7 @@ def convert_md_to_rst(md_path, rst_temp_path): - - """ - # Pandoc uses the UTF-8 character encoding for both input and output. -- command = "pandoc --write=rst --output=%s %s" % (rst_temp_path, md_path) -+ command = "pandoc -f markdown-smart --write=rst --output=%s %s" % (rst_temp_path, md_path) - print("converting with pandoc: %s to %s\n-->%s" % (md_path, rst_temp_path, - command)) - -@@ -308,65 +269,9 @@ Run the following command and commit the changes-- - os.system('python setup.py sdist upload') - - --# We use the package simplejson for older Python versions since Python --# does not contain the module json before 2.6: --# --# http://docs.python.org/library/json.html --# --# Moreover, simplejson stopped officially support for Python 2.4 in version 2.1.0: --# --# https://github.com/simplejson/simplejson/blob/master/CHANGES.txt --# --requires = [] --if py_version < (2, 5): -- requires.append('simplejson<2.1') --elif py_version < (2, 6): -- requires.append('simplejson') -- --INSTALL_REQUIRES = requires -- --# TODO: decide whether to use find_packages() instead. I'm not sure that --# find_packages() is available with distutils, for example. --PACKAGES = [ -- 'pystache', -- 'pystache.commands', -- # The following packages are only for testing. -- 'pystache.tests', -- 'pystache.tests.data', -- 'pystache.tests.data.locator', -- 'pystache.tests.examples', --] -- -- --# The purpose of this function is to follow the guidance suggested here: --# --# http://packages.python.org/distribute/python3.html#note-on-compatibility-with-setuptools --# --# The guidance is for better compatibility when using setuptools (e.g. with --# earlier versions of Python 2) instead of Distribute, because of new --# keyword arguments to setup() that setuptools may not recognize. --def get_extra_args(): -- """ -- Return a dictionary of extra args to pass to setup(). -- -- """ -- extra = {} -- # TODO: it might be more correct to check whether we are using -- # Distribute instead of setuptools, since use_2to3 doesn't take -- # effect when using Python 2, even when using Distribute. -- if py_version >= (3, ): -- # Causes 2to3 to be run during the build step. -- extra['use_2to3'] = True -- -- return extra -- -- - def main(sys_argv): - - # TODO: use the logging module instead of printing. -- # TODO: include the following in a verbose mode. -- sys.stderr.write("pystache: using: version %s of %s\n" % (repr(dist.__version__), repr(dist))) -- - command = sys_argv[-1] - - if command == 'publish': -@@ -377,35 +282,10 @@ def main(sys_argv): - sys.exit() - - long_description = read(RST_DESCRIPTION_PATH) -- template_files = ['*.mustache', '*.txt'] -- extra_args = get_extra_args() -- -- setup(name='pystache', -- version=VERSION, -- license='MIT', -- description='Mustache for Python', -- long_description=long_description, -- author='Chris Wanstrath', -- author_email='chris@ozmm.org', -- maintainer='Chris Jerdonek', -- maintainer_email='chris.jerdonek@gmail.com', -- url='http://github.com/defunkt/pystache', -- install_requires=INSTALL_REQUIRES, -- packages=PACKAGES, -- package_data = { -- # Include template files so tests can be run. -- 'pystache.tests.data': template_files, -- 'pystache.tests.data.locator': template_files, -- 'pystache.tests.examples': template_files, -- }, -- entry_points = { -- 'console_scripts': [ -- 'pystache=pystache.commands.render:main', -- 'pystache-test=pystache.commands.test:main', -- ], -- }, -- classifiers = CLASSIFIERS, -- **extra_args -+ -+ setup( -+ long_description=long_description, -+ long_description_content_type='text/x-rst', - ) - - -diff --git a/setup_description.rst b/setup_description.rst -index 724c457..d7f1bc0 100644 ---- a/setup_description.rst -+++ b/setup_description.rst -@@ -4,13 +4,17 @@ - Pystache - ======== - --.. figure:: http://defunkt.github.com/pystache/images/logo_phillips.png -- :alt: mustachioed, monocled snake by David Phillips -+|ci| |Conda| |Wheels| |Release| |Python| - --.. figure:: https://secure.travis-ci.org/defunkt/pystache.png -- :alt: Travis CI current build status -+|Latest release| |License| |Maintainability| |codecov| - --`Pystache `__ is a Python -+This updated fork of Pystache is currently tested on Python 3.6+ and in -+Conda, on Linux, Macos, and Windows (Python 2.7 support has been -+removed). -+ -+|image9| -+ -+`Pystache `__ is a Python - implementation of `Mustache `__. Mustache - is a framework-agnostic, logic-free templating system inspired by - `ctemplate `__ and -@@ -23,62 +27,45 @@ page provides a good introduction to Mustache's syntax. For a more - complete (and more current) description of Mustache's behavior, see the - official `Mustache spec `__. - --Pystache is `semantically versioned `__ and can be --found on `PyPI `__. This version --of Pystache passes all tests in `version --1.1.2 `__ of the spec. -+Pystache is `semantically versioned `__ and older -+versions can still be found on -+`PyPI `__. This version of -+Pystache now passes all tests in `version -+1.1.3 `__ of the spec. - - Requirements - ------------ - - Pystache is tested with-- - --- Python 2.4 (requires simplejson `version -- 2.0.9 `__ or earlier) --- Python 2.5 (requires -- `simplejson `__) --- Python 2.6 --- Python 2.7 --- Python 3.1 --- Python 3.2 --- Python 3.3 --- `PyPy `__ -+- Python 3.6 -+- Python 3.7 -+- Python 3.8 -+- Python 3.9 -+- Conda (py36-py39) - - `Distribute `__ (the setuptools --fork) is recommended over --`setuptools `__, and is required --in some cases (e.g. for Python 3 support). If you use --`pip `__, you probably already satisfy --this requirement. -+fork) is no longer required over -+`setuptools `__, as the current -+packaging is now PEP517-compliant. - - JSON support is needed only for the command-line interface and to run --the spec tests. We require simplejson for earlier versions of Python --since Python's `json `__ --module was added in Python 2.6. -- --For Python 2.4 we require an earlier version of simplejson since --simplejson stopped officially supporting Python 2.4 in simplejson --version 2.1.0. Earlier versions of simplejson can be installed manually, --as follows: -- --:: -- -- pip install 'simplejson<2.1.0' -+the spec tests; PyYAML can still be used (see the Develop section). - --Official support for Python 2.4 will end with Pystache version 0.6.0. -+Official support for Python 2 will end with Pystache version 0.6.0. - - Install It - ---------- - - :: - -- pip install pystache -+ pip install -U pystache -f https://github.com/sarnold/pystache/releases/ - - And test it-- - - :: - -- pystache-test -+ pystache-test - - To install and test from source (e.g. from GitHub), see the Develop - section. -@@ -88,68 +75,68 @@ Use It - - :: - -- >>> import pystache -- >>> print pystache.render('Hi {{person}}!', {'person': 'Mom'}) -- Hi Mom! -+ >>> import pystache -+ >>> print(pystache.render('Hi {{person}}!', {'person': 'Mom'})) -+ Hi Mom! - - You can also create dedicated view classes to hold your view logic. - --Here's your view class (in .../examples/readme.py): -+Here's your view class (in ../pystache/tests/examples/readme.py): - - :: - -- class SayHello(object): -- def to(self): -- return "Pizza" -+ class SayHello(object): -+ def to(self): -+ return "Pizza" - - Instantiating like so: - - :: - -- >>> from pystache.tests.examples.readme import SayHello -- >>> hello = SayHello() -+ >>> from pystache.tests.examples.readme import SayHello -+ >>> hello = SayHello() - --Then your template, say\_hello.mustache (by default in the same --directory as your class definition): -+Then your template, say_hello.mustache (by default in the same directory -+as your class definition): - - :: - -- Hello, {{to}}! -+ Hello, {{to}}! - - Pull it together: - - :: - -- >>> renderer = pystache.Renderer() -- >>> print renderer.render(hello) -- Hello, Pizza! -+ >>> renderer = pystache.Renderer() -+ >>> print(renderer.render(hello)) -+ Hello, Pizza! - - For greater control over rendering (e.g. to specify a custom template - directory), use the ``Renderer`` class like above. One can pass - attributes to the Renderer class constructor or set them on a Renderer - instance. To customize template loading on a per-view basis, subclass - ``TemplateSpec``. See the docstrings of the --`Renderer `__ -+`Renderer `__ - class and --`TemplateSpec `__ -+`TemplateSpec `__ - class for more information. - - You can also pre-parse a template: - - :: - -- >>> parsed = pystache.parse(u"Hey {{#who}}{{.}}!{{/who}}") -- >>> print parsed -- [u'Hey ', _SectionNode(key=u'who', index_begin=12, index_end=18, parsed=[_EscapeNode(key=u'.'), u'!'])] -+ >>> parsed = pystache.parse(u"Hey {{#who}}{{.}}!{{/who}}") -+ >>> print(parsed) -+ ['Hey ', _SectionNode(key='who', index_begin=12, index_end=18, parsed=[_EscapeNode(key='.'), '!'])] - - And then: - - :: - -- >>> print renderer.render(parsed, {'who': 'Pops'}) -- Hey Pops! -- >>> print renderer.render(parsed, {'who': 'you'}) -- Hey you! -+ >>> print(renderer.render(parsed, {'who': 'Pops'})) -+ Hey Pops! -+ >>> print(renderer.render(parsed, {'who': 'you'})) -+ Hey you! - - Python 3 - -------- -@@ -211,22 +198,24 @@ To test from a source distribution (without installing)-- - - :: - -- python test_pystache.py -+ python test_pystache.py - - To test Pystache with multiple versions of Python (with a single --command!), you can use `tox `__: -+command!) and different platforms, you can use -+`tox `__: - - :: - -- pip install 'virtualenv<1.8' # Version 1.8 dropped support for Python 2.4. -- pip install 'tox<1.4' # Version 1.4 dropped support for Python 2.4. -- tox -+ pip install tox -+ tox -e setup - --If you do not have all Python versions listed in ``tox.ini``-- -+To run tests on multiple versions with coverage, run: - - :: - -- tox -e py26,py32 # for example -+ tox -e py38-linux,py39-linux # for example -+ -+(substitute your platform above, eg, macos or windows) - - The source distribution tests also include doctests and tests from the - Mustache spec. To include tests from the Mustache spec in your test -@@ -234,8 +223,8 @@ runs: - - :: - -- git submodule init -- git submodule update -+ git submodule init -+ git submodule update - - The test harness parses the spec's (more human-readable) yaml files if - `PyYAML `__ is present. Otherwise, -@@ -243,94 +232,113 @@ it parses the json files. To install PyYAML-- - - :: - -- pip install pyyaml -+ pip install pyyaml -+ -+Once the submodule is available, you can run the full test set with: -+ -+:: -+ -+ tox -e setup . ext/spec/specs - - To run a subset of the tests, you can use - `nose `__: - - :: - -- pip install nose -- nosetests --tests pystache/tests/test_context.py:GetValueTests.test_dictionary__key_present -+ pip install nose -+ nosetests --tests pystache/tests/test_context.py:GetValueTests.test_dictionary__key_present - --Using Python 3 with Pystache from source --~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+Mailing List (old) -+------------------ - --Pystache is written in Python 2 and must be converted to Python 3 prior --to using it with Python 3. The installation process (and tox) do this --automatically. -+There is(was) a `mailing -+list `__. Note that there is a -+bit of a delay between posting a message and seeing it appear in the -+mailing list archive. - --To convert the code to Python 3 manually (while using Python 3)-- -+Credits -+------- - - :: - -- python setup.py build -+ >>> import pystache -+ >>> context = { 'author': 'Chris Wanstrath', 'maintainer': 'Chris Jerdonek','refurbisher': 'Steve Arnold' } -+ >>> print(pystache.render("Author: {{author}}\nMaintainer: {{maintainer}}\nRefurbisher: {{refurbisher}}", context)) -+ Author: Chris Wanstrath -+ Maintainer: Chris Jerdonek -+ Refurbisher: Steve Arnold - --This writes the converted code to a subdirectory called ``build``. By --design, Python 3 builds --`cannot `__ --be created from Python 2. -+Pystache logo by `David Phillips `__ is -+licensed under a `Creative Commons Attribution-ShareAlike 3.0 Unported -+License `__. -+|image10| - --To convert the code without using setup.py, you can use --`2to3 `__ as follows (two --steps)-- -+History -+======= - --:: -+**Note:** Official support for Python 2.7 will end with Pystache version -+0.6.0. - -- 2to3 --write --nobackups --no-diffs --doctests_only pystache -- 2to3 --write --nobackups --no-diffs pystache -+0.6.0 (2021-03-04) -+------------------ - --This converts the code (and doctests) in place. -+- Bump spec versions to latest => v1.1.3 -+- Modernize python and CI tools, update docs/doctests -+- Update unicode conversion test for py3-only -+- Add pep8speaks cfg, cleanup warnings -+- Remove superfluous setup test/unused imports -+- Add conda recipe/CI build - --To ``import pystache`` from a source distribution while using Python 3, --be sure that you are importing from a directory containing a converted --version of the code (e.g. from the ``build`` directory after --converting), and not from the original (unconverted) source directory. --Otherwise, you will get a syntax error. You can help prevent this by not --running the Python IDE from the project directory when importing --Pystache while using Python 3. -+.. _section-1: - --Mailing List -------------- -+0.5.6 (2021-02-28) -+------------------ - --There is a `mailing list `__. --Note that there is a bit of a delay between posting a message and seeing --it appear in the mailing list archive. -+- Use correct wheel name in release workflow, limit wheels -+- Add install check/test of downloaded wheel -+- Update/add ci workflows and tox cfg, bump to next dev0 version - --Credits --------- -+.. _section-2: - --:: -+0.5.5 (2020-12-16) -+------------------ - -- >>> context = { 'author': 'Chris Wanstrath', 'maintainer': 'Chris Jerdonek' } -- >>> print pystache.render("Author: {{author}}\nMaintainer: {{maintainer}}", context) -- Author: Chris Wanstrath -- Maintainer: Chris Jerdonek -+- fix document processing, update pandoc args and history -+- add release.yml to CI, test env settings -+- fix bogus commit message, update versions and tox cf -+- add post-test steps for building pkgs with/without doc updates -+- add CI build check, fix MANIFEST.in pruning - --Pystache logo by `David Phillips `__ is --licensed under a `Creative Commons Attribution-ShareAlike 3.0 Unported --License `__. --|image0| -+.. _section-3: - --History --======= -+0.5.4-2 (2020-11-09) -+-------------------- - --**Note:** Official support for Python 2.4 will end with Pystache version --0.6.0. -+- Merge pull request #1 from sarnold/rebase-up -+- Bugfix: test_specloader.py: fix test_find__with_directory on other -+ OSs -+- Bugfix: pystache/loader.py: remove stray windows line-endings -+- fix crufty (and insecure) http urls -+- Bugfix: modernize python versions (keep py27) and fix spec_test load -+ cmd -+ -+.. _section-4: - - 0.5.4 (2014-07-11) - ------------------ - - - Bugfix: made test with filenames OS agnostic (issue #162). - -+.. _section-5: -+ - 0.5.3 (2012-11-03) - ------------------ - - - Added ability to customize string coercion (e.g. to have None render - as ``''``) (issue #130). --- Added Renderer.render\_name() to render a template by name (issue -+- Added Renderer.render_name() to render a template by name (issue - #122). --- Added TemplateSpec.template\_path to specify an absolute path to a -+- Added TemplateSpec.template_path to specify an absolute path to a - template (issue #41). - - Added option of raising errors on missing tags/partials: - ``Renderer(missing_tags='strict')`` (issue #110). -@@ -355,6 +363,8 @@ History - - More robust handling of byte strings in Python 3. - - Added Creative Commons license for David Phillips's logo. - -+.. _section-6: -+ - 0.5.2 (2012-05-03) - ------------------ - -@@ -367,16 +377,20 @@ History - context stack (issue #113). - - Bugfix: lists of lambdas for sections were not rendered (issue #114). - -+.. _section-7: -+ - 0.5.1 (2012-04-24) - ------------------ - - - Added support for Python 3.1 and 3.2. - - Added tox support to test multiple Python versions. - - Added test script entry point: pystache-test. --- Added \_\_version\_\_ package attribute. -+- Added \__version_\_ package attribute. - - Test harness now supports both YAML and JSON forms of Mustache spec. - - Test harness no longer requires nose. - -+.. _section-8: -+ - 0.5.0 (2012-04-03) - ------------------ - -@@ -435,11 +449,15 @@ Bug fixes: - - Passing ``**kwargs`` to ``Template()`` with no context no longer - raises an exception. - -+.. _section-9: -+ - 0.4.1 (2012-03-25) - ------------------ - - - Added support for Python 2.4. [wangtz, jvantuyl] - -+.. _section-10: -+ - 0.4.0 (2011-01-12) - ------------------ - -@@ -447,19 +465,25 @@ Bug fixes: - - Add support for inverted lists - - Decoupled template loading - -+.. _section-11: -+ - 0.3.1 (2010-05-07) - ------------------ - - - Fix package - -+.. _section-12: -+ - 0.3.0 (2010-05-03) - ------------------ - --- View.template\_path can now hold a list of path -+- View.template_path can now hold a list of path - - Add {{& blah}} as an alias for {{{ blah }}} - - Higher Order Sections - - Inverted sections - -+.. _section-13: -+ - 0.2.0 (2010-02-15) - ------------------ - -@@ -473,12 +497,16 @@ Bug fixes: - [enaeseth] - - Template file encoding awareness. [enaeseth] - -+.. _section-14: -+ - 0.1.1 (2009-11-13) - ------------------ - - - Ensure we're dealing with strings, always - - Tests can be run by executing the test file directly - -+.. _section-15: -+ - 0.1.0 (2009-11-12) - ------------------ - -@@ -510,4 +538,23 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --.. |image0| image:: http://i.creativecommons.org/l/by-sa/3.0/88x31.png -+.. |ci| image:: https://github.com/sarnold/pystache/actions/workflows/ci.yml/badge.svg -+ :target: https://github.com/sarnold/pystache/actions/workflows/ci.yml -+.. |Conda| image:: https://github.com/sarnold/pystache/actions/workflows/conda.yml/badge.svg -+ :target: https://github.com/sarnold/pystache/actions/workflows/conda.yml -+.. |Wheels| image:: https://github.com/sarnold/pystache/actions/workflows/wheels.yml/badge.svg -+ :target: https://github.com/sarnold/pystache/actions/workflows/wheels.yml -+.. |Release| image:: https://github.com/sarnold/pystache/actions/workflows/release.yml/badge.svg -+ :target: https://github.com/sarnold/pystache/actions/workflows/release.yml -+.. |Python| image:: https://img.shields.io/badge/python-3.6+-blue.svg -+ :target: https://www.python.org/downloads/ -+.. |Latest release| image:: https://img.shields.io/github/v/release/sarnold/pystache?include_prereleases -+ :target: https://github.com/sarnold/pystache/releases/latest -+.. |License| image:: https://img.shields.io/github/license/sarnold/pystache -+ :target: https://github.com/sarnold/pystache/blob/master/LICENSE -+.. |Maintainability| image:: https://api.codeclimate.com/v1/badges/a8fa1bf4638bfc6581b6/maintainability -+ :target: https://codeclimate.com/github/sarnold/pystache/maintainability -+.. |codecov| image:: https://codecov.io/gh/sarnold/pystache/branch/master/graph/badge.svg?token=5PZNMZBI6K -+ :target: https://codecov.io/gh/sarnold/pystache -+.. |image9| image:: gh/images/logo_phillips_small.png -+.. |image10| image:: http://i.creativecommons.org/l/by-sa/3.0/88x31.png -diff --git a/tox.ini b/tox.ini -index d1eaebf..66c4515 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -1,36 +1,110 @@ --# A tox configuration file to test across multiple Python versions. --# --# http://pypi.python.org/pypi/tox --# - [tox] --# Tox 1.4 drops py24 and adds py33. In the current version, we want to --# support 2.4, so we can't simultaneously support 3.3. --envlist = py24,py25,py26,py27,py27-yaml,py27-noargs,py31,py32,pypy -+envlist = py{36,37,38,39}-{linux,macos,windows} -+skip_missing_interpreters = true -+isolated_build = true -+#skipsdist = true -+ -+[gh-actions] -+python = -+ 3.6: py36 -+ 3.7: py37 -+ 3.8: py38 -+ 3.9: py39 -+ -+[gh-actions:env] -+PLATFORM = -+ ubuntu-18.04: linux -+ macos-latest: macos -+ windows-latest: windows - - [testenv] -+passenv = CI PYTHON PYTHONIOENCODING -+ -+deps = -+ pip>=20.0.1 -+ nose -+ coverage -+ -+commands = -+ nosetests -sx . {posargs} -+ -+[testenv:bare] - # Change the working directory so that we don't import the pystache located - # in the original location. -+deps = -+ pip>=20.0.1 -+ -e . -+ - changedir = - {envbindir} -+ - commands = -- pystache-test {toxinidir} -+ pystache-test -+ -+[testenv:bench] -+passenv = CI PYTHON PYTHONIOENCODING - --# Check that the spec tests work with PyYAML. --[testenv:py27-yaml] --basepython = -- python2.7 - deps = -- PyYAML --changedir = -- {envbindir} -+ pip>=20.0.1 -+ # uncomment for comparison, posargs expects a number, eg, 10000 -+ #chevron -+ -+commands_pre = -+ pip install . -+ - commands = -- pystache-test {toxinidir} -+ python pystache/tests/benchmark.py {posargs} -+ -+[testenv:setup] -+passenv = CI PYTHON PYTHONIOENCODING -+ -+deps = -+ pyyaml -+ twine -+ -+commands = -+ python setup.py install -+ twine check dist/* -+ pystache-test {posargs} -+ -+[testenv:deploy] -+passenv = CI PYTHON PYTHONIOENCODING -+allowlist_externals = bash -+ -+deps = -+ pip>=19.0.1 -+ wheel -+ pep517 -+ twine -+ -+commands = -+ python -m pep517.build . -+ twine check dist/* -+ -+[testenv:check] -+passenv = CI PYTHON PYTHONIOENCODING -+skip_install = true -+ -+allowlist_externals = bash -+ -+deps = -+ pip>=20.0.1 - --# Check that pystache-test works from an install with no arguments. --[testenv:py27-noargs] --basepython = -- python2.7 --changedir = -- {envbindir} - commands = -+ bash -c 'export WHL_FILE=$(ls dist/*.whl); \ -+ python -m pip install $WHL_FILE' - pystache-test -+ -+[testenv:docs] -+passenv = CI PYTHON PYTHONIOENCODING -+allowlist_externals = bash -+ -+deps = -+ pip>=19.0.1 -+ wheel -+ docutils -+ # apt/emerge pandoc first -+ -+commands = -+ python setup.py prep -+ bash -c 'python setup.py --long-description | rst2html.py -v --no-raw > out.html' -diff --git a/travis.yml_disabled b/travis.yml_disabled -new file mode 100644 -index 0000000..f0b4042 ---- /dev/null -+++ b/travis.yml_disabled -@@ -0,0 +1,52 @@ -+dist: xenial -+language: python -+ -+# Travis CI has no plans to support Jython and no longer supports Python 2.5. -+python: -+ - "2.7" -+ - "3.5" -+ - "3.6" -+ - "3.7" -+ - "3.8" -+ - "3.9-dev" -+ - "nightly" -+ -+matrix: -+ fast_finish: true -+ include: -+ - os: osx -+ # osx is goofy, ``python`` is always py2, images mutate fast -+ language: shell -+ before_install: -+ - pip3 install --upgrade pip wheel -+ install: -+ - python3 setup.py install -+ script: -+ - pystache-test . ext/spec/specs -+ - os: windows -+ # windows is even goofier, install path is different for python/python3 -+ # but either way you get python3 and the cmd is always ``python`` o.O -+ # (also versions mutuate like bacteria) -+ language: shell -+ before_install: -+ - choco install python3 --params "/InstallDir:C:\\Python" -+ - python -m pip install --upgrade pip wheel -+ env: PATH="/c/Python:/c/Python/Scripts:$PATH" -+ install: -+ - python setup.py install -+ script: -+ - pystache-test . ext/spec/specs -+ allow_failures: -+ - python: "nightly" -+ -+# command to install dependencies -+install: -+ - pip install --upgrade pip -+ - pip install codecov -+ -+script: -+ - python setup.py install -+ # Include the spec tests directory for Mustache spec tests and the -+ # project directory for doctests. -+ - pystache-test . ext/spec/specs -+ #- tox --- -2.33.0 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pystache_0.5.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pystache_0.5.4.bb deleted file mode 100644 index 0ae5a19115..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pystache_0.5.4.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Python implementation of Mustache" -HOMEPAGE = "https://github.com/defunkt/pystache" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=eb4417802c56384aac71b34505528a60" - -SRC_URI += "file://0001-Modernize-python-versions-remove-py2x-and-fix-tests-.patch" - -SRC_URI[md5sum] = "485885e67a0f6411d5252e69b20a35ca" -SRC_URI[sha256sum] = "f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-netserver \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.8.0.bb index cdfb7d3b0c..0056a794f9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.8.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Python bindings for interacting with systemd over DBus" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" SRC_URI[md5sum] = "f993739eca645749f18d4ccfd4a0fbf3" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb index c6f352bc61..a751ad6e5a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=772fcdaca14b378878d05c7d857e6c3e" SRC_URI[sha256sum] = "8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422d7440e" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta DEPENDS += "python3-setuptools-scm-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.4.29.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.4.29.bb index 0ee1bd6866..024650e9b3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.4.29.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.4.29.bb @@ -6,17 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=440a4cdb311cd7ad181efb4cba06d562" SRC_URI[sha256sum] = "183524e3db4e2a1fea92e0ca3662a624ba44c9f3568da15679d7535ba6838a6a" -inherit pypi setuptools3 - -# Workaround for network access issue during compile step -# this needs to be fixed in the recipes buildsystem to move -# this such that it can be accomplished during do_fetch task -do_compile[network] = "1" - -DEPENDS += "\ - ${PYTHON_PN}-wheel-native \ - ${PYTHON_PN}-pip-native \ -" +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += " \ ${PYTHON_PN}-pytest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_3.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_3.1.1.bb index cd0450f519..ce55554a01 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_3.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_3.1.1.bb @@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" SRC_URI[sha256sum] = "3ee1cf319c913d19fe53aeb0bc400e7b0bc2dbeb477553733db1dad12eb75ee3" - PYPI_PACKAGE = "pytest-html" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += " \ ${PYTHON_PN}-pytest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture/run-ptest new file mode 100644 index 0000000000..b63c4de0d9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture_0.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture_0.6.3.bb new file mode 100644 index 0000000000..32b5677f1a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture_0.6.3.bb @@ -0,0 +1,23 @@ +# Copyright (C) 2022 Wind River Systems + +SUMMARY = "Use your fixtures in @pytest.mark.parametrize." +HOMEPAGE = "https://github.com/tvorog/pytest-lazy-fixture" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=aae6f2b7c9b3ced83e0b5bb42346d4dd" + +SRC_URI[sha256sum] = "0e7d0c7f74ba33e6e80905e9bfd81f9d15ef9a790de97993e34213deb5ad10ac" + +SRC_URI += "file://run-ptest \ + " + + +inherit ptest pypi setuptools3 + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + + +RDEPENDS:${PN} += "python3-core python3-pytest" +RDEPENDS:${PN}-ptest = " python3-unixadmin" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.11.0.bb deleted file mode 100644 index 060eee3a5a..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_1.11.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "pytest-metadata is a plugin that allowed for accessing pytest metadata" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" - -SRC_URI[sha256sum] = "71b506d49d34e539cc3cfdb7ce2c5f072bea5c953320002c95968e0238f8ecf1" - -PYPI_PACKAGE = "pytest-metadata" - -inherit pypi setuptools3 - -RDEPENDS:${PN} = " \ - ${PYTHON_PN}-pytest \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.1.bb new file mode 100644 index 0000000000..35e8b7568f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "pytest-metadata is a plugin that allowed for accessing pytest metadata" +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" + +SRC_URI[sha256sum] = "5cdb6aeea8ba9109181cf9f149c8a3ae1430ff7e44506a8f866af8a98ca46301" + +PYPI_PACKAGE = "pytest-metadata" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = " \ + ${PYTHON_PN}-pytest \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.3.1.bb deleted file mode 100644 index 28b7053218..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_5.3.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Invoke py.test as distutils command with dependency resolution" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" - -SRC_URI[sha256sum] = "0fce5b8dc68760f353979d99fdd6b3ad46330b6b1837e2077a89ebcf204aac91" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-setuptools-scm-native" - -RDEPENDS:${PN} = "${PYTHON_PN}-py ${PYTHON_PN}-setuptools ${PYTHON_PN}-debugger ${PYTHON_PN}-json \ - ${PYTHON_PN}-io" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-subtests_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-subtests_0.6.0.bb deleted file mode 100644 index 5e4847b8d9..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-subtests_0.6.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "unittest subTest() support and subtests fixture." -DESCRIPTION = "Adds support for TestCase.subTest.\ -New subtests fixture, providing similar functionality for pure pytest tests." -HOMEPAGE = "https://github.com/pytest-dev/pytest-subtests" -BUGTRACKER = "https://github.com/pytest-dev/pytest-subtests/issues" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=242b4e17fa287dcf7aef372f6bc3dcb1" - -SRC_URI[sha256sum] = "3ebd306a8dcf75133f1742f288c82f36426ebcf8a132d4ee89782d20e84fc13a" - -inherit pypi setuptools3 - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-pytest \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-xdist_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-xdist_2.5.0.bb index a10ac8cc49..c3e69e3e0a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-xdist_2.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-xdist_2.5.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=772fcdaca14b378878d05c7d857e6c3e" SRC_URI[sha256sum] = "4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta DEPENDS += "python3-setuptools-scm-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.12118.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.12118.bb deleted file mode 100644 index 3e799cf622..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.12118.bb +++ /dev/null @@ -1,8 +0,0 @@ -SUMMARY = "This module provides ctypes-based bindings for the native libvlc API of the VLC video player." -HOMEPAGE = "wiki.videolan.org/PythonBinding" -LICENSE = "LGPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[sha256sum] = "566f2f7c303f6800851cacc016df1c6eeec094ad63e0a49d87db9d698094f1fb" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.16120.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.16120.bb new file mode 100644 index 0000000000..a4d21a50e8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-python-vlc_3.0.16120.bb @@ -0,0 +1,8 @@ +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-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[sha256sum] = "92f98fee088f72bd6d063b3b3312d0bd29b37e7ad65ddeb3a7303320300c2807" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz-deprecation-shim_0.1.0.post0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz-deprecation-shim_0.1.0.post0.bb index 76487c830f..d116c3bd4c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz-deprecation-shim_0.1.0.post0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz-deprecation-shim_0.1.0.post0.bb @@ -8,9 +8,4 @@ SRC_URI[sha256sum] = "af097bae1b616dde5c5744441e2ddc69e74dfdcb0c263129610d85b874 PYPI_PACKAGE = "pytz_deprecation_shim" PYPI_SRC_URI = "https://files.pythonhosted.org/packages/94/f0/909f94fea74759654390a3e1a9e4e185b6cd9aa810e533e3586f39da3097/${PYPI_PACKAGE}-${PV}.tar.gz" -inherit pypi setuptools3 - -do_compile:prepend() { - echo "from setuptools import setup" > ${S}/setup.py - echo "setup()" >> ${S}/setup.py -} +inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz/run-ptest deleted file mode 100644 index b63c4de0d9..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2021.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2021.3.bb deleted file mode 100644 index 119342a4bd..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2021.3.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "World timezone definitions, modern and historical" -HOMEPAGE = "http://pythonhosted.org/pytz" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a67fc46c1b596cce5d21209bbe75999" - -inherit pypi setuptools3 ptest - -SRC_URI[sha256sum] = "acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326" - -RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-threading \ -" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/pytz - install -d ${D}${PTEST_PATH}/pytz/tests - cp -rf ${S}/pytz/tests/* ${D}${PTEST_PATH}/pytz/tests/ - cp -f ${S}/README.rst ${D}${PTEST_PATH}/ - -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.23.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.23.2.bb index 183bf7273c..4c4c959eba 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.23.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.23.2.bb @@ -1,6 +1,6 @@ SUMMARY = "A libudev binding" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI[sha256sum] = "32ae3585b320a51bc283e0a04000fd8a25599edb44541e2f5034f6afee5d15cc" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq/club-rpath-out.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq/club-rpath-out.patch new file mode 100644 index 0000000000..61aeaca5fa --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq/club-rpath-out.patch @@ -0,0 +1,29 @@ +From efae4e08d13e0958d929ea524e21c0a210b31982 Mon Sep 17 00:00:00 2001 +From: Leon Anavi +Date: Fri, 22 Jan 2021 11:41:12 +0200 +Subject: [PATCH] setup.py: Adjust _add_rpath + +Fix error: unrecognized command-line option '-R' + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Leon Anavi + +--- + setup.py | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/setup.py b/setup.py +index b634d94..7f6a2f1 100755 +--- a/setup.py ++++ b/setup.py +@@ -235,9 +235,6 @@ def _add_rpath(settings, path): + """ + if sys.platform == 'darwin': + settings['extra_link_args'].extend(['-Wl,-rpath', '-Wl,%s' % path]) +- else: +- settings['runtime_library_dirs'].append(path) +- + + def settings_from_prefix(prefix=None): + """load appropriate library/include settings from ZMQ prefix""" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb index 87605c2b3e..e4762eb5f8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_22.3.0.bb @@ -1,24 +1,20 @@ SUMMARY = "Pyzmq provides Zero message queue access for the Python language" HOMEPAGE = "http://zeromq.org/bindings:python" -LICENSE = "BSD-3-Clause & LGPL-3.0" +LICENSE = "BSD-3-Clause & LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e \ file://COPYING.LESSER;md5=12c592fa0bcfff3fb0977b066e9cb69e" DEPENDS = "zeromq" -FILESEXTRAPATHS:prepend := "${THISDIR}/python-pyzmq:" - SRC_URI += "file://club-rpath-out.patch" SRC_URI[sha256sum] = "8eddc033e716f8c91c6a2112f0a8ebc5e00532b4a6ae1eb0ccc48e027f9c671c" -inherit pypi pkgconfig setuptools3 +inherit pypi pkgconfig python_setuptools_build_meta RDEPENDS:${PN} += " \ ${PYTHON_PN}-multiprocessing \ ${PYTHON_PN}-json \ " -FILES:${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/zmq/backend/cython/.debug" - do_compile:prepend() { echo [global] > ${S}/setup.cfg echo zmq_prefix = ${STAGING_DIR_HOST} >> ${S}/setup.cfg diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.6.bb new file mode 100644 index 0000000000..63453517ec --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.6.bb @@ -0,0 +1,24 @@ +SUMMARY = "A generator framework based on a common modern IDL" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=eee61e10a40b0e3045ee5965bcd9a8b5" + +SRC_URI[sha256sum] = "87ce8ce7123ae57d91ac903c6c330a99273e7f4665a0ab88e6a17f9c98143a68" + +inherit pypi python_setuptools_build_meta + +DEPS = "\ + python3-jinja2 \ + python3-click \ + python3-pyyaml \ + python3-pytest \ + python3-six \ + python3-path \ + python3-antlr4-runtime \ + python3-watchdog \ + python3-markupsafe \ + python3-setuptools \ +" +DEPENDS += "${DEPS}" +RDEPENDS:${PN} += "${DEPS}" + +BBCLASSEXTEND = "nativesdk native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.1.1.bb deleted file mode 100644 index 9af7383de3..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.1.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Python client for Redis key-value store" -DESCRIPTION = "The Python interface to the Redis key-value store." -HOMEPAGE = "http://github.com/andymccurdy/redis-py" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=51d9ad56299ab60ba7be65a621004f27" - -SRC_URI[sha256sum] = "07420a3fbedd8e012c31d4fadac943fb81568946da202c5a5bc237774e5280a0" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-cryptography \ - ${PYTHON_PN}-packaging \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.0.bb new file mode 100644 index 0000000000..d4fc98817d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.2.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "Python client for Redis key-value store" +DESCRIPTION = "The Python interface to the Redis key-value store." +HOMEPAGE = "http://github.com/andymccurdy/redis-py" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=51d9ad56299ab60ba7be65a621004f27" + +SRC_URI[sha256sum] = "6758d01dec81af191b98a35cce3402675d115456584c39b500ab485a5e386bbb" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-cryptography \ + ${PYTHON_PN}-packaging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2021.11.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2021.11.10.bb deleted file mode 100644 index dce232ba68..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2021.11.10.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Alternative regular expression module, to replace re." -HOMEPAGE = "https://bitbucket.org/mrabarnett/mrab-regex/src" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "f341ee2df0999bfdf7a95e448075effe0db212a59387de1a70690e4acb03d4c6" - -RDEPENDS:${PN} += " \ - python3-stringold \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.3.2.bb new file mode 100644 index 0000000000..c71394cb38 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.3.2.bb @@ -0,0 +1,14 @@ +SUMMARY = "Alternative regular expression module, to replace re." +HOMEPAGE = "https://bitbucket.org/mrabarnett/mrab-regex/src" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "79e5af1ff258bc0fe0bdd6f69bc4ae33935a898e3cbefbbccf22e88a27fa053b" + +RDEPENDS:${PN} += " \ + python3-stringold \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.27.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.27.1.bb deleted file mode 100644 index af52b7caf5..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.27.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Python HTTP for Humans." -HOMEPAGE = "http://python-requests.org" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" - -SRC_URI[sha256sum] = "68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-ndg-httpsclient \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-pyasn1 \ - ${PYTHON_PN}-pyopenssl \ - ${PYTHON_PN}-pysocks \ - ${PYTHON_PN}-urllib3 \ - ${PYTHON_PN}-chardet \ - ${PYTHON_PN}-idna \ -" - -CVE_PRODUCT = "requests" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.1.3.bb deleted file mode 100644 index a40d047d72..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_4.1.3.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "A Python generic test automation framework" -DESCRIPTION = "Generic open source test atomation framework for acceptance\ -testing and acceptance test-driven development (ATDD). It has easy-to-use\ -tabular test data syntax and it utilizes the keyword-driven testing approach.\ -Its testing capabilities can be extended by test libraries implemented either\ -with Python or Java, and users can create new higher-level keywords from\ -existing ones using the same syntax that is used for creating test cases." -HOMEPAGE = "http://robotframework.org" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" - -inherit pypi setuptools3 - -PYPI_PACKAGE_EXT = "zip" - -SRC_URI[sha256sum] = "d2675cbe3e5a4c90be3ddb61be3b88cc0d6ff503c298ad8f8a78aad14e71e886" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-xml \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-docutils \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-profile \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_5.0.bb new file mode 100644 index 0000000000..d66fd33e8d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_5.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "A Python generic test automation framework" +DESCRIPTION = "Generic open source test atomation framework for acceptance\ +testing and acceptance test-driven development (ATDD). It has easy-to-use\ +tabular test data syntax and it utilizes the keyword-driven testing approach.\ +Its testing capabilities can be extended by test libraries implemented either\ +with Python or Java, and users can create new higher-level keywords from\ +existing ones using the same syntax that is used for creating test cases." +HOMEPAGE = "http://robotframework.org" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" + +inherit pypi setuptools3 + +PYPI_PACKAGE_EXT = "zip" + +SRC_URI[sha256sum] = "bffecba8c43d4294936d921f0af4941079039edce88194769133719732c608bc" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-xml \ + ${PYTHON_PN}-difflib \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-html \ + ${PYTHON_PN}-docutils \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-profile \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.8.bb index d0a18f92e5..21b664ddd1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.8.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c403f6882d4f97a9cd927df987d55634" SRC_URI[sha256sum] = "5c6bd9dc7a543b7fe4304a631f8a8a3b674e2bbfc49c2ae96200cdbe55df6b17" -inherit pypi setuptools3 update-alternatives +inherit pypi python_poetry_core update-alternatives ALTERNATIVE:${PN} = "\ pyrsa-decrypt \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.19.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.19.bb deleted file mode 100644 index f0a9e16159..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.19.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Bindings for the scrypt key derivation function library" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=05b5ac2824a7ae7489193b0f6a6f2cd1" -HOMEPAGE="https://github.com/holgern/py-scrypt" - -SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch" - -SRC_URI[sha256sum] = "ad143035ae0cf5e97c4b399f4e4686adf442c5f0f06f9f198a0cc6c091335fb7" - -inherit pypi ptest setuptools3 dos2unix - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-ctypes \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/scrypt/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb new file mode 100644 index 0000000000..c386932683 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Bindings for the scrypt key derivation function library" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=05b5ac2824a7ae7489193b0f6a6f2cd1" +HOMEPAGE="https://github.com/holgern/py-scrypt" + +SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch" + +SRC_URI[sha256sum] = "0d226c1c6744fb2e308b391410669b1df5cfe82637ffcb5ed489bf82b2d2eb78" + +inherit pypi ptest setuptools3 dos2unix + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-ctypes \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/scrypt/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify/0001-setup.py-switch-to-setuptools.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify/0001-setup.py-switch-to-setuptools.patch new file mode 100644 index 0000000000..cf7696aa63 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify/0001-setup.py-switch-to-setuptools.patch @@ -0,0 +1,31 @@ +From f662280b26eb1549890e88e8e9085f1937d7962d Mon Sep 17 00:00:00 2001 +From: Tim Orling +Date: Mon, 28 Feb 2022 07:54:03 -0800 +Subject: [PATCH] setup.py: switch to setuptools + +In Python 3.10, 'distutils' is deprecated and is slated for removal in +Python 3.12. + +Switch from distutils.core to setuptools. This also allows the 'wheel' +binary archive format to be built with 'setup.py bdist_wheel'. + +Upstream-Status: Submitted [https://github.com/bb4242/sdnotify/pull/7] + +Signed-off-by: Tim Orling +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 433222c..32b5bd6 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,4 +1,4 @@ +-from distutils.core import setup ++from setuptools import setup + + VERSION='0.3.2' + +-- +2.30.2 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb index 221a8c8717..dc1961ac30 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb @@ -12,7 +12,8 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cc572ccc4b18a4b7d13be5d01bc8213e" -SRC_URI[md5sum] = "749ddca1c70be1697fecc443fb1fdb16" SRC_URI[sha256sum] = "73977fc746b36cc41184dd43c3fe81323e7b8b06c2bb0826c4f59a20c56bb9f1" +SRC_URI += "file://0001-setup.py-switch-to-setuptools.patch" + inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-semantic-version_2.8.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-semantic-version_2.8.5.bb deleted file mode 100644 index b8541ff570..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-semantic-version_2.8.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "A library implementing the 'SemVer' scheme." -DESCRIPTION = "Semantic version comparison for Python (see http://semver.org/)" -HOMEPAGE = "https://github.com/rbarrois/python-semanticversion" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4fb31e3c1c7eeb8b5e8c07657cdd54e2" - -SRC_URI[sha256sum] = "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54" - -PYPI_PACKAGE = "semantic_version" -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.5.3.bb deleted file mode 100644 index 9822b41b1d..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.5.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "The new Python SDK for Sentry.io" -DESCRIPTION = "This is the next line of the Python SDK \ -for Sentry, intended to replace the raven package on PyPI." -HOMEPAGE = "https://github.com/getsentry/sentry-python" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" - -RDEPENDS:${PN} += "python3-urllib3" - -SRC_URI[sha256sum] = "141da032f0fa4c56f9af6b361fda57360af1789576285bd1944561f9c274f9c0" - -PYPI_PACKAGE = "sentry-sdk" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.5.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.5.7.bb new file mode 100644 index 0000000000..1594fb5dd7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.5.7.bb @@ -0,0 +1,14 @@ +SUMMARY = "The new Python SDK for Sentry.io" +DESCRIPTION = "This is the next line of the Python SDK \ +for Sentry, intended to replace the raven package on PyPI." +HOMEPAGE = "https://github.com/getsentry/sentry-python" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" + +RDEPENDS:${PN} += "python3-urllib3" + +SRC_URI[sha256sum] = "aa52da941c56b5a76fd838f8e9e92a850bf893a9eb1e33ffce6c21431d07ee30" + +PYPI_PACKAGE = "sentry-sdk" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-rust-native_1.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-rust-native_1.1.2.bb deleted file mode 100644 index 34ff91241f..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-rust-native_1.1.2.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Setuptools Rust extension plugin" -DESCRIPTION = "setuptools-rust is a plugin for setuptools to build Rust \ -Python extensions implemented with PyO3 or rust-cpython.\ -\ -Compile and distribute Python extensions written in Rust as easily as if they were written in C." -HOMEPAGE = "https://github.com/PyO3/setuptools-rust" -BUGTRACKER = "https://github.com/PyO3/setuptools-rust/issues" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=011cd92e702dd9e6b1a26157b6fd53f5" - -SRC_URI = "https://files.pythonhosted.org/packages/67/08/e1aa2c582c62ac76e4d60f8e454bd3bba933781a06a88b4e38797445822a/setuptools-rust-${PV}.tar.gz" -SRC_URI[sha256sum] = "a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1" - -inherit cargo pypi setuptools3 native - -DEPENDS += "python3-setuptools-scm-native python3-wheel-native" - -RDEPENDS:${PN}:class-native += " \ - python3-semantic-version-native \ - python3-setuptools-native \ - python3-setuptools-scm-native \ - python3-toml-native \ - python3-typing-extensions-native \ - python3-wheel-native \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval_0.9.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval_0.9.12.bb index 8ad6acc875..343e5c03de 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval_0.9.12.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval_0.9.12.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=dc9277482effe59b734b004cbcc1fee7" SRC_URI[sha256sum] = "3e0be507486d4e21cf9d08847c7e57dd61a1603950399985f7c5a0be7fd33e36" -inherit pypi setuptools3 ptest +inherit pypi python_setuptools_build_meta ptest BBCLASSEXTEND = "native nativesdk" @@ -21,10 +21,6 @@ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " -do_configure:prepend() { - sed -i -e "/use_2to3=True,/d" ${S}/setup.py -} - do_install_ptest() { cp -f ${S}/test_simpleeval.py ${D}${PTEST_PATH}/ } diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus/0001-setup.py-Use-setuptools-instead-of-distutils.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus/0001-setup.py-Use-setuptools-instead-of-distutils.patch new file mode 100644 index 0000000000..1208769b2f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus/0001-setup.py-Use-setuptools-instead-of-distutils.patch @@ -0,0 +1,38 @@ +From 4309ce76351b1685d08b3ba55d4f62b3e53ef76b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 1 Mar 2022 19:06:35 -0800 +Subject: [PATCH] setup.py: Use setuptools instead of distutils + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + setup.py.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/setup.py.in ++++ b/setup.py.in +@@ -2,20 +2,17 @@ + # -*- coding: utf-8 -*- + + import sys +-from distutils.core import setup ++from setuptools import setup, find_packages + + setup(name="slip", version="@VERSION@", + py_modules=["slip.__init__", "slip.util.__init__", + "slip.util.hookable", "slip.util.files", +- "slip._wrappers.__init__", "slip._wrappers._glib"], +- requires=["selinux"]) +- +-setup(name="slip.dbus", version="@VERSION@", +- py_modules=["slip.dbus.__init__", "slip.dbus.bus", ++ "slip._wrappers.__init__", "slip._wrappers._glib", ++ "slip.dbus.__init__", "slip.dbus.bus", + "slip.dbus.constants", "slip.dbus.introspection", + "slip.dbus.mainloop", "slip.dbus.polkit", "slip.dbus.proxies", + "slip.dbus.service"], +- requires=["dbus", "decorator", "StringIO", "xml.etree.ElementTree"]) ++ requires=["dbus", "decorator", "selinux", "StringIO", "xml.etree.ElementTree"]) + + if sys.version_info.major == 2: + setup(name="slip.gtk", version="@VERSION@", diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus/9b939c0b534c1b7958fa0a3c7aedf30bca910431.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus/9b939c0b534c1b7958fa0a3c7aedf30bca910431.patch new file mode 100644 index 0000000000..b0e9d2215f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus/9b939c0b534c1b7958fa0a3c7aedf30bca910431.patch @@ -0,0 +1,76 @@ +From 9b939c0b534c1b7958fa0a3c7aedf30bca910431 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Mon, 7 Jun 2021 23:23:47 +0200 +Subject: [PATCH] Python 3.10+ fix: Use collections.abc.Callable instead of + collections.Callable + +The deprecated aliases to Collections Abstract Base Classes were removed from +the collections module in Python 3.10. +https://docs.python.org/3.10/whatsnew/changelog.html#python-3-10-0-alpha-5 +https://bugs.python.org/issue37324 +--- + slip/dbus/polkit.py | 6 +++--- + slip/util/hookable.py | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/slip/dbus/polkit.py b/slip/dbus/polkit.py +index 128e8ce..320676d 100644 +--- a/slip/dbus/polkit.py ++++ b/slip/dbus/polkit.py +@@ -26,7 +26,7 @@ + + from __future__ import absolute_import + +-import collections ++import collections.abc + import dbus + from decorator import decorator + from functools import reduce +@@ -103,14 +103,14 @@ class MyProxy(object): + def some_method(self, ...): + ...""" + +- assert(func is None or isinstance(func, collections.Callable)) ++ assert(func is None or isinstance(func, collections.abc.Callable)) + + assert( + authfail_result in (None, AUTHFAIL_DONTCATCH) or + authfail_exception is None) + assert( + authfail_callback is None or +- isinstance(authfail_callback, collections.Callable)) ++ isinstance(authfail_callback, collections.abc.Callable)) + assert( + authfail_exception is None or + issubclass(authfail_exception, Exception)) +diff --git a/slip/util/hookable.py b/slip/util/hookable.py +index 89c7392..0cd9967 100644 +--- a/slip/util/hookable.py ++++ b/slip/util/hookable.py +@@ -23,7 +23,7 @@ + """This module contains variants of certain base types which call registered + hooks on changes.""" + +-import collections ++import collections.abc + from six import with_metaclass + + __all__ = ["Hookable", "HookableSet"] +@@ -67,7 +67,7 @@ class _HookEntry(object): + + def __init__(self, hook, args, kwargs, hookable=None): + +- assert(isinstance(hook, collections.Callable)) ++ assert(isinstance(hook, collections.abc.Callable)) + assert(isinstance(hookable, Hookable)) + + for n, x in enumerate(args): +@@ -174,7 +174,7 @@ def add_hook_hookable(self, hook, *args, **kwargs): + self.__add_hook(hook, self, *args, **kwargs) + + def __add_hook(self, hook, _hookable, *args, **kwargs): +- assert isinstance(hook, collections.Callable) ++ assert isinstance(hook, collections.abc.Callable) + assert isinstance(_hookable, Hookable) + hookentry = _HookEntry(hook, args, kwargs, hookable=_hookable) + self.__hooks__.add(hookentry) diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus_0.6.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus_0.6.5.bb index 00d83ab61b..ae4e6f72da 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus_0.6.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus_0.6.5.bb @@ -10,16 +10,18 @@ there are no clients anymore on the message bus, as well as convenience \ functions and decorators for integrating a dbus service with PolicyKit." SECTION = "devel/python" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" SRCNAME = "python-slip" -SRC_URI = "https://github.com/nphilipp/${SRCNAME}/releases/download/${SRCNAME}-${PV}/${SRCNAME}-${PV}.tar.bz2" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -SRC_URI[md5sum] = "28ae5f93853466c44ec96706ba2a1eb4" +SRC_URI = "https://github.com/nphilipp/${SRCNAME}/releases/download/${SRCNAME}-${PV}/${SRCNAME}-${PV}.tar.bz2 \ + file://9b939c0b534c1b7958fa0a3c7aedf30bca910431.patch \ + file://0001-setup.py-Use-setuptools-instead-of-distutils.patch \ + " SRC_URI[sha256sum] = "c726c086f0dd93a0ac7a0176f383a12af91b6657b78a301e3f5b25d9f8d4d10b" +S = "${WORKDIR}/${SRCNAME}-${PV}" + do_compile:prepend() { sed -e 's/@VERSION@/${PV}/g' ${S}/setup.py.in > ${S}/setup.py } @@ -32,3 +34,4 @@ RDEPENDS:${PN} += "\ CLEANBROKEN = "1" inherit setuptools3 +PIP_INSTALL_PACKAGE = "slip" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.3.bb index ecdff3adad..b305a128a2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.3.bb @@ -1,5 +1,5 @@ SUMMARY = "Set of i2c tools for linux - Python module" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://py-smbus/smbusmodule.c;beginline=1;endline=18;md5=46e424fb045901ab25e0f92c28c80055" SRC_URI = "${KERNELORG_MIRROR}/software/utils/i2c-tools/i2c-tools-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.2.1.bb index 7401e039bf..be0bafd33f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.2.1.bb @@ -1,6 +1,6 @@ SUMMARY = "SMPP library for python" SECTION = "devel/python" -LICENSE = "GPLv3.0" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://README.md;md5=8b4e2ac8cf248f7b991784f88b630852" PYPI_PACKAGE = "smpplib" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.0.bb deleted file mode 100644 index f8e6281a18..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Python library for the snappy compression library from Google" -DEPENDS += "snappy" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b3090152f53ee19f6a7b64b1a36384fb" - -SRC_URI[sha256sum] = "168a98d3f597b633cfeeae7fe1c78a8dfd81f018b866cf7ce9e4c56086af891a" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "python-snappy" - -RDEPENDS:${PN} += "snappy" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.1.bb new file mode 100644 index 0000000000..8a30f7cb78 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Python library for the snappy compression library from Google" +DEPENDS += "snappy" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b3090152f53ee19f6a7b64b1a36384fb" + +SRC_URI[sha256sum] = "b6a107ab06206acc5359d4c5632bd9b22d448702a79b3169b0c62e0fb808bb2a" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "python-snappy" + +RDEPENDS:${PN} += "snappy" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.5.1.bb deleted file mode 100644 index ebbb5c047a..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.5.1.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Socket.IO server" -HOMEPAGE = "https://github.com/miguelgrinberg/python-socketio/" -SECTION = "devel/python" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=42d0a9e728978f0eeb759c3be91536b8" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "python-socketio" - -SRC_URI[sha256sum] = "ac8e64d59a15d1c31a4fe8434f4ff16d0f640c824ba517dce7ca99e95f0cd36a" - -PACKAGECONFIG ?= "asyncio_client client" -PACKAGECONFIG[asyncio_client] = ",,,${PYTHON_PN}-aiohttp ${PYTHON_PN}-websockets" -PACKAGECONFIG[client] = ",,,${PYTHON_PN}-requests ${PYTHON_PN}-websocket-client" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-engineio \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-attrs \ - ${PYTHON_PN}-bidict \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.5.2.bb new file mode 100644 index 0000000000..6611743bf8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.5.2.bb @@ -0,0 +1,28 @@ +SUMMARY = "Socket.IO server" +HOMEPAGE = "https://github.com/miguelgrinberg/python-socketio/" +SECTION = "devel/python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=42d0a9e728978f0eeb759c3be91536b8" + +inherit pypi python_setuptools_build_meta + +PYPI_PACKAGE = "python-socketio" + +SRC_URI[sha256sum] = "6213f7dfbb87e554472d11151f96bae9059854aa88e4a1e0fa6e97cca1c3fcf4" + +PACKAGECONFIG ?= "asyncio_client client" +PACKAGECONFIG[asyncio_client] = ",,,${PYTHON_PN}-aiohttp ${PYTHON_PN}-websockets" +PACKAGECONFIG[client] = ",,,${PYTHON_PN}-requests ${PYTHON_PN}-websocket-client" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-engineio \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-attrs \ + ${PYTHON_PN}-bidict \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.3.1.bb index f4cf93daba..7cb76b426f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.3.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=33c3a77def9b3ad83e01c65bdcc1af67" SRC_URI[sha256sum] = "b8d49b1cd4f037c7082a9683dfa1801aa2597fb11c3a1155b7a5b94829b4f1f9" -inherit pypi setuptools3 ptest +inherit pypi python_setuptools_build_meta ptest SRC_URI += " \ file://run-ptest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.31.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.31.bb deleted file mode 100644 index 510bb7d9e4..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.31.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ -application developers the full power and flexibility of SQL" -HOMEPAGE = "http://www.sqlalchemy.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f4001d1ca15b69d096fa1b4fd1bdce79" - -SRC_URI[sha256sum] = "582b59d1e5780a447aada22b461e50b404a9dc05768da1d87368ad8190468418" - -PYPI_PACKAGE = "SQLAlchemy" -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-profile \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.32.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.32.bb new file mode 100644 index 0000000000..93a49df53a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.32.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives \ +application developers the full power and flexibility of SQL" +HOMEPAGE = "http://www.sqlalchemy.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f4001d1ca15b69d096fa1b4fd1bdce79" + +SRC_URI[sha256sum] = "6fdd2dc5931daab778c2b65b03df6ae68376e028a3098eb624d0909d999885bc" + +PYPI_PACKAGE = "SQLAlchemy" +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-profile \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb index cbc9f44bc7..10614fe374 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb @@ -1,6 +1,6 @@ SUMMARY = "Python interface for libsystemd" HOMEPAGE = "https://github.com/systemd/python-systemd" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c" PYPI_PACKAGE = "systemd-python" @@ -15,6 +15,9 @@ SRC_URI[sha256sum] = "fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895 # allow for common patches for python- and python3-systemd FILESEXTRAPATHS:prepend := "${THISDIR}/python-systemd:" -SRC_URI += "file://endian.patch" +SRC_URI += " \ + file://endian.patch \ + file://0002-setup.py-switch-from-distutils-to-setuptools.patch \ +" SRC_URI:append:libc-musl = " file://0001-Provide-implementation-of-strndupa-for-musl.patch" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-term_2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-term_2.3.bb index 723f1db512..6b62eb02ce 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-term_2.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-term_2.3.bb @@ -1,6 +1,6 @@ SUMMARY = "An enhanced version of the tty module" SECTION = "devel/python" -LICENSE = "Python-2" +LICENSE = "Python-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=d90e2d280a4836c607520383d1639be1" SRC_URI[md5sum] = "ab0c1bce381b1109fe4390c56aa06237" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch new file mode 100644 index 0000000000..a55a6a914b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-termcolor/0001-setup.py-Use-setuptools-instead-of-distutils.patch @@ -0,0 +1,27 @@ +From e30308284c721210e2ba50d8b3d159cedf5eada8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 28 Feb 2022 14:44:42 -0800 +Subject: [PATCH] setup.py: Use setuptools instead of distutils + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index c4fe4ed..dad1d29 100755 +--- a/setup.py ++++ b/setup.py +@@ -23,7 +23,7 @@ + # Author: Konstantin Lepa + + import os +-from distutils.core import setup ++from setuptools import setup + + prjdir = os.path.dirname(__file__) + +-- +2.35.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb index 17df7f983d..15bab622a6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-termcolor_1.1.0.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=809e8749b63567978acfbd81d9f6a27d" inherit pypi setuptools3 -SRC_URI[md5sum] = "043e89644f8909d462fbbfa511c768df" +SRC_URI += "file://0001-setup.py-Use-setuptools-instead-of-distutils.patch" + SRC_URI[sha256sum] = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.62.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.62.3.bb deleted file mode 100644 index 148431d0ad..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.62.3.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Fast, Extensible Progress Meter" -HOMEPAGE = "http://tqdm.github.io/" -SECTION = "devel/python" - -LICENSE = "MIT & MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENCE;md5=1672e2674934fd93a31c09cf17f34100" - -SRC_URI[sha256sum] = "d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d" - -inherit pypi setuptools3 - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -RDEPENDS:${PN} += " \ - python3-logging \ - python3-numbers \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.63.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.63.1.bb new file mode 100644 index 0000000000..0fcd4d4575 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.63.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "Fast, Extensible Progress Meter" +HOMEPAGE = "http://tqdm.github.io/" +SECTION = "devel/python" + +LICENSE = "MIT & MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENCE;md5=1672e2674934fd93a31c09cf17f34100" + +SRC_URI[sha256sum] = "4230a49119a416c88cc47d0d2d32d5d90f1a282d5e497d49801950704e49863d" + +inherit pypi python_setuptools_build_meta + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +RDEPENDS:${PN} += " \ + python3-logging \ + python3-numbers \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.1.1.bb index bfed02d6f5..8f80426e6c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.1.1.bb @@ -13,4 +13,4 @@ RDEPENDS:${PN} = "\ ${PYTHON_PN}-decorator \ " -inherit setuptools3 pypi +inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.10.bb deleted file mode 100644 index 46292987b1..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.10.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "A lightweight, object-oriented Python state machine implementation with many extensions." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=baac7be1f4c17620df74188e23da6d47" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "b0385975a842e885c1a55c719d2f90164471665794d39d51f9eb3f11e1d9c8ac" - -RDEPENDS:${PN} += "python3-six python3-logging" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.11.bb new file mode 100644 index 0000000000..14189424a2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.8.11.bb @@ -0,0 +1,9 @@ +SUMMARY = "A lightweight, object-oriented Python state machine implementation with many extensions." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=baac7be1f4c17620df74188e23da6d47" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "7b20d32906ea4d60ee6f6c1f5dc9c9f178802425c5b155213eb0f25c277f04e4" + +RDEPENDS:${PN} += "python3-six python3-logging" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.7.1.bb deleted file mode 100644 index bcc881e44f..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.7.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Utilities for interacting with PyPI" -HOMEPAGE = "https://twine.readthedocs.io/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a3d1106b253a8d50dd82a4202a045b4c" - -SRC_URI[sha256sum] = "28460a3db6b4532bde6a5db6755cf2dce6c5020bada8a641bb2c5c7a9b1f35b8" - -inherit pypi setuptools3 - -DEPENDS += "\ - ${PYTHON_PN}-setuptools-scm-native \ -" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-importlib-metadata \ -" - -do_compile:prepend() { - echo "from setuptools import setup" > ${S}/setup.py - echo "setup()" >> ${S}/setup.py -} - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.8.0.bb new file mode 100644 index 0000000000..4296ab2b33 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_3.8.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Utilities for interacting with PyPI" +HOMEPAGE = "https://twine.readthedocs.io/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a3d1106b253a8d50dd82a4202a045b4c" + +SRC_URI[sha256sum] = "8efa52658e0ae770686a13b675569328f1fba9837e5de1867bfe5f46a9aefe19" + +inherit pypi python_setuptools_build_meta + +DEPENDS += "\ + ${PYTHON_PN}-setuptools-scm-native \ +" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-importlib-metadata \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb deleted file mode 100644 index 8fd7801c35..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.1.0.bb +++ /dev/null @@ -1,324 +0,0 @@ -DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \ -Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols \ -(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more." -HOMEPAGE = "http://www.twistedmatrix.com" - -#twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL. -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0f8d67f84b6e178c92d471011b2245fc" - -SRC_URI[sha256sum] = "b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61" - -PYPI_PACKAGE = "Twisted" - -inherit pypi setuptools3 - -do_install:append() { - # remove some useless files before packaging - find ${D} \( -name "*.bat" -o -name "*.c" -o -name "*.h" \) -exec rm -f {} \; -} - -PACKAGES += "\ - ${PN}-zsh \ - ${PN}-test \ - ${PN}-protocols \ - ${PN}-conch \ - ${PN}-mail \ - ${PN}-names \ - ${PN}-news \ - ${PN}-runner \ - ${PN}-web \ - ${PN}-words \ - ${PN}-flow \ - ${PN}-pair \ - ${PN}-core \ -" - -PACKAGES =+ "\ - ${PN}-bin \ -" - -DEPENDS += " \ - ${PYTHON_PN}-incremental-native \ -" - -RDEPENDS:${PN} = "\ - ${PN}-bin \ - ${PN}-core \ - ${PN}-conch \ - ${PN}-mail \ - ${PN}-names \ - ${PN}-pair \ - ${PN}-protocols \ - ${PN}-runner \ - ${PN}-web \ - ${PN}-words \ - ${PN}-zsh \ -" - -RDEPENDS:${PN}-core = "${PYTHON_PN}-appdirs \ - ${PYTHON_PN}-automat \ - ${PYTHON_PN}-constantly \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-debugger \ - ${PYTHON_PN}-hyperlink \ - ${PYTHON_PN}-incremental \ - ${PYTHON_PN}-pyhamcrest \ - ${PYTHON_PN}-pyserial \ - ${PYTHON_PN}-unixadmin \ - ${PYTHON_PN}-zopeinterface \ -" -RDEPENDS:${PN}-test = "${PN}" -RDEPENDS:${PN}-conch = "${PN}-core ${PN}-protocols ${PYTHON_PN}-bcrypt ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1 ${PYTHON_PN}-pickle" -RDEPENDS:${PN}-mail = "${PN}-core ${PN}-protocols" -RDEPENDS:${PN}-names = "${PN}-core" -RDEPENDS:${PN}-news = "${PN}-core ${PN}-protocols" -RDEPENDS:${PN}-runner = "${PN}-core ${PN}-protocols" -RDEPENDS:${PN}-web += "${PN}-core ${PN}-protocols" -RDEPENDS:${PN}-words += "${PN}-core" -RDEPENDS:${PN}-flow += "${PN}-core" -RDEPENDS:${PN}-pair += "${PN}-core" -RDEPENDS:${PN}-dbg = "${PN}" - -ALLOW_EMPTY:${PN} = "1" -FILES:${PN} = "" - -FILES:${PN}-test = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy/test/ \ -" - -FILES:${PN}-protocols = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/*.py* \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/gps/ \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/mice/ \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy \ -" - -FILES:${PN}-zsh = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/twisted-completion.zsh \ -" - -FILES:${PN}-conch = " \ - ${bindir}/ckeygen \ - ${bindir}/tkconch \ - ${bindir}/conch \ - ${bindir}/conchftp \ - ${bindir}/cftp \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch \ -" - -FILES:${PN}-core = " \ -${bindir}/manhole \ -${bindir}/mktap \ -${bindir}/twistd \ -${bindir}/tap2deb \ -${bindir}/tap2rpm \ -${bindir}/tapconvert \ -${bindir}/tkmktap \ -${bindir}/trial \ -${bindir}/easy_install* \ -${bindir}/pyhtmlizer \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.so \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/dropin.cache \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/application \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/cred \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/enterprise \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/internet \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols\ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python\ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/tap/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/*.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/topfiles \ -${libdir}/${PYTHON_DIR}/site-packages/Twisted*egg-info \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/logger/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/_threads/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/positioning/ \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/py.typed \ -" - -FILES:${PN}-mail = " \ -${bindir}/mailmail \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/mail \ -" - -FILES:${PN}-names = " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/names \ -" - -FILES:${PN}-news = " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/news \ -" - -FILES:${PN}-runner = " \ -${libdir}/site-packages/twisted/runner/portmap.so \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/runner\ -" - -FILES:${PN}-web = " \ -${bindir}/websetroot \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/web\ -" - -FILES:${PN}-words = " \ -${bindir}/im \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/words\ -" - -FILES:${PN}-flow = " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_flow.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/flow \" - -FILES:${PN}-pair = " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_pair.py* \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/pair \ -" - -FILES:${PN}-dbg += " \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*/.debug \ -${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/.debug \ -" - -FILES:${PN}-doc += " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_pydoctortemplates/ \ -" - -RDEPENDS:${PN}-src = "${PN}" -FILES:${PN}-src = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*.py \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/*.py \ -" - -FILES:${PN}-core:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__pycache__/*pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/__init__*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/notestplugin*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/testplugin*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_ftp*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_inet*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_manhole*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_portforward*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_socks*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_telnet*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_trial*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_core*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_qtstub*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_reactors*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/cred*.pyc \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/dropin*.cache \ -" - -FILES:${PN}-names:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_names*.pyc \ -" - -FILES:${PN}-news:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_news*.pyc \ -" - -FILES:${PN}-protocols:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/__pycache__/*pyc \ -" - -FILES:${PN}-conch:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_conch*.pyc \ -" - -FILES:${PN}-lore:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_lore*.pyc \ -" -FILES:${PN}-mail:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_mail*.pyc \ -" - -FILES:${PN}-web:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_web*.pyc \ -" - -FILES:${PN}-words:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_words*.pyc \ -" - -FILES:${PN}-flow:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_flow*.pyc \ -" - -FILES:${PN}-pair:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_pair*.pyc \ -" - -FILES:${PN}-runner:append = " \ - ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_runner*.pyc \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.2.0.bb new file mode 100644 index 0000000000..f4575c9c2e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.2.0.bb @@ -0,0 +1,310 @@ +DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \ +Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols \ +(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more." +HOMEPAGE = "http://www.twistedmatrix.com" + +#twisted/topfiles/NEWS:655: - Relicensed: Now under the MIT license, rather than LGPL. +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0f8d67f84b6e178c92d471011b2245fc" + +SRC_URI[sha256sum] = "57f32b1f6838facb8c004c89467840367ad38e9e535f8252091345dba500b4f2" + +PYPI_PACKAGE = "Twisted" + +inherit pypi python_setuptools_build_meta + +do_install:append() { + # remove some useless files before packaging + find ${D} \( -name "*.bat" -o -name "*.c" -o -name "*.h" \) -exec rm -f {} \; +} + +PACKAGES += "\ + ${PN}-zsh \ + ${PN}-test \ + ${PN}-protocols \ + ${PN}-conch \ + ${PN}-mail \ + ${PN}-names \ + ${PN}-news \ + ${PN}-runner \ + ${PN}-web \ + ${PN}-words \ + ${PN}-flow \ + ${PN}-pair \ + ${PN}-core \ +" + +PACKAGES =+ "\ + ${PN}-bin \ +" + +DEPENDS += " \ + ${PYTHON_PN}-incremental-native \ +" + +RDEPENDS:${PN} = "\ + ${PN}-bin \ + ${PN}-core \ + ${PN}-conch \ + ${PN}-mail \ + ${PN}-names \ + ${PN}-pair \ + ${PN}-protocols \ + ${PN}-runner \ + ${PN}-web \ + ${PN}-words \ + ${PN}-zsh \ +" + +RDEPENDS:${PN}-core = "${PYTHON_PN}-appdirs \ + ${PYTHON_PN}-automat \ + ${PYTHON_PN}-constantly \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-debugger \ + ${PYTHON_PN}-hyperlink \ + ${PYTHON_PN}-incremental \ + ${PYTHON_PN}-pyhamcrest \ + ${PYTHON_PN}-pyserial \ + ${PYTHON_PN}-unixadmin \ + ${PYTHON_PN}-zopeinterface \ +" +RDEPENDS:${PN}-test = "${PN}" +RDEPENDS:${PN}-conch = "${PN}-core ${PN}-protocols ${PYTHON_PN}-bcrypt ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1 ${PYTHON_PN}-pickle" +RDEPENDS:${PN}-mail = "${PN}-core ${PN}-protocols" +RDEPENDS:${PN}-names = "${PN}-core" +RDEPENDS:${PN}-news = "${PN}-core ${PN}-protocols" +RDEPENDS:${PN}-runner = "${PN}-core ${PN}-protocols" +RDEPENDS:${PN}-web += "${PN}-core ${PN}-protocols" +RDEPENDS:${PN}-words += "${PN}-core" +RDEPENDS:${PN}-flow += "${PN}-core" +RDEPENDS:${PN}-pair += "${PN}-core" + +FILES:${PN} = "${PYTHON_SITEPACKAGES_DIR}/${PYPI_PACKAGE}-${PV}.dist-info/*" + +FILES:${PN}-test = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/*/test \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy/test/ \ +" + +FILES:${PN}-protocols = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/*.py* \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/gps/ \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/mice/ \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/haproxy \ +" + +FILES:${PN}-zsh = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/twisted-completion.zsh \ +" + +FILES:${PN}-conch = " \ + ${bindir}/ckeygen \ + ${bindir}/tkconch \ + ${bindir}/conch \ + ${bindir}/conchftp \ + ${bindir}/cftp \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch \ +" + +FILES:${PN}-core = " \ +${bindir}/manhole \ +${bindir}/mktap \ +${bindir}/twistd \ +${bindir}/tap2deb \ +${bindir}/tap2rpm \ +${bindir}/tapconvert \ +${bindir}/tkmktap \ +${bindir}/trial \ +${bindir}/easy_install* \ +${bindir}/pyhtmlizer \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.so \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/dropin.cache \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/application \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/cred \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/enterprise \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/internet \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols\ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python\ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts/ \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/ \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/tap/ \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/ \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/python/*.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/*.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/topfiles \ +${libdir}/${PYTHON_DIR}/site-packages/Twisted*egg-info \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/logger/ \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/_threads/ \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/positioning/ \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/py.typed \ +" + +FILES:${PN}-mail = " \ +${bindir}/mailmail \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/mail \ +" + +FILES:${PN}-names = " \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/names \ +" + +FILES:${PN}-news = " \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/news \ +" + +FILES:${PN}-runner = " \ +${libdir}/site-packages/twisted/runner/portmap.so \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/runner\ +" + +FILES:${PN}-web = " \ +${bindir}/websetroot \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/web\ +" + +FILES:${PN}-words = " \ +${bindir}/im \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/words\ +" + +FILES:${PN}-flow = " \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_flow.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/flow \" + +FILES:${PN}-pair = " \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_pair.py* \ +${libdir}/${PYTHON_DIR}/site-packages/twisted/pair \ +" + +FILES:${PN}-doc += " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_pydoctortemplates/ \ +" + +FILES:${PN}-core:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/__pycache__ \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__pycache__/*pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/__init__*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/notestplugin*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/testplugin*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_ftp*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_inet*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_manhole*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_portforward*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_socks*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_telnet*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_trial*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_core*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_qtstub*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_reactors*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/cred*.pyc \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/dropin*.cache \ +" + +FILES:${PN}-names:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_names*.pyc \ +" + +FILES:${PN}-news:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_news*.pyc \ +" + +FILES:${PN}-protocols:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/__pycache__/*pyc \ +" + +FILES:${PN}-conch:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_conch*.pyc \ +" + +FILES:${PN}-lore:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_lore*.pyc \ +" +FILES:${PN}-mail:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_mail*.pyc \ +" + +FILES:${PN}-web:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_web*.pyc \ +" + +FILES:${PN}-words:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_words*.pyc \ +" + +FILES:${PN}-flow:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_flow*.pyc \ +" + +FILES:${PN}-pair:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_pair*.pyc \ +" + +FILES:${PN}-runner:append = " \ + ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__pycache__/twisted_runner*.pyc \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish/0002-setup.py-switch-to-setuptools.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish/0002-setup.py-switch-to-setuptools.patch new file mode 100644 index 0000000000..99e5c6c517 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish/0002-setup.py-switch-to-setuptools.patch @@ -0,0 +1,26 @@ +From fe10781bd15ed7a5c384dbf121f78f129995aa8f Mon Sep 17 00:00:00 2001 +From: Tim Orling +Date: Sun, 27 Feb 2022 11:02:36 -0800 +Subject: [PATCH] setup.py: switch to setuptools + +Upstream-Status: Submitted +[https://github.com/keybase/python-twofish/pull/9] + +Signed-off-by: Tim Orling +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index fcc9546..bfc3273 100644 +--- a/setup.py ++++ b/setup.py +@@ -8,7 +8,7 @@ Copyright (c) 2013 Keybase + setup.py - build and package info + """ + +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + + twofish_module = Extension('_twofish', + sources=['twofish-0.3/twofish.c', 'twofish.c'], diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb index 94fb71090e..f45772d507 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb @@ -5,9 +5,11 @@ HOMEPAGE = "http://github.com/keybase/python-twofish" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=33a63abf6d7567b1689d8ce69f00e43b" -SRC_URI += "file://0001-Fix-missing-return-statements-in-module-stubs.patch" +SRC_URI += " \ + file://0001-Fix-missing-return-statements-in-module-stubs.patch \ + file://0002-setup.py-switch-to-setuptools.patch \ +" -SRC_URI[md5sum] = "d7d22f16dc4ffa0e3ae2200654033abe" SRC_URI[sha256sum] = "b09d8bb50d33b23ff34cafb1f9209f858f752935c6a5c901efb92a41acb830fa" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_21.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_21.2.1.bb deleted file mode 100644 index 8b55b3641c..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_21.2.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Compatibility API between asyncio/Twisted/Trollius" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" - -SRC_URI[sha256sum] = "7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-twisted \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_22.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_22.2.1.bb new file mode 100644 index 0000000000..e2102695ec --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_22.2.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Compatibility API between asyncio/Twisted/Trollius" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" + +SRC_URI[sha256sum] = "2e4582b70f04b2345908254684a984206c0d9b50e3074a24a4c55aba21d24d01" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-twisted \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typed-ast_1.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typed-ast_1.4.3.bb deleted file mode 100644 index c482251b8f..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typed-ast_1.4.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Modified fork of CPython's ast module that parses `# type:` comments" -HOMEPAGE = "https://github.com/python/typed_ast" -LICENSE = "Apache-2.0 & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=97f1494e93daf66a5df47118407a4c4f" - -PYPI_PACKAGE = "typed_ast" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "fb1bbeac803adea29cedd70781399c99138358c26d05fcbd23c13016b7f5ec65" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typed-ast_1.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typed-ast_1.5.2.bb new file mode 100644 index 0000000000..55cd78ce8f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typed-ast_1.5.2.bb @@ -0,0 +1,12 @@ +SUMMARY = "Modified fork of CPython's ast module that parses `# type:` comments" +HOMEPAGE = "https://github.com/python/typed_ast" +LICENSE = "Apache-2.0 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=97f1494e93daf66a5df47118407a4c4f" + +PYPI_PACKAGE = "typed_ast" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "525a2d4088e70a9f75b08b3f87a51acc9cde640e19cc523c7e41aa355564ae27" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.13.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.13.3.bb index 21ca439505..e9fce61452 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.13.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.13.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f0e423eea5c91e7aa21bdb70184b3e53" SRC_URI[sha256sum] = "00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4" -inherit pypi setuptools3 ptest +inherit pypi python_setuptools_build_meta ptest SRC_URI += " \ file://run-ptest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typing-extensions_3.10.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typing-extensions_3.10.0.0.bb deleted file mode 100644 index a8e632487d..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typing-extensions_3.10.0.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -HOMEPAGE = "https://github.com/python/typing" -LICENSE = "PSF" -LIC_FILES_CHKSUM = "file://LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f" - -# The name on PyPi is slightly different. -PYPI_PACKAGE = "typing_extensions" - -SRC_URI[sha256sum] = "50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.1.bb index 29a69f8b8f..1c910920e0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_4.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=57e0bd61643d81d05683cdce65b11d10" SRC_URI[sha256sum] = "0f28015ac68a5c067210400a9197fc5d36ba9bc3f8eaf1da3cbd59acdfed9e09" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += "\ ${PYTHON_PN}-pytz-deprecation-shim \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.8.bb deleted file mode 100644 index c2a51b9148..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.8.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Python HTTP library with thread-safe connection pooling, file post support, sanity friendly, and more" -HOMEPAGE = "https://github.com/shazow/urllib3" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c" - -SRC_URI[sha256sum] = "0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-certifi \ - ${PYTHON_PN}-cryptography \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-idna \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-pyopenssl \ - ${PYTHON_PN}-threading \ -" - -CVE_PRODUCT = "urllib3" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb index cf0fa30a32..ea40d5f6bb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-versiontools_1.9.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Smart replacement for plain tuple used in __version__" SECTION = "devel/python" HOMEPAGE = "https://launchpad.net/versiontools" -LICENSE = "LGPLv3" +LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://setup.py;beginline=3;endline=20;md5=02193721a38fd8a05a4ddeb7df8e294d" SRC_URI[md5sum] = "602b7db8eea30dd29a1d451997adf251" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.0.0.bb deleted file mode 100644 index 490dcee6c4..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.0.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "A WSGI server for Python" -DESCRIPTION = "Waitress is meant to be a production-quality pure-Python WSGI \ - server with very acceptable performance." -HOMEPAGE = "https://github.com/Pylons/waitress" -SECTION = "devel/python" -LICENSE = "ZPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=78ccb3640dc841e1baecb3e27a6966b2" - -SRC_URI[sha256sum] = "69e1f242c7f80273490d3403c3976f3ac3b26e289856936d1f620ed48f321897" - -inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.1.1.bb new file mode 100644 index 0000000000..b7f8099790 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.1.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "A WSGI server for Python" +DESCRIPTION = "Waitress is meant to be a production-quality pure-Python WSGI \ + server with very acceptable performance." +HOMEPAGE = "https://github.com/Pylons/waitress" +SECTION = "devel/python" +LICENSE = "ZPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=78ccb3640dc841e1baecb3e27a6966b2" + +RDEPENDS:${PN} += " \ + python3-logging \ +" + +SRC_URI[sha256sum] = "e2e60576cf14a1539da79f7b7ee1e79a71e64f366a0b47db54a15e971f57bb16" + +inherit python_setuptools_build_meta pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.6.bb deleted file mode 100644 index 2bb110049f..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.6.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Filesystem events monitoring" -DEPENDS = "${PYTHON_PN}-argh" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI[sha256sum] = "a36e75df6c767cbf46f61a91c70b3ba71811dfa0aca4a324d9407a06a8b7a2e7" - -inherit pypi setuptools3 - -RDEPENDS:${PN} = " \ - ${PYTHON_PN}-argh \ - ${PYTHON_PN}-pathtools3 \ - ${PYTHON_PN}-pyyaml \ - ${PYTHON_PN}-requests \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.7.bb new file mode 100644 index 0000000000..7e91295fb4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.7.bb @@ -0,0 +1,18 @@ +SUMMARY = "Filesystem events monitoring" +DEPENDS = "${PYTHON_PN}-argh" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI[sha256sum] = "3fd47815353be9c44eebc94cc28fe26b2b0c5bd889dafc4a5a7cbdf924143480" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = " \ + ${PYTHON_PN}-argh \ + ${PYTHON_PN}-pathtools3 \ + ${PYTHON_PN}-pyyaml \ + ${PYTHON_PN}-requests \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.2.3.bb deleted file mode 100644 index f85657a221..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.2.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "websocket client for python" -DESCRIPTION = "\ -websocket-client module is WebSocket client for python. \ -This provide the low level APIs for WebSocket. All APIs \ -are the synchronous functions." -HOMEPAGE = "https://github.com/websocket-client/websocket-client" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e401d789b93b47e65e852f16f2907aab" - -SRC_URI[sha256sum] = "1315816c0acc508997eb3ae03b9d3ff619c9d12d544c9a9b553704b1cc4f6af5" - -inherit pypi setuptools3 - -RDEPENDS:${PN} = "\ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-logging \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.1.bb new file mode 100644 index 0000000000..166dd0355c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.1.bb @@ -0,0 +1,17 @@ +SUMMARY = "websocket client for python" +DESCRIPTION = "\ +websocket-client module is WebSocket client for python. \ +This provide the low level APIs for WebSocket. All APIs \ +are the synchronous functions." +HOMEPAGE = "https://github.com/websocket-client/websocket-client" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b969e9612325987c823fc0737063ebc8" + +SRC_URI[sha256sum] = "6278a75065395418283f887de7c3beafb3aa68dada5cacbe4b214e8d26da499b" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = "\ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-logging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_10.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_10.1.bb deleted file mode 100644 index 6dd29a9ff6..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_10.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "An implementation of the WebSocket Protocol (RFC 6455)" -HOMEPAGE = "https://github.com/aaugustin/websockets" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=78c2cc91e172ca96d6f8e4a76c739ec6" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "181d2b25de5a437b36aefedaf006ecb6fa3aa1328ec0236cdde15f32f9d3ff6d" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS:${PN} = "\ - ${PYTHON_PN}-asyncio \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_10.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_10.2.bb new file mode 100644 index 0000000000..c8179df5b1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_10.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "An implementation of the WebSocket Protocol (RFC 6455)" +HOMEPAGE = "https://github.com/aaugustin/websockets" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=78c2cc91e172ca96d6f8e4a76c739ec6" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "8351c3c86b08156337b0e4ece0e3c5ec3e01fcd14e8950996832a23c99416098" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} = "\ + ${PYTHON_PN}-asyncio \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.13.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.13.3.bb deleted file mode 100644 index 05ee4c6356..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.13.3.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "A Python module for decorators, wrappers and monkey patching." -HOMEPAGE = "http://wrapt.readthedocs.org/" -LICENSE = "BSD-2-Clause" -SECTION = "devel/python" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fdfc019b57affbe1d7a32e3d34e83db4" - -SRC_URI[sha256sum] = "1fea9cd438686e6682271d36f3481a9f3636195578bab9ca3382e2f5f01fc185" - -inherit pypi setuptools3 - -RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-threading \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.14.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.14.0.bb new file mode 100644 index 0000000000..9dcab8101f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.14.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "A Python module for decorators, wrappers and monkey patching." +HOMEPAGE = "http://wrapt.readthedocs.org/" +LICENSE = "BSD-2-Clause" +SECTION = "devel/python" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fdfc019b57affbe1d7a32e3d34e83db4" + +SRC_URI[sha256sum] = "8323a43bd9c91f62bb7d4be74cc9ff10090e7ef820e27bfe8815c57e68261311" + +inherit pypi setuptools3 + +RDEPENDS:${PN}:class-target += "\ + ${PYTHON_PN}-stringold \ + ${PYTHON_PN}-threading \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb index bd6853e747..da0dc26715 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb @@ -17,6 +17,8 @@ SRCREV = "b8d573e11ec149da695d695c81a156232b89a949" S = "${WORKDIR}/git" inherit ptest setuptools3 +PIP_INSTALL_PACKAGE = "xlrd" +PIP_INSTALL_DIST_PATH = "${S}/dist" RDEPENDS:${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.2.bb deleted file mode 100644 index 04f25532a6..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Python 2 and 3 compatibility library" -HOMEPAGE = "https://xlsxwriter.readthedocs.io" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e5c795ec8cf90514a6d844b1d3cc3224" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "XlsxWriter" - -RDEPENDS:${PN} += " \ - python3-crypt \ - python3-datetime \ - python3-compression \ - python3-numbers \ - python3-io \ -" - -SRC_URI[sha256sum] = "53005f03e8eb58f061ebf41d5767c7495ee0772c2396fe26b7e0ca22fa9c2570" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.3.bb new file mode 100644 index 0000000000..0f8dd35e0f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.0.3.bb @@ -0,0 +1,21 @@ +SUMMARY = "Python 2 and 3 compatibility library" +HOMEPAGE = "https://xlsxwriter.readthedocs.io" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2b9a26d1a52d2c66df334bbdad23896a" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "XlsxWriter" + +RDEPENDS:${PN} += " \ + python3-crypt \ + python3-datetime \ + python3-compression \ + python3-numbers \ + python3-io \ +" + +SRC_URI[sha256sum] = "e89f4a1d2fa2c9ea15cde77de95cd3fd8b0345d0efb3964623f395c8c4988b7f" + +BBCLASSEXTEND = "native nativesdk" 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 index 7e7b5235ee..e81e4dabee 100644 --- 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 @@ -1,6 +1,6 @@ SUMMARY = "unittest-based test runner with Ant/JUnit like XML reporting" HOMEPAGE = "https://github.com/pycontribs/xmlrunner" -LICENSE = "LGPL-3.0" +LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://PKG-INFO;md5=fa964f202b6ae067ed5828fe43c77c1a" SRC_URI[md5sum] = "7b0b152ed2d278516aedbc0cac22dfb3" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmodem_0.4.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmodem_0.4.6.bb index 9d722b84f6..6df392e2d6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmodem_0.4.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmodem_0.4.6.bb @@ -7,8 +7,13 @@ SRC_URI[sha256sum] = "089737298f5738eabc43f2519efdc80b402693768f16383f7013b9e6f8 inherit pypi setuptools3 +do_install:append() { + install -d ${D}${docdir}/${PN} + mv ${D}/usr/doc/* ${D}${docdir}/${PN}/ + rmdir ${D}/usr/doc +} + RDEPENDS:${PN} += " \ ${PYTHON_PN}-logging \ " - BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_4.7.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_4.7.0.0.bb index b45e96d387..ccd1cd787d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_4.7.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_4.7.0.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Font Awesome icons packaged for setuptools (easy_install) / pip." HOMEPAGE = "https://pypi.python.org/pypi/XStatic-Font-Awesome" SECTION = "devel/python" -LICENSE = "Apache-2" +LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://PKG-INFO;md5=313d021898694cd2b0ea6508bdfe51a2" PYPI_PACKAGE = "XStatic-Font-Awesome" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_2.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_2.0.2.bb deleted file mode 100644 index 01343abc85..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_2.0.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "xxhash is a Python binding for the xxHash library by Yann Collet." -SECTION = "devel/python" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3a9dab7f159514231249aa3e108ab26b" - -SRC_URI[sha256sum] = "b7bead8cf6210eadf9cecf356e17af794f57c0939a3d420a00d87ea652f87b49" - -SRC_URI += " \ - file://run-ptest \ -" - -inherit pypi setuptools3 ptest - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.0.0.bb new file mode 100644 index 0000000000..ca8ed3b01e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.0.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "xxhash is a Python binding for the xxHash library by Yann Collet." +SECTION = "devel/python" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3a9dab7f159514231249aa3e108ab26b" + +SRC_URI[sha256sum] = "30b2d97aaf11fb122023f6b44ebb97c6955e9e00d7461a96415ca030b5ceb9c7" + +SRC_URI += " \ + file://run-ptest \ +" + +inherit pypi setuptools3 ptest + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yamlloader_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yamlloader_1.1.0.bb index a5510d5dc7..0deb1b7dd4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yamlloader_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yamlloader_1.1.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6831ef36faa29329bce2420c5356f97e" SRC_URI[sha256sum] = "8a297c7a197683ba02e5e2b882ffd6c6180d01bdefb534b69cd3962df020bfe6" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta RDEPENDS:${PN}:class-target += "\ ${PYTHON_PN}-pyyaml \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.1.bb index c49782e426..bc06618c1e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)" HOMEPAGE = "https://github.com/jstasiak/python-zeroconf" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=3bb705b228ea4a14ea2728215b780d80" SRC_URI[sha256sum] = "10c501b25d8881b656e56c34674d98fe6bc752240a572e74f918bc849c93ba9c" diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.0.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.0.bb deleted file mode 100644 index 85f80b8c05..0000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.0.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "A python module for system storage configuration" -HOMEPAGE = "http://fedoraproject.org/wiki/blivet" -LICENSE = "LGPLv2+" -SECTION = "devel/python" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -S = "${WORKDIR}/git" -B = "${S}" - -SRCREV = "f7d9027e4fdad11187980e73726cd75a2dc962c2" -SRC_URI = "git://github.com/storaged-project/blivet.git;branch=3.4-release;protocol=https \ - file://0002-run_program-support-timeout.patch \ - file://0003-support-infinit-timeout.patch \ - file://0004-fix-new.roots-object-is-not-iterable.patch \ - file://0005-fix-incorrect-timeout-while-system-time-changed.patch \ - file://0006-tweak-btrfs-packages.patch \ - file://0007-invoking-mount-with-infinite-timeout.patch \ - file://0008-use-oe-variable-to-replace-hardcoded-dir.patch \ - file://0009-invoking-fsck-with-infinite-timeout.patch \ - file://0010-invoking-mkfs-with-infinite-timeout.patch \ - file://0011-invoking-dd-with-infinite-timeout.patch \ -" - -UPSTREAM_CHECK_GITTAGREGEX = "blivet-(?P\d+(\.\d+)+)$" - -inherit features_check -REQUIRED_DISTRO_FEATURES = "systemd" - -inherit setuptools3 python3native - -RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \ - parted python3-pyparted multipath-tools \ - lsof cryptsetup libblockdev \ - libbytesize \ -" - -FILES:${PN} += " \ - ${datadir}/dbus-1/system-services \ -" - -inherit systemd - -SYSTEMD_AUTO_ENABLE = "disable" -SYSTEMD_SERVICE:${PN} = "blivet.service" diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb new file mode 100644 index 0000000000..bd57604f26 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "A python module for system storage configuration" +HOMEPAGE = "http://fedoraproject.org/wiki/blivet" +LICENSE = "LGPL-2.0-or-later" +SECTION = "devel/python" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI += "\ + file://0002-run_program-support-timeout.patch \ + file://0003-support-infinit-timeout.patch \ + file://0004-fix-new.roots-object-is-not-iterable.patch \ + file://0005-fix-incorrect-timeout-while-system-time-changed.patch \ + file://0006-tweak-btrfs-packages.patch \ + file://0007-invoking-mount-with-infinite-timeout.patch \ + file://0008-use-oe-variable-to-replace-hardcoded-dir.patch \ + file://0009-invoking-fsck-with-infinite-timeout.patch \ + file://0010-invoking-mkfs-with-infinite-timeout.patch \ + file://0011-invoking-dd-with-infinite-timeout.patch \ +" +SRC_URI[sha256sum] = "1b05b77f3ee35d82c7a577a168c9ba0204d3e9a87eb1975e5f9af47700eeff48" + +inherit pypi features_check systemd setuptools3_legacy + +REQUIRED_DISTRO_FEATURES = "systemd" + +RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \ + parted python3-pyparted multipath-tools \ + lsof cryptsetup libblockdev \ + libbytesize \ +" + +FILES:${PN} += " \ + ${datadir}/dbus-1/system-services \ +" + +SYSTEMD_AUTO_ENABLE = "disable" +SYSTEMD_SERVICE:${PN} = "blivet.service" diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch new file mode 100644 index 0000000000..c88912bfa0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch @@ -0,0 +1,30 @@ +From 54014061be2fed20d6c35aba9719ea70a9fea9ea Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny +Date: Wed, 1 Sep 2021 08:59:19 +0200 +Subject: [PATCH] Use setuptools instead of distutils in setup.py + +The distutils module is deprecated and will be removed in Python +3.12. + +Upstream-Status: Backport [https://github.com/kraj/blivet-gui/commit/54014061be2fed20d6c35aba9719ea70a9fea9ea] +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index aa8ef57..77849a1 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,7 +1,7 @@ + from __future__ import print_function + +-from distutils.core import setup +-from distutils.command.sdist import sdist ++from setuptools import setup ++from setuptools.command.sdist import sdist + import glob + import sys + +-- +2.35.1 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.2.1.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.2.1.bb deleted file mode 100644 index 632b313a86..0000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.2.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "GUI tool for storage configuration using blivet library" -HOMEPAGE = "https://github.com/rhinstaller/blivet-gui" -LICENSE = "GPLv2+" -SECTION = "devel/python" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -S = "${WORKDIR}/git" -B = "${S}" - -SRCREV = "adb6bd69fb3cfa709265db66ddcee04c0b5e070f" -SRC_URI = "git://github.com/storaged-project/blivet-gui.git;branch=master;protocol=https" - -inherit features_check -REQUIRED_DISTRO_FEATURES = "x11 systemd" - -inherit setuptools3 python3native - -RDEPENDS:${PN} = "python3-pygobject python3 \ - python3-blivet gtk+3 \ - python3-pid libreport \ -" - -FILES:${PN} += " \ - ${datadir}/* \ - " diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb new file mode 100644 index 0000000000..c26ae1fe98 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "GUI tool for storage configuration using blivet library" +HOMEPAGE = "https://github.com/rhinstaller/blivet-gui" +LICENSE = "GPL-2.0-or-later" +SECTION = "devel/python" + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +S = "${WORKDIR}/git" +B = "${S}" + +SRCREV = "42512ee48494cee71febf04078d9774f0146a085" +SRC_URI = "git://github.com/storaged-project/blivet-gui.git;branch=master;protocol=https \ + file://0001-Use-setuptools-instead-of-distutils-in-setup.py.patch \ + " + +inherit features_check +REQUIRED_DISTRO_FEATURES = "x11 systemd" + +inherit setuptools3_legacy python3native + +PIP_INSTALL_PACKAGE = "blivet_gui" + +RDEPENDS:${PN} = "python3-pygobject python3 \ + python3-blivet gtk+3 \ + python3-pid libreport \ +" + +FILES:${PN} += " \ + ${datadir}/* \ + " diff --git a/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson_git.bb b/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson_git.bb index 5d696b30f7..c4fcc61ec0 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson_git.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-cson/python3-cson_git.bb @@ -17,5 +17,7 @@ DEPENDS:append:class-native = " python-native " inherit setuptools3 +PIP_INSTALL_PACKAGE = "python_cson" + BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch new file mode 100644 index 0000000000..2eb6be5a18 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh/0001-setup.py-switch-from-distutils-to-setuptools.patch @@ -0,0 +1,31 @@ +From 034ac41561409ffc7836683331b6b94a641436e4 Mon Sep 17 00:00:00 2001 +From: Tim Orling +Date: Mon, 28 Feb 2022 09:41:02 -0800 +Subject: [PATCH] setup.py: switch from distutils to setuptools + +In Python 3.10 'distutils' is deprecated with removal slated for Python +3.12. Switch from 'distutils.core' to 'setuptools'. + +This also allows for a 'wheel' binary archive format to be built with +'setup.py bdist_wheel'. + +Upstream-Status: Backport [cf9eafdd165347f86bb4a2534c41fd805db52322] + +Signed-off-by: Tim Orling + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 9c12180..3ba5195 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,6 +1,6 @@ + #!/usr/bin/python3 + +-from distutils.core import setup ++from setuptools import setup + + setup(name='python-meh', version='0.50.1', + description='Python module for handling exceptions', diff --git a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb index bf0df021a4..1d9af438da 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.50.1.bb @@ -1,16 +1,17 @@ SUMMARY = "A python library for handling exceptions" DESCRIPTION = "The python-meh package is a python library for handling, saving, and reporting \ exceptions." -HOMEPAGE = "http://git.fedorahosted.org/git/?p=python-meh.git" -LICENSE = "GPLv2+" +HOMEPAGE = "https://github.com/rhinstaller/python-meh" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -inherit setuptools3 +inherit setuptools3_legacy S = "${WORKDIR}/git" -SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=rhel9-branch" +SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=rhel9-branch \ + file://0001-setup.py-switch-from-distutils-to-setuptools.patch \ + " SRCREV = "c321ce22950aff76611a3c6beffa02b5ea3adbed" -FILES:${PN} += "${datadir}/*" - +FILES:${PN} += "${datadir}/python-meh" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.34.bb b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.34.bb index 65fc88e77b..6bf9ada581 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.34.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.34.bb @@ -1,6 +1,6 @@ DESCRIPTION = "A python library for manipulating kickstart files" HOMEPAGE = "http://fedoraproject.org/wiki/pykickstart" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" FILESEXTRAPATHS:prepend := "${THISDIR}/files:" @@ -23,3 +23,5 @@ SRCREV = "bfd836cfdd8439d984595aca015811ed5c6be733" UPSTREAM_CHECK_GITTAGREGEX = "r(?P\d+(\.\d+)+(-\d+)*)" inherit setuptools3 +PIP_INSTALL_PACKAGE = "pykickstart" +PIP_INSTALL_DIST_PATH = "${S}/dist" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb index 66cd27d447..2cdf82365a 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.7.bb @@ -3,7 +3,7 @@ an interface to libparted, the GNU parted library for disk partitioning and \ filesystem manipulation." SUMMARY = "Python bindings for libparted" HOMEPAGE = "https://github.com/rhinstaller/pyparted" -LICENSE = "GPL-2.0+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "\ file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ file://src/_pedmodule.c;beginline=10;endline=22;md5=9e53304db812b80d0939e11bb69dcab2 \ diff --git a/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.3.2.bb b/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.3.2.bb index bf9304cdd1..2d23017c88 100644 --- a/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.3.2.bb +++ b/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.3.2.bb @@ -1,6 +1,6 @@ SUMMARY = "Cross-platform locking library" DESCRIPTION = "Portalocker is a library to provide an easy API to file locking" -LICENSE = "PSF" +LICENSE = "PSF-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=f9273424c73af966635d66eb53487e14" diff --git a/meta-openembedded/meta-python/recipes-extended/python3-pydot/python3-pydot_1.4.2.bb b/meta-openembedded/meta-python/recipes-extended/python3-pydot/python3-pydot_1.4.2.bb new file mode 100644 index 0000000000..fde1029c74 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python3-pydot/python3-pydot_1.4.2.bb @@ -0,0 +1,11 @@ +SUMMARY = "pydot is is an interface to Graphviz." +HOMEPAGE = "https://github.com/pydot/pydot" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3f6fa041dfcc7ff7747cfceaa34a3180" + +SRC_URI[sha256sum] = "248081a39bcb56784deb018977e428605c1c758f10897a339fce1dd728ff007d" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = "graphviz python3-pyparsing" diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.3.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.3.0.bb index 26758427a2..676c654b52 100644 --- a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.3.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.3.0.bb @@ -13,7 +13,7 @@ at http://www.dmtf.org/standards/wbem. \ It also provides a Python provider interface, and is the fastest and easiest \ way to write providers on the planet." HOMEPAGE = "http://pywbem.github.io" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" SRC_URI[sha256sum] = "5df0af28f81891a3914a12f3a30b11b1981f7b30e09c5a42c011797e7fce9b6a" diff --git a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.9.1.bb b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.9.1.bb deleted file mode 100644 index c51f860fd5..0000000000 --- a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_0.9.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "A set of tools using pywbem" -DESCRIPTION = "A set of tools using pywbem to communicate with WBEM servers" -HOMEPAGE = "https://pywbemtools.readthedocs.io/en/stable/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" - -SRC_URI[sha256sum] = "cbe2fe67620e73a81807940a75aeed8570205e2213d6f8de4db15fbc06fe8804" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-pyyaml-native \ - ${PYTHON_PN}-pywbem-native \ - ${PYTHON_PN}-six-native \ - ${PYTHON_PN}-click-native \ -" - -RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-ply \ - ${PYTHON_PN}-pyyaml \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-pywbem \ - ${PYTHON_PN}-click \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-prompt-toolkit \ - ${PYTHON_PN}-mock \ - ${PYTHON_PN}-packaging \ - ${PYTHON_PN}-nocasedict \ - ${PYTHON_PN}-yamlloader \ - ${PYTHON_PN}-click-repl \ - ${PYTHON_PN}-click-spinner \ - ${PYTHON_PN}-asciitree \ - ${PYTHON_PN}-tabulate \ - ${PYTHON_PN}-pydicti \ - ${PYTHON_PN}-nocaselist \ - ${PYTHON_PN}-custom-inherit \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.0.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.0.0.bb new file mode 100644 index 0000000000..3a9f0ad6fd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.0.0.bb @@ -0,0 +1,39 @@ +SUMMARY = "A set of tools using pywbem" +DESCRIPTION = "A set of tools using pywbem to communicate with WBEM servers" +HOMEPAGE = "https://pywbemtools.readthedocs.io/en/stable/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e23fadd6ceef8c618fc1c65191d846fa" + +SRC_URI[sha256sum] = "0af7e067e0c0ba32cc19c2c2dc67875c591b806c4b49480ebe46e37bfb399684" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-pyyaml-native \ + ${PYTHON_PN}-pywbem-native \ + ${PYTHON_PN}-six-native \ + ${PYTHON_PN}-click-native \ +" + +RDEPENDS:${PN}:class-target += "\ + ${PYTHON_PN}-ply \ + ${PYTHON_PN}-pyyaml \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-pywbem \ + ${PYTHON_PN}-click \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-prompt-toolkit \ + ${PYTHON_PN}-mock \ + ${PYTHON_PN}-packaging \ + ${PYTHON_PN}-nocasedict \ + ${PYTHON_PN}-yamlloader \ + ${PYTHON_PN}-click-repl \ + ${PYTHON_PN}-click-spinner \ + ${PYTHON_PN}-asciitree \ + ${PYTHON_PN}-tabulate \ + ${PYTHON_PN}-pydicti \ + ${PYTHON_PN}-nocaselist \ + ${PYTHON_PN}-custom-inherit \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-webserver/conf/layer.conf b/meta-openembedded/meta-webserver/conf/layer.conf index 312c39b3b3..5ae5e796ae 100644 --- a/meta-openembedded/meta-webserver/conf/layer.conf +++ b/meta-openembedded/meta-webserver/conf/layer.conf @@ -9,7 +9,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "webserver" BBFILE_PATTERN_webserver := "^${LAYERDIR}/" -BBFILE_PRIORITY_webserver = "6" +BBFILE_PRIORITY_webserver = "5" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0001-configure-use-pkg-config-for-PCRE-detection.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0001-configure-use-pkg-config-for-PCRE-detection.patch index 6c0286457c..50775be533 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0001-configure-use-pkg-config-for-PCRE-detection.patch +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0001-configure-use-pkg-config-for-PCRE-detection.patch @@ -1,44 +1,43 @@ -From d2cedfa3394365689a3f7c8cfe8e0dd56b29bed9 Mon Sep 17 00:00:00 2001 +From ba9015386cbc044e111d7c266f13e2be045e4bf1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 17 Jun 2014 09:10:57 +0200 Subject: [PATCH] configure: use pkg-config for PCRE detection -Upstream-Status: Pending +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Koen Kooi --- - configure.in | 27 +++++---------------------- - 1 file changed, 5 insertions(+), 22 deletions(-) + configure.in | 26 +++++--------------------- + 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/configure.in b/configure.in -index 9feaceb..dc6ea15 100644 +index 38c1d0a..c799aec 100644 --- a/configure.in +++ b/configure.in -@@ -215,28 +215,11 @@ fi - AC_ARG_WITH(pcre, - APACHE_HELP_STRING(--with-pcre=PATH,Use external PCRE library)) +@@ -221,27 +221,11 @@ else if which $with_pcre 2>/dev/null; then :; else + fi + fi --AC_PATH_PROG(PCRE_CONFIG, pcre-config, false) --if test -d "$with_pcre" && test -x "$with_pcre/bin/pcre-config"; then -- PCRE_CONFIG=$with_pcre/bin/pcre-config --elif test -x "$with_pcre"; then -- PCRE_CONFIG=$with_pcre --fi +-AC_CHECK_TARGET_TOOLS(PCRE_CONFIG, [pcre2-config pcre-config], +- [`which $with_pcre 2>/dev/null`], $with_pcre) - --if test "$PCRE_CONFIG" != "false"; then +-if test "x$PCRE_CONFIG" != "x"; then - if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else -- AC_MSG_ERROR([Did not find pcre-config script at $PCRE_CONFIG]) +- AC_MSG_ERROR([Did not find working script at $PCRE_CONFIG]) - fi - case `$PCRE_CONFIG --version` in +- [1[0-9].*]) +- AC_DEFINE(HAVE_PCRE2, 1, [Detected PCRE2]) +- ;; - [[1-5].*]) - AC_MSG_ERROR([Need at least pcre version 6.0]) - ;; - esac - AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG]) - APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`]) -- APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs`]) +- APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs8 2>/dev/null || $PCRE_CONFIG --libs`]) -else -- AC_MSG_ERROR([pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/]) +- AC_MSG_ERROR([pcre(2)-config for libpcre not found. PCRE is required and available from http://pcre.org/]) -fi +PKG_CHECK_MODULES([PCRE], [libpcre], [ + AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) @@ -49,5 +48,5 @@ index 9feaceb..dc6ea15 100644 AC_MSG_NOTICE([]) -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0001-support-apxs.in-force-destdir-to-be-empty-string.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0001-support-apxs.in-force-destdir-to-be-empty-string.patch deleted file mode 100644 index bdedd146c2..0000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0001-support-apxs.in-force-destdir-to-be-empty-string.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 705c0a7e9d9c1e64ee09fc0b54f6b5a4e27de1ca Mon Sep 17 00:00:00 2001 -From: Trevor Gamblin -Date: Fri, 17 Apr 2020 06:31:35 -0700 -Subject: [PATCH] support/apxs.in: force destdir to be empty string - -If destdir is assigned to anything other than the empty string, the -search path for apache2 config files is appended to itself, and -related packages like apache-websocket will be unable to locate them: - -| cannot open -/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot//usr/share/apache2/build/config_vars.mk: -No such file or directory at -/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot/usr/bin/crossscripts/apxs -line 213. - -Ensure that it is always the empty string so that apache-websocket -is able to find the required config files. - -Upstream-Status: Inappropriate (embedded-specific) - -Signed-off-by: Trevor Gamblin ---- - support/apxs.in | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/support/apxs.in b/support/apxs.in -index 65e1288527..9d96e33728 100644 ---- a/support/apxs.in -+++ b/support/apxs.in -@@ -28,10 +28,12 @@ package apxs; - # is the empty string. - - my $destdir = ""; --my $ddi = rindex($0, "@exp_bindir@"); --if ($ddi >= 0) { -- $destdir = substr($0, 0, $ddi); --} -+# Comment out assignment of destdir so that it doesn't affect bitbake -+# cross-compilation setup -+#my $ddi = rindex($0, "@exp_bindir@"); -+#if ($ddi >= 0) { -+# $destdir = substr($0, 0, $ddi); -+#} - - my %config_vars = (); - --- -2.17.1 - diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch index 85fe6ae4bd..bbe8b325b5 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch @@ -1,8 +1,8 @@ -From 7df207ad4d0dcda2ad36e5642296e0dec7e13647 Mon Sep 17 00:00:00 2001 +From 5074ab3425e5f1e01fd9cfa2d9b7300ea1b3f38f Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 17 Jul 2012 11:27:39 +0100 -Subject: [PATCH] apache2: bump up the core size limit if CoreDumpDirectory - is configured +Subject: [PATCH] apache2: bump up the core size limit if CoreDumpDirectory is + configured Bump up the core size limit if CoreDumpDirectory is configured. @@ -11,16 +11,15 @@ Upstream-Status: Pending Note: upstreaming was discussed but there are competing desires; there are portability oddities here too. - --- server/core.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/server/core.c b/server/core.c -index eacb54f..7aa841f 100644 +index 090e397..3020090 100644 --- a/server/core.c +++ b/server/core.c -@@ -4965,6 +4965,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte +@@ -5107,6 +5107,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte } apr_pool_cleanup_register(pconf, NULL, ap_mpm_end_gen_helper, apr_pool_cleanup_null); @@ -47,5 +46,5 @@ index eacb54f..7aa841f 100644 } -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0003-apache2-do-not-export-apr-apr-util-symbols-when-usin.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0003-apache2-do-not-export-apr-apr-util-symbols-when-usin.patch index 081a02baa3..adb728ba31 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0003-apache2-do-not-export-apr-apr-util-symbols-when-usin.patch +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0003-apache2-do-not-export-apr-apr-util-symbols-when-usin.patch @@ -1,8 +1,8 @@ -From ddd560024a6d526187fd126f306b59533ca3f7e2 Mon Sep 17 00:00:00 2001 +From 9c03ed909b8da0e1a288f53fda535a3f15bcf791 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 17 Jul 2012 11:27:39 +0100 -Subject: [PATCH] apache2: do not export apr/apr-util symbols when using - shared libapr +Subject: [PATCH] apache2: do not export apr/apr-util symbols when using shared + libapr There is no need to "suck in" the apr/apr-util symbols when using a shared libapr{,util}, it just bloats the symbol table; so don't. @@ -10,13 +10,12 @@ a shared libapr{,util}, it just bloats the symbol table; so don't. Upstream-Status: Pending Note: EXPORT_DIRS change is conditional on using shared apr - --- server/Makefile.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/server/Makefile.in b/server/Makefile.in -index 1fa3344..f635d76 100644 +index 8111877..8c0c396 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -60,9 +60,6 @@ export_files: @@ -30,5 +29,5 @@ index 1fa3344..f635d76 100644 exports.c: export_files -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch index 78a04d9af4..5d82919685 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch @@ -1,4 +1,4 @@ -From dfa834ebd449df299f54e98f0fb3a7bb4008fb03 Mon Sep 17 00:00:00 2001 +From 37699e9be04d83c5923644e298f400e077f76e85 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 17 Jul 2012 11:27:39 +0100 Subject: [PATCH] Log the SELinux context at startup. @@ -8,17 +8,16 @@ Log the SELinux context at startup. Upstream-Status: Inappropriate [other] Note: unlikely to be any interest in this upstream - --- configure.in | 5 +++++ server/core.c | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/configure.in b/configure.in -index dc6ea15..caa6f54 100644 +index c799aec..76811e7 100644 --- a/configure.in +++ b/configure.in -@@ -466,6 +466,11 @@ getloadavg +@@ -491,6 +491,11 @@ getloadavg dnl confirm that a void pointer is large enough to store a long integer APACHE_CHECK_VOID_PTR_LEN @@ -31,10 +30,10 @@ index dc6ea15..caa6f54 100644 [AC_TRY_RUN(#define _GNU_SOURCE #include diff --git a/server/core.c b/server/core.c -index 7aa841f..79f34db 100644 +index 3020090..8fef5fd 100644 --- a/server/core.c +++ b/server/core.c -@@ -59,6 +59,10 @@ +@@ -65,6 +65,10 @@ #include #endif @@ -45,7 +44,7 @@ index 7aa841f..79f34db 100644 /* LimitRequestBody handling */ #define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1) #define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 0) -@@ -4984,6 +4988,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte +@@ -5126,6 +5130,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte } #endif @@ -75,5 +74,5 @@ index 7aa841f..79f34db 100644 } -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0005-replace-lynx-to-curl-in-apachectl-script.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0005-replace-lynx-to-curl-in-apachectl-script.patch index 47320a9ee5..7b4a1b932b 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0005-replace-lynx-to-curl-in-apachectl-script.patch +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0005-replace-lynx-to-curl-in-apachectl-script.patch @@ -1,4 +1,4 @@ -From 7db1b650bb4b01a5194a34cd7573f915656a595b Mon Sep 17 00:00:00 2001 +From e59aab44a28c654e518080693d573ca472ca5a08 Mon Sep 17 00:00:00 2001 From: Yulong Pei Date: Thu, 1 Sep 2011 01:03:14 +0800 Subject: [PATCH] replace lynx to curl in apachectl script @@ -48,5 +48,5 @@ index 3281c2e..6ab4ba5 100644 *) $HTTPD "$@" -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0006-apache2-fix-the-race-issue-of-parallel-installation.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0006-apache2-fix-the-race-issue-of-parallel-installation.patch index 227d04064b..dbaf01d2c5 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0006-apache2-fix-the-race-issue-of-parallel-installation.patch +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0006-apache2-fix-the-race-issue-of-parallel-installation.patch @@ -1,4 +1,4 @@ -From 4f4d7d6b88b6e440263ebeb22dfb40c52bb30fd8 Mon Sep 17 00:00:00 2001 +From fb09f1fe4525058b16b3d4edb2e3ae693154026e Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Fri, 25 Jan 2013 18:10:50 +0800 Subject: [PATCH] apache2: fix the race issue of parallel installation @@ -31,5 +31,5 @@ index e2d5bb6..dde5ae0 100755 pathcomp="$pathcomp/" done -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0007-apache2-allow-to-disable-selinux-support.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0007-apache2-allow-to-disable-selinux-support.patch index fed6b5010b..3ff6894409 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0007-apache2-allow-to-disable-selinux-support.patch +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0007-apache2-allow-to-disable-selinux-support.patch @@ -1,4 +1,4 @@ -From 964ef2c1af74984602f46e7db938d3b95b148385 Mon Sep 17 00:00:00 2001 +From 0686564f64130f230870db8b4846973e3edbd646 Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Mon, 1 Dec 2014 02:08:27 -0500 Subject: [PATCH] apache2: allow to disable selinux support @@ -11,10 +11,10 @@ Signed-off-by: Wenzong Fan 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in -index caa6f54..eab2090 100644 +index 76811e7..4df3ff3 100644 --- a/configure.in +++ b/configure.in -@@ -466,10 +466,16 @@ getloadavg +@@ -491,10 +491,16 @@ getloadavg dnl confirm that a void pointer is large enough to store a long integer APACHE_CHECK_VOID_PTR_LEN @@ -36,5 +36,5 @@ index caa6f54..eab2090 100644 AC_CACHE_CHECK([for gettid()], ac_cv_gettid, [AC_TRY_RUN(#define _GNU_SOURCE -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch new file mode 100644 index 0000000000..dc5b5c88f2 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch @@ -0,0 +1,36 @@ +From 443d15b91d4e4979d92405610303797663f31102 Mon Sep 17 00:00:00 2001 +From: echo +Date: Tue, 28 Apr 2009 03:11:06 +0000 +Subject: [PATCH] Fix perl install directory to /usr/bin + +Upstream-Status: Inappropriate [configuration] + +Add back this patch. Without this patch, apxs's shebang will use +perl under hosttools, which can be too long for shebang, and cause +error: +bad interpreter: No such file or directory + +Signed-off-by: Changqing Li +--- + configure.in | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index 4df3ff3..4eeb609 100644 +--- a/configure.in ++++ b/configure.in +@@ -903,10 +903,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", + AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", + [Location of the MIME types config file, relative to the Apache root directory]) + +-perlbin=`$ac_aux_dir/PrintPath perl` +-if test "x$perlbin" = "x"; then +- perlbin="/replace/with/path/to/perl/interpreter" +-fi ++perlbin='/usr/bin/perl' + AC_SUBST(perlbin) + + dnl If we are running on BSD/OS, we need to use the BSD .include syntax. +-- +2.25.1 + diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0008-apache2-do-not-use-relative-path-for-gen_test_char.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0008-apache2-do-not-use-relative-path-for-gen_test_char.patch deleted file mode 100644 index 82e9e8c35f..0000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0008-apache2-do-not-use-relative-path-for-gen_test_char.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b62c4cd2295c98b2ebe12641e5f01590bd96ae94 Mon Sep 17 00:00:00 2001 -From: Paul Eggleton -Date: Tue, 17 Jul 2012 11:27:39 +0100 -Subject: [PATCH] apache2: do not use relative path for gen_test_char - -Upstream-Status: Inappropriate [embedded specific] - ---- - server/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/server/Makefile.in b/server/Makefile.in -index f635d76..0d48924 100644 ---- a/server/Makefile.in -+++ b/server/Makefile.in -@@ -29,7 +29,7 @@ gen_test_char: $(gen_test_char_OBJECTS) - $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS) - - test_char.h: gen_test_char -- ./gen_test_char > test_char.h -+ gen_test_char > test_char.h - - util.lo: test_char.h - --- -2.7.4 - diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0009-support-apxs.in-force-destdir-to-be-empty-string.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0009-support-apxs.in-force-destdir-to-be-empty-string.patch new file mode 100644 index 0000000000..d1f9bb0f43 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0009-support-apxs.in-force-destdir-to-be-empty-string.patch @@ -0,0 +1,49 @@ +From 43a4ad04e0d8771267a73f98b5918bcd10b167ec Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin +Date: Fri, 17 Apr 2020 06:31:35 -0700 +Subject: [PATCH] support/apxs.in: force destdir to be empty string + +If destdir is assigned to anything other than the empty string, the +search path for apache2 config files is appended to itself, and +related packages like apache-websocket will be unable to locate them: + +| cannot open +/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot//usr/share/apache2/build/config_vars.mk: +No such file or directory at +/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot/usr/bin/crossscripts/apxs +line 213. + +Ensure that it is always the empty string so that apache-websocket +is able to find the required config files. + +Upstream-Status: Inappropriate (embedded-specific) + +Signed-off-by: Trevor Gamblin +--- + support/apxs.in | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/support/apxs.in b/support/apxs.in +index b2705fa..781f2ab 100644 +--- a/support/apxs.in ++++ b/support/apxs.in +@@ -28,10 +28,12 @@ package apxs; + # is the empty string. + + my $destdir = ""; +-my $ddi = rindex($0, "@exp_bindir@"); +-if ($ddi >= 0) { +- $destdir = substr($0, 0, $ddi); +-} ++# Comment out assignment of destdir so that it doesn't affect bitbake ++# cross-compilation setup ++#my $ddi = rindex($0, "@exp_bindir@"); ++#if ($ddi >= 0) { ++# $destdir = substr($0, 0, $ddi); ++#} + + my %config_vars = (); + +-- +2.25.1 + diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0010-apache2-do-not-use-relative-path-for-gen_test_char.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0010-apache2-do-not-use-relative-path-for-gen_test_char.patch new file mode 100644 index 0000000000..ced8469f3a --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0010-apache2-do-not-use-relative-path-for-gen_test_char.patch @@ -0,0 +1,26 @@ +From d9993cbc33565c0acd29b0127d651dafa2a16975 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Tue, 17 Jul 2012 11:27:39 +0100 +Subject: [PATCH] apache2: do not use relative path for gen_test_char + +Upstream-Status: Inappropriate [embedded specific] +--- + server/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/server/Makefile.in b/server/Makefile.in +index 8c0c396..3544f55 100644 +--- a/server/Makefile.in ++++ b/server/Makefile.in +@@ -29,7 +29,7 @@ gen_test_char: $(gen_test_char_OBJECTS) + $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS) + + test_char.h: gen_test_char +- ./gen_test_char > test_char.h ++ gen_test_char > test_char.h + + util.lo: test_char.h + +-- +2.25.1 + diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch deleted file mode 100644 index 61669e3641..0000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5412077c398dec74321388fe6e593a44c4c80de6 Mon Sep 17 00:00:00 2001 -From: echo -Date: Tue, 28 Apr 2009 03:11:06 +0000 -Subject: [PATCH] Fix perl install directory to /usr/bin - -Upstream-Status: Inappropriate [configuration] - -Add back this patch. Without this patch, apxs's shebang will use -perl under hosttools, which can be too long for shebang, and cause -error: -bad interpreter: No such file or directory - -Signed-off-by: Changqing Li - ---- - configure.in | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/configure.in b/configure.in -index d828512..be7bd25 100644 ---- a/configure.in -+++ b/configure.in -@@ -855,10 +855,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", - AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", - [Location of the MIME types config file, relative to the Apache root directory]) - --perlbin=`$ac_aux_dir/PrintPath perl` --if test "x$perlbin" = "x"; then -- perlbin="/replace/with/path/to/perl/interpreter" --fi -+perlbin='/usr/bin/perl' - AC_SUBST(perlbin) - - dnl If we are running on BSD/OS, we need to use the BSD .include syntax. diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.52.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.52.bb deleted file mode 100644 index 39407b8a1d..0000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.52.bb +++ /dev/null @@ -1,224 +0,0 @@ -DESCRIPTION = "The Apache HTTP Server is a powerful, efficient, and \ -extensible web server." -SUMMARY = "Apache HTTP Server" -HOMEPAGE = "http://httpd.apache.org/" -SECTION = "net" -LICENSE = "Apache-2.0" - -SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ - file://0001-configure-use-pkg-config-for-PCRE-detection.patch \ - file://0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch \ - file://0003-apache2-do-not-export-apr-apr-util-symbols-when-usin.patch \ - file://0004-apache2-log-the-SELinux-context-at-startup.patch \ - file://0005-replace-lynx-to-curl-in-apachectl-script.patch \ - file://0006-apache2-fix-the-race-issue-of-parallel-installation.patch \ - file://0007-apache2-allow-to-disable-selinux-support.patch \ - file://apache-configure_perlbin.patch \ - file://0001-support-apxs.in-force-destdir-to-be-empty-string.patch \ - " - -SRC_URI:append:class-target = " \ - file://0008-apache2-do-not-use-relative-path-for-gen_test_char.patch \ - file://init \ - file://apache2-volatile.conf \ - file://apache2.service \ - file://volatiles.04_apache2 \ - " - -LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" -SRC_URI[sha256sum] = "0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9" - -S = "${WORKDIR}/httpd-${PV}" - -inherit autotools update-rc.d pkgconfig systemd update-alternatives - -DEPENDS = "openssl expat pcre apr apr-util apache2-native " - -CVE_PRODUCT = "http_server" - -SSTATE_SCAN_FILES += "apxs config_vars.mk config.nice" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" -PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" -PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap" -PACKAGECONFIG[zlib] = "--enable-deflate,,zlib,zlib" - -CFLAGS:append = " -DPATH_MAX=4096" - -EXTRA_OECONF:class-target = "\ - --enable-layout=Debian \ - --prefix=${base_prefix} \ - --exec_prefix=${exec_prefix} \ - --includedir=${includedir}/${BPN} \ - --sysconfdir=${sysconfdir}/${BPN} \ - --datadir=${datadir}/${BPN} \ - --libdir=${libdir} \ - --libexecdir=${libexecdir}/${BPN}/modules \ - --localstatedir=${localstatedir} \ - --enable-ssl \ - --with-dbm=sdbm \ - --with-gdbm=no \ - --with-ndbm=no \ - --with-berkeley-db=no \ - --enable-info \ - --enable-rewrite \ - --enable-mpms-shared \ - ap_cv_void_ptr_lt_long=no \ - ac_cv_have_threadsafe_pollset=no \ - " - -EXTRA_OECONF:class-native = "\ - --prefix=${prefix} \ - --includedir=${includedir}/${BPN} \ - --sysconfdir=${sysconfdir}/${BPN} \ - --datadir=${datadir}/${BPN} \ - --libdir=${libdir} \ - --libexecdir=${libdir}/${BPN}/modules \ - --localstatedir=${localstatedir} \ - " - -do_configure:prepend() { - sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout -} - -do_install:append:class-target() { - install -d ${D}/${sysconfdir}/init.d - - cat ${WORKDIR}/init | \ - sed -e 's,/usr/sbin/,${sbindir}/,g' \ - -e 's,/usr/bin/,${bindir}/,g' \ - -e 's,/usr/lib/,${libdir}/,g' \ - -e 's,/etc/,${sysconfdir}/,g' \ - -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${BPN} - - chmod 755 ${D}/${sysconfdir}/init.d/${BPN} - - # Remove the goofy original files... - rm -rf ${D}/${sysconfdir}/${BPN}/original - - install -d ${D}${sysconfdir}/${BPN}/conf.d - install -d ${D}${sysconfdir}/${BPN}/modules.d - - # Ensure configuration file pulls in conf.d and modules.d - printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf - printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.load" >> ${D}/${sysconfdir}/${BPN}/httpd.conf - printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf - - # Match with that is in init script - printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf - - # Set 'ServerName' to fix error messages when restart apache service - sed -i 's/^#ServerName www.example.com/ServerName localhost/' ${D}/${sysconfdir}/${BPN}/httpd.conf - - sed -i 's/^ServerRoot/#ServerRoot/' ${D}/${sysconfdir}/${BPN}/httpd.conf - - sed -i -e 's,${STAGING_DIR_TARGET},,g' \ - -e 's,${DEBUG_PREFIX_MAP},,g' \ - -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \ - -e 's,${HOSTTOOLS_DIR}/,,g' \ - -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk - - sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's,${DEBUG_PREFIX_MAP},,g' \ - -e 's,${RECIPE_SYSROOT},,g' \ - -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ - -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/apache2.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apache2.service - sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/apache2.service - elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 - fi - - rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* - chown -R root:root ${D} -} - -do_install:append:class-native() { - install -d ${D}${bindir} ${D}${libdir} - install -m 755 server/gen_test_char ${D}${bindir} -} - -SYSROOT_PREPROCESS_FUNCS:append:class-target = " apache_sysroot_preprocess" - -apache_sysroot_preprocess() { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} - install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts} - install -d ${SYSROOT_DESTDIR}${sbindir} - install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir} - sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs - - sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^CFLAGS = -I[^ ]*!CFLAGS = -I${STAGING_INCDIR}/openssl!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^EXTRA_LDFLAGS = .*!EXTRA_LDFLAGS = -L${STAGING_LIBDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^EXTRA_INCLUDES = .*!EXTRA_INCLUDES = -I$(includedir) -I. -I${STAGING_INCDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!--sysroot=[^ ]*!--sysroot=${STAGING_DIR_HOST}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -} - -# Implications - used by update-rc.d scripts -INITSCRIPT_NAME = "apache2" -INITSCRIPT_PARAMS = "defaults 91 20" - -SYSTEMD_SERVICE:${PN} = "apache2.service" -SYSTEMD_AUTO_ENABLE:${PN} = "enable" - -ALTERNATIVE:${PN}-doc = "htpasswd.1" -ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" - -PACKAGES = "${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" - -CONFFILES:${PN} = "${sysconfdir}/${BPN}/httpd.conf \ - ${sysconfdir}/${BPN}/magic \ - ${sysconfdir}/${BPN}/mime.types \ - ${sysconfdir}/${BPN}/extra/*" - -# We override here rather than append so that .so links are -# included in the runtime package rather than here (-dev) -# and to get build, icons, error into the -dev package -FILES:${PN}-dev = "${datadir}/${BPN}/build \ - ${datadir}/${BPN}/icons \ - ${datadir}/${BPN}/error \ - ${includedir}/${BPN} \ - ${bindir}/apxs \ - " - -# Add the manual to -doc -FILES:${PN}-doc += " ${datadir}/${BPN}/manual" - -FILES:${PN}-scripts += "${bindir}/dbmmanage" - -# Override this too - here is the default, less datadir -FILES:${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir} \ - ${sysconfdir} ${libdir}/${BPN}" - -# We want htdocs and cgi-bin to go with the binary -FILES:${PN} += "${datadir}/${BPN}/ ${libdir}/cgi-bin" - -FILES:${PN}-dbg += "${libdir}/${BPN}/modules/.debug" - -RDEPENDS:${PN} += "openssl libgcc" -RDEPENDS:${PN}-scripts += "perl ${PN}" -RDEPENDS:${PN}-dev = "perl" - -BBCLASSEXTEND = "native" - -pkg_postinst:${PN}() { - if [ -z "$D" ]; then - if type systemd-tmpfiles >/dev/null; then - systemd-tmpfiles --create - elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then - ${sysconfdir}/init.d/populate-volatile.sh update - fi - fi -} diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.53.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.53.bb new file mode 100644 index 0000000000..8413f53790 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.53.bb @@ -0,0 +1,224 @@ +DESCRIPTION = "The Apache HTTP Server is a powerful, efficient, and \ +extensible web server." +SUMMARY = "Apache HTTP Server" +HOMEPAGE = "http://httpd.apache.org/" +SECTION = "net" +LICENSE = "Apache-2.0" + +SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ + file://0001-configure-use-pkg-config-for-PCRE-detection.patch \ + file://0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch \ + file://0003-apache2-do-not-export-apr-apr-util-symbols-when-usin.patch \ + file://0004-apache2-log-the-SELinux-context-at-startup.patch \ + file://0005-replace-lynx-to-curl-in-apachectl-script.patch \ + file://0006-apache2-fix-the-race-issue-of-parallel-installation.patch \ + file://0007-apache2-allow-to-disable-selinux-support.patch \ + file://0008-Fix-perl-install-directory-to-usr-bin.patch \ + file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \ + " + +SRC_URI:append:class-target = " \ + file://0010-apache2-do-not-use-relative-path-for-gen_test_char.patch \ + file://init \ + file://apache2-volatile.conf \ + file://apache2.service \ + file://volatiles.04_apache2 \ + " + +LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" +SRC_URI[sha256sum] = "d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63" + +S = "${WORKDIR}/httpd-${PV}" + +inherit autotools update-rc.d pkgconfig systemd update-alternatives + +DEPENDS = "openssl expat pcre apr apr-util apache2-native " + +CVE_PRODUCT = "http_server" + +SSTATE_SCAN_FILES += "apxs config_vars.mk config.nice" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" +PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap" +PACKAGECONFIG[zlib] = "--enable-deflate,,zlib,zlib" + +CFLAGS:append = " -DPATH_MAX=4096" + +EXTRA_OECONF:class-target = "\ + --enable-layout=Debian \ + --prefix=${base_prefix} \ + --exec_prefix=${exec_prefix} \ + --includedir=${includedir}/${BPN} \ + --sysconfdir=${sysconfdir}/${BPN} \ + --datadir=${datadir}/${BPN} \ + --libdir=${libdir} \ + --libexecdir=${libexecdir}/${BPN}/modules \ + --localstatedir=${localstatedir} \ + --enable-ssl \ + --with-dbm=sdbm \ + --with-gdbm=no \ + --with-ndbm=no \ + --with-berkeley-db=no \ + --enable-info \ + --enable-rewrite \ + --enable-mpms-shared \ + ap_cv_void_ptr_lt_long=no \ + ac_cv_have_threadsafe_pollset=no \ + " + +EXTRA_OECONF:class-native = "\ + --prefix=${prefix} \ + --includedir=${includedir}/${BPN} \ + --sysconfdir=${sysconfdir}/${BPN} \ + --datadir=${datadir}/${BPN} \ + --libdir=${libdir} \ + --libexecdir=${libdir}/${BPN}/modules \ + --localstatedir=${localstatedir} \ + " + +do_configure:prepend() { + sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout +} + +do_install:append:class-target() { + install -d ${D}/${sysconfdir}/init.d + + cat ${WORKDIR}/init | \ + sed -e 's,/usr/sbin/,${sbindir}/,g' \ + -e 's,/usr/bin/,${bindir}/,g' \ + -e 's,/usr/lib/,${libdir}/,g' \ + -e 's,/etc/,${sysconfdir}/,g' \ + -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${BPN} + + chmod 755 ${D}/${sysconfdir}/init.d/${BPN} + + # Remove the goofy original files... + rm -rf ${D}/${sysconfdir}/${BPN}/original + + install -d ${D}${sysconfdir}/${BPN}/conf.d + install -d ${D}${sysconfdir}/${BPN}/modules.d + + # Ensure configuration file pulls in conf.d and modules.d + printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf + printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.load" >> ${D}/${sysconfdir}/${BPN}/httpd.conf + printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf + + # Match with that is in init script + printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf + + # Set 'ServerName' to fix error messages when restart apache service + sed -i 's/^#ServerName www.example.com/ServerName localhost/' ${D}/${sysconfdir}/${BPN}/httpd.conf + + sed -i 's/^ServerRoot/#ServerRoot/' ${D}/${sysconfdir}/${BPN}/httpd.conf + + sed -i -e 's,${STAGING_DIR_TARGET},,g' \ + -e 's,${DEBUG_PREFIX_MAP},,g' \ + -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \ + -e 's,${HOSTTOOLS_DIR}/,,g' \ + -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ + -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk + + sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's,${DEBUG_PREFIX_MAP},,g' \ + -e 's,${RECIPE_SYSROOT},,g' \ + -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ + -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ + -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d/ + install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/apache2.service ${D}${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apache2.service + sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/apache2.service + elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 + fi + + rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* + chown -R root:root ${D} +} + +do_install:append:class-native() { + install -d ${D}${bindir} ${D}${libdir} + install -m 755 server/gen_test_char ${D}${bindir} +} + +SYSROOT_PREPROCESS_FUNCS:append:class-target = " apache_sysroot_preprocess" + +apache_sysroot_preprocess() { + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} + install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts} + install -d ${SYSROOT_DESTDIR}${sbindir} + install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir} + sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs + + sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i 's!^CFLAGS = -I[^ ]*!CFLAGS = -I${STAGING_INCDIR}/openssl!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i 's!^EXTRA_LDFLAGS = .*!EXTRA_LDFLAGS = -L${STAGING_LIBDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i 's!^EXTRA_INCLUDES = .*!EXTRA_INCLUDES = -I$(includedir) -I. -I${STAGING_INCDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i 's!--sysroot=[^ ]*!--sysroot=${STAGING_DIR_HOST}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk +} + +# Implications - used by update-rc.d scripts +INITSCRIPT_NAME = "apache2" +INITSCRIPT_PARAMS = "defaults 91 20" + +SYSTEMD_SERVICE:${PN} = "apache2.service" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" + +ALTERNATIVE:${PN}-doc = "htpasswd.1" +ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" + +PACKAGES = "${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" + +CONFFILES:${PN} = "${sysconfdir}/${BPN}/httpd.conf \ + ${sysconfdir}/${BPN}/magic \ + ${sysconfdir}/${BPN}/mime.types \ + ${sysconfdir}/${BPN}/extra/*" + +# We override here rather than append so that .so links are +# included in the runtime package rather than here (-dev) +# and to get build, icons, error into the -dev package +FILES:${PN}-dev = "${datadir}/${BPN}/build \ + ${datadir}/${BPN}/icons \ + ${datadir}/${BPN}/error \ + ${includedir}/${BPN} \ + ${bindir}/apxs \ + " + +# Add the manual to -doc +FILES:${PN}-doc += " ${datadir}/${BPN}/manual" + +FILES:${PN}-scripts += "${bindir}/dbmmanage" + +# Override this too - here is the default, less datadir +FILES:${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir} \ + ${sysconfdir} ${libdir}/${BPN}" + +# We want htdocs and cgi-bin to go with the binary +FILES:${PN} += "${datadir}/${BPN}/ ${libdir}/cgi-bin" + +FILES:${PN}-dbg += "${libdir}/${BPN}/modules/.debug" + +RDEPENDS:${PN} += "openssl libgcc" +RDEPENDS:${PN}-scripts += "perl ${PN}" +RDEPENDS:${PN}-dev = "perl" + +BBCLASSEXTEND = "native" + +pkg_postinst:${PN}() { + if [ -z "$D" ]; then + if type systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create + elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi + fi +} diff --git a/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb index 16733c6621..7100ef4341 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Cherokee Web Server fast and secure" SUMMARY:cget = "Small downloader based in the Cherokee client library" HOMEPAGE = "http://www.cherokee-project.com/" SECTION = "network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "unzip-native libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb index f13f144fcc..2e848eaf56 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb @@ -1,6 +1,6 @@ SUMMARY = "Lightweight secure web server" HOMEPAGE = "http://www.hiawatha-webserver.org" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "libxml2 libxslt virtual/crypt" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc index b99e29ef99..dfced33300 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -39,6 +39,7 @@ DISABLE_STATIC = "" PACKAGECONFIG ??= "ssl" +PACKAGECONFIG[gunzip] = "--with-http_gunzip_module,," PACKAGECONFIG[http2] = "--with-http_v2_module,," PACKAGECONFIG[ssl] = "--with-http_ssl_module,,openssl" PACKAGECONFIG[http-auth-request] = "--with-http_auth_request_module,," diff --git a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.3.bb b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.3.bb index dca476cede..7ccc05ec3e 100644 --- a/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.3.bb +++ b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.1.3.bb @@ -1,7 +1,7 @@ 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" +LICENSE = "GPL-2.0-only & LGPL-3.0-only & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://vendor/tecnickcom/tcpdf/LICENSE.TXT;md5=dd6470bbcd3436ca317f82d34abaf688 \ file://js/vendor/jquery/MIT-LICENSE.txt;md5=de877aa6d744cc160ff41c26a8e4811f \ diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb index 7c3c17cd78..c08de89316 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/cockpit/cockpit_220.bb @@ -1,7 +1,7 @@ SUMMARY = "Admin interface for Linux machines" DESCRIPTION = "Cockpit makes it easy to administer your GNU/Linux servers via a web browser" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI += " \ @@ -166,6 +166,8 @@ FILES:${PN} += " \ ${datadir}/cockpit \ ${datadir}/metainfo/cockpit.appdata.xml \ ${datadir}/pixmaps/cockpit.png \ + ${nonarch_libdir}/tmpfiles.d \ + ${nonarch_libdir}/firewalld \ " RDEPENDS:${PN} += "${PN}-bridge" diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.33.1.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.33.1.bb index 2004670f62..f575a4cbaf 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.33.1.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.33.1.bb @@ -1,8 +1,8 @@ -HOMEPAGE = "https://github.com/netdata/netdata/" SUMMARY = "Real-time performance monitoring" DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troubleshooting. \ Open-source, free, preconfigured, opinionated, and always real-time." -LICENSE = "GPLv3" +HOMEPAGE = "https://github.com/netdata/netdata/" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" DEPENDS += "libuv util-linux zlib" @@ -41,6 +41,7 @@ USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" PACKAGECONFIG ??= "https" +PACKAGECONFIG[cloud] = "--enable-cloud, --disable-cloud, json-c" PACKAGECONFIG[compression] = "--enable-compression, --disable-compression, lz4" PACKAGECONFIG[https] = "--enable-https, --disable-https, openssl" @@ -75,6 +76,6 @@ do_install:append() { chown -R netdata:netdata ${D}${datadir}/netdata/web } -FILES_${PN} += "${localstatedir}/cache/netdata/ ${localstatedir}/lib/netdata/" +FILES:${PN} += "${localstatedir}/cache/netdata/ ${localstatedir}/lib/netdata/" RDEPENDS:${PN} = "bash zlib" diff --git a/meta-openembedded/meta-xfce/conf/layer.conf b/meta-openembedded/meta-xfce/conf/layer.conf index be58708679..28dfc5b340 100644 --- a/meta-openembedded/meta-xfce/conf/layer.conf +++ b/meta-openembedded/meta-xfce/conf/layer.conf @@ -6,7 +6,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "xfce-layer" BBFILE_PATTERN_xfce-layer := "^${LAYERDIR}/" -BBFILE_PRIORITY_xfce-layer = "7" +BBFILE_PRIORITY_xfce-layer = "5" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb index bf3d7ed979..98cd251d2d 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb @@ -1,9 +1,9 @@ SUMMARY = "Catfish is a handy file searching tool for linux and unix" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" -inherit xfce-app setuptools3 gtk-icon-cache mime-xdg +inherit xfce-app python_setuptools_build_meta gtk-icon-cache mime-xdg DEPENDS += "python3-distutils-extra-native" diff --git a/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.5.2.bb b/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.5.2.bb index 517f1f4c50..6b845ea613 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.5.2.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.5.2.bb @@ -1,6 +1,6 @@ SUMMARY = "Gigolo is a frontend to easily manage connections to remote filesystems using GIO/GVfs" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "gtk+3 intltool-native xfce4-dev-tools-native" diff --git a/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb index 3d0e55d360..65aa7a53e2 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb @@ -1,7 +1,7 @@ DESCRIPTION = "An advanced menu editor" HOMEPAGE = "https://bluesabre.org/menulibre/" SECTION = "x11/graphics" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = " \ @@ -9,8 +9,7 @@ DEPENDS = " \ intltool-native \ " -inherit setuptools3 gtk-icon-cache features_check - +inherit setuptools3_legacy gtk-icon-cache features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "git://github.com/bluesabre/menulibre.git;protocol=https;branch=master" diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.8.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.8.bb index 0f847e4596..90a75bf5a3 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.8.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.8.bb @@ -1,6 +1,6 @@ SUMMARY = "A simple text editor for Xfce" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "gtk+3 gtksourceview4 xfconf xfce4-dev-tools-native" diff --git a/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb b/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb index 8277705f4c..ed7f42024e 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Xfce Calender" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" DEPENDS = "gtk+ xfce4-panel libical popt" diff --git a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.1.bb b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.1.bb index aeeb7e7659..f2156a3e2a 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.1.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.12.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Tiny image-viewer" HOMEPAGE = "https://docs.xfce.org/apps/ristretto/start" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b" DEPENDS = "exo libexif libxfce4ui libxfce4util xfconf cairo file" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index e56824e595..d8f0033b3e 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Lightweight, desktop independent GTK+ archive manager" HOMEPAGE = "http://xarchiver.sourceforge.net" SECTION = "x11" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "gtk+3 glib-2.0 xfce4-dev-tools-native intltool-native" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb index 58e628deca..3e3301f748 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb @@ -1,5 +1,5 @@ SUMMARY = "A simple PolicyKit authentication agent for XFCE" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=758b03f872a88c99fc36d50c5932091c" DEPENDS = "libxfce4ui polkit" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb index 9d68ad272b..6bcfc4ba43 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A fork of (early) gnome-control-center datetime panel for XFCE. \ It is based upon GTK3 and embedds into recent xfce4-settings." HOMEPAGE = "https://github.com/schnitzeltony/xfce4-datetime-setter" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" DEPENDS = "glib-2.0-native libxfce4ui" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb index a145295b6a..2174d2af4f 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.2.bb @@ -1,6 +1,6 @@ SUMMARY = "Easily themable notification daemon with transparency effects" HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = " \ dbus \ diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb index d5b0cf0bb3..ab1b827266 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb @@ -1,6 +1,6 @@ SUMMARY = "Backup, restore, import, and export panel layouts" SECTION = "x11/application" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit python3native gettext gtk-icon-cache features_check diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb index a770ff7f00..685c4c1f65 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Xfce screensaver is a screen saver and locker that aims to have s HOMEPAGE = "https://git.xfce.org/apps/xfce4-screensaver/about/" SECTION = "x11/application" -LICENSE = "GPLv2+ & LGPLv2+ " +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later " LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ " diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb index 2518435339..78e0848177 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.9.bb @@ -1,7 +1,7 @@ SUMMARY = "Application to take screenshots" HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.2.bb index e0da70dd0b..a3d10cd256 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.2.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.2.bb @@ -1,5 +1,5 @@ SUMMARY = "Easy to use task manager" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-app diff --git a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.10.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.10.bb index 7e7c4bbbce..e9f2e40593 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.10.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.10.bb @@ -1,7 +1,7 @@ SUMMARY = "Terminal emulator for the Xfce desktop environment" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui" +DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui gtk-doc-native" inherit xfce-app diff --git a/meta-openembedded/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb b/meta-openembedded/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb index 78dd5b8743..532980d967 100644 --- a/meta-openembedded/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb +++ b/meta-openembedded/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Rodent-icon-theme (was xfce4-icon-theme) is a svg icon theme" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" inherit allarch autotools gtk-icon-cache diff --git a/meta-openembedded/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb b/meta-openembedded/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb index 46302bf9f0..4cbdb4e083 100644 --- a/meta-openembedded/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb +++ b/meta-openembedded/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb @@ -1,5 +1,5 @@ SUMMARY = "Modified version of the xfce-dusk theme to support also gtk 3.x too" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=8f0e2cd40e05189ec81232da84bd6e1a" inherit allarch diff --git a/meta-openembedded/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb b/meta-openembedded/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb index 4c2e99a22c..272f83c01b 100644 --- a/meta-openembedded/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb +++ b/meta-openembedded/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Additional (old) themes for Xfwm4" SECTION = "x11/wm" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit xfce diff --git a/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb index e4a845ca5e..0a65bd94a2 100644 --- a/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb +++ b/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb @@ -1,5 +1,5 @@ SUMMARY = "Xfce4 Vala provides bindings for the Xfce framework" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" DEPENDS = "libxfce4util garcon xfconf libxfce4ui xfce4-panel exo vala xfce4-dev-tools-native" diff --git a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb index c94d5e893c..cdf4557cd3 100644 --- a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb +++ b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb @@ -7,7 +7,7 @@ This package contains the core DBus services and some utilities." HOMEPAGE = "http://code.google.com/p/imsettings/" SECTION = "Applications/System" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit autotools gtk-doc gobject-introspection gettext features_check diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb b/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb index f925864fbd..93e5bbf71d 100644 --- a/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb +++ b/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb @@ -1,6 +1,9 @@ SUMMARY = "All packages multimedia packages available for XFCE" -inherit packagegroup +inherit packagegroup features_check + +# parole needs x11 +REQUIRED_DISTRO_FEATURES = "pam x11" # While this item does not require it, it depends on xfmpc and xfc4-mpc-plugin # that wants mpd which does diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_4.16.0.bb index 0b38f6d603..545ab816e1 100644 --- a/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_4.16.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Parole is a modern simple media player based on the GStreamer framework" HOMEPAGE = "https://docs.xfce.org/apps/parole/start" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit xfce-app gtk-doc mime mime-xdg diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb b/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb index 4e3c1d1c36..4a7ed93ebc 100644 --- a/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb +++ b/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.2.bb @@ -1,7 +1,7 @@ SUMMARY = "Simple client plugin for Music Player Daemon" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin" SECTION = "x11/application" -LICENSE = "BSD-0-Clause" +LICENSE = "0BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=3604d987e6dfdfc672c754d08953b0e0" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.0.bb b/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.0.bb index 8384a5a78e..b8521ba95e 100644 --- a/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.0.bb +++ b/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Music Player Daemon (MPD) client written in GTK+" HOMEPAGE = "https://goodies.xfce.org/projects/applications/xfmpc" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libxfce4util libxfce4ui libmpd vala-native" diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.4.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.4.bb index 9e65cf688a..0f8489b18c 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.4.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.4.bb @@ -1,6 +1,6 @@ SUMMARY = "A battery monitor panel plugin for Xfce4, compatible with APM and ACP" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.1.bb index 6ed9e35d77..8fd2bd0d29 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.7.1.bb @@ -1,6 +1,6 @@ SUMMARY = "A calculator plugin for the Xfce panel" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-calculator-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=909430f63fddd63f120ba29e8979f65c" inherit xfce-panel-plugin gtk-icon-cache diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.2.bb index d5c626eec6..39a8f2edfe 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.2.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.6.2.bb @@ -1,7 +1,7 @@ SUMMARY = "Clipman is a clipboard manager for Xfce" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb index 67f4172228..2384682ecb 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb @@ -1,6 +1,6 @@ SUMMARY = "Plugin displaying close button for application currently active" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" inherit xfce-panel-plugin xfce-git gtk-icon-cache perlnative diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.5.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.5.bb index 8fef520271..f3d78c11df 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.5.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.5.bb @@ -1,6 +1,6 @@ SUMMARY = "Panel plugin to display frequency of all cpus" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1f6f1c0be32491a0c8d2915607a28f36" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.5.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.5.bb index ad731e0167..583eacb2bc 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.5.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.5.bb @@ -1,6 +1,6 @@ SUMMARY = "Panel plugin with graphical representation of the cpu frequency" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.1.bb index f95995b07c..c029ac1c0f 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.8.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Panel plugin displaying date and time and a calendar when left-clicked" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.1.bb index fce5df5e3e..e18621d813 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.5.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Panel plugin with graphical representation of the cpu frequency" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.1.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.1.1.bb index 9a6d4b19c8..d792bc047b 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.1.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.1.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "This plugin cyclically spawns the indicated script/program, captures its output (stdout) and displays the resulting string into the panel." HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.3.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.3.0.bb index c4172f4d6b..a5c98efc1c 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.3.0.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.3.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Multi-protocol, multi-mailbox mail watcher for the Xfce4 panel" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb index 3f35b8c248..3a6baf21f9 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.5.bb @@ -1,7 +1,7 @@ SUMMARY = "Mount/umount utility for the xfce panel" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.4.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.4.0.bb index b30543b10a..834f5cfaae 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.4.0.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.4.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Panel plugin displaying current load of the network interfaces" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=35a7203c41b86d15546dddc05995f97f" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.9.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.9.0.bb index cd7212f655..dc0fc2c60e 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.9.0.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.9.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Notes plugin for the Xfce Panel" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb index c88e8439e2..e2075a6d32 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.8.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Menu for quick access to folders, documents and removable media" DESCRIPTION = "Panel plugin displaying menu with quick access to folders, documents and removable media" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b6952d9a47fc2ad0f315510e1290455f" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb index 9292023cef..b2d61a1d22 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.3.bb @@ -1,5 +1,5 @@ SUMMARY = "Pulseaudio mixer for the xfce panel" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f5eac6bb0d6ec0dc655e417781d4015f" inherit xfce-panel-plugin features_check diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.2.bb index c00ca6fafb..68f3f64295 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.2.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.2.bb @@ -1,6 +1,6 @@ SUMMARY = "Sensors plugin for the Xfce Panel" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.2.bb index 81370e3c11..fdec598190 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.2.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.2.bb @@ -1,6 +1,6 @@ SUMMARY = "Panel plugin allowing to send requests directly to browser" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.2.bb index 185e9bca02..5b7f62471d 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.2.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.1.2.bb @@ -1,7 +1,7 @@ SUMMARY = "This plugin makes it possible to take periodical breaks" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.1.bb index f154023e2f..1231e084cd 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.1.bb @@ -1,7 +1,7 @@ SUMMARY = "XFCE panel plugin to generate alarm messages" DESCRIPTION = "This is a simple plugin that lets the user run an alarm at a specified time or at the end of a specified countdown period" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ae39271267fd63eb7619432ff24e7ff1" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.1.bb index 5902ad0bd5..21bbda331a 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_2.0.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Verve panel plugin is a comfortable command line plugin for the Xfce panel" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.11.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.11.0.bb index 069c9150e3..ede98e9926 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.11.0.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.11.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Panel plugin to display current temperature and weather condition" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb index cebe1106c0..6621099cbd 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.7.1.bb @@ -1,6 +1,6 @@ SUMMARY = "An alternate menu for the Xfce desktop environment" HOMEPAGE = "http://gottcode.org/xfce4-whiskermenu-plugin/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin cmake diff --git a/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.2.bb index ff572362d3..3d935a3d71 100644 --- a/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.2.bb +++ b/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.2.bb @@ -1,7 +1,7 @@ SUMMARY = "XKB layout switching panel plug-in for the Xfce desktop environment" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=496f09f084b0f7e6f02f769a84490c6b" inherit xfce-panel-plugin diff --git a/meta-openembedded/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.4.0.bb b/meta-openembedded/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.4.0.bb index 144e26069e..0a1098db56 100644 --- a/meta-openembedded/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.4.0.bb +++ b/meta-openembedded/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.4.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Thunar Archive Plugin allows you to create and extract archive files using file context menus in Thunar" HOMEPAGE = "http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" inherit thunar-plugin diff --git a/meta-openembedded/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.3.0.bb b/meta-openembedded/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.3.0.bb index a61e7648ed..06695f694c 100644 --- a/meta-openembedded/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.3.0.bb +++ b/meta-openembedded/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.3.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Adds ID3/OGG tag support to the Thunar bulk rename dialog" HOMEPAGE = "http://thunar.xfce.org" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit thunar-plugin diff --git a/meta-openembedded/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.1.bb b/meta-openembedded/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.1.bb index de19c44af0..6ed9cecefb 100644 --- a/meta-openembedded/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.1.bb +++ b/meta-openembedded/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.1.bb @@ -1,9 +1,10 @@ SUMMARY = "Quickly share a folder using Samba from Thunar" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit thunar-plugin features_check -REQUIRED_DISTRO_FEATURES = "pam" +# x11 is needed for thunar +REQUIRED_DISTRO_FEATURES = "pam x11" SRC_URI[md5sum] = "0884855d60cf1031b9013b6f5b125372" SRC_URI[sha256sum] = "dc1d8c7caa727e76d033d4653dc0742613f57a1711d0050900659c90a84452a0" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.3.bb b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.3.bb index f27171dc37..2b164442f8 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.3.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.3.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Application library for the Xfce desktop environment" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gtk+3 libxfce4ui virtual/libx11 liburi-perl-native cairo" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb index 65db345005..a6c56edf3b 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Xfce Menu Library" SECTION = "x11/libs" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb index 2c6c7424e6..e3d2a00eea 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Xfce4 Widget library and X Window System interaction" SECTION = "x11/libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" DEPENDS = "intltool-native perl-native gtk+3 libice libsm libxfce4util xfce4-dev-tools xfconf virtual/libx11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb index 9462b28ac5..6824ac67e3 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Basic utility library for Xfce4" SECTION = "x11/libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb index 5c669a5e95..e529bc80c9 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Automatic management of removable drives and media for thunar" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "exo libnotify libgudev" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.9.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.9.bb index 0872110f80..93c41aedfe 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.9.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_4.16.9.bb @@ -1,6 +1,6 @@ SUMMARY = "File manager for the Xfce Desktop Environment" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libxml-parser-perl-native exo gdk-pixbuf libxfce4ui libsm startup-notification libnotify xfce4-panel udev" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb index c5ab85dd08..6a583ade73 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Thumbnail service implementing the thumbnail management D-Bus specification" SECTION = "x11/libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb index 89385b0569..18d9fedfce 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Xfce4 Application Finder" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "glib-2.0 gtk+3 libxfce4util libxfce4ui garcon xfconf" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb index 7162311e56..5c41a76ed6 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Xfce4 development tools" HOMEPAGE = "http://www.xfce.org" SECTION = "x11/libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" DEPENDS = "glib-2.0" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb index 02038b0c12..b9201bc655 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb @@ -1,6 +1,6 @@ SUMMARY = "Xfce4 Panel" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxml2 libwnck3 vala-native" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.16.0.bb index a79d8015b6..34de7a7086 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.16.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Power manager for the Xfce desktop environment" HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-power-manager" SECTION = "x11" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit xfce features_check diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb index fee634ed44..e6613b8ee9 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb @@ -1,6 +1,6 @@ SUMMARY = "xfce4-session is a session manager for Xfce 4 Desktop Environment" SECTION = "x11" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" DEPENDS = "libwnck3 libsm libxfce4ui virtual/libx11" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb index aff57a5788..83b624f120 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb @@ -1,6 +1,6 @@ SUMMARY = "Xfce4 settings" SECTION = "x11/wm" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "exo garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb index 0bbef847ce..be742192b1 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Xfce configuration daemon and utilities" SECTION = "x11/wm" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "libxfce4util perl intltool-native xfce4-dev-tools-native" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb index 7136350413..b0dc8e1762 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Xfce4 Desktop Manager" SECTION = "x11/base" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libxfce4ui libwnck thunar garcon exo" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb index f4a78f1adf..a32bad47ed 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Xfce4 Window Manager" SECTION = "x11/wm" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama" -- cgit v1.2.3