From 615f2f11d3f46e3eae642475495a7ca4cfddc49e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 15 Jul 2022 14:00:58 -0500 Subject: subtree updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit poky: ee0d001b81..4161dbbbd6: Aatir Manzur (1): docs: add CONVERSION_CMD definition Ahmed Hossam (1): insane.bbclass: host-user-contaminated: Correct per package home path Alejandro Hernandez Samaniego (1): package.bbclass: Fix base directory for debugsource files when using externalsrc Alex Kiernan (1): python3-cryptography: Cleanup DEPENDS/RDEPENDS Alexander Kanavin (53): mesa: update 22.0.3 -> 22.1.2 python3-numpy: update 1.22.3 -> 1.22.4 python3-setuptools: update 62.3.2 -> 62.5.0 vulkan: upgrade 1.3.211.0 -> 1.3.216.0 lttng-modules: update 2.13.3 -> 2.13.4 go: update 1.18.2 -> 1.18.3 ell: update 0.50 -> 0.51 libdrm: update 2.4.110 -> 2.4.111 diffoscope: upgrade 215 -> 216 dos2unix: upgrade 7.4.2 -> 7.4.3 librsvg: upgrade 2.54.3 -> 2.54.4 puzzles: upgrade to latest revision sudo: upgrade 1.9.10 -> 1.9.11p2 wireless-regdb: upgrade 2022.04.08 -> 2022.06.06 x264: upgrade to latest revision python3-requests: upgrade 2.27.1 -> 2.28.0 oeqa/sdk: drop the nativesdk-python 2.x test python3-hatch-vcs: fix upstream version check at: take tarballs from debian pango: exclude 1.9x versions which are 2.x pre-releases. adwaita-icon-theme: upgrade 41.0 -> 42.0 rust: update 1.60.0 -> 1.62.0 weston: update 10.0.0 -> 10.0.1 python3-setuptools-scm: upgrade 6.4.2 -> 7.0.3 waffle: correctly request wayland-scanner executable openssl: update 3.0.4 -> 3.0.5 diffoscope: upgrade 216 -> 217 glib-2.0: upgrade 2.72.2 -> 2.72.3 glib-networking: upgrade 2.72.0 -> 2.72.1 gstreamer1.0: upgrade 1.20.2 -> 1.20.3 harfbuzz: upgrade 4.3.0 -> 4.4.1 kmod: upgrade 29 -> 30 libsoup: upgrade 3.0.6 -> 3.0.7 mesa: upgrade 22.1.2 -> 22.1.3 mpg123: upgrade 1.29.3 -> 1.30.0 nghttp2: upgrade 1.47.0 -> 1.48.0 piglit: upgrade to latest revision pulseaudio: upgrade 16.0 -> 16.1 python3-cffi: upgrade 1.15.0 -> 1.15.1 python3-cryptography: upgrade 37.0.2 -> 37.0.3 python3-cryptography-vectors: upgrade 37.0.2 -> 37.0.3 python3-hatchling: upgrade 1.3.0 -> 1.3.1 python3-hypothesis: upgrade 6.46.11 -> 6.48.2 python3-jsonschema: upgrade 4.6.0 -> 4.6.1 python3-mako: upgrade 1.2.0 -> 1.2.1 python3-pycryptodomex: upgrade 3.14.1 -> 3.15.0 python3-requests: upgrade 2.28.0 -> 2.28.1 python3-setuptools: upgrade 62.5.0 -> 62.6.0 python3-sphinx: upgrade 5.0.0 -> 5.0.2 xcb-proto: upgrade 1.15 -> 1.15.2 procps: restrict version check to 3.x ncurses: mark upstream version as unknown wayland: update 1.20.0 -> 1.21.0 Alexandre Belloni (1): oeqa/selftest/bbtests: Update message lookup for test_git_unpack_nonetwork_fail Aryaman Gupta (5): buildstats.py: enable collection of /proc/pressure data pybootchartgui: render cpu and io pressure buildstats.bbclass: correct sampling of system stats buildstats.py: close /proc/pressure/cpu file descriptor buildperf/base.py: skip reduced_proc_pressure directory Bruce Ashfield (29): perf: fix reproducibility in 5.19+ linux-yocto/5.10: update to v5.10.121 linux-yocto/5.15: update to v5.15.46 linux-yocto/5.15: update to v5.15.48 linux-yocto/5.10: update to v5.10.123 linux-yocto-dev: bump to v5.19-rc linux-yocto/5.15: drop obselete GPIO sysfs ABI lttng-modules: fix 5.19+ build kernel-devsrc: fix reproducibility and buildpaths QA warning linux-yocto/5.15: update to v5.15.52 linux-yocto/5.10: update to v5.10.128 kernel-devsrc: ppc32: fix reproducibility linux-yocto/5.15: fix qemuppc buildpaths warning linux-yocto/5.15: fix build_OID_registry buildpaths warning yocto-bsps: update to v5.10.128 and buildpaths fixes yocto-bsps: update to v5.15.52 and buildpaths fixes linux-yocto/5.10: fix build_OID_registry/conmakehash buildpaths warning linux-yocto/5.10: fix buildpaths issue with gen-mach-types linux-yocto/5.15: fix buildpaths issue with gen-mach-types yocto-bsps/5.10: fix buildpaths issue with gen-mach-types yocto-bsps/5.15: fix buildpaths issue with gen-mach-types linux-yocto/5.15: update to v5.15.54 linux-yocto/5.15: fix buildpaths issue with pnmtologo linux-yocto/5.10: update to v5.10.130 linux-yocto/5.10: fix buildpaths issue with pnmtologo yocto-bsps/5.10: fix buildpaths issue with pnmtologo yocto-bsps/5.15: fix buildpaths issue with pnmtologo yocto-bsps: update to v5.15.54 yocto-bsps: update to v5.10.130 Christoph Lauer (1): package.bbclass: Avoid stripping signed kernel modules in splitdebuginfo David Bagonyi (1): sanity.bbclass: Add ftps to accepted URI protocols for mirrors sanity Dmitry Baryshkov (1): linux-firmware: upgrade 20220509 -> 20220610 Enrico Scholz (6): npm: replace 'npm pack' call by 'tar czf' npm: return content of 'package.json' in 'npm_pack' npm: take 'version' directly from 'package.json' npm: disable 'audit' + 'fund' lib:npm_registry: initial checkin npm: use npm_registry to cache package Federico Pellegrin (1): signing-keys: fix RDEPENDS to signing-keys-dev Gennaro Iorio (1): bitbake: fetch2: gitsm: fix incorrect handling of git submodule relative urls He Zhe (1): curl: Fix build failure for qemuriscv64 Jacob Kroon (1): bitbake: bitbake-user-manual: Correct description of the ??= operator Jose Quaresma (3): archiver: don't use machine variables in shared recipes sstate: Use the python3 ThreadPoolExecutor instead of the OE ThreadedPool oe/utils: remove the ThreadedPool Joshua Watt (1): classes/create-spdx: Add SPDX_PRETTY option Kai Kang (1): glibc-tests: not clear BBCLASSEXTEND Khem Raj (2): libmodule-build-perl: Use env utility to find perl interpreter ltp: Remove -mfpmath=sse on x86 Luca Ceresoli (1): llvm: add PACKAGECONFIG[optviewer] Lucas Stach (1): perf: sort-pmuevents: really keep array terminators Marius Kriegerowski (1): scriptutils: fix style to be more PEP8 compliant Marta Rybczynska (2): cve-check: add support for Ignored CVEs oeqa/selftest/cve_check: add tests for Ignored and partial reports Martin Jansa (3): mesa: backport a patch to support compositors without zwp_linux_dmabuf_v1 again wic: fix WicError message bitbake: fetch2/git: show SRCREV and git repo in error message about fixed SRCREV Maxime Roussin-Bélanger (1): libffi: fix native build being not portable Michael Halstead (2): releases: include 3.1.17 releases: include 4.0.2 Michael Opdenacker (18): rootfs-postcommands.bbclass: correct comments dev-manual: mention the new CVE patch metrics page dev-manual: fix references to BitBake user manual docs: standards.md: add more rules: line wrapping and variables doc: standard for bulleted lists ref-manual: add description for the "sysroot" term manuals: update host tool requirements ref-manual: document SSTATE_EXCLUDEDEPS_SYSROOT ref-manual: document SYSTEMD_DEFAULT_TARGET ref-manual: IMAGE_FEATURES: add allow-root-login and correct allow-empty-password ref-manual: correct description of empty-root-passwd in IMAGE_FEATURES bitbake: doc: bitbake-user-manual: add explicit target for crates fetcher bitbake: doc: bitbake-user-manual: document npm and npmsw fetchers dev-manual: NPM packages: minor grammar fix manuals: switch to the sstate mirror shared between all versions manuals: replace hyphens with em dashes dev-manual: update section about creating NPM packages dev-manual: improve screenshot resolution Ming Liu (3): udev-extraconf: fix some systemd automount issues meta: introduce UBOOT_MKIMAGE_KERNEL_TYPE udev-extraconf:mount.sh: fix path mismatching issues Mingli Yu (1): vim: not adjust script pathnames for native scripts either Muhammad Hamza (6): initramfs-framework: move storage mounts to actual rootfs udev-extraconf/mount.sh: add LABELs to mountpoints udev-extraconf/mount.sh: save mount name in our tmp filecache udev-extraconf/mount.sh: only mount devices on hotplug udev-extraconf: force systemd-udevd to use shared MountFlags udev-extraconf/mount.sh: ignore lvm in automount Nick Potenski (1): systemd: systemd-systemctl: Support instance conf files during enable Ola x Nilsson (1): bitbake: ConfHandler: Remove lingering close Pascal Bach (1): bin_package: install into base_prefix Paul Eggleton (4): devtool: ignore pn- overrides when determining SRC_URI overrides patch: handle if S points to a subdirectory of a git repo devtool: finish: handle patching when S points to subdir of a git repo oe-selftest: devtool: test modify git recipe building from a subdir Paulo Neves (14): python: Avoid shebang overflow on python-config.py gtk-doc: Fix potential shebang overflow on gtkdoc-mkhtml2 ref-manual: SYSTEMD_SERVICE allows multiple services ref-manual: SYSTEMD_SERVICE overrides depend on SYSTEMD_PACKAGES insane.bbclass: Make do_qa_staging check shebangs oeqa/selftest: Add test for shebang overflow oeqa/selftest: Test staged .la and .pc files utils: Add cmdline_shebang_wrapper util. libcheck: Fix too long shebang for native case. utils: create_cmdline_shebang_wrapper whitespace and sed refactor utils: create_cmdline_shebang_wrapper preserve permission and ownership oeqa/sysroot.py: Check bitbake return status bitbake: fetch: bb.fatal when trying to checksum non-existing files oeqa: test_invalid_recipe_src_uri expect parse time error Pavel Zhukov (4): systemd: Add missed sys/file.h includes for musl systemd: Rebase patches on v251 bitbake: tests/fetch: Add test for broken mirror tarball systemd: update upstream status of merged patches Peter Bergin (2): systemd: add packageconfig for sysext rust: fix issue building cross-canadian tools for aarch64 on x86_64 Peter Kjellerstedt (2): ref-manual: Add documentation for INCOMPATIBLE_LICENSE_EXCEPTIONS base.bbclass: Correct the test for obsolete license exceptions Peter Marko (1): alsa-state: correct license Pgowda (1): binutils : CVE-2019-1010204 Quentin Schulz (3): docs: releases: move hardknott and honister to outdated section docs: conf.py: bump minimum Sphinx version requirement Revert "docs: conf.py: fix cve extlinks caption for sphinx <4.0" Raju Kumar Pothuraju (2): runqemu: add QB_KERNEL_CMDLINE kernel-uboot.bbclass: Use vmlinux.initramfs when INITRAMFS_IMAGE_BUNDLE set Richard Purdie (42): gcc-source: Fix incorrect task dependencies from ${B} vim: Upgrade 8.2.5034 -> 8.2.5083 local.conf.sample: Update sstate url to new 'all' path ref/dev-manual: Update multiconfig documentation oeqa/runtime/scp: Disable scp test for dropbear unzip: Port debian fixes for two CVEs elfutils/flex: Disable parallel make ptest compile bitbake: server/process: Fix logging issues where only the first message was displayed coreutils: Tweak packaging variable names for coreutils-dev packagegroup-core-ssh-dropbear: Add openssh-sftp-server recommendation bitbake.conf/recipes: Introduce add DEV_PKG_DEPENDENCY to change RDEPENDS:${PN}-dev bitbake.conf: Change -dev RDEPENDS to RRECOMMENDS vim: 8.2.5083 -> 9.0.0005 ncurses: 6.3 -> 6.3+20220423 oe-selftest-image: Ensure the image has sftp as well as dropbear cve-extra-exclusions: Clean up and ignore three CVEs (2xqemu and nasm) openssl: Upgrade 3.0.3 -> 3.0.4 insane: Fix buildpaths test to work with special devices go: Filter build paths on staticly linked arches glibc-tests: Avoid reproducibility issues gperf: Add a patch to work around reproducibility issues bitbake: ConfHandler/BBHandler: Improve comment error messages and add tests icon-naming-utils: Resurrect for sato-icon-theme sato-icon-theme: Add back with support for scalable icons lua: Fix multilib buildpath reproducibility issues vala: Fix on target wrapper buildpaths issue gtk-doc: Remove hardcoded buildpath gperf: Switch to upstream patch qemu: Avoid accidental librdmacm linkage kernel-arch: Fix buildpaths leaking into external module compiles qemu: Fix slirp determinism issue qemu: Add PACKAGECONFIG for brlapi gcc-runtime: Fix build when using gold insane: Add buildpaths to WARN_QA by default insane: Reword staging to refer to populate_sysroot bitbake: fetch2: Ensure directory exists before creating symlink bitbake: fetch2: Drop DL_DIR fallback for local file fetcher oeqa/selftest/sstatetests: Update test to work with bitbake changes gcc-runtime: Fix missing MLPREFIX in debug mappings insane: Drop debug exclusion from buildpaths test selftest/runtime_test/virgl: Disable for all almalinux local.conf.sample: Mention other MACHINE options may exist Robert Joslyn (1): curl: Update to 7.84.0 Ross Burton (24): python3: fix a race condition in the test_socket.testSockName test Add python3-editables (from meta-python) Add python3-pathspec (from meta-python) Add python3-hatchling (from meta-oe) python3-hatch-vcs: add new recipe python3-jsonschema: upgrade 4.5.1 -> 4.6.0 package_manager: Change complementary package handling to not include soft dependencies cups: ignore CVE-2022-26691 cve-check: hook cleanup to the BuildCompleted event, not CookerExit busybox: fix CVE-2022-30065 ncurses: use GitHub mirror, not Debian's packaging ltp: remove open-posix-testsuite build logs tiff: backport the fix for CVE-2022-2056, CVE-2022-2057, and CVE-2022-2058 perl: don't install Makefile.old into perl-ptest vim: upgrade to 9.0.0021 ltp: fix builds when host ld doesn't know about target ELF formats python3-setuptools-scm: add missing python3-typing-extensions dependency python3-flit-core: bootstrap explicitly python3-installer: bootstrap by installing installer with installer python3-picobuild: add new recipe python_pep517: use picobuild instead of manually calling the API classes: remove obsolete PEP517_BUILD_API python3-hatchling: remove PEP517_BUILD_API documentation: remove obsolete PEP517_BUILD_API Steve Sakoman (3): qemu: add PACKAGECONFIG for capstone qemu: Avoid accidental libvdeplug linkage ruby: add PACKAGECONFIG for capstone Sundeep KOKKONDA (2): glibc: stable 2.35 branch updates binutils : stable 2.38 branch updates Thomas Perrot (1): opensbi: Update to v1.1 Thomas Roos (1): recipetool/devtool: Fix python egg whitespace issues in PACKAGECONFIG Xu Huan (2): python3: upgrade 3.10.4 -> 3.10.5 python3-magic: upgrade 0.4.26 -> 0.4.27 Yi Zhao (2): popt: fix override syntax in RDEPENDS git: fix override syntax in RDEPENDS Yogesh Tyagi (2): testimage : remove curl-ptest from rpm index curl : Add ptest Yue Tao (1): gnupg: upgrade to 2.3.7 to fix CVE-2022-34903 Yulong (Kevin) Liu (1): python3-pyasn1: Eliminated ptest deprecation warnings aatir (1): docs: make DISTRO_FEATURES description more explicit niko.mauno@vaisala.com (3): ptest.bbclass: Honor PARALLEL_MAKE, PARALLEL_MAKEINST valgrind: Drop redundant oe_runmake parameter strace: Drop redundant oe_runmake parameter pgowda (1): gcc: Backport a fix for gcc bug 105039 ssuesens (3): weston.py: added xwayland test weston.init: enabled xwayland xwayland.weston-start: adaption of X11-unix folder wangmy (57): btrfs-tools: upgrade 5.18 -> 5.18.1 ethtool: upgrade 5.17 -> 5.18 file: upgrade 5.41 -> 5.42 libx11: upgrade 1.8 -> 1.8.1 lighttpd: upgrade 1.4.64 -> 1.4.65 gnu-config: update to latest version musl-obstack: upgrade 1.1 -> 1.2 piglit: upgrade to latest revision stress-ng: upgrade 0.14.01 -> 0.14.02 erofs-utils: upgrade 1.4 -> 1.5 alsa-lib: upgrade 1.2.7 -> 1.2.7.1 alsa-plugins: upgrade 1.2.6 -> 1.2.7.1 alsa-ucm-conf: upgrade 1.2.7 -> 1.2.7.1 bind: upgrade 9.18.3 -> 9.18.4 kbd: upgrade 2.5.0 -> 2.5.1 libproxy: upgrade 0.4.17 -> 0.4.18 python3-dbusmock: upgrade 0.27.5 -> 0.28.0 sbc: upgrade 1.5 -> 2.0 strace: upgrade 5.17 -> 5.18 python3-chardet: upgrade 4.0.0 -> 5.0.0 python3-importlib-metadata: upgrade 4.11.4 -> 4.12.0 python3-babel: upgrade 2.10.1 -> 2.10.3 python3-certifi: upgrade 2022.5.18.1 -> 2022.6.15 python3-dbusmock: upgrade 0.28.0 -> 0.28.1 python3-numpy: upgrade 1.22.4 -> 1.23.0 python3-pycryptodome: upgrade 3.14.1 -> 3.15.0 dmidecode: upgrade 3.3 -> 3.4 git: upgrade 2.36.1 -> 2.37.0 harfbuzz: upgrade 4.3.0 -> 4.4.0 speexdsp: upgrade 1.2.0 -> 1.2.1 speex: upgrade 1.2.0 -> 1.2.1 repo: upgrade 2.26 -> 2.27 sqlite3: upgrade 3.38.5 -> 3.39.0 sudo: upgrade 1.9.11p2 -> 1.9.11p3 createrepo-c: upgrade 0.20.0 -> 0.20.1 gst-devtools: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-libav: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-omx: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-plugins-bad: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-plugins-base: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-plugins-good: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-plugins-ugly: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-python: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-rtsp-server: upgrade 1.20.2 -> 1.20.3 gstreamer1.0-vaapi: upgrade 1.20.2 -> 1.20.3 inetutils: upgrade 2.2 -> 2.3 python3-atomicwrites: upgrade 1.4.0 -> 1.4.1 python3-cryptography: upgrade 37.0.3 -> 37.0.4 python3-cryptography-vectors: upgrade 37.0.3 -> 37.0.4 python3-hatchling: upgrade 1.3.1 -> 1.5.0 python3-imagesize: upgrade 1.3.0 -> 1.4.1 python3-jsonschema: upgrade 4.6.1 -> 4.7.1 python3-numpy: upgrade 1.23.0 -> 1.23.1 python3-typing-extensions: upgrade 4.2.0 -> 4.3.0 python3-urllib3: upgrade 1.26.9 -> 1.26.10 init-system-helpers: upgrade 1.63 -> 1.64 dpkg: upgrade 1.21.8 -> 1.21.9 meta-security: 8c6fe006a1..7ad5f6a9da: Armin Kuster (32): apparmor: fix ownership issues sssd:move to dynamic networking-layer layer.conf:add meta-netorking to BBFILES_DYNAMIC packagegroup-core-security: drop sssd packagegroup-core-security.bbappend: add sssd oeqa: fix checksec runtime test sssd: use example conf file oeqa: sssd.py fix tests sssd: update to 2.7.1 security-test-image: auto include layers if present. smack-test: more py3 covertion oeqa: update smack runtime test aide: add a few more config options oeqa: add aide test libmhash: add native pkg support classes: add aide routines aide: add native support for build time db creation aide.conf: adjust to allow for build time db creation firejail: Add new package oeqa: Add a very basic firejail test packagegroup-core-security: add firejail security-test-image: add firejail and aide test suites oeqa/clamav drop depricated --list-mirror test oeqa: meta-tpm shut swtpm down before and after testing oeqa: shut done swtpm before and after testing ccs-tools: update to 1.8.9 lynis: update to 3.0.8 README: update email address packagegroup-core-security: skip mips firejail chipsec: update to 1.8.5 security-build-image: add lkrg-module to build image lkrg: update to 0.9.3 Jeremy A. Puhlman (2): clamav: make install owner match the added user name python3-privacyidea: add correct path to lib/privacyidea Jose Quaresma (1): meta-integrity: kernel-modsign: prevents splitting out debug symbols Yi Zhao (1): aide: fix typo meta-openembedded: 11df15765c..31c10bd3e6: Adrian Freihofer (3): firewalld: update to 1.1.1 fixes ptest firewalld: upgrade 1.1.1 -> 1.2.0 libqmi: upgrade 1.30.4 -> 1.30.8 Akash Hadke (2): ntfs-3g-ntfsprogs: Set CVE_PRODUCT to "tuxera:ntfs-3g" iperf: Set CVE_PRODUCT to "iperf_project:iperf" Alex Kiernan (2): jansson: Upgrade 2.13.1 -> 2.14 nftables: Upgrade 1.0.2 -> 1.0.4 Alex Stewart (1): openvpn: distribute sample-config-files Andreas Müller (1): glmark2: Build with meson Andrej Valek (1): poco: upgrade 1.11.3 -> 1.12.0 Andrew Davis (1): libsdl: The libsdl and libsdl2 are not virtual Ashish Sharma (1): netserver: don't change permissions on /dev/null Aurélien Bertron (1): fix(syslog-ng): warning about conf version Bartosz Golaszewski (1): python3-pybluez: fix a runtime issue with python 3.10 Ben Powell (1): python3-can: Add typing-extensions dependency Changqing Li (3): chrony: create /var/lib/chrony by systemd-tmpfiles redis: upgrade 6.2.6 -> 6.2.7 redis: upgrade 7.0.0 to 7.0.2 Chen Qi (2): apache2: split out a new package apache2-utils ntfs-3g-ntfsprogs: upgrade to 2022.5.17 Daide Li (1): python3-iperf: initial add 0.1.11 Davide Gardenal (9): usrsctp: add CVE_VERSION to correctly check for CVEs ntp: ignore many CVEs openflow: ignore CVE-2018-1078 emlog: ignore unrelated CVEs imagemagick: upgrade 7.0.10-25 -> 7.0.10-62 wireshark: upgrade 3.4.11 -> 3.4.12 thrift: add CVE_PRODUCT to fix CVE reporting spice: ignore patched CVEs quagga: ignore CVE-2016-4049 Fabien Parent (1): gpsd-machine-conf: allow creation of an empty package Harshal (1): lldpd: upgrade 1.0.8 -> 1.0.14 Hitendra Prajapati (1): cyrus-sasl: CVE-2022-24407 failure to properly escape SQL input allows an attacker to execute arbitrary SQL commands Jan Vermaete (1): netdata: version bump 1.34.1 -> 1.35.0 Javier Viguera (1): networkmanager: fix build with enabled ppp Jeremy Puhlman (1): freeradius: mutlilib fixes Jonas Gorski (1): abseil-cpp: do not enforce -mfpu=neon on arm Kai Kang (4): libdbi-perl: fix interpreter on shebang line libdev-checklib-perl: fix interpreter of script use-devel-checklib libparse-yapp-perl: update interpreter of yapp python3-flatbuffer: enable native Khem Raj (8): libxml++: Disable parallel make in ptest compile geos: Disable inlining php: Fix absolute paths to php in phar.phar scripts libspiro: Add recipe fontforge: Upgrade to 20220308 opencv: Link with libatomic on mips fontforge: Use alternate way to detect libm opencv: Link with libatomic on rv32 Leon Anavi (19): python3-traitlets: Upgrade 5.2.1 -> 5.3.0 python3-humanize: Upgrade 4.1.0 -> 4.2.0 python3-autobahn: Upgrade 22.4.2 -> 22.5.1 python3-elementpath: Upgrade 2.5.0 -> 2.5.3 python3-eth-hash: Upgrade 0.3.2 -> 0.3.3 python3-serpent: Upgrade 1.40 -> 1.41 python3-web3: Upgrade 5.29.1 -> 5.29.2 python3-pika: Upgrade 1.2.1 -> 1.3.0 python3-tabulate: Upgrade 0.8.9 -> 0.8.10 python3-marshmallow: Upgrade 3.15.0 -> 3.17.0 python3-pychromecast: Upgrade 12.1.3 -> 12.1.4 python3-humanize: Upgrade 4.2.0 -> 4.2.3 python3-tornado: Upgrade 6.1 -> 6.2 python3-coverage: Upgrade 6.3.2 -> 6.4.1 python3-email-validator: Upgrade 1.1.3 -> 1.2.1 python3-networkx: Upgrade 2.7.1 -> 2.8.4 python3-unidiff: Upgrade 0.7.3 -> 0.7.4 python3-toolz: Upgrade 0.11.2 -> 0.12.0 python3-ansi2html: Upgrade 1.7.0 -> 1.8.0 Marcus Flyckt (1): python3-pyconnman: Add 'future' runtime dependency Markus Volk (1): flatbuffers: update to 2.0.6 Martin Jansa (3): glmark2: fix compatibility with python-3.11 leveldb: switch from master branch to main tesseract-lang: switch from master branch to main Mikko Rapeli (1): polkit: switch back to mozjs but leave duktape as PACKAGECONFIG option Mingli Yu (3): kronosnet: Fix build with gcc-12 s-nail: Fix build with gcc-12 mariadb: Upgrade to 10.8.3 Pascal Bach (1): python3-pybind11: upgrade 2.8.1 -> 2.9.2 Peter Kjellerstedt (1): cryptsetup: Add support for building without SSH tokens Ross Burton (5): python3-cbor2: upgrade 5.4.2 to 5.4.3 cppzmq: fix -dev RDEPENDS python3-hatchling: remove (now in oe-core) python3-pathspec: remove (now in oe-core) python3-editables: remove (now in oe-core) Sakib Sajal (1): minicoredumper: retry elf parsing as long as needed Theodore A. Roth (1): crda: Depend on correct wireless-regdb package Wentao Zhang (1): protobuf-c: update to 1.4.1 fix CVE-2022-33070 Xu Huan (20): python3-lxml: upgrade 4.8.0 -> 4.9.0 python3-msgpack: upgrade 1.0.3 -> 1.0.4 python3-protobuf: upgrade 3.20.1 -> 4.21.1 python3-mypy: upgrade 0.960 -> 0.961 python3-pylint: upgrade 2.13.9 -> 2.14.1 python3-smbus2: upgrade 0.4.1 -> 0.4.2 python3-pillow: upgrade 9.0.1 -> 9.1.1 python3-pychromecast: upgrade 12.1.2 -> 12.1.3 python3-pylint: upgrade 2.14.1 -> 2.14.3 python3-pyscaffold: upgrade 4.2.2 -> 4.2.3 python3-redis: upgrade 4.3.1 -> 4.3.3 python3-aiohue: upgrade 4.4.1 -> 4.4.2 python3-astroid: upgrade 2.11.5 -> 2.11.6 python3-charset-normalizer: upgrade 2.0.12 -> 2.1.0 python3-colorama: upgrade 0.4.4 -> 0.4.5 python3-eth-typing: upgrade 3.0.0 -> 3.1.0 python3-autobahn: upgrade 22.5.1 -> 22.6.1 python3-awesomeversion: upgrade 22.5.2 -> 22.6.0 python3-grpcio: upgrade 1.45.0 -> 1.47.0 python3-lxml: upgrade 4.9.0 -> 4.9.1 Yi Zhao (12): openldap: pass correct URANDOM_DEVICE to CPPFLAGS openvpn: eliminate build path from openvpn --version option grubby: fix syntax for ALTERNATIVE duktape: fix override syntax in RDEPENDS polkit-group-rule-udisks2: fix override syntax in RDEPENDS libcrypt-openssl-guess-perl: fix syntax for PROVIDES evince: fix typo for RRECOMMENDS blueman: fix typo for RRECOMMENDS dnsmasq: Security fix CVE-2022-0934 strongswan: upgrade 5.9.5 -> 5.9.6 openvpn: add PACKAGECONFIG for systemd openvpn: add PACKAGECONFIG for selinux Yue Tao (2): exo: upgrade 4.16.3 -> 4.16.4 dlt-daemon: upgrade to commit 6a3bd901d8 to fix CVE-2022-31291 Zoltán Böszörményi (5): opencv: Upgrade to version 4.6.0 proj: Upgrade to 8.2.1 python3-pyproj: New recipe for pyproj version 3.3.1 geos: Upgrade to 3.9.3 libspatialite: Upgrade to 5.0.1 jybros (1): clinfo: use virtual opencl loader provider wangmy (72): python3-cantools: upgrade 37.0.7 -> 37.1.0 python3-regex: upgrade 2022.4.24 -> 2022.6.2 python3-sqlalchemy: upgrade 1.4.36 -> 1.4.37 python3-twine: upgrade 4.0.0 -> 4.0.1 python3-waitress: upgrade 2.1.1 -> 2.1.2 python3-xmlschema: upgrade 1.11.0 -> 1.11.1 gspell: upgrade 1.10.0 -> 1.11.1 ctags: upgrade 5.9.20220529.0 -> 5.9.20220605.0 feh: upgrade 3.8 -> 3.9 inotify-tools: upgrade 3.22.1.0 -> 3.22.6.0 apache2: upgrade 2.4.53 -> 2.4.54 libnftnl: upgrade 1.2.1 -> 1.2.2 nbdkit: upgrade 1.31.7 -> 1.31.8 irssi: upgrade 1.2.3 -> 1.4.1 musl-nscd: upgrade 1.0.2 -> 1.1.0 rdma-core: upgrade 40.0 -> 41.0 snort: upgrade 2.9.19 -> 2.9.20 php: upgrade 8.1.6 -> 8.1.7 poco: upgrade 1.11.2 -> 1.11.3 pyxdg: upgrade 0.27 -> 0.28 syslog-ng: upgrade 3.36.1 -> 3.37.1 dnf-plugin-tui: Added postatinstall python3-dill: upgrade 0.3.4 -> 0.3.5.1 python3-robotframework-seriallibrary: upgrade 0.3.1 -> 0.4.3 python3-ujson: upgrade 5.1.0 -> 5.3.0 python3-watchdog: upgrade 2.1.8 -> 2.1.9 python3-websocket-client: upgrade 1.3.2 -> 1.3.3 gnome-commander: upgrade 1.14.2 -> 1.14.3 libwacom: upgrade 2.2.0 -> 2.3.0 nbdkit: upgrade 1.31.8 -> 1.31.9 googletest: upgrade 1.11.0 -> 1.12.0 gperftools: upgrade 2.9.1 -> 2.10 iwd: upgrade 1.27 -> 1.28 libzip: upgrade 1.8.0 -> 1.9.0 postgresql: upgrade 14.3 -> 14.4 uftrace: upgrade 0.11 -> 0.12 python3-googleapis-common-protos: upgrade 1.56.2 -> 1.56.3 python3-ifaddr: upgrade 0.1.7 -> 0.2.0 python3-jmespath: upgrade 1.0.0 -> 1.0.1 python3-pandas: upgrade 1.4.2 -> 1.4.3 python3-zeroconf: upgrade 0.38.6 -> 0.38.7 geocode-glib: upgrade 3.26.2 -> 3.26.3 gnome-bluetooth: upgrade 42.0 -> 42.1 gnome-calculator: upgrade 42.0 -> 42.2 gnome-text-editor: upgrade 42.1 -> 42.2 gtk4: upgrade 4.6.4 -> 4.6.6 gtksourceview5: upgrade 5.4.1 -> 5.4.2 gvfs: upgrade 1.50.0 -> 1.50.2 abseil-cpp: upgrade 20211102 -> 20220623 capnproto: upgrade 0.9.1 -> 0.10.2 ctags: upgrade 5.9.20220605.0 -> 5.9.20220703.0 fwupd: upgrade 1.7.6 -> 1.8.1 googletest: upgrade 1.12.0 -> 1.12.1 nautilus: upgrade 42.1.1 -> 42.2 nbdkit: upgrade 1.31.9 -> 1.31.10 openconnect: upgrade 8.20 -> 9.01 bats: upgrade 1.6.1 -> 1.7.0 cloc: upgrade 1.92 -> 1.94 hwdata: upgrade 0.360 -> 0.361 libvpx: upgrade 1.11.0 -> 1.12.0 libzip: upgrade 1.9.0 -> 1.9.2 pegtl: upgrade 3.2.5 -> 3.2.6 phoronix-test-suite: upgrade 10.8.3 -> 10.8.4 poppler: upgrade 22.06.0 -> 22.07.0 netdata: upgrade 1.35.0 -> 1.35.1 evince: upgrade 42.2 -> 42.3 gjs: upgrade 1.72.0 -> 1.72.1 gnome-bluetooth: upgrade 42.1 -> 42.2 libadwaita: upgrade 1.1.1 -> 1.1.2 liburing: upgrade 2.1 -> 2.2 libcrypt-openssl-rsa-perl: upgrade 0.32 -> 0.33 libencode-perl: upgrade 3.17 -> 3.18 zhengruoqin (23): python3-absl: upgrade 1.0.0 -> 1.1.0 python3-alembic: upgrade 1.7.7 -> 1.8.0 python3-asyncinotify: upgrade 2.0.3 -> 2.0.4 python3-crc32c: upgrade 2.2.post0 -> 2.3 python3-msk: upgrade 0.3.16 -> 0.4.0 python3-bitstruct: upgrade 8.14.1 -> 8.15.1 python3-google-api-python-client: upgrade 2.49.0 -> 2.50.0 python3-google-auth: upgrade 2.6.6 -> 2.7.0 python3-xmlschema: upgrade 1.11.1 -> 1.11.2 python3-flask-wtf: upgrade 0.15.1 -> 1.0.1 python3-gnupg: upgrade 0.4.8 -> 0.4.9 python3-google-api-python-client: upgrade 2.50.0 -> 2.51.0 python3-kiwisolver: upgrade 1.4.2 -> 1.4.3 python3-nmap: upgrade 1.5.1 -> 1.5.4 python3-asyncinotify: upgrade 2.0.4 -> 2.0.5 python3-google-auth: upgrade 2.7.0 -> 2.8.0 python3-protobuf: upgrade 4.21.1 -> 4.21.2 python3-sqlalchemy: upgrade 1.4.37 -> 1.4.39 python3-xmlschema: upgrade 1.11.2 -> 1.11.3 python3-engineio: upgrade 4.3.2 -> 4.3.3 python3-google-api-core: upgrade 2.8.0 -> 2.8.2 python3-google-auth: upgrade 2.8.0 -> 2.9.0 python3-grpcio-tools: upgrade 1.46.3 -> 1.47.0 Signed-off-by: Andrew Geissler Change-Id: I22f0dab7f3253d77cc99fd462c6be45ddeb333cd --- .../ntfs-3g-ntfsprogs_2021.8.22.bb | 52 --- .../ntfs-3g-ntfsprogs_2022.5.17.bb | 53 +++ .../meta-gnome/recipes-gimp/gegl/gegl_0.4.36.bb | 4 +- .../meta-gnome/recipes-gnome/evince/evince_42.2.bb | 51 --- .../meta-gnome/recipes-gnome/evince/evince_42.3.bb | 51 +++ .../geocode-glib/geocode-glib_3.26.2.bb | 20 - .../geocode-glib/geocode-glib_3.26.3.bb | 19 + .../meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb | 40 -- .../meta-gnome/recipes-gnome/gjs/gjs_1.72.1.bb | 40 ++ .../gnome-bluetooth/gnome-bluetooth_42.0.bb | 44 --- .../gnome-bluetooth/gnome-bluetooth_42.2.bb | 44 +++ .../gnome-calculator/gnome-calculator_42.0.bb | 37 -- .../gnome-calculator/gnome-calculator_42.2.bb | 37 ++ .../gnome-commander/gnome-commander_1.14.2.bb | 22 -- .../gnome-commander/gnome-commander_1.14.3.bb | 22 ++ .../gnome-text-editor/gnome-text-editor_42.1.bb | 27 -- .../gnome-text-editor/gnome-text-editor_42.2.bb | 27 ++ .../recipes-gnome/gspell/gspell_1.10.0.bb | 10 - .../recipes-gnome/gspell/gspell_1.11.1.bb | 10 + .../meta-gnome/recipes-gnome/gtk4/gtk4_4.6.4.bb | 142 ------- .../meta-gnome/recipes-gnome/gtk4/gtk4_4.6.6.bb | 142 +++++++ .../gtksourceview/gtksourceview5_5.4.1.bb | 34 -- .../gtksourceview/gtksourceview5_5.4.2.bb | 34 ++ .../meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb | 88 ----- .../meta-gnome/recipes-gnome/gvfs/gvfs_1.50.2.bb | 88 +++++ .../recipes-gnome/libadwaita/libadwaita_1.1.1.bb | 25 -- .../recipes-gnome/libadwaita/libadwaita_1.1.2.bb | 25 ++ .../recipes-gnome/nautilus/nautilus_42.1.1.bb | 45 --- .../recipes-gnome/nautilus/nautilus_42.2.bb | 45 +++ .../recipes-support/libwacom/libwacom_2.2.0.bb | 24 -- .../recipes-support/libwacom/libwacom_2.3.0.bb | 24 ++ .../recipes-devtools/grubby/grubby_git.bb | 2 +- .../libopenmpt/libopenmpt_0.6.2.bb | 2 +- .../recipes-multimedia/pipewire/pipewire_0.3.50.bb | 2 +- .../recipes-connectivity/crda/crda_3.18.bb | 2 +- .../recipes-connectivity/firewalld/files/run-ptest | 21 ++ .../firewalld/firewalld_0.9.4.bb | 92 ----- .../firewalld/firewalld_1.2.0.bb | 310 +++++++++++++++ .../recipes-connectivity/blueman/blueman_2.2.4.bb | 2 +- .../freeradius/freeradius_3.0.21.bb | 34 +- .../networkmanager/networkmanager_1.38.0.bb | 2 +- .../openconnect/openconnect_8.20.bb | 32 -- .../openconnect/openconnect_9.01.bb | 32 ++ .../recipes-connectivity/snort/snort_2.9.19.bb | 111 ------ .../recipes-connectivity/snort/snort_2.9.20.bb | 111 ++++++ .../recipes-daemons/lldpd/lldpd_1.0.14.bb | 63 ++++ .../recipes-daemons/lldpd/lldpd_1.0.8.bb | 64 ---- .../0001-links.c-Fix-build-with-gcc-12.patch | 40 ++ .../recipes-extended/kronosnet/kronosnet_1.22.bb | 1 + .../recipes-filter/libnftnl/libnftnl_1.2.1.bb | 41 -- .../recipes-filter/libnftnl/libnftnl_1.2.2.bb | 41 ++ ...mpile-with-make-check-and-add-AM_CPPFLAGS.patch | 39 -- ...01-nftables-python-Split-root-from-prefix.patch | 44 +++ .../recipes-filter/nftables/nftables_1.0.2.bb | 53 --- .../recipes-filter/nftables/nftables_1.0.4.bb | 53 +++ .../recipes-protocols/openflow/openflow.inc | 4 + .../recipes-protocols/quagga/quagga_1.2.4.bb | 4 + .../recipes-protocols/usrsctp/usrsctp_git.bb | 2 + .../recipes-support/chrony/chrony_4.2.bb | 4 + .../dnsmasq/dnsmasq/CVE-2022-0934.patch | 191 ++++++++++ .../recipes-support/dnsmasq/dnsmasq_2.86.bb | 1 + .../recipes-support/nbdkit/nbdkit_1.31.10.bb | 33 ++ .../recipes-support/nbdkit/nbdkit_1.31.7.bb | 34 -- .../netperf/files/netserver_permissions.patch | 29 ++ .../recipes-support/netperf/netperf_git.bb | 1 + .../recipes-support/ntp/ntp_4.2.8p15.bb | 26 +- ...c-eliminate-build-path-from-openvpn-versi.patch | 48 +++ .../recipes-support/openvpn/openvpn/openvpn | 0 .../openvpn/openvpn/openvpn-volatile.conf | 1 - .../openvpn/openvpn/openvpn@.service | 12 - .../recipes-support/openvpn/openvpn_2.5.7.bb | 56 +-- .../recipes-support/rdma-core/rdma-core_40.0.bb | 42 --- .../recipes-support/rdma-core/rdma-core_41.0.bb | 42 +++ .../recipes-support/spice/spice_git.bb | 6 + .../files/0001-enum-Fix-compiler-warning.patch | 31 ++ .../0001-openssl-Don-t-unload-providers.patch | 92 ----- .../recipes-support/strongswan/strongswan_5.9.5.bb | 186 --------- .../recipes-support/strongswan/strongswan_5.9.6.bb | 186 +++++++++ .../recipes-support/wireshark/wireshark_3.4.11.bb | 88 ----- .../recipes-support/wireshark/wireshark_3.4.12.bb | 88 +++++ .../recipes-benchmark/glmark2/glmark2_git.bb | 6 +- .../recipes-benchmark/iperf2/iperf2_2.0.13.bb | 2 + .../recipes-benchmark/iperf3/iperf3_3.11.bb | 2 + .../phoronix-test-suite_10.8.3.bb | 40 -- .../phoronix-test-suite_10.8.4.bb | 40 ++ .../meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb | 127 ------- .../meta-oe/recipes-bsp/fwupd/fwupd_1.8.1.bb | 127 +++++++ .../recipes-connectivity/irssi/irssi_1.2.3.bb | 22 -- .../recipes-connectivity/irssi/irssi_1.4.1.bb | 21 ++ .../meta-oe/recipes-connectivity/iwd/iwd_1.27.bb | 55 --- .../meta-oe/recipes-connectivity/iwd/iwd_1.28.bb | 55 +++ .../recipes-connectivity/libqmi/libqmi_1.30.4.bb | 32 -- .../recipes-connectivity/libqmi/libqmi_1.30.8.bb | 32 ++ .../recipes-connectivity/thrift/thrift_0.16.0.bb | 2 + .../recipes-connectivity/zeromq/cppzmq_git.bb | 1 + .../meta-oe/recipes-core/emlog/emlog_git.bb | 11 + .../meta-oe/recipes-core/libxml/libxml++_2.42.1.bb | 2 + .../recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb | 12 +- .../meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb | 2 +- .../recipes-dbs/mysql/mariadb-native_10.7.4.bb | 20 - .../recipes-dbs/mysql/mariadb-native_10.8.3.bb | 20 + .../meta-oe/recipes-dbs/mysql/mariadb.inc | 11 +- .../mysql/mariadb/mariadb-openssl3.patch | 416 --------------------- .../meta-oe/recipes-dbs/mysql/mariadb_10.7.4.bb | 28 -- .../meta-oe/recipes-dbs/mysql/mariadb_10.8.3.bb | 28 ++ ...ure.ac-bypass-autoconf-2.69-version-check.patch | 6 +- .../recipes-dbs/postgresql/postgresql_14.3.bb | 13 - .../recipes-dbs/postgresql/postgresql_14.4.bb | 13 + .../0001-absl-always-use-asm-sgidefs.h.patch | 11 +- ...Remove-maes-option-from-cross-compilation.patch | 14 +- ...Remove-neon-option-from-cross-compilation.patch | 47 +++ .../recipes-devtools/abseil-cpp/abseil-cpp_git.bb | 7 +- .../recipes-devtools/capnproto/capnproto_0.10.2.bb | 29 ++ .../recipes-devtools/capnproto/capnproto_0.9.1.bb | 29 -- .../meta-oe/recipes-devtools/cloc/cloc_1.92.bb | 20 - .../meta-oe/recipes-devtools/cloc/cloc_1.94.bb | 20 + .../recipes-devtools/ctags/ctags_5.9.20220529.0.bb | 34 -- .../recipes-devtools/ctags/ctags_5.9.20220703.0.bb | 34 ++ .../dnf-plugin-tui/dnf-plugin-tui_git.bb | 2 +- .../flatbuffers/flatbuffers_2.0.0.bb | 43 --- .../flatbuffers/flatbuffers_2.0.6.bb | 31 ++ .../flatbuffers/python3-flatbuffers_2.0.6.bb | 16 + .../0001-Fix-build-under-GCC-fno-common.patch | 43 --- ...figure-Check-for-flex-if-lex-is-not-found.patch | 29 -- .../meta-oe/recipes-devtools/musl/musl-nscd_git.bb | 8 +- .../recipes-devtools/perl/libdbi-perl_1.643.bb | 5 + .../perl/libdev-checklib-perl_1.14.bb | 8 + .../perl/libparse-yapp-perl_1.21.bb | 4 + ...ext-phar-Makefile.frag-Fix-phar-packaging.patch | 9 +- .../meta-oe/recipes-devtools/php/php_8.1.6.bb | 280 -------------- .../meta-oe/recipes-devtools/php/php_8.1.7.bb | 280 ++++++++++++++ .../recipes-devtools/protobuf/protobuf-c_1.4.0.bb | 36 -- .../recipes-devtools/protobuf/protobuf-c_1.4.1.bb | 36 ++ .../recipes-devtools/uftrace/uftrace_0.11.bb | 44 --- .../recipes-devtools/uftrace/uftrace_0.12.bb | 44 +++ .../dlt-daemon/dlt-daemon_2.18.8.bb | 7 +- .../recipes-extended/duktape/duktape_2.7.0.bb | 2 +- .../recipes-extended/jansson/jansson_2.13.1.bb | 14 - .../recipes-extended/jansson/jansson_2.14.bb | 15 + .../recipes-extended/libzip/libzip_1.8.0.bb | 27 -- .../recipes-extended/libzip/libzip_1.9.2.bb | 27 ++ .../meta-oe/recipes-extended/pegtl/pegtl_3.2.5.bb | 13 - .../meta-oe/recipes-extended/pegtl/pegtl_3.2.6.bb | 13 + .../polkit/polkit-group-rule-udisks2.bb | 2 +- .../polkit/0002-jsauthority-port-to-mozjs-91.patch | 38 ++ ...-ensure-to-call-JS_Init-and-JS_ShutDown-e.patch | 63 ++++ .../recipes-extended/polkit/polkit_0.119.bb | 19 +- .../recipes-extended/redis/redis/GNU_SOURCE.patch | 14 +- .../meta-oe/recipes-extended/redis/redis_6.2.6.bb | 66 ---- .../meta-oe/recipes-extended/redis/redis_6.2.7.bb | 66 ++++ .../meta-oe/recipes-extended/redis/redis_7.0.0.bb | 68 ---- .../meta-oe/recipes-extended/redis/redis_7.0.2.bb | 68 ++++ ...1-su_INLINE-eh-no-give-up-share-detection.patch | 68 ++++ ...su_INLINE-gcc-only-GNU-specifics-after-Og.patch | 45 +++ .../recipes-extended/s-nail/s-nail_14.9.24.bb | 5 +- .../meta-oe/recipes-gnome/pyxdg/pyxdg_0.27.bb | 12 - .../meta-oe/recipes-gnome/pyxdg/pyxdg_0.28.bb | 12 + .../meta-oe/recipes-graphics/feh/feh_3.8.bb | 31 -- .../meta-oe/recipes-graphics/feh/feh_3.9.bb | 31 ++ ...01-cmake-Use-alternate-way-to-detect-libm.patch | 67 ++++ ...01-fontforgeexe-Use-env-to-find-fontforge.patch | 29 ++ ...include-sys-select-on-non-glibc-platforms.patch | 11 +- .../fontforge/fontforge_20190801.bb | 47 --- .../fontforge/fontforge_20220308.bb | 49 +++ .../fontforge/libspiro_20200505.bb | 14 + .../recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb | 2 +- .../recipes-graphics/libsdl/libsdl-image_1.2.12.bb | 2 +- .../recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb | 2 +- .../recipes-graphics/libsdl/libsdl-net_1.2.8.bb | 2 +- .../recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb | 2 +- .../recipes-graphics/libsdl/libsdl2-image_2.0.5.bb | 2 +- .../recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb | 2 +- .../recipes-graphics/libsdl/libsdl2-net_2.0.1.bb | 2 +- .../recipes-graphics/libsdl/libsdl2-ttf_2.0.18.bb | 2 +- .../recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 - .../tesseract/tesseract-lang_4.1.0.bb | 2 +- ...umper-retry-elf-parsing-as-long-as-needed.patch | 128 +++++++ .../minicoredumper/minicoredumper_2.0.1.bb | 1 + .../recipes-multimedia/webm/libvpx_1.11.0.bb | 50 --- .../recipes-multimedia/webm/libvpx_1.12.0.bb | 50 +++ .../geos-config-Add-includedir-variable.patch | 39 -- .../meta-oe/recipes-navigation/geos/geos.inc | 2 + .../meta-oe/recipes-navigation/geos/geos_3.4.3.bb | 7 - .../meta-oe/recipes-navigation/geos/geos_3.9.3.bb | 3 + .../gpsd/gpsd-machine-conf_1.0.bb | 1 + .../libspatialite/libspatialite/geos-config.patch | 17 - .../libspatialite/libspatialite_geos.patch | 43 +++ .../libspatialite/libspatialite_macros.patch | 12 + .../libspatialite/libspatialite_pkgconfig.patch | 11 + .../libspatialite/libspatialite_4.3.0a.bb | 22 -- .../libspatialite/libspatialite_5.0.1.bb | 24 ++ .../meta-oe/recipes-navigation/proj/proj_7.0.1.bb | 21 -- .../meta-oe/recipes-navigation/proj/proj_8.2.1.bb | 22 ++ .../cyrus-sasl/cyrus-sasl/CVE-2022-24407.patch | 27 ++ .../cyrus-sasl/cyrus-sasl_2.1.28.bb | 1 + .../gperftools/gperftools/ppc-musl.patch | 19 +- .../recipes-support/gperftools/gperftools_2.10.bb | 67 ++++ .../recipes-support/gperftools/gperftools_2.9.1.bb | 67 ---- .../meta-oe/recipes-support/hwdata/hwdata_0.360.bb | 25 -- .../meta-oe/recipes-support/hwdata/hwdata_0.361.bb | 25 ++ .../imagemagick/imagemagick_7.0.10.bb | 8 +- .../inotify-tools/inotify-tools_3.22.1.0.bb | 26 -- .../inotify-tools/inotify-tools_3.22.6.0.bb | 26 ++ ...scall-wrappers-instead-of-using-syscall-2.patch | 59 --- .../recipes-support/liburing/liburing_2.1.bb | 31 -- .../recipes-support/liburing/liburing_2.2.bb | 29 ++ .../recipes-support/opencl/clinfo_3.0.21.02.21.bb | 2 +- ...-vsx-update-vec_absd-workaround-condition.patch | 28 -- .../meta-oe/recipes-support/opencv/opencv_4.5.5.bb | 239 ------------ .../meta-oe/recipes-support/opencv/opencv_4.6.0.bb | 241 ++++++++++++ .../recipes-support/openldap/openldap_2.5.12.bb | 2 +- .../poco/0001-fix-unbundled-PCRE2-dependency.patch | 25 ++ .../0002-remove-providers-unitialization.patch | 35 ++ .../meta-oe/recipes-support/poco/poco_1.11.2.bb | 101 ----- .../meta-oe/recipes-support/poco/poco_1.12.0.bb | 106 ++++++ .../recipes-support/poppler/poppler_22.06.0.bb | 55 --- .../recipes-support/poppler/poppler_22.07.0.bb | 55 +++ .../syslog-ng/files/syslog-ng.conf.systemd | 2 +- .../syslog-ng/files/syslog-ng.conf.sysvinit | 2 +- .../recipes-support/syslog-ng/syslog-ng_3.36.1.bb | 140 ------- .../recipes-support/syslog-ng/syslog-ng_3.37.1.bb | 140 +++++++ .../meta-oe/recipes-test/bats/bats_1.6.1.bb | 33 -- .../meta-oe/recipes-test/bats/bats_1.7.0.bb | 33 ++ .../recipes-test/googletest/googletest_git.bb | 6 +- .../libcrypt/files/0001-Fix-for-Issue-31.patch | 37 -- .../libcrypt/libcrypt-openssl-guess-perl_0.15.bb | 2 +- .../libcrypt/libcrypt-openssl-rsa-perl_0.32.bb | 39 -- .../libcrypt/libcrypt-openssl-rsa-perl_0.33.bb | 38 ++ .../recipes-perl/libencode/libencode-perl_3.17.bb | 105 ------ .../recipes-perl/libencode/libencode-perl_3.18.bb | 105 ++++++ .../meta-python/classes/python_hatchling.bbclass | 5 - .../python-pyconnman/python3-pyconnman_0.2.0.bb | 2 +- .../recipes-devtools/python/python3-absl_1.0.0.bb | 13 - .../recipes-devtools/python/python3-absl_1.1.0.bb | 13 + .../python/python3-aiohue_4.4.1.bb | 16 - .../python/python3-aiohue_4.4.2.bb | 16 + .../python/python3-alembic_1.7.7.bb | 19 - .../python/python3-alembic_1.8.0.bb | 19 + .../python/python3-ansi2html_1.7.0.bb | 20 - .../python/python3-ansi2html_1.8.0.bb | 20 + .../python/python3-astroid_2.11.5.bb | 32 -- .../python/python3-astroid_2.11.6.bb | 32 ++ .../python/python3-asyncinotify_2.0.3.bb | 15 - .../python/python3-asyncinotify_2.0.5.bb | 15 + .../python/python3-autobahn_22.4.2.bb | 23 -- .../python/python3-autobahn_22.6.1.bb | 23 ++ .../python/python3-awesomeversion_22.5.2.bb | 11 - .../python/python3-awesomeversion_22.6.0.bb | 11 + .../python/python3-bitstruct_8.14.1.bb | 13 - .../python/python3-bitstruct_8.15.1.bb | 13 + .../recipes-devtools/python/python3-can_4.0.0.bb | 1 + .../python/python3-cantools_37.0.7.bb | 21 -- .../python/python3-cantools_37.1.0.bb | 22 ++ .../recipes-devtools/python/python3-cbor2_5.4.2.bb | 29 -- .../recipes-devtools/python/python3-cbor2_5.4.3.bb | 29 ++ .../python/python3-charset-normalizer_2.0.12.bb | 15 - .../python/python3-charset-normalizer_2.1.0.bb | 15 + .../python/python3-colorama_0.4.4.bb | 11 - .../python/python3-colorama_0.4.5.bb | 10 + .../python/python3-coverage_6.3.2.bb | 16 - .../python/python3-coverage_6.4.1.bb | 16 + .../python/python3-crc32c_2.2.post0.bb | 22 -- .../recipes-devtools/python/python3-crc32c_2.3.bb | 22 ++ .../recipes-devtools/python/python3-dill_0.3.4.bb | 14 - .../python/python3-dill_0.3.5.1.bb | 15 + .../python/python3-editables_0.3.bb | 11 - .../python/python3-elementpath_2.5.0.bb | 15 - .../python/python3-elementpath_2.5.3.bb | 15 + .../python/python3-email-validator_1.1.3.bb | 13 - .../python/python3-email-validator_1.2.1.bb | 12 + .../python/python3-engineio_4.3.2.bb | 20 - .../python/python3-engineio_4.3.3.bb | 20 + .../python/python3-eth-hash_0.3.2.bb | 9 - .../python/python3-eth-hash_0.3.3.bb | 14 + .../python/python3-eth-typing_3.0.0.bb | 9 - .../python/python3-eth-typing_3.1.0.bb | 9 + .../python/python3-flask-wtf_0.15.1.bb | 16 - .../python/python3-flask-wtf_1.0.1.bb | 16 + .../recipes-devtools/python/python3-gnupg_0.4.8.bb | 14 - .../recipes-devtools/python/python3-gnupg_0.4.9.bb | 14 + .../python/python3-google-api-core_2.8.0.bb | 26 -- .../python/python3-google-api-core_2.8.2.bb | 26 ++ .../python3-google-api-python-client_2.49.0.bb | 20 - .../python3-google-api-python-client_2.51.0.bb | 20 + .../python/python3-google-auth_2.6.6.bb | 27 -- .../python/python3-google-auth_2.9.0.bb | 27 ++ .../python3-googleapis-common-protos_1.56.2.bb | 14 - .../python3-googleapis-common-protos_1.56.3.bb | 14 + ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 13 +- .../python/python3-grpcio-tools_1.46.3.bb | 17 - .../python/python3-grpcio-tools_1.47.0.bb | 17 + ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 25 +- .../python/python3-grpcio_1.45.0.bb | 46 --- .../python/python3-grpcio_1.47.0.bb | 46 +++ .../python/python3-hatchling_1.3.0.bb | 21 -- .../python/python3-humanize_4.1.0.bb | 21 -- .../python/python3-humanize_4.2.3.bb | 21 ++ .../python/python3-ifaddr_0.1.7.bb | 14 - .../python/python3-ifaddr_0.2.0.bb | 14 + .../python/python3-iperf_0.1.11.bb | 11 + .../python/python3-jmespath_1.0.0.bb | 11 - .../python/python3-jmespath_1.0.1.bb | 11 + .../python/python3-kiwisolver_1.4.2.bb | 19 - .../python/python3-kiwisolver_1.4.3.bb | 19 + .../recipes-devtools/python/python3-lxml_4.8.0.bb | 42 --- .../recipes-devtools/python/python3-lxml_4.9.1.bb | 42 +++ .../python/python3-marshmallow_3.15.0.bb | 28 -- .../python/python3-marshmallow_3.17.0.bb | 28 ++ .../python/python3-msgpack_1.0.3.bb | 27 -- .../python/python3-msgpack_1.0.4.bb | 27 ++ .../recipes-devtools/python/python3-msk_0.3.16.bb | 11 - .../recipes-devtools/python/python3-msk_0.4.0.bb | 10 + .../recipes-devtools/python/python3-mypy_0.960.bb | 23 -- .../recipes-devtools/python/python3-mypy_0.961.bb | 23 ++ .../python/python3-networkx_2.7.1.bb | 19 - .../python/python3-networkx_2.8.4.bb | 19 + .../recipes-devtools/python/python3-nmap_1.5.1.bb | 18 - .../recipes-devtools/python/python3-nmap_1.5.4.bb | 18 + .../python/python3-pandas_1.4.2.bb | 26 -- .../python/python3-pandas_1.4.3.bb | 26 ++ .../python/python3-pathspec_0.9.0.bb | 11 - .../recipes-devtools/python/python3-pika_1.2.1.bb | 21 -- .../recipes-devtools/python/python3-pika_1.3.0.bb | 26 ++ .../python/python3-pillow_9.0.1.bb | 42 --- .../python/python3-pillow_9.1.1.bb | 42 +++ .../python/python3-protobuf_3.20.1.bb | 39 -- .../python/python3-protobuf_4.21.2.bb | 39 ++ .../python/python3-pybind11_2.8.1.bb | 39 -- .../python/python3-pybind11_2.9.2.bb | 39 ++ ...e_t-when-parsing-buffer-length-fix-426-42.patch | 153 ++++++++ .../python/python3-pybluez_0.23.bb | 1 + .../python/python3-pychromecast_12.1.2.bb | 18 - .../python/python3-pychromecast_12.1.4.bb | 19 + .../python/python3-pylint_2.13.9.bb | 18 - .../python/python3-pylint_2.14.3.bb | 18 + .../python/python3-pyproj_3.3.1.bb | 16 + .../python/python3-pyscaffold_4.2.2.bb | 22 -- .../python/python3-pyscaffold_4.2.3.bb | 22 ++ .../recipes-devtools/python/python3-redis_4.3.1.bb | 15 - .../recipes-devtools/python/python3-redis_4.3.3.bb | 15 + .../python/python3-regex_2022.4.24.bb | 14 - .../python/python3-regex_2022.6.2.bb | 14 + .../e31d5fdf2ea00ac6349e64580a20816783064dd4.patch | 45 --- .../python3-robotframework-seriallibrary_0.3.1.bb | 20 - .../python3-robotframework-seriallibrary_0.4.3.bb | 17 + .../python/python3-serpent_1.40.bb | 26 -- .../python/python3-serpent_1.41.bb | 26 ++ .../python/python3-smbus2_0.4.1.bb | 18 - .../python/python3-smbus2_0.4.2.bb | 18 + .../python/python3-sqlalchemy_1.4.36.bb | 23 -- .../python/python3-sqlalchemy_1.4.39.bb | 23 ++ .../python/python3-tabulate_0.8.10.bb | 8 + .../python/python3-tabulate_0.8.9.bb | 8 - .../python/python3-toolz_0.11.2.bb | 14 - .../python/python3-toolz_0.12.0.bb | 14 + .../recipes-devtools/python/python3-tornado_6.1.bb | 28 -- .../recipes-devtools/python/python3-tornado_6.2.bb | 27 ++ .../python/python3-traitlets_5.2.1.bb | 14 - .../python/python3-traitlets_5.3.0.bb | 14 + .../recipes-devtools/python/python3-twine_4.0.0.bb | 18 - .../recipes-devtools/python/python3-twine_4.0.1.bb | 18 + ...1-setup.py-Do-not-strip-debugging-symbols.patch | 20 +- .../recipes-devtools/python/python3-ujson_5.1.0.bb | 34 -- .../recipes-devtools/python/python3-ujson_5.3.0.bb | 34 ++ .../python/python3-unidiff_0.7.3.bb | 26 -- .../python/python3-unidiff_0.7.4.bb | 26 ++ .../python/python3-waitress_2.1.1.bb | 15 - .../python/python3-waitress_2.1.2.bb | 15 + .../python/python3-watchdog_2.1.8.bb | 18 - .../python/python3-watchdog_2.1.9.bb | 18 + .../recipes-devtools/python/python3-web3_5.29.1.bb | 20 - .../recipes-devtools/python/python3-web3_5.29.2.bb | 20 + .../python/python3-websocket-client_1.3.2.bb | 17 - .../python/python3-websocket-client_1.3.3.bb | 17 + .../python/python3-xmlschema_1.11.0.bb | 20 - .../python/python3-xmlschema_1.11.3.bb | 20 + .../python/python3-zeroconf_0.38.6.bb | 13 - .../python/python3-zeroconf_0.38.7.bb | 13 + ...pache2-log-the-SELinux-context-at-startup.patch | 12 +- .../recipes-httpd/apache2/apache2_2.4.53.bb | 224 ----------- .../recipes-httpd/apache2/apache2_2.4.54.bb | 236 ++++++++++++ ...se-explicit-typecast-to-enum-rrdset_flags.patch | 39 -- .../recipes-webadmin/netdata/netdata_1.34.1.bb | 83 ---- .../recipes-webadmin/netdata/netdata_1.35.1.bb | 82 ++++ .../meta-xfce/recipes-xfce/exo/exo_4.16.3.bb | 26 -- .../meta-xfce/recipes-xfce/exo/exo_4.16.4.bb | 26 ++ 386 files changed, 6950 insertions(+), 6264 deletions(-) delete mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2021.8.22.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.5.17.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.3.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.3.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.1.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.2.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.3.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.10.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.11.1.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gtk4/gtk4_4.6.4.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gtk4/gtk4_4.6.6.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.1.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.2.0.bb create mode 100644 meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.3.0.bb create mode 100644 meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/files/run-ptest delete mode 100644 meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_0.9.4.bb create mode 100644 meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.2.0.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.20.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_9.01.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.19.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb create mode 100644 meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.14.bb delete mode 100644 meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.8.bb create mode 100644 meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.1.bb create mode 100644 meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.2.bb delete mode 100644 meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch create mode 100644 meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-nftables-python-Split-root-from-prefix.patch delete mode 100644 meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb create mode 100644 meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.4.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/CVE-2022-0934.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.31.10.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.31.7.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/netperf/files/netserver_permissions.patch create mode 100644 meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch mode change 100755 => 100644 meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn delete mode 100644 meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf delete mode 100644 meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn@.service delete mode 100644 meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_40.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_41.0.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-openssl-Don-t-unload-providers.patch delete mode 100644 meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.5.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb delete mode 100644 meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.11.bb create mode 100644 meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.12.bb delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.2.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.4.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.27.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.28.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.8.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.7.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.8.3.bb delete 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.7.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.8.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.10.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.9.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.92.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.94.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20220529.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20220703.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php_8.1.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/php/php_8.1.7.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.11.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.12.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.13.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.14.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.9.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.6.bb create 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-jsauthority-ensure-to-call-JS_Init-and-JS_ShutDown-e.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.7.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch delete mode 100644 meta-openembedded/meta-oe/recipes-gnome/pyxdg/pyxdg_0.27.bb create mode 100644 meta-openembedded/meta-oe/recipes-gnome/pyxdg/pyxdg_0.28.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.9.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-cmake-Use-alternate-way-to-detect-libm.patch create mode 100644 meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-fontforgeexe-Use-env-to-find-fontforge.patch delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20220308.bb create mode 100644 meta-openembedded/meta-oe/recipes-graphics/fontforge/libspiro_20200505.bb create mode 100644 meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-retry-elf-parsing-as-long-as-needed.patch delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.11.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.12.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch delete mode 100644 meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.3.bb create mode 100644 meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/geos-config.patch create mode 100644 meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_geos.patch create mode 100644 meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch create mode 100644 meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch delete mode 100644 meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_4.3.0a.bb create mode 100644 meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-navigation/proj/proj_7.0.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-navigation/proj/proj_8.2.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/CVE-2022-24407.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.10.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.360.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.361.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.1.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Use-syscall-wrappers-instead-of-using-syscall-2.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-core-vsx-update-vec_absd-workaround-condition.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.6.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco/0001-fix-unbundled-PCRE2-dependency.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco/0002-remove-providers-unitialization.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.06.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.07.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.36.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.37.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-test/bats/bats_1.6.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-test/bats/bats_1.7.0.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libcrypt/files/0001-Fix-for-Issue-31.patch delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.32.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.33.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.17.bb create mode 100644 meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.18.bb delete mode 100644 meta-openembedded/meta-python/classes/python_hatchling.bbclass delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-absl_1.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-absl_1.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.4.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.4.2.bb delete 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-alembic_1.8.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.7.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.8.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.11.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.11.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_22.4.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_22.6.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_22.5.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_22.6.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.14.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.15.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_37.0.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_37.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.4.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.4.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_2.0.12.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_2.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.5.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_6.3.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_6.4.1.bb delete 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-crc32c_2.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.5.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-editables_0.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.5.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.5.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_1.1.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_1.2.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.3.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.3.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.3.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.3.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_3.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_3.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_0.15.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.8.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.9.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.8.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.8.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.49.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.51.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.6.6.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.9.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.56.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.56.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.46.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.47.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.45.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.47.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-hatchling_1.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.2.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.1.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.2.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-iperf_0.1.11.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jmespath_1.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-jmespath_1.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.3.bb delete 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-lxml_4.9.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.15.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.17.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.3.16.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.4.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.960.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.961.bb delete 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-networkx_2.8.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.5.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.5.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pathspec_0.9.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.2.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.0.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.20.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.21.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.8.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.9.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez/0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_12.1.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_12.1.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.13.9.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.14.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.3.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.2.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.2.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.3.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.3.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.4.24.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.6.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary/e31d5fdf2ea00ac6349e64580a20816783064dd4.patch delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.3.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.4.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.40.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.41.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.36.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.39.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.8.10.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.8.9.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-toolz_0.11.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-toolz_0.12.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.2.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.3.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.1.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.1.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.8.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.9.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-web3_5.29.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-web3_5.29.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.11.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.11.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.6.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.7.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.53.bb create mode 100644 meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Use-explicit-typecast-to-enum-rrdset_flags.patch delete mode 100644 meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.34.1.bb create mode 100644 meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.35.1.bb delete mode 100644 meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.3.bb create mode 100644 meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.4.bb (limited to 'meta-openembedded') 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 deleted file mode 100644 index aa1b4c2e95..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2021.8.22.bb +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION = "The NTFS-3G driver is an open source, freely available NTFS driver for Linux with read and write support." -HOMEPAGE = "http://www.ntfs-3g.org/" -DEPENDS = "fuse libgcrypt" -PROVIDES = "ntfsprogs ntfs-3g" -LICENSE = "GPL-2.0-only & LGPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" - -SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ - file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \ -" -S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" -SRC_URI[md5sum] = "90da343e78877d388eb34cefae6799ae" -SRC_URI[sha256sum] = "55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb" - -UPSTREAM_CHECK_URI = "https://www.tuxera.com/community/open-source-ntfs-3g/" -UPSTREAM_CHECK_REGEX = "ntfs-3g_ntfsprogs-(?P\d+(\.\d+)+)\.tgz" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "" -PACKAGECONFIG[uuid] = "--with-uuid,--without-uuid,util-linux" - -# required or it calls ldconfig at install step -EXTRA_OEMAKE = "LDCONFIG=echo" - -PACKAGES =+ "ntfs-3g ntfsprogs libntfs-3g" - -FILES:ntfs-3g = "${base_sbindir}/*.ntfs-3g ${bindir}/ntfs-3g* ${base_sbindir}/mount.ntfs" -RDEPENDS:ntfs-3g += "fuse" -RRECOMMENDS:ntfs-3g = "util-linux-mount" - -FILES:ntfsprogs = "${base_sbindir}/* ${bindir}/* ${sbindir}/*" -FILES:libntfs-3g = "${libdir}/*${SOLIBS}" - -do_install:append() { - # Standard mount will execute the program /sbin/mount.TYPE when called. - # Add a symbolic link to let mount find ntfs. - ln -sf mount.ntfs-3g ${D}${base_sbindir}/mount.ntfs - rmdir ${D}${libdir}/ntfs-3g - - # Handle when usrmerge is in effect. Some files are installed to /sbin - # regardless of the value of ${base_sbindir}. - if [ "${base_sbindir}" != /sbin ] && [ -d ${D}/sbin ]; then - mkdir -p ${D}${base_sbindir} - mv ${D}/sbin/* ${D}${base_sbindir} - rmdir ${D}/sbin - fi -} - -# Satisfy the -dev runtime dependency -ALLOW_EMPTY:${PN} = "1" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.5.17.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.5.17.bb new file mode 100644 index 0000000000..b29716ad49 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2022.5.17.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "The NTFS-3G driver is an open source, freely available NTFS driver for Linux with read and write support." +HOMEPAGE = "http://www.ntfs-3g.org/" +DEPENDS = "fuse libgcrypt" +PROVIDES = "ntfsprogs ntfs-3g" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" + +SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz \ + file://0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch \ +" +S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}" +SRC_URI[sha256sum] = "0489fbb6972581e1b417ab578d543f6ae522e7fa648c3c9b49c789510fd5eb93" + +UPSTREAM_CHECK_URI = "https://www.tuxera.com/community/open-source-ntfs-3g/" +UPSTREAM_CHECK_REGEX = "ntfs-3g_ntfsprogs-(?P\d+(\.\d+)+)\.tgz" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "" +PACKAGECONFIG[uuid] = "--with-uuid,--without-uuid,util-linux" + +# required or it calls ldconfig at install step +EXTRA_OEMAKE = "LDCONFIG=echo" + +PACKAGES =+ "ntfs-3g ntfsprogs libntfs-3g" + +FILES:ntfs-3g = "${base_sbindir}/*.ntfs-3g ${bindir}/ntfs-3g* ${base_sbindir}/mount.ntfs" +RDEPENDS:ntfs-3g += "fuse" +RRECOMMENDS:ntfs-3g = "util-linux-mount" + +FILES:ntfsprogs = "${base_sbindir}/* ${bindir}/* ${sbindir}/*" +FILES:libntfs-3g = "${libdir}/*${SOLIBS}" + +do_install:append() { + # Standard mount will execute the program /sbin/mount.TYPE when called. + # Add a symbolic link to let mount find ntfs. + ln -sf mount.ntfs-3g ${D}${base_sbindir}/mount.ntfs + rmdir ${D}${libdir}/ntfs-3g + + # Handle when usrmerge is in effect. Some files are installed to /sbin + # regardless of the value of ${base_sbindir}. + if [ "${base_sbindir}" != /sbin ] && [ -d ${D}/sbin ]; then + mkdir -p ${D}${base_sbindir} + mv ${D}/sbin/* ${D}${base_sbindir} + rmdir ${D}/sbin + fi +} + +# Satisfy the -dev runtime dependency +ALLOW_EMPTY:${PN} = "1" + +CVE_PRODUCT = "tuxera:ntfs-3g" 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 index 64291bee52..913957c3a9 100644 --- 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 @@ -38,8 +38,8 @@ 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[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,libsdl" +PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,libsdl2" PACKAGECONFIG[tiff] = "-Dlibtiff=enabled,-Dlibtiff=disabled,tiff" PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,webp" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.2.bb deleted file mode 100644 index c9e5617e7e..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.2.bb +++ /dev/null @@ -1,51 +0,0 @@ -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','dbus',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[archive.sha256sum] = "ff7f81f308cf8d4956ed97fb724a7e49448c214beeab998812ef9efbb38df8ae" - -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_42.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.3.bb new file mode 100644 index 0000000000..0c97f75e90 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.3.bb @@ -0,0 +1,51 @@ +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','dbus',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[archive.sha256sum] = "49aecf845c946c96db17ba89d75c8002c5ae8963f504a9b0626d12675914645e" + +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" +RRECOMMENDS:${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/geocode-glib/geocode-glib_3.26.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb deleted file mode 100644 index df401f7291..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A convenience library for the geocoding" - -LICENSE = "LGPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" - -GNOMEBASEBUILDCLASS = "meson" -GIR_MESON_OPTION = "enable-introspection" -GTKDOC_MESON_OPTION = "enable-gtk-doc" - -inherit gnomebase gobject-introspection gettext gtk-doc upstream-version-is-even - -DEPENDS = " \ - json-glib \ - libsoup-2.4 \ -" - -SRC_URI[archive.md5sum] = "e1ef140a11a543643d170dc701009e39" -SRC_URI[archive.sha256sum] = "01fe84cfa0be50c6e401147a2bc5e2f1574326e2293b55c69879be3e82030fd1" - -EXTRA_OEMESON = "-Denable-installed-tests=false" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.3.bb new file mode 100644 index 0000000000..9783dade11 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.3.bb @@ -0,0 +1,19 @@ +SUMMARY = "A convenience library for the geocoding" + +LICENSE = "LGPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" + +GNOMEBASEBUILDCLASS = "meson" +GIR_MESON_OPTION = "enable-introspection" +GTKDOC_MESON_OPTION = "enable-gtk-doc" + +inherit gnomebase gobject-introspection gettext gtk-doc upstream-version-is-even + +DEPENDS = " \ + json-glib \ + libsoup-2.4 \ +" + +SRC_URI[archive.sha256sum] = "1dfeae83b90eccca1b6cf7dcf7c5e3b317828cf0b56205c4471ef0f911999766" + +EXTRA_OEMESON = "-Denable-installed-tests=false" 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 deleted file mode 100644 index 95e4bd5cc6..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb +++ /dev/null @@ -1,40 +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-91 cairo" - -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/gjs/gjs_1.72.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.1.bb new file mode 100644 index 0000000000..355894073d --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.1.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 cairo" + +inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even pkgconfig + +SRC_URI[archive.sha256sum] = "17c0b1ec3f096671ff8bfaba6e4bbf14198c7013c604bfd677a9858da079c0ab" +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-bluetooth/gnome-bluetooth_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb deleted file mode 100644 index 36fe9cf215..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "GNOME bluetooth manager" -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ -" - -SECTION = "x11/gnome" - -DEPENDS = " \ - udev \ - libnotify \ - libcanberra \ - bluez5 \ - upower \ - gtk4 \ - gsound \ - libadwaita \ -" - -GNOMEBASEBUILDCLASS = "meson" -GTKDOC_MESON_OPTION = "gtk_doc" -GTKIC_VERSION = "4" - -inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.sha256sum] = "3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170" - -BT_PULSE_PACKS = " \ - pulseaudio-lib-bluez5-util \ - pulseaudio-module-bluetooth-discover \ - pulseaudio-module-bluetooth-policy \ - pulseaudio-module-bluez5-device \ - pulseaudio-module-bluez5-discover \ -" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" -PACKAGECONFIG[pulseaudio] = ",,,${BT_PULSE_PACKS}" - -FILES:${PN} += "${datadir}/gnome-bluetooth-3.0" - -RDEPENDS:${PN} += "bluez5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.2.bb new file mode 100644 index 0000000000..c916aca007 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.2.bb @@ -0,0 +1,44 @@ +SUMMARY = "GNOME bluetooth manager" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +" + +SECTION = "x11/gnome" + +DEPENDS = " \ + udev \ + libnotify \ + libcanberra \ + bluez5 \ + upower \ + gtk4 \ + gsound \ + libadwaita \ +" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" +GTKIC_VERSION = "4" + +inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "8ce8ecfab28272db1830a63f08f9ccb5304734d1be2dbfce795fe4029e629f0c" + +BT_PULSE_PACKS = " \ + pulseaudio-lib-bluez5-util \ + pulseaudio-module-bluetooth-discover \ + pulseaudio-module-bluetooth-policy \ + pulseaudio-module-bluez5-device \ + pulseaudio-module-bluez5-discover \ +" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" +PACKAGECONFIG[pulseaudio] = ",,,${BT_PULSE_PACKS}" + +FILES:${PN} += "${datadir}/gnome-bluetooth-3.0" + +RDEPENDS:${PN} += "bluez5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.0.bb deleted file mode 100644 index 80cc38c615..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.0.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "GNOME calculator" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SECTION = "x11/gnome" - -DEPENDS = " \ - yelp-tools-native \ - gtk4 \ - libsoup-2.4 \ - libgee \ - libmpc \ - gtksourceview5 \ - libadwaita \ -" - -GIR_MESON_OPTION = 'disable-introspection' -GIR_MESON_ENABLE_FLAG = 'false' -GIR_MESON_DISABLE_FLAG = 'true' - -GNOMEBASEBUILDCLASS = "meson" -GTKIC_VERSION = '4' - -inherit gnomebase gobject-introspection gnome-help vala gtk-icon-cache gettext features_check - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.sha256sum] = "a535a14ebea58e691a4b5a085256aed060a2c3f07384ac3a3d01832332a27e4a" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/gnome-shell \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.2.bb new file mode 100644 index 0000000000..31513a5f61 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.2.bb @@ -0,0 +1,37 @@ +SUMMARY = "GNOME calculator" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SECTION = "x11/gnome" + +DEPENDS = " \ + yelp-tools-native \ + gtk4 \ + libsoup-2.4 \ + libgee \ + libmpc \ + gtksourceview5 \ + libadwaita \ +" + +GIR_MESON_OPTION = 'disable-introspection' +GIR_MESON_ENABLE_FLAG = 'false' +GIR_MESON_DISABLE_FLAG = 'true' + +GNOMEBASEBUILDCLASS = "meson" +GTKIC_VERSION = '4' + +inherit gnomebase gobject-introspection gnome-help vala gtk-icon-cache gettext features_check + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "33dab1bca43658d66520958b0f674cb0ad3185cfd30c12e459e7f69481c5c6a0" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/gnome-shell \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.2.bb deleted file mode 100644 index c672422992..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A light and fast file manager" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -DEPENDS = " \ - glib-2.0-native \ - gtk+ \ -" - -inherit gnomebase itstool gettext gnome-help features_check -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" - -SRC_URI[archive.sha256sum] = "1378efd24f8af18a09031d83d918f9662a3f5eba5a6f9df9fc55870f2e6f0ee9" - -PACKAGECONFIG ??= "exiv2 taglib libgsf poppler" -PACKAGECONFIG[exiv2] = "--with-exiv2,--without-exiv2,exiv2" -PACKAGECONFIG[taglib] = "--with-taglib,--without-taglib,taglib" -PACKAGECONFIG[libgsf] = "--with-libgsf,--without-libgsf,libgsf" -PACKAGECONFIG[poppler] = "--with-poppler,--without-poppler,poppler" - -FILES:${PN} += "${datadir}/metainfo" -FILES:${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.3.bb new file mode 100644 index 0000000000..b16400cf38 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.14.3.bb @@ -0,0 +1,22 @@ +SUMMARY = "A light and fast file manager" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS = " \ + glib-2.0-native \ + gtk+ \ +" + +inherit gnomebase itstool gettext gnome-help features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + +SRC_URI[archive.sha256sum] = "78d8dce70fb922b2909cf767783053b0811213a4d6a49b3875510cf3a84efd7b" + +PACKAGECONFIG ??= "exiv2 taglib libgsf poppler" +PACKAGECONFIG[exiv2] = "--with-exiv2,--without-exiv2,exiv2" +PACKAGECONFIG[taglib] = "--with-taglib,--without-taglib,taglib" +PACKAGECONFIG[libgsf] = "--with-libgsf,--without-libgsf,libgsf" +PACKAGECONFIG[poppler] = "--with-poppler,--without-poppler,poppler" + +FILES:${PN} += "${datadir}/metainfo" +FILES:${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.1.bb deleted file mode 100644 index 7efc6867d8..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "A simple text editor" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - desktop-file-utils-native \ - libadwaita \ - gtk4 \ - gtksourceview5 \ - enchant2 \ -" - -GTKIC_VERSION = "4" - -inherit gnomebase gtk-icon-cache itstool gnome-help mime-xdg features_check - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "opengl" - -SRC_URI[archive.sha256sum] = "a3c8508033bfb63a8b48a062ac1e67b2c333ba0153879b38c661968a103ad15c" - -FILES:${PN} += " \ - ${datadir}/metainfo \ - ${datadir}/dbus-1 \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.2.bb new file mode 100644 index 0000000000..1446b151c5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.2.bb @@ -0,0 +1,27 @@ +SUMMARY = "A simple text editor" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + desktop-file-utils-native \ + libadwaita \ + gtk4 \ + gtksourceview5 \ + enchant2 \ +" + +GTKIC_VERSION = "4" + +inherit gnomebase gtk-icon-cache itstool gnome-help mime-xdg features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "opengl" + +SRC_URI[archive.sha256sum] = "e56d4a8cdcbce8a8f1c0881b45de799f8b25205ec0cbf2269e532025761cc5da" + +FILES:${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.10.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.10.0.bb deleted file mode 100644 index fe1b3ea67c..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.10.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "gspell adds spell-checking to a GTK+ applications" -HOMEPAGE = "https://wiki.gnome.org/Projects/gspell" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=8c2e1ec1540fb3e0beb68361344cba7e" - -DEPENDS = "gtk+3 iso-codes enchant2" - -inherit gnomebase gettext gobject-introspection vala - -SRC_URI[archive.sha256sum] = "803bb884c0215d3fd22a85d7f30423aff88d9792f05a5199d8a489a2ffaae1da" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.11.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.11.1.bb new file mode 100644 index 0000000000..c76a48f19a --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.11.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "gspell adds spell-checking to a GTK+ applications" +HOMEPAGE = "https://wiki.gnome.org/Projects/gspell" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=8c2e1ec1540fb3e0beb68361344cba7e" + +DEPENDS = "gtk+3 iso-codes enchant2" + +inherit gnomebase gettext gobject-introspection vala + +SRC_URI[archive.sha256sum] = "ef6aa4e3f711775158a7e241a5f809cf2426bc0e02c23a7d2b5c71fc3de00292" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtk4/gtk4_4.6.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtk4/gtk4_4.6.4.bb deleted file mode 100644 index 9f4737168c..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtk4/gtk4_4.6.4.bb +++ /dev/null @@ -1,142 +0,0 @@ -SUMMARY = "Multi-platform toolkit for creating GUIs" -DESCRIPTION = "GTK is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ -set of widgets, GTK is suitable for projects ranging from small one-off projects to complete application suites." -HOMEPAGE = "http://www.gtk.org" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "libs" - -DEPENDS = " \ - sassc-native \ - glib-2.0 \ - libepoxy \ - graphene \ - cairo \ - pango \ - atk \ - jpeg \ - libpng \ - librsvg \ - tiff \ - gdk-pixbuf-native gdk-pixbuf \ -" - -LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-or-later" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ - file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ - file://tests/testgtk.c;endline=25;md5=49d06770681b8322466b52ed19d29fb2 \ -" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -UPSTREAM_CHECK_REGEX = "gtk-(?P\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" -SRC_URI[sha256sum] = "a79a2bbcc7931b703fc4fa1fcbe1b906e229a1522d854d522801766a79bcac9f" - -S = "${WORKDIR}/gtk-${PV}" - -inherit meson gettext pkgconfig gtk-doc update-alternatives gsettings features_check gobject-introspection - -# TBD: nativesdk -# gobject-introspection.bbclass pins introspection off for nativesk. As long as -# we do not remove this wisdom or hack gtk4, it is not possible to build -# nativesdk-gtk4 -BBCLASSEXTEND = "native" - -GSETTINGS_PACKAGE:class-native = "" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "opengl" - -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' -GTKDOC_MESON_OPTION = 'gtk_doc' - -EXTRA_OEMESON = " -Dbuild-tests=false" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" -PACKAGECONFIG:class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" - -PACKAGECONFIG[x11] = "-Dx11-backend=true,-Dx11-backend=false,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes xinerama" -PACKAGECONFIG[wayland] = "-Dwayland-backend=true,-Dwayland-backend=false,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native" -PACKAGECONFIG[cups] = "-Dprint-cups=enabled,-Dprint-cups=disabled,cups" -PACKAGECONFIG[colord] = "-Dcolord=enabled,-Dcolord=disabled,colord" -# gtk4 wants gstreamer-player-1.0 -> gstreamer1.0-plugins-bad -PACKAGECONFIG[gstreamer] = "-Dmedia-gstreamer=enabled,-Dmedia-gstreamer=disabled,gstreamer1.0-plugins-bad" -PACKAGECONFIG[tracker] = "-Dtracker=enabled,-Dtracker=disabled,tracker" - - -do_compile:prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" -} - - -PACKAGES =+ "${PN}-demo" -LIBV = "4.0.0" - -FILES:${PN}-demo = " \ - ${datadir}/applications/org.gtk.Demo4.desktop \ - ${datadir}/applications/org.gtk.IconBrowser4.desktop \ - ${datadir}/applications/org.gtk.WidgetFactory4.desktop \ - ${datadir}/icons/hicolor/*/apps/org.gtk.Demo4*.* \ - ${datadir}/icons/hicolor/*/apps/org.gtk.IconBrowser4*.* \ - ${datadir}/icons/hicolor/*/apps/org.gtk.WidgetFactory4*.* \ - ${bindir}/gtk4-demo \ - ${bindir}/gtk4-demo-application \ - ${bindir}/gtk4-icon-browser \ - ${bindir}/gtk4-widget-factory \ -" - -FILES:${PN}:append = " \ - ${datadir}/glib-2.0/schemas/ \ - ${datadir}/gtk-4.0/emoji/ \ - ${datadir}/metainfo/ \ - ${datadir}/icons/hicolor/*/apps/org.gtk.PrintEditor4*.* \ - ${libdir}/gtk-4.0/${LIBV}/printbackends \ - ${bindir}/gtk4-update-icon-cache \ - ${bindir}/gtk4-launch \ -" - -FILES:${PN}-dev += " \ - ${datadir}/gtk-4.0/gtk4builder.rng \ - ${datadir}/gtk-4.0/include \ - ${datadir}/gtk-4.0/valgrind \ - ${datadir}/gettext/its \ - ${bindir}/gtk4-builder-tool \ - ${bindir}/gtk4-encode-symbolic-svg \ - ${bindir}/gtk4-query-settings \ -" - -GTKBASE_RRECOMMENDS ?= " \ - liberation-fonts \ - gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-jpeg \ - gdk-pixbuf-loader-gif \ - gdk-pixbuf-loader-xpm \ - shared-mime-info \ - adwaita-icon-theme-symbolic \ -" - -GTKBASE_RRECOMMENDS:class-native ?= "" - -GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" - -RRECOMMENDS:${PN} = "${GTKBASE_RRECOMMENDS}" -RRECOMMENDS:${PN}:libc-glibc = "${GTKGLIBC_RRECOMMENDS}" -RDEPENDS:${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}" - -PACKAGES_DYNAMIC += "^gtk4-printbackend-.*" -python populate_packages:prepend () { - import os.path - - gtk_libdir = d.expand('${libdir}/gtk-3.0/${LIBV}') - printmodules_root = os.path.join(gtk_libdir, 'printbackends'); - - do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk4-printbackend-%s', 'GTK printbackend module for %s') - - if (d.getVar('DEBIAN_NAMES')): - d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-4.0') -} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtk4/gtk4_4.6.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtk4/gtk4_4.6.6.bb new file mode 100644 index 0000000000..dcebd0de5a --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtk4/gtk4_4.6.6.bb @@ -0,0 +1,142 @@ +SUMMARY = "Multi-platform toolkit for creating GUIs" +DESCRIPTION = "GTK is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ +set of widgets, GTK is suitable for projects ranging from small one-off projects to complete application suites." +HOMEPAGE = "http://www.gtk.org" +BUGTRACKER = "https://bugzilla.gnome.org/" +SECTION = "libs" + +DEPENDS = " \ + sassc-native \ + glib-2.0 \ + libepoxy \ + graphene \ + cairo \ + pango \ + atk \ + jpeg \ + libpng \ + librsvg \ + tiff \ + gdk-pixbuf-native gdk-pixbuf \ +" + +LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ + file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ + file://tests/testgtk.c;endline=25;md5=49d06770681b8322466b52ed19d29fb2 \ +" + +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +UPSTREAM_CHECK_REGEX = "gtk-(?P\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" + +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" +SRC_URI[sha256sum] = "7bbfe4d13569f7c297ed49834ac7263e318b7bf102d3271cb466d5971f59ae70" + +S = "${WORKDIR}/gtk-${PV}" + +inherit meson gettext pkgconfig gtk-doc update-alternatives gsettings features_check gobject-introspection + +# TBD: nativesdk +# gobject-introspection.bbclass pins introspection off for nativesk. As long as +# we do not remove this wisdom or hack gtk4, it is not possible to build +# nativesdk-gtk4 +BBCLASSEXTEND = "native" + +GSETTINGS_PACKAGE:class-native = "" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "opengl" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = 'gtk_doc' + +EXTRA_OEMESON = " -Dbuild-tests=false" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" +PACKAGECONFIG:class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" + +PACKAGECONFIG[x11] = "-Dx11-backend=true,-Dx11-backend=false,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes xinerama" +PACKAGECONFIG[wayland] = "-Dwayland-backend=true,-Dwayland-backend=false,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native" +PACKAGECONFIG[cups] = "-Dprint-cups=enabled,-Dprint-cups=disabled,cups" +PACKAGECONFIG[colord] = "-Dcolord=enabled,-Dcolord=disabled,colord" +# gtk4 wants gstreamer-player-1.0 -> gstreamer1.0-plugins-bad +PACKAGECONFIG[gstreamer] = "-Dmedia-gstreamer=enabled,-Dmedia-gstreamer=disabled,gstreamer1.0-plugins-bad" +PACKAGECONFIG[tracker] = "-Dtracker=enabled,-Dtracker=disabled,tracker" + + +do_compile:prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" +} + + +PACKAGES =+ "${PN}-demo" +LIBV = "4.0.0" + +FILES:${PN}-demo = " \ + ${datadir}/applications/org.gtk.Demo4.desktop \ + ${datadir}/applications/org.gtk.IconBrowser4.desktop \ + ${datadir}/applications/org.gtk.WidgetFactory4.desktop \ + ${datadir}/icons/hicolor/*/apps/org.gtk.Demo4*.* \ + ${datadir}/icons/hicolor/*/apps/org.gtk.IconBrowser4*.* \ + ${datadir}/icons/hicolor/*/apps/org.gtk.WidgetFactory4*.* \ + ${bindir}/gtk4-demo \ + ${bindir}/gtk4-demo-application \ + ${bindir}/gtk4-icon-browser \ + ${bindir}/gtk4-widget-factory \ +" + +FILES:${PN}:append = " \ + ${datadir}/glib-2.0/schemas/ \ + ${datadir}/gtk-4.0/emoji/ \ + ${datadir}/metainfo/ \ + ${datadir}/icons/hicolor/*/apps/org.gtk.PrintEditor4*.* \ + ${libdir}/gtk-4.0/${LIBV}/printbackends \ + ${bindir}/gtk4-update-icon-cache \ + ${bindir}/gtk4-launch \ +" + +FILES:${PN}-dev += " \ + ${datadir}/gtk-4.0/gtk4builder.rng \ + ${datadir}/gtk-4.0/include \ + ${datadir}/gtk-4.0/valgrind \ + ${datadir}/gettext/its \ + ${bindir}/gtk4-builder-tool \ + ${bindir}/gtk4-encode-symbolic-svg \ + ${bindir}/gtk4-query-settings \ +" + +GTKBASE_RRECOMMENDS ?= " \ + liberation-fonts \ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-jpeg \ + gdk-pixbuf-loader-gif \ + gdk-pixbuf-loader-xpm \ + shared-mime-info \ + adwaita-icon-theme-symbolic \ +" + +GTKBASE_RRECOMMENDS:class-native ?= "" + +GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" + +RRECOMMENDS:${PN} = "${GTKBASE_RRECOMMENDS}" +RRECOMMENDS:${PN}:libc-glibc = "${GTKGLIBC_RRECOMMENDS}" +RDEPENDS:${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}" + +PACKAGES_DYNAMIC += "^gtk4-printbackend-.*" +python populate_packages:prepend () { + import os.path + + gtk_libdir = d.expand('${libdir}/gtk-3.0/${LIBV}') + printmodules_root = os.path.join(gtk_libdir, 'printbackends'); + + do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk4-printbackend-%s', 'GTK printbackend module for %s') + + if (d.getVar('DEBIAN_NAMES')): + d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-4.0') +} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.1.bb deleted file mode 100644 index f667238e65..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Portable C library for multiline text editing" -HOMEPAGE = "http://projects.gnome.org/gtksourceview/" - -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -DEPENDS = " \ - glib-2.0-native \ - gnome-common-native \ - intltool-native \ - gtk+3 \ - gtk4 \ - libxml2 \ - libpcre2 \ -" - -PNAME = "gtksourceview" - -S = "${WORKDIR}/${PNAME}-${PV}" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase lib_package gettext features_check gtk-doc gtk-icon-cache gobject-introspection vala - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -SRC_URI = "https://download.gnome.org/sources/gtksourceview/5.4/${PNAME}-${PV}.tar.xz" -SRC_URI[sha256sum] = "eb3584099cfa0adc9a0b1ede08def6320bd099e79e74a2d0aefb4057cd93d68e" - -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' -GTKDOC_MESON_OPTION = "gtk_doc" - -FILES:${PN} += "${datadir}/gtksourceview-5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb new file mode 100644 index 0000000000..52c270e6a0 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb @@ -0,0 +1,34 @@ +SUMMARY = "Portable C library for multiline text editing" +HOMEPAGE = "http://projects.gnome.org/gtksourceview/" + +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = " \ + glib-2.0-native \ + gnome-common-native \ + intltool-native \ + gtk+3 \ + gtk4 \ + libxml2 \ + libpcre2 \ +" + +PNAME = "gtksourceview" + +S = "${WORKDIR}/${PNAME}-${PV}" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase lib_package gettext features_check gtk-doc gtk-icon-cache gobject-introspection vala + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI = "https://download.gnome.org/sources/gtksourceview/5.4/${PNAME}-${PV}.tar.xz" +SRC_URI[sha256sum] = "ad140e07eb841910de483c092bd4885abd29baadd6e95fa22d93ed2df0b79de7" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = "gtk_doc" + +FILES:${PN} += "${datadir}/gtksourceview-5" 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 deleted file mode 100644 index 21d351a7b5..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb +++ /dev/null @@ -1,88 +0,0 @@ -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" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -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.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.2.bb new file mode 100644 index 0000000000..e8d9f16de1 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.2.bb @@ -0,0 +1,88 @@ +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] = "03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +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/libadwaita/libadwaita_1.1.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.1.bb deleted file mode 100644 index 8ca3be352e..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Building blocks for modern GNOME applications" -LICENSE="LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - sassc-native \ - gtk4 \ -" - -inherit gnomebase gobject-introspection gtk-doc vala features_check - -SRC_URI[archive.sha256sum] = "491169d4f6a11765328996bc088272d05c7235453bc0ee73c20dfd4bd67b401c" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "opengl" - -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' -GTKDOC_MESON_OPTION = 'gtk_doc' - -PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false" - -FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.2.bb new file mode 100644 index 0000000000..3ae740ee2b --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.2.bb @@ -0,0 +1,25 @@ +SUMMARY = "Building blocks for modern GNOME applications" +LICENSE="LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + sassc-native \ + gtk4 \ +" + +inherit gnomebase gobject-introspection gtk-doc vala features_check + +SRC_URI[archive.sha256sum] = "2b5ca4104c21a36e31f900ef117ab887dd9d471f6a65d2ba374ce0339314219f" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "opengl" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = 'gtk_doc' + +PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false" + +FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.1.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.1.1.bb deleted file mode 100644 index 6d942204f6..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.1.1.bb +++ /dev/null @@ -1,45 +0,0 @@ -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 \ -" - -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] = "8519d4565e842aa3d31d0fe39b21d48ac54edc0f0658fe1d8ea2da4e704c1b66" - -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OEMESON += " \ - -Dtests=none \ -" - -PACKAGECONFIG = "extensions" -PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base" -PACKAGECONFIG[libportal] = "-Dlibportal=true,-Dlibportal=false, libportal" - -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.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb new file mode 100644 index 0000000000..f9c2ed020b --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.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 \ +" + +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] = "99212d2eb75996f181728ad04a2e2d86f2577b064e68a34c8b81a7037df4ccb2" + +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OEMESON += " \ + -Dtests=none \ +" + +PACKAGECONFIG = "extensions" +PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base" +PACKAGECONFIG[libportal] = "-Dlibportal=true,-Dlibportal=false, libportal" + +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-support/libwacom/libwacom_2.2.0.bb b/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.2.0.bb deleted file mode 100644 index 78f5a289c6..0000000000 --- a/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.2.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 = "be485deca03157b0dbd702c7acaf35b71378be9e" - -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.3.0.bb b/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.3.0.bb new file mode 100644 index 0000000000..41d8c62424 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.3.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 = "b88053851ef81694b9e3927e0857f0f02ff9a8a8" + +DEPENDS = " \ + libxml2-native \ + libgudev \ +" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +EXTRA_OEMESON = " \ + -Dtests=disabled \ +" 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 a276bf423c..bbfabf0209 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_git.bb @@ -39,7 +39,7 @@ RDEPENDS:${PN} += "bash" RDEPENDS:${PN}-ptest = "util-linux-getopt bash" inherit update-alternatives -ALTERNATIVE_${PN} = "installkernel" +ALTERNATIVE:${PN} = "installkernel" ALTERNATIVE_LINK_NAME[installkernel] = "${sbindir}/installkernel" COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' 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 index 700df2cefb..47173d71d5 100644 --- 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 @@ -37,7 +37,7 @@ 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[sdl2] = "--with-sdl2,--without-sdl2,libsdl2" PACKAGECONFIG[sndfile] = "--with-sndfile,--without-sndfile,libsndfile1" PACKAGECONFIG[vorbis] = "--with-vorbis,--without-vorbis,libvorbis" PACKAGECONFIG[vorbisfile] = "--with-vorbisfile,--without-vorbisfile,libvorbis" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.50.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.50.bb index 0f527c0a59..c176c6eeb1 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.50.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.50.bb @@ -100,7 +100,7 @@ PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=enabled,-Dpipewire-alsa=disabled PACKAGECONFIG[pipewire-jack] = "-Dpipewire-jack=enabled -Dlibjack-path=${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=disabled,jack,,,jack" PACKAGECONFIG[pw-cat] = "-Dpw-cat=enabled,-Dpw-cat=disabled" PACKAGECONFIG[raop] = "-Draop=enabled,-Draop=disabled,openssl" -PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" +PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,libsdl2" PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" PACKAGECONFIG[systemd-system-service] = "-Dsystemd-system-service=enabled,-Dsystemd-system-service=disabled,systemd" diff --git a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_3.18.bb b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_3.18.bb index 9abfd61cf2..a616557e7c 100644 --- a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_3.18.bb @@ -36,4 +36,4 @@ do_install() { oe_runmake SBINDIR=${sbindir}/ install } -RDEPENDS:${PN} = "udev wireless-regdb-static" +RDEPENDS:${PN} = "udev wireless-regdb" diff --git a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/files/run-ptest b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/files/run-ptest new file mode 100644 index 0000000000..9d3ec79042 --- /dev/null +++ b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/files/run-ptest @@ -0,0 +1,21 @@ +#!/bin/sh + +ret_val=0 + +# Check if all the kernel modules are available +FIREWALLD_KERNEL_MODULES="@@FIREWALLD_KERNEL_MODULES@@" +for m in $FIREWALLD_KERNEL_MODULES; do + if modprobe $m; then + echo "PASS: loading $m" + else + echo "FAIL: loading $m" + ret_val=1 + fi +done + +# Run the test suite from firewalld +# Failing testsuites: 203 226 241 250 270 280 281 282 285 286 +# Problem icmpv6 compared against ipv6-icmptype? +/usr/share/firewalld/testsuite/testsuite -C /tmp -A || ret_val=1 + +exit $ret_val diff --git a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_0.9.4.bb b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_0.9.4.bb deleted file mode 100644 index 1dea339535..0000000000 --- a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_0.9.4.bb +++ /dev/null @@ -1,92 +0,0 @@ -SUMMARY = "Dynamic firewall daemon with a D-Bus interface" -HOMEPAGE = "https://firewalld.org/" -BUGTRACKER = "https://github.com/firewalld/firewalld/issues" -UPSTREAM_CHECK_URI = "https://github.com/firewalld/firewalld/releases" -LICENSE = "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 \ - file://firewalld.init \ -" -SRC_URI[sha256sum] = "52c5e3d5b1e2efc0e86c22b2bc1f7fd80908cc2d8130157dc2a3517a59b0a760" - -# glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 -DEPENDS = "intltool-native glib-2.0-native nftables" - -inherit gettext autotools bash-completion pkgconfig python3native gsettings systemd update-rc.d - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" -PACKAGECONFIG[docs] = "--with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog,--disable-docs,libxslt-native docbook-xsl-stylesheets-native" - -PACKAGES += "${PN}-zsh-completion" - -# iptables, ip6tables, ebtables, and ipset *should* be unnecessary -# when the nftables backend is available, because nftables supersedes all of them. -# However we still need iptables and ip6tables to be available otherwise any -# application relying on "direct passthrough" rules (such as docker) will break. -# /etc/sysconfig/firewalld is a Red Hat-ism, only referenced by -# the Red Hat-specific init script which we aren't using, so we disable that. -EXTRA_OECONF = "\ - --without-ipset \ - --with-iptables=${sbindir}/iptables \ - --with-iptables-restore=${sbindir}/iptables-restore \ - --with-ip6tables=${sbindir}/ip6tables \ - --with-ip6tables-restore=${sbindir}/ip6tables-restore \ - --without-ebtables \ - --without-ebtables-restore \ - --disable-sysconfig \ -" - -INITSCRIPT_NAME = "firewalld" -SYSTEMD_SERVICE:${PN} = "firewalld.service" - -do_install:append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - : - else - # firewalld ships an init script but it contains Red Hat-isms, replace it with our own - rm -rf ${D}${sysconfdir}/rc.d/ - install -d ${D}${sysconfdir}/init.d - install -m0755 ${WORKDIR}/firewalld.init ${D}${sysconfdir}/init.d/firewalld - fi - - # We ran ./configure with PYTHON pointed at the binary inside $STAGING_BINDIR_NATIVE - # so now we need to fix up any references to point at the proper path in the image. - # This hack is also in distutils.bbclass, but firewalld doesn't use distutils/setuptools. - if [ ${PN} != "${BPN}-native" ]; then - sed -i -e s:${STAGING_BINDIR_NATIVE}/python3-native/python3:${bindir}/python3:g \ - ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml - fi - sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \ - ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml - - # This file contains Red Hat-isms. Modules get loaded without it. - rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf -} - -FILES:${PN} += "\ - ${PYTHON_SITEPACKAGES_DIR}/firewall \ - ${nonarch_libdir}/firewalld \ - ${datadir}/dbus-1 \ - ${datadir}/polkit-1 \ - ${datadir}/metainfo \ -" -FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" - -RDEPENDS:${PN} = "\ - nftables-python \ - iptables \ - python3-core \ - python3-io \ - python3-fcntl \ - python3-shell \ - python3-syslog \ - python3-xml \ - python3-dbus \ - python3-slip-dbus \ - python3-decorator \ - python3-pygobject \ - python3-json \ - python3-ctypes \ -" diff --git a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.2.0.bb b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.2.0.bb new file mode 100644 index 0000000000..987cc640e1 --- /dev/null +++ b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.2.0.bb @@ -0,0 +1,310 @@ +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 = "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 \ + file://firewalld.init \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "28fd90e88bda0dfd460f370f353474811b2e295d7eb27f0d7d18ffa3d786eeb7" + +# glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 +DEPENDS = "intltool-native glib-2.0-native nftables" + +inherit gettext autotools-brokensep bash-completion pkgconfig python3native python3-dir gsettings systemd update-rc.d ptest + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd" +PACKAGECONFIG[docs] = "--with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog,--disable-docs,libxslt-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[ipset] = "--with-ipset=${sbindir}/ipset,--without-ipset,,ipset" +PACKAGECONFIG[ebtables] = "--with-ebtables=${base_sbindir}/ebtables --with-ebtables-restore=${sbindir}/ebtables-legacy-restore,--without-ebtables --without-ebtables-restore,,ebtables" + +# Default logging configuration: mixed syslog file console +FIREWALLD_DEFAULT_LOG_TARGET ??= "syslog" + +# The UIs are not yet tested and the dependencies are probably not quite correct yet. +# Splitting into separate packages is beneficial so that no dead code is transferred +# to the target device. +# Without enabling qt5, the firewalld-config package is not usable. +# Without enabling qt5 and gtk, the firewalld-applet package is not usable. +PACKAGECONFIG[qt5] = "" +PACKAGECONFIG[gtk] = "" + +PACKAGES =+ "python3-firewall ${PN}-applet ${PN}-config ${PN}-offline-cmd ${PN}-zsh-completion ${PN}-log-rotate" + +# iptables, ip6tables, ebtables, and ipset *should* be unnecessary +# when the nftables backend is available, because nftables supersedes all of them. +# However we still need iptables and ip6tables to be available otherwise any +# application relying on "direct passthrough" rules (such as docker) will break. +# /etc/sysconfig/firewalld is a Red Hat-ism, only referenced by +# the Red Hat-specific init script which we aren't using, so we disable that. +EXTRA_OECONF = "\ + --with-iptables=${sbindir}/iptables \ + --with-iptables-restore=${sbindir}/iptables-restore \ + --with-ip6tables=${sbindir}/ip6tables \ + --with-ip6tables-restore=${sbindir}/ip6tables-restore \ + --disable-sysconfig \ +" + +INITSCRIPT_NAME = "firewalld" +SYSTEMD_SERVICE:${PN} = "firewalld.service" + +# kernel modules loaded after ptest execution (linux-yocto 5.15) +FIREWALLD_KERNEL_MODULES ?= "\ + xt_tcpudp \ + xt_TCPMSS \ + xt_set \ + xt_sctp \ + xt_REDIRECT \ + xt_pkttype \ + xt_NFLOG \ + xt_nat \ + xt_MASQUERADE \ + xt_mark \ + xt_mac \ + xt_LOG \ + xt_limit \ + xt_dccp \ + xt_CT \ + xt_conntrack \ + xt_CHECKSUM \ + nft_redir \ + nft_objref \ + nft_nat \ + nft_masq \ + nft_log \ + nfnetlink_log \ + nf_nat_tftp \ + nf_nat_sip \ + nf_nat_ftp \ + nf_log_syslog \ + nf_conntrack_tftp \ + nf_conntrack_sip \ + nf_conntrack_netbios_ns \ + nf_conntrack_ftp \ + nf_conntrack_broadcast \ + ipt_REJECT \ + ip6t_rpfilter \ + ip6t_REJECT \ + ip_set_hash_netport \ + ip_set_hash_netnet \ + ip_set_hash_netiface \ + ip_set_hash_net \ + ip_set_hash_mac \ + ip_set_hash_ipportnet \ + ip_set_hash_ipport \ + ip_set_hash_ipmark \ + ip_set_hash_ip \ + ebt_ip6 \ + nft_fib_inet \ + nft_fib_ipv4 \ + nft_fib_ipv6 \ + nft_fib \ + nft_reject_inet \ + nf_reject_ipv4 \ + nf_reject_ipv6 \ + nft_reject \ + nft_ct \ + nft_chain_nat \ + ebtable_nat \ + ebtable_broute \ + ip6table_nat \ + ip6table_mangle \ + ip6table_raw \ + ip6table_security \ + iptable_nat \ + nf_nat \ + nf_conntrack \ + nf_defrag_ipv6 \ + nf_defrag_ipv4 \ + iptable_mangle \ + iptable_raw \ + iptable_security \ + ip_set \ + ebtable_filter \ + ebtables \ + ip6table_filter \ + ip6_tables \ + iptable_filter \ + ip_tables \ + x_tables \ + sch_fq_codel \ +" + +do_configure:prepend() { + export DEFAULT_LOG_TARGET=${FIREWALLD_DEFAULT_LOG_TARGET} +} + +do_install:append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'false', 'true', d)}; then + # firewalld ships an init script but it contains Red Hat-isms, replace it with our own + rm -rf ${D}${sysconfdir}/rc.d/ + install -d ${D}${sysconfdir}/init.d + install -m0755 ${WORKDIR}/firewalld.init ${D}${sysconfdir}/init.d/firewalld + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'false', 'true', d)}; then + # Delete polkit profiles if polkit is not available + rm -rf ${D}${datadir}/polkit-1 + fi + + # We ran ./configure with PYTHON pointed at the binary inside $STAGING_BINDIR_NATIVE + # so now we need to fix up any references to point at the proper path in the image. + # This hack is also in distutils.bbclass, but firewalld doesn't use distutils/setuptools. + if [ ${PN} != "${BPN}-native" ]; then + sed -i -e s:${STAGING_BINDIR_NATIVE}/python3-native/python3:${bindir}/python3:g \ + ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml + fi + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g \ + ${D}${bindir}/* ${D}${sbindir}/* ${D}${sysconfdir}/firewalld/*.xml + + # This file contains Red Hat-isms. Modules get loaded without it. + rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf +} + +do_install_ptest:append() { + # Add kernel modules to the ptest script + if [ ${PTEST_ENABLED} = "1" ]; then + sed -i -e 's:@@FIREWALLD_KERNEL_MODULES@@:${FIREWALLD_KERNEL_MODULES}:g' \ + ${D}${PTEST_PATH}/run-ptest + fi +} + +SUMMARY:python3-firewall = "${SUMMARY} (Python3 bindings)" +FILES:python3-firewall = "\ + ${PYTHON_SITEPACKAGES_DIR}/firewall/__pycache__/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/config/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/config/__pycache__/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/core/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/core/__pycache__/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/core/io/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/core/io/__pycache__/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/server/*.py* \ + ${PYTHON_SITEPACKAGES_DIR}/firewall/server/__pycache__/*.py* \ +" +RDEPENDS:python3-firewall = "\ + python3-dbus \ + nftables-python \ + python3-pygobject \ +" + +# Do not depend on QT5 layer and GTK deps if not explicitely required. +FIREWALLD_QT5_RDEPENDS = "\ + ${PN}-config \ + hicolor-icon-theme \ + python3-pyqt5 \ + python3-pygobject \ + libnotify \ + networkmanager \ +" +FIREWALLD_GTK_RDEPENDS = "\ + gtk3 \ +" + +# A QT5 based UI +SUMMARY:${PN}-config = "${SUMMARY} (configuration application)" +FILES:${PN}-config = "\ + ${bindir}/firewall-config \ + ${datadir}/firewalld/firewall-config.glade \ + ${datadir}/firewalld/gtk3_chooserbutton.py* \ + ${datadir}/firewalld/gtk3_niceexpander.py* \ + ${datadir}/applications/firewall-config.desktop \ + ${datadir}/metainfo/firewall-config.appdata.xml \ + ${datadir}/icons/hicolor/*/apps/firewall-config*.* \ +" +RDEPENDS:${PN}-config += "\ + python3-core \ + python3-ctypes \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '${FIREWALLD_QT5_RDEPENDS}', '', d)} \ +" + +# A GTK3 applet depending on the QT5 firewall-config UI +SUMMARY:${PN}-applet = "${SUMMARY} (panel applet)" +FILES:${PN}-applet += "\ + ${bindir}/firewall-applet \ + ${sysconfdir}/xdg/autostart/firewall-applet.desktop \ + ${sysconfdir}/firewall/applet.conf \ + ${datadir}/icons/hicolor/*/apps/firewall-applet*.* \ +" +RDEPENDS:${PN}-applet += "\ + python3-core \ + python3-ctypes \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '${FIREWALLD_QT5_RDEPENDS}', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gtk', '${FIREWALLD_GTK_RDEPENDS}', '', d)} \ +" + +SUMMARY:${PN}-offline-cmd = "${SUMMARY} (offline configuration utility)" +FILES:${PN}-offline-cmd += " \ + ${bindir}/firewall-offline-cmd \ +" +RDEPENDS:${PN}-offline-cmd += "python3-core" + +SUMMARY:${PN}-log-rotate = "${SUMMARY} (log-rotate configuration)" +FILES:${PN}-log-rotate += "${sysconfdir}/logrotate.d" + +# To get allmost all tests passing +# - Enable PACKAGECONFIG ipset, ebtable +# - Enough RAM QB_MEM = "-m 8192" (used für fancy ipset tests) +FILES:${PN}-ptest += "\ + ${datadir}/firewalld/testsuite \ +" +RDEPENDS:${PN}-ptest += "\ + python3-unittest \ + ${PN}-offline-cmd \ + procps-ps \ + iproute2 \ +" +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils glibc-localedata-en-us" + +FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +FILES:${PN} += "\ + ${PYTHON_SITEPACKAGES_DIR}/firewall \ + ${nonarch_libdir}/firewalld \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ + ${datadir}/metainfo \ + ${datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml \ +" +RDEPENDS:${PN} += "\ + python3-firewall \ + iptables \ + python3-core \ + python3-io \ + python3-fcntl \ + python3-syslog \ + python3-xml \ + python3-json \ + python3-ctypes \ + python3-pprint \ +" +# If firewalld writes a log file rotation is needed +RRECOMMENDS:${PN} += "${@bb.utils.contains_any('FIREWALLD_DEFAULT_LOG_TARGET', [ 'mixed', 'file' ], '${PN}-log-rotate', '', d)}" + +# Add required kernel modules. With Yocto kernel 5.15 this currently means: +# - features/nf_tables/nf_tables.scc +# - features/netfilter/netfilter.scc +# - cgl/features/audit/audit.scc +# - cfg/net/ip6_nf.scc +# - Plus: +# - ebtables +# - ipset +# - CONFIG_IP6_NF_SECURITY=m +# - CONFIG_IP6_NF_MATCH_RPFILTER=m +# - CONFIG_IP6_NF_TARGET_REJECT=m +# - CONFIG_NFT_OBJREF=m +# - CONFIG_NFT_FIB=m +# - CONFIG_NFT_FIB_INET=m +# - CONFIG_NFT_FIB_IPV4=m +# - CONFIG_NFT_FIB_IPV6=m +# - CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m +# - CONFIG_NETFILTER_XT_SET=m +def get_kernel_deps(d): + kmodules = (d.getVar('FIREWALLD_KERNEL_MODULES') or "").split() + return ' '.join([ 'kernel-module-' + mod.replace('_', '-').lower() for mod in kmodules ]) +RRECOMMENDS:${PN} += "${@get_kernel_deps(d)}" 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 index d5aeceeb42..119752086e 100644 --- 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 @@ -19,7 +19,7 @@ EXTRA_OEMESON = "-Druntime_deps_check=false -Dappindicator=false -Dpythoninstall SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service" SYSTEMD_AUTO_ENABLE:${PN} = "disable" -RRECOMENDS_${PN} += "adwaita-icon-theme" +RRECOMMENDS:${PN} += "adwaita-icon-theme" RDEPENDS:${PN} += " \ python3-core \ python3-dbus \ 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 da7e60419e..453e514b67 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 @@ -34,6 +34,8 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.0.x;lfs=0 file://check-openssl-cmds-in-script-bootstrap.patch \ " +raddbdir="${sysconfdir}/${MLPREFIX}raddb" + SRCREV = "af428abda249b2279ba0582180985a9f6f4a144a" PARALLEL_MAKE = "" @@ -48,6 +50,7 @@ EXTRA_OECONF = " --enable-strict-dependencies \ --with-docdir=${docdir}/freeradius-${PV} \ --with-openssl-includes=${STAGING_INCDIR} \ --with-openssl-libraries=${STAGING_LIBDIR} \ + --with-raddbdir=${raddbdir} \ --without-rlm_ippool \ --without-rlm_cache_memcached \ --without-rlm_counter \ @@ -98,7 +101,9 @@ PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl" PACKAGECONFIG[rlm-eap-fast] = "--with-rlm_eap_fast, --without-rlm_eap_fast" PACKAGECONFIG[rlm-eap-pwd] = "--with-rlm_eap_pwd, --without-rlm_eap_pwd" -inherit useradd autotools-brokensep update-rc.d systemd +inherit useradd autotools-brokensep update-rc.d systemd multilib_script multilib_header + +MULTILIB_SCRIPTS = "${PN}:${sbindir}/checkrad" # This is not a cpan or python based package, but it needs some definitions # from cpan-base and python3-dir bbclasses for building rlm_perl and rlm_python @@ -141,7 +146,7 @@ do_install() { oe_runmake install R=${D} INSTALLSTRIP="" # remove unsupported config files - rm -f ${D}/${sysconfdir}/raddb/experimental.conf + rm -f ${D}/${raddbdir}/experimental.conf # remove scripts that required Perl(DBI) rm -rf ${D}/${bindir}/radsqlrelay @@ -153,7 +158,7 @@ do_install() { rm -rf ${D}/${localstatedir}/log/ install -m 0644 ${WORKDIR}/volatiles.58_radiusd ${D}${sysconfdir}/default/volatiles/58_radiusd - chown -R radiusd:radiusd ${D}/${sysconfdir}/raddb/ + chown -R radiusd:radiusd ${D}/${raddbdir} chown -R radiusd:radiusd ${D}/${localstatedir}/lib/radiusd # For systemd @@ -169,6 +174,9 @@ do_install() { install -d ${D}${sysconfdir}/tmpfiles.d/ install -m 0644 ${WORKDIR}/radiusd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/radiusd.conf fi + oe_multilib_header freeradius/autoconf.h + oe_multilib_header freeradius/missing.h + oe_multilib_header freeradius/radpaths.h } # This is only needed when we install/update on a running target. @@ -183,7 +191,7 @@ pkg_postinst:${PN} () { fi # Fix ownership for /etc/raddb/*, /var/lib/radiusd - chown -R radiusd:radiusd ${sysconfdir}/raddb + chown -R radiusd:radiusd ${raddbdir} chown -R radiusd:radiusd ${localstatedir}/lib/radiusd fi } @@ -204,30 +212,30 @@ PACKAGES =+ "${PN}-utils ${PN}-ldap ${PN}-krb5 ${PN}-perl \ FILES:${PN}-utils = "${bindir}/*" FILES:${PN}-ldap = "${libdir}/rlm_ldap.so* \ - ${sysconfdir}/raddb/mods-available/ldap \ + ${raddbdir}/mods-available/ldap \ " FILES:${PN}-krb5 = "${libdir}/rlm_krb5.so* \ - ${sysconfdir}/raddb/mods-available/krb5 \ + ${raddbdir}/mods-available/krb5 \ " FILES:${PN}-perl = "${libdir}/rlm_perl.so* \ - ${sysconfdir}/raddb/mods-config/perl \ - ${sysconfdir}/raddb/mods-available/perl \ + ${raddbdir}/mods-config/perl \ + ${raddbdir}/mods-available/perl \ " FILES:${PN}-python = "${libdir}/rlm_python3.so* \ - ${sysconfdir}/raddb/mods-config/python3 \ - ${sysconfdir}/raddb/mods-available/python3 \ + ${raddbdir}/mods-config/python3 \ + ${raddbdir}/mods-available/python3 \ " FILES:${PN}-mysql = "${libdir}/rlm_sql_mysql.so* \ - ${sysconfdir}/raddb/mods-config/sql/*/mysql \ - ${sysconfdir}/raddb/mods-available/sql \ + ${raddbdir}/mods-config/sql/*/mysql \ + ${raddbdir}/mods-available/sql \ " FILES:${PN}-postgresql = "${libdir}/rlm_sql_postgresql.so* \ - ${sysconfdir}/raddb/mods-config/sql/*/postgresql \ + ${raddbdir}/mods-config/sql/*/postgresql \ " FILES:${PN}-unixodbc = "${libdir}/rlm_sql_unixodbc.so*" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb index d52ad6e6ce..c8fea5dbb7 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb @@ -86,7 +86,7 @@ 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" +PACKAGECONFIG[ppp] = "-Dppp=true -Dpppd=${sbindir}/pppd,-Dppp=false,ppp,ppp" PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq" PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss" PACKAGECONFIG[resolvconf] = "-Dresolvconf=${base_sbindir}/resolvconf,-Dresolvconf=no,,resolvconf" 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 deleted file mode 100644 index 022ba85a26..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.20.bb +++ /dev/null @@ -1,32 +0,0 @@ -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/openconnect/openconnect_9.01.bb b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_9.01.bb new file mode 100644 index 0000000000..afdbdca4e3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_9.01.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 = "5695cd6b0c7d42ca293ce0f00abcbe3d1ec4e609" + +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/snort/snort_2.9.19.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.19.bb deleted file mode 100644 index 26b335dbd5..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.19.bb +++ /dev/null @@ -1,111 +0,0 @@ -DESCRIPTION = "snort - a free lightweight network intrusion detection system for UNIX and Windows." -HOMEPAGE = "http://www.snort.org/" -SECTION = "net" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" - -DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native libtirpc bison-native" - -SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \ - file://snort.init \ - file://volatiles.99_snort \ - file://0001-libpcap-search-sysroot-for-headers.patch \ - file://fix-host-contamination-when-enable-static-daq.patch \ - file://disable-run-test-program-while-cross-compiling.patch \ - file://configure.in-disable-tirpc-checking-for-fedora.patch \ -" -SRC_URI[sha256sum] = "b12fc6db72afb58987a2bf1954b8f45bde02047c235513c7663857b9506369c7" - -UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" -UPSTREAM_CHECK_REGEX = "snort-(?P\d+(\.\d+)+)\.tar" - -inherit autotools gettext update-rc.d pkgconfig - -INITSCRIPT_NAME = "snort" -INITSCRIPT_PARAMS = "defaults" - -EXTRA_OECONF = " \ - --enable-gre \ - --enable-linux-smp-stats \ - --enable-reload \ - --enable-reload-error-restart \ - --enable-targetbased \ - --enable-static-daq \ - --with-dnet-includes=${STAGING_INCDIR} \ - --with-dnet-libraries=${STAGING_LIBDIR} \ - --with-libpcre-includes=${STAGING_INCDIR} \ - --with-libpcre-libraries=${STAGING_LIBDIR} \ - --with-daq-includes=${STAGING_INCDIR} \ - --with-daq-libraries=${STAGING_LIBDIR} \ -" - -# if you want to disable it, you need to patch configure.in first -# AC_CHECK_HEADERS([openssl/sha.h],, SHA_H="no") -# is called even with --without-openssl-includes -PACKAGECONFIG ?= "openssl lzma" -PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," -PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," -PACKAGECONFIG[appid] = "--enable-open-appid, --disable-open-appid, luajit, bash" - -CFLAGS += "-I${STAGING_INCDIR}/tirpc" -LDFLAGS += " -ltirpc" - -do_install:append() { - install -d ${D}${sysconfdir}/snort/rules - install -d ${D}${sysconfdir}/snort/preproc_rules - install -d ${D}${sysconfdir}/init.d - for i in map config conf dtd; do - cp ${S}/etc/*.$i ${D}${sysconfdir}/snort/ - done - - # fix the hardcoded path and lib name - # comment out the rules that are not provided - sed -i -e 's#/usr/local/lib#${libdir}#' \ - -e 's#\.\./\(.*rules\)#${sysconfdir}/snort/\1#' \ - -e 's#\(libsf_engine.so\)#\1.0#' \ - -e 's/^\(include $RULE_PATH\)/#\1/' \ - -e 's/^\(dynamicdetection\)/#\1/' \ - -e '/preprocessor reputation/,/blacklist/ s/^/#/' \ - ${D}${sysconfdir}/snort/snort.conf - - cp ${S}/preproc_rules/*.rules ${D}${sysconfdir}/snort/preproc_rules/ - install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort - - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort - - sed -i -e 's|-ffile-prefix-map[^ ]*||g; s|-fdebug-prefix-map[^ ]*||g; s|-fmacro-prefix-map[^ ]*||g; s|${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc -} - -pkg_postinst:${PN}() { - if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then - ${sysconfdir}/init.d/populate-volatile.sh update - fi -} - -FILES:${PN} += " \ - ${libdir}/snort_dynamicengine/*.so.* \ - ${libdir}/snort_dynamicpreprocessor/*.so.* \ - ${libdir}/snort_dynamicrules/*.so.* \ -" -FILES:${PN}-dbg += " \ - ${libdir}/snort_dynamicengine/.debug \ - ${libdir}/snort_dynamicpreprocessor/.debug \ - ${libdir}/snort_dynamicrules/.debug \ -" -FILES:${PN}-staticdev += " \ - ${libdir}/snort_dynamicengine/*.a \ - ${libdir}/snort_dynamicpreprocessor/*.a \ - ${libdir}/snort_dynamicrules/*.a \ - ${libdir}/snort/dynamic_preproc/*.a \ - ${libdir}/snort/dynamic_output/*.a \ -" -FILES:${PN}-dev += " \ - ${libdir}/snort_dynamicengine/*.la \ - ${libdir}/snort_dynamicpreprocessor/*.la \ - ${libdir}/snort_dynamicrules/*.la \ - ${libdir}/snort_dynamicengine/*.so \ - ${libdir}/snort_dynamicpreprocessor/*.so \ - ${libdir}/snort_dynamicrules/*.so \ - ${prefix}/src/snort_dynamicsrc \ -" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb new file mode 100644 index 0000000000..c15c20443d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb @@ -0,0 +1,111 @@ +DESCRIPTION = "snort - a free lightweight network intrusion detection system for UNIX and Windows." +HOMEPAGE = "http://www.snort.org/" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" + +DEPENDS = "xz libpcap libpcre daq libdnet util-linux daq-native libtirpc bison-native" + +SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \ + file://snort.init \ + file://volatiles.99_snort \ + file://0001-libpcap-search-sysroot-for-headers.patch \ + file://fix-host-contamination-when-enable-static-daq.patch \ + file://disable-run-test-program-while-cross-compiling.patch \ + file://configure.in-disable-tirpc-checking-for-fedora.patch \ +" +SRC_URI[sha256sum] = "29400e13f53b1831e0b8b10ec1224a1cbaa6dc1533a5322a20dd80bb84b4981c" + +UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" +UPSTREAM_CHECK_REGEX = "snort-(?P\d+(\.\d+)+)\.tar" + +inherit autotools gettext update-rc.d pkgconfig + +INITSCRIPT_NAME = "snort" +INITSCRIPT_PARAMS = "defaults" + +EXTRA_OECONF = " \ + --enable-gre \ + --enable-linux-smp-stats \ + --enable-reload \ + --enable-reload-error-restart \ + --enable-targetbased \ + --enable-static-daq \ + --with-dnet-includes=${STAGING_INCDIR} \ + --with-dnet-libraries=${STAGING_LIBDIR} \ + --with-libpcre-includes=${STAGING_INCDIR} \ + --with-libpcre-libraries=${STAGING_LIBDIR} \ + --with-daq-includes=${STAGING_INCDIR} \ + --with-daq-libraries=${STAGING_LIBDIR} \ +" + +# if you want to disable it, you need to patch configure.in first +# AC_CHECK_HEADERS([openssl/sha.h],, SHA_H="no") +# is called even with --without-openssl-includes +PACKAGECONFIG ?= "openssl lzma" +PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," +PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," +PACKAGECONFIG[appid] = "--enable-open-appid, --disable-open-appid, luajit, bash" + +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDFLAGS += " -ltirpc" + +do_install:append() { + install -d ${D}${sysconfdir}/snort/rules + install -d ${D}${sysconfdir}/snort/preproc_rules + install -d ${D}${sysconfdir}/init.d + for i in map config conf dtd; do + cp ${S}/etc/*.$i ${D}${sysconfdir}/snort/ + done + + # fix the hardcoded path and lib name + # comment out the rules that are not provided + sed -i -e 's#/usr/local/lib#${libdir}#' \ + -e 's#\.\./\(.*rules\)#${sysconfdir}/snort/\1#' \ + -e 's#\(libsf_engine.so\)#\1.0#' \ + -e 's/^\(include $RULE_PATH\)/#\1/' \ + -e 's/^\(dynamicdetection\)/#\1/' \ + -e '/preprocessor reputation/,/blacklist/ s/^/#/' \ + ${D}${sysconfdir}/snort/snort.conf + + cp ${S}/preproc_rules/*.rules ${D}${sysconfdir}/snort/preproc_rules/ + install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort + + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort + + sed -i -e 's|-ffile-prefix-map[^ ]*||g; s|-fdebug-prefix-map[^ ]*||g; s|-fmacro-prefix-map[^ ]*||g; s|${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc +} + +pkg_postinst:${PN}() { + if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi +} + +FILES:${PN} += " \ + ${libdir}/snort_dynamicengine/*.so.* \ + ${libdir}/snort_dynamicpreprocessor/*.so.* \ + ${libdir}/snort_dynamicrules/*.so.* \ +" +FILES:${PN}-dbg += " \ + ${libdir}/snort_dynamicengine/.debug \ + ${libdir}/snort_dynamicpreprocessor/.debug \ + ${libdir}/snort_dynamicrules/.debug \ +" +FILES:${PN}-staticdev += " \ + ${libdir}/snort_dynamicengine/*.a \ + ${libdir}/snort_dynamicpreprocessor/*.a \ + ${libdir}/snort_dynamicrules/*.a \ + ${libdir}/snort/dynamic_preproc/*.a \ + ${libdir}/snort/dynamic_output/*.a \ +" +FILES:${PN}-dev += " \ + ${libdir}/snort_dynamicengine/*.la \ + ${libdir}/snort_dynamicpreprocessor/*.la \ + ${libdir}/snort_dynamicrules/*.la \ + ${libdir}/snort_dynamicengine/*.so \ + ${libdir}/snort_dynamicpreprocessor/*.so \ + ${libdir}/snort_dynamicrules/*.so \ + ${prefix}/src/snort_dynamicsrc \ +" diff --git a/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.14.bb b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.14.bb new file mode 100644 index 0000000000..eda0129feb --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.14.bb @@ -0,0 +1,63 @@ +SUMMARY = "A 802.1ab implementation (LLDP) to help you locate neighbors of all your equipments" +SECTION = "net/misc" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" + +DEPENDS = "libbsd libevent" + +SRC_URI = "\ + http://media.luffy.cx/files/${BPN}/${BPN}-${PV}.tar.gz \ + file://lldpd.init.d \ + file://lldpd.default \ + " + +SRC_URI[sha256sum] = "a74819214f116a5dbc407a3d490caa01ba401a249517ac826a374059c12d12e8" + +inherit autotools update-rc.d useradd systemd pkgconfig bash-completion + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system -g lldpd --shell /bin/false lldpd" +GROUPADD_PARAM:${PN} = "--system lldpd" + +EXTRA_OECONF += "--without-embedded-libevent \ + --disable-oldies \ + --with-privsep-user=lldpd \ + --with-privsep-group=lldpd \ + --with-systemdsystemunitdir=${systemd_system_unitdir} \ + --without-sysusersdir \ +" + +PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3" +PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxm2" +PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp" +PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" +PACKAGECONFIG[seccomp] = "--with-seccomp,--without-seccomp,libseccomp" +PACKAGECONFIG[cdp] = "--enable-cdp,--disable-cdp" +PACKAGECONFIG[fdp] = "--enable-fdp,--disable-fdp" +PACKAGECONFIG[edp] = "--enable-edp,--disable-edp" +PACKAGECONFIG[sonmp] = "--enable-sonmp,--disable-sonmp" +PACKAGECONFIG[lldpmed] = "--enable-lldpmed,--disable-lldpmed" +PACKAGECONFIG[dot1] = "--enable-dot1,--disable-dot1" +PACKAGECONFIG[dot3] = "--enable-dot3,--disable-dot3" +PACKAGECONFIG[custom] = "--enable-custom,--disable-custom" + +INITSCRIPT_NAME = "lldpd" +INITSCRIPT_PARAMS = "defaults" + +SYSTEMD_SERVICE:${PN} = "lldpd.service" + +do_install:append() { + install -Dm 0755 ${WORKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd + install -Dm 0644 ${WORKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd + # Make an empty configuration file + touch ${D}${sysconfdir}/lldpd.conf +} + +PACKAGES =+ "${PN}-zsh-completion" + +FILES:${PN} += "${libdir}/sysusers.d" +RDEPENDS:${PN} += "os-release" + +FILES:${PN}-zsh-completion += "${datadir}/zsh/" +# FIXME: zsh is broken in meta-oe so this cannot be enabled for now +#RDEPENDS:${PN}-zsh-completion += "zsh" diff --git a/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.8.bb b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.8.bb deleted file mode 100644 index cf2b156fe7..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.8.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "A 802.1ab implementation (LLDP) to help you locate neighbors of all your equipments" -SECTION = "net/misc" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" - -DEPENDS = "libbsd libevent" - -SRC_URI = "\ - http://media.luffy.cx/files/${BPN}/${BPN}-${PV}.tar.gz \ - file://lldpd.init.d \ - file://lldpd.default \ - " - -SRC_URI[md5sum] = "000042dbf5b445f750b5ba01ab25c8ba" -SRC_URI[sha256sum] = "98d200e76e30f6262c4a4493148c1840827898329146a57a34f8f0f928ca3def" - -inherit autotools update-rc.d useradd systemd pkgconfig bash-completion - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system -g lldpd --shell /bin/false lldpd" -GROUPADD_PARAM:${PN} = "--system lldpd" - -EXTRA_OECONF += "--without-embedded-libevent \ - --disable-oldies \ - --with-privsep-user=lldpd \ - --with-privsep-group=lldpd \ - --with-systemdsystemunitdir=${systemd_system_unitdir} \ - --without-sysusersdir \ -" - -PACKAGECONFIG ??= "cdp fdp edp sonmp lldpmed dot1 dot3" -PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxm2" -PACKAGECONFIG[snmp] = "--with-snmp,--without-snmp,net-snmp" -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" -PACKAGECONFIG[seccomp] = "--with-seccomp,--without-seccomp,libseccomp" -PACKAGECONFIG[cdp] = "--enable-cdp,--disable-cdp" -PACKAGECONFIG[fdp] = "--enable-fdp,--disable-fdp" -PACKAGECONFIG[edp] = "--enable-edp,--disable-edp" -PACKAGECONFIG[sonmp] = "--enable-sonmp,--disable-sonmp" -PACKAGECONFIG[lldpmed] = "--enable-lldpmed,--disable-lldpmed" -PACKAGECONFIG[dot1] = "--enable-dot1,--disable-dot1" -PACKAGECONFIG[dot3] = "--enable-dot3,--disable-dot3" -PACKAGECONFIG[custom] = "--enable-custom,--disable-custom" - -INITSCRIPT_NAME = "lldpd" -INITSCRIPT_PARAMS = "defaults" - -SYSTEMD_SERVICE:${PN} = "lldpd.service" - -do_install:append() { - install -Dm 0755 ${WORKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd - install -Dm 0644 ${WORKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd - # Make an empty configuration file - touch ${D}${sysconfdir}/lldpd.conf -} - -PACKAGES =+ "${PN}-zsh-completion" - -FILES:${PN} += "${libdir}/sysusers.d" -RDEPENDS:${PN} += "os-release" - -FILES:${PN}-zsh-completion += "${datadir}/zsh/" -# FIXME: zsh is broken in meta-oe so this cannot be enabled for now -#RDEPENDS:${PN}-zsh-completion += "zsh" diff --git a/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch new file mode 100644 index 0000000000..e59501cc49 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet/0001-links.c-Fix-build-with-gcc-12.patch @@ -0,0 +1,40 @@ +From a8aac8f3fd8b07fde8f5dc0aa9ece54a46d24425 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Thu, 9 Jun 2022 16:03:06 +0800 +Subject: [PATCH] links.c: Fix build with gcc-12 + +Fixes: + | /build/tmp-glibc/work/corei7-64-wrs-linux/kronosnet/1.22-r0/recipe-sysroot/usr/include/bits/string_fortified.h:59:10: error: 'link' may be used uninitialized [-Werror=maybe-uninitialized] + | 59 | return __builtin___memset_chk (__dest, __ch, __len, + | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | 60 | __glibc_objsize0 (__dest)); + | | ~~~~~~~~~~~~~~~~~~~~~~~~~~ + | ../../git/libknet/links.c: In function 'knet_link_set_config': + | ../../git/libknet/links.c:108:27: note: 'link' was declared here + | 108 | struct knet_link *link; + | | ^~~~ + | cc1: all warnings being treated as errors + +Upstream-Status: Submitted[https://github.com/kronosnet/kronosnet/pull/382] + +Signed-off-by: Mingli Yu +--- + libknet/links.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libknet/links.c b/libknet/links.c +index 8cb1621b..0ef42b79 100644 +--- a/libknet/links.c ++++ b/libknet/links.c +@@ -105,7 +105,7 @@ int knet_link_set_config(knet_handle_t knet_h, knet_node_id_t host_id, uint8_t l + { + int savederrno = 0, err = 0, i, wipelink = 0, link_idx; + struct knet_host *host, *tmp_host; +- struct knet_link *link; ++ struct knet_link *link = NULL; + + if (!_is_valid_handle(knet_h)) { + return -1; +-- +2.25.1 + 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 ad0a00e78a..0b0bc29452 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 @@ -14,6 +14,7 @@ DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl SRCREV = "0123ecebce0ad6aba3cdb320027192e15fd71e23" SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1 \ file://0001-libknet-tests-Correct-include-path-for-poll.h.patch \ + file://0001-links.c-Fix-build-with-gcc-12.patch \ " UPSTREAM_CHECK_URI = "https://github.com/kronosnet/kronosnet/releases" 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 deleted file mode 100644 index 44479638f1..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.1.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Library for low-level interaction with nftables Netlink's API over libmnl" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26" -SECTION = "libs" -DEPENDS = "libmnl" - -SRCREV = "09456c720e9c00eecc08e41ac6b7c291b3821ee5" -SRC_URI = "git://git.netfilter.org/libnftnl;branch=master \ - file://0001-avoid-naming-local-function-as-one-of-printf-family.patch \ - file://0001-configure.ac-Add-serial-tests.patch \ - file://run-ptest \ - " - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig ptest - -RDEPENDS:${PN}-ptest += " bash python3-core make" - -TESTDIR = "tests" - -do_compile_ptest() { - cp -rf ${S}/build-aux . - oe_runmake buildtest-TESTS -} - -do_install_ptest() { - cp -rf ${B}/build-aux ${D}${PTEST_PATH} - install -d ${D}${PTEST_PATH}/${TESTDIR} - cp -rf ${B}/${TESTDIR}/Makefile ${D}${PTEST_PATH}/${TESTDIR} - - # the binaries compiled in ${TESTDIR} will look for a compiler to - # use, which will cause failures. Substitute the binaries in - # ${TESTDIR}/.libs instead - cp -rf ${B}/${TESTDIR}/.libs/* ${D}${PTEST_PATH}/${TESTDIR} - - # Alter the Makefile so that it does not try and rebuild anything in - # other nonexistent paths before running the actual tests - sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile -} - diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.2.bb b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.2.bb new file mode 100644 index 0000000000..3eca92dcec --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.2.bb @@ -0,0 +1,41 @@ +SUMMARY = "Library for low-level interaction with nftables Netlink's API over libmnl" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26" +SECTION = "libs" +DEPENDS = "libmnl" + +SRCREV = "f6575131e60ab10f131ea3ff36f69af2b6c3f614" +SRC_URI = "git://git.netfilter.org/libnftnl;branch=master \ + file://0001-avoid-naming-local-function-as-one-of-printf-family.patch \ + file://0001-configure.ac-Add-serial-tests.patch \ + file://run-ptest \ + " + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig ptest + +RDEPENDS:${PN}-ptest += " bash python3-core make" + +TESTDIR = "tests" + +do_compile_ptest() { + cp -rf ${S}/build-aux . + oe_runmake buildtest-TESTS +} + +do_install_ptest() { + cp -rf ${B}/build-aux ${D}${PTEST_PATH} + install -d ${D}${PTEST_PATH}/${TESTDIR} + cp -rf ${B}/${TESTDIR}/Makefile ${D}${PTEST_PATH}/${TESTDIR} + + # the binaries compiled in ${TESTDIR} will look for a compiler to + # use, which will cause failures. Substitute the binaries in + # ${TESTDIR}/.libs instead + cp -rf ${B}/${TESTDIR}/.libs/* ${D}${PTEST_PATH}/${TESTDIR} + + # Alter the Makefile so that it does not try and rebuild anything in + # other nonexistent paths before running the actual tests + sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile +} + 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 deleted file mode 100644 index 65ab2dfd8c..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-examples-compile-with-make-check-and-add-AM_CPPFLAGS.patch +++ /dev/null @@ -1,39 +0,0 @@ -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/0001-nftables-python-Split-root-from-prefix.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-nftables-python-Split-root-from-prefix.patch new file mode 100644 index 0000000000..377b29fff8 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-nftables-python-Split-root-from-prefix.patch @@ -0,0 +1,44 @@ +From c7513195a72b2e5be5c9c439cc606eb5dcc3fb7a Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Tue, 12 Jul 2022 17:44:34 +0100 +Subject: [PATCH] nftables: python: Split root from prefix + +The buildpaths QA check fails when python is enabled: + + WARNING: nftables-1.0.4-r0 do_package_qa: QA Issue: File /usr/lib/python3.10/site-packages/nftables/__pycache__/nftables.cpython-310.pyc in package nftables-python contains reference to TMPDIR + File /usr/lib/python3.10/site-packages/nftables/__pycache__/__init__.cpython-310.pyc in package nftables-python contains reference to TMPDIR [buildpaths] + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan +--- + py/Makefile.am | 2 +- + py/setup.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/py/Makefile.am b/py/Makefile.am +index 215ecd9e4751..a827cca10135 100644 +--- a/py/Makefile.am ++++ b/py/Makefile.am +@@ -7,7 +7,7 @@ all-local: + install-exec-local: + cd $(srcdir) && \ + $(PYTHON_BIN) setup.py build --build-base $(abs_builddir) \ +- install --prefix $(DESTDIR)$(prefix) ++ install --root $(DESTDIR) --prefix $(prefix) + + uninstall-local: + rm -rf $(DESTDIR)$(prefix)/lib*/python*/site-packages/nftables +diff --git a/py/setup.py b/py/setup.py +index 72fc8fd98b26..976aec583b71 100755 +--- a/py/setup.py ++++ b/py/setup.py +@@ -1,5 +1,5 @@ + #!/usr/bin/env python +-from distutils.core import setup ++from setuptools._distutils.core import setup + from nftables import NFTABLES_VERSION + + setup(name='nftables', +-- +2.35.1 + 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 deleted file mode 100644 index e078be79a1..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.2.bb +++ /dev/null @@ -1,53 +0,0 @@ -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 \ - file://run-ptest \ - " - -SRC_URI[sha256sum] = "0b28a36ffcf4567b841de7bd3f37918b1fed27859eb48bdec51e1f7a83954c02" - -inherit autotools manpages pkgconfig ptest - -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}" - -RDEPENDS:${PN}-ptest += " make bash python3-core python3-ctypes python3-json python3-misc util-linux" - -TESTDIR = "tests" - -PRIVATE_LIBS:${PN}-ptest:append = "libnftables.so.1" - -do_install_ptest() { - cp -rf ${S}/build-aux ${D}${PTEST_PATH} - cp -rf ${S}/src ${D}${PTEST_PATH} - mkdir -p ${D}${PTEST_PATH}/src/.libs - cp -rf ${B}/src/.libs/* ${D}${PTEST_PATH}/src/.libs - cp -rf ${B}/src/.libs/nft ${D}${PTEST_PATH}/src/ - cp -rf ${S}/py ${D}${PTEST_PATH} - cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH}/${TESTDIR} - sed -i 's#/usr/bin/python#/usr/bin/python3#' ${D}${PTEST_PATH}/${TESTDIR}/json_echo/run-test.py - sed -i 's#/usr/bin/env python#/usr/bin/env python3#' ${D}${PTEST_PATH}/${TESTDIR}/py/nft-test.py -} diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.4.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.4.bb new file mode 100644 index 0000000000..3466e16a62 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.4.bb @@ -0,0 +1,53 @@ +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)}" + +SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \ + file://0001-nftables-python-Split-root-from-prefix.patch \ + file://run-ptest \ + " + +SRC_URI[sha256sum] = "927fb1fea1f685a328c10cf791eb655d7e1ed49d310eea5cb3101dfd8d6cba35" + +inherit autotools manpages pkgconfig ptest + +PACKAGECONFIG ?= "python readline json" +PACKAGECONFIG[editline] = "--with-cli=editline, , libedit, , , linenoise readline" +PACKAGECONFIG[json] = "--with-json, --without-json, jansson" +PACKAGECONFIG[linenoise] = "--with-cli=linenoise, , linenoise, , , editline readline" +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}, --disable-python, python3-setuptools-native" +PACKAGECONFIG[readline] = "--with-cli=readline, , readline, , , editline linenoise" +PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" + +EXTRA_OECONF = "${@bb.utils.contains_any('PACKAGECONFIG', 'editline linenoise readline', '', '--without-cli', d)}" + +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}" + +RDEPENDS:${PN}-ptest += " ${PN}-python make bash python3-core python3-ctypes python3-json python3-misc util-linux" + +TESTDIR = "tests" + +PRIVATE_LIBS:${PN}-ptest:append = "libnftables.so.1" + +do_install_ptest() { + cp -rf ${S}/build-aux ${D}${PTEST_PATH} + cp -rf ${S}/src ${D}${PTEST_PATH} + mkdir -p ${D}${PTEST_PATH}/src/.libs + cp -rf ${B}/src/.libs/* ${D}${PTEST_PATH}/src/.libs + cp -rf ${B}/src/.libs/nft ${D}${PTEST_PATH}/src/ + cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH}/${TESTDIR} + sed -i 's#/usr/bin/python#/usr/bin/python3#' ${D}${PTEST_PATH}/${TESTDIR}/json_echo/run-test.py + sed -i 's#/usr/bin/env python#/usr/bin/env python3#' ${D}${PTEST_PATH}/${TESTDIR}/py/nft-test.py +} diff --git a/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc index 15eb65ad32..ccafaf0de4 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc +++ b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc @@ -53,3 +53,7 @@ do_install:append() { } FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" + +# This CVE is not for this product but cve-check assumes it is +# because two CPE collides when checking the NVD database +CVE_CHECK_IGNORE = "CVE-2018-1078" diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb b/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb index a7697a1ae9..984264a30f 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb @@ -2,3 +2,7 @@ require quagga.inc SRC_URI[md5sum] = "eced21b054d71c9e1b7c6ac43286a166" SRC_URI[sha256sum] = "e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3" + +CVE_CHECK_IGNORE += "\ + CVE-2016-4049 \ +" diff --git a/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb b/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb index 4f8e4d4282..dcfa7406d2 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb @@ -23,3 +23,5 @@ PACKAGECONFIG[inet] = "--enable-inet,--disable-inet," PACKAGECONFIG[inet6] = "--enable-inet6,--disable-inet6," EXTRA_OECONF += "--disable-debug" + +CVE_VERSION = "0.9.3.0" 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 57dd635dc3..8ce9e1db55 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 @@ -126,6 +126,10 @@ do_install() { ${D}${systemd_unitdir}/system/chronyd.service sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/chronyd sed -i 's!^EnvironmentFile=.*!EnvironmentFile=-${sysconfdir}/default/chronyd!' ${D}${systemd_unitdir}/system/chronyd.service + + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /var/lib/chrony 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/chronyd.conf + } FILES:${PN} = "${sbindir}/chronyd ${sysconfdir} ${localstatedir}/lib/chrony ${localstatedir}" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/CVE-2022-0934.patch b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/CVE-2022-0934.patch new file mode 100644 index 0000000000..6bd734d756 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/CVE-2022-0934.patch @@ -0,0 +1,191 @@ +From 3cdecc159e0f417a2f8d43d99632af26beea630f Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Thu, 31 Mar 2022 21:35:20 +0100 +Subject: [PATCH] Fix write-after-free error in DHCPv6 code. CVE-2022-0934 + refers. + +CVE: CVE-2022-0934 + +Upstream-Status: Backport +[https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff;h=03345ecefe] + +Signed-off-by: Yi Zhao +--- + CHANGELOG | 3 +++ + src/rfc3315.c | 48 +++++++++++++++++++++++++++--------------------- + 2 files changed, 30 insertions(+), 21 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 5e54df9..a28da2a 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,4 +1,7 @@ + version 2.86 ++ Fix write-after-free error in DHCPv6 server code. ++ CVE-2022-0934 refers. ++ + Handle DHCPREBIND requests in the DHCPv6 server code. + Thanks to Aichun Li for spotting this omission, and the initial + patch. +diff --git a/src/rfc3315.c b/src/rfc3315.c +index 5c2ff97..6ecfeeb 100644 +--- a/src/rfc3315.c ++++ b/src/rfc3315.c +@@ -33,9 +33,9 @@ struct state { + unsigned int mac_len, mac_type; + }; + +-static int dhcp6_maybe_relay(struct state *state, void *inbuff, size_t sz, ++static int dhcp6_maybe_relay(struct state *state, unsigned char *inbuff, size_t sz, + struct in6_addr *client_addr, int is_unicast, time_t now); +-static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_t sz, int is_unicast, time_t now); ++static int dhcp6_no_relay(struct state *state, int msg_type, unsigned char *inbuff, size_t sz, int is_unicast, time_t now); + static void log6_opts(int nest, unsigned int xid, void *start_opts, void *end_opts); + static void log6_packet(struct state *state, char *type, struct in6_addr *addr, char *string); + static void log6_quiet(struct state *state, char *type, struct in6_addr *addr, char *string); +@@ -104,12 +104,12 @@ unsigned short dhcp6_reply(struct dhcp_context *context, int interface, char *if + } + + /* This cost me blood to write, it will probably cost you blood to understand - srk. */ +-static int dhcp6_maybe_relay(struct state *state, void *inbuff, size_t sz, ++static int dhcp6_maybe_relay(struct state *state, unsigned char *inbuff, size_t sz, + struct in6_addr *client_addr, int is_unicast, time_t now) + { + void *end = inbuff + sz; + void *opts = inbuff + 34; +- int msg_type = *((unsigned char *)inbuff); ++ int msg_type = *inbuff; + unsigned char *outmsgtypep; + void *opt; + struct dhcp_vendor *vendor; +@@ -259,15 +259,15 @@ static int dhcp6_maybe_relay(struct state *state, void *inbuff, size_t sz, + return 1; + } + +-static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_t sz, int is_unicast, time_t now) ++static int dhcp6_no_relay(struct state *state, int msg_type, unsigned char *inbuff, size_t sz, int is_unicast, time_t now) + { + void *opt; +- int i, o, o1, start_opts; ++ int i, o, o1, start_opts, start_msg; + struct dhcp_opt *opt_cfg; + struct dhcp_netid *tagif; + struct dhcp_config *config = NULL; + struct dhcp_netid known_id, iface_id, v6_id; +- unsigned char *outmsgtypep; ++ unsigned char outmsgtype; + struct dhcp_vendor *vendor; + struct dhcp_context *context_tmp; + struct dhcp_mac *mac_opt; +@@ -296,12 +296,13 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ + v6_id.next = state->tags; + state->tags = &v6_id; + +- /* copy over transaction-id, and save pointer to message type */ +- if (!(outmsgtypep = put_opt6(inbuff, 4))) ++ start_msg = save_counter(-1); ++ /* copy over transaction-id */ ++ if (!put_opt6(inbuff, 4)) + return 0; + start_opts = save_counter(-1); +- state->xid = outmsgtypep[3] | outmsgtypep[2] << 8 | outmsgtypep[1] << 16; +- ++ state->xid = inbuff[3] | inbuff[2] << 8 | inbuff[1] << 16; ++ + /* We're going to be linking tags from all context we use. + mark them as unused so we don't link one twice and break the list */ + for (context_tmp = state->context; context_tmp; context_tmp = context_tmp->current) +@@ -347,7 +348,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ + (msg_type == DHCP6REQUEST || msg_type == DHCP6RENEW || msg_type == DHCP6RELEASE || msg_type == DHCP6DECLINE)) + + { +- *outmsgtypep = DHCP6REPLY; ++ outmsgtype = DHCP6REPLY; + o1 = new_opt6(OPTION6_STATUS_CODE); + put_opt6_short(DHCP6USEMULTI); + put_opt6_string("Use multicast"); +@@ -619,11 +620,11 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ + struct dhcp_netid *solicit_tags; + struct dhcp_context *c; + +- *outmsgtypep = DHCP6ADVERTISE; ++ outmsgtype = DHCP6ADVERTISE; + + if (opt6_find(state->packet_options, state->end, OPTION6_RAPID_COMMIT, 0)) + { +- *outmsgtypep = DHCP6REPLY; ++ outmsgtype = DHCP6REPLY; + state->lease_allocate = 1; + o = new_opt6(OPTION6_RAPID_COMMIT); + end_opt6(o); +@@ -809,7 +810,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ + int start = save_counter(-1); + + /* set reply message type */ +- *outmsgtypep = DHCP6REPLY; ++ outmsgtype = DHCP6REPLY; + state->lease_allocate = 1; + + log6_quiet(state, "DHCPREQUEST", NULL, ignore ? _("ignored") : NULL); +@@ -924,7 +925,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ + int address_assigned = 0; + + /* set reply message type */ +- *outmsgtypep = DHCP6REPLY; ++ outmsgtype = DHCP6REPLY; + + log6_quiet(state, msg_type == DHCP6RENEW ? "DHCPRENEW" : "DHCPREBIND", NULL, NULL); + +@@ -1057,7 +1058,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ + int good_addr = 0; + + /* set reply message type */ +- *outmsgtypep = DHCP6REPLY; ++ outmsgtype = DHCP6REPLY; + + log6_quiet(state, "DHCPCONFIRM", NULL, NULL); + +@@ -1121,7 +1122,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ + log6_quiet(state, "DHCPINFORMATION-REQUEST", NULL, ignore ? _("ignored") : state->hostname); + if (ignore) + return 0; +- *outmsgtypep = DHCP6REPLY; ++ outmsgtype = DHCP6REPLY; + tagif = add_options(state, 1); + break; + } +@@ -1130,7 +1131,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ + case DHCP6RELEASE: + { + /* set reply message type */ +- *outmsgtypep = DHCP6REPLY; ++ outmsgtype = DHCP6REPLY; + + log6_quiet(state, "DHCPRELEASE", NULL, NULL); + +@@ -1195,7 +1196,7 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ + case DHCP6DECLINE: + { + /* set reply message type */ +- *outmsgtypep = DHCP6REPLY; ++ outmsgtype = DHCP6REPLY; + + log6_quiet(state, "DHCPDECLINE", NULL, NULL); + +@@ -1275,7 +1276,12 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_ + } + + } +- ++ ++ /* Fill in the message type. Note that we store the offset, ++ not a direct pointer, since the packet memory may have been ++ reallocated. */ ++ ((unsigned char *)(daemon->outpacket.iov_base))[start_msg] = outmsgtype; ++ + log_tags(tagif, state->xid); + log6_opts(0, state->xid, daemon->outpacket.iov_base + start_opts, daemon->outpacket.iov_base + save_counter(-1)); + +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.86.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.86.bb index 31ca51ec60..0f7880ce8c 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.86.bb +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.86.bb @@ -3,5 +3,6 @@ require dnsmasq.inc SRC_URI[dnsmasq-2.86.sha256sum] = "ef15f608a83ee2b1d1d2c1f11d089a7e0ac401ffb0991de73fc01ce5f290e512" SRC_URI += "\ file://lua.patch \ + file://CVE-2022-0934.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.31.10.bb b/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.31.10.bb new file mode 100644 index 0000000000..07870bb2c0 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.31.10.bb @@ -0,0 +1,33 @@ +SUMMARY = "nbdkit is a toolkit for creating NBD servers." +DESCRIPTION = "NBD — Network Block Device — is a protocol \ +for accessing Block Devices (hard disks and disk-like things) \ +over a Network. \ +\ +nbdkit is a toolkit for creating NBD servers." + +HOMEPAGE = "https://github.com/libguestfs/nbdkit" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9dcc2d8acdde215fa4bd6ac12bb14f0" + +SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https;branch=master \ +" +SRCREV = "1c31e0e5397646ae3709b1fbfd9c3b47b904f254" + +S = "${WORKDIR}/git" + +DEPENDS = "curl xz e2fsprogs zlib" + +# autotools-brokensep is needed as nbdkit does not support build in external directory +inherit pkgconfig python3native perlnative bash-completion autotools-brokensep + +# Those are required to build standalone +EXTRA_OECONF = " --without-libvirt --without-libguestfs --disable-perl" + +# Disable some extended support (not desired for small embedded systems) +#EXTRA_OECONF += " --disable-python" +#EXTRA_OECONF += " --disable-ocaml" +#EXTRA_OECONF += " --disable-rust" +#EXTRA_OECONF += " --disable-ruby" +#EXTRA_OECONF += " --disable-tcl" +#EXTRA_OECONF += " --disable-lua" +#EXTRA_OECONF += " --disable-vddk" diff --git a/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.31.7.bb b/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.31.7.bb deleted file mode 100644 index 2de32cc1ee..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/nbdkit/nbdkit_1.31.7.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "nbdkit is a toolkit for creating NBD servers." -DESCRIPTION = "NBD — Network Block Device — is a protocol \ -for accessing Block Devices (hard disks and disk-like things) \ -over a Network. \ -\ -nbdkit is a toolkit for creating NBD servers." - -HOMEPAGE = "https://github.com/libguestfs/nbdkit" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f9dcc2d8acdde215fa4bd6ac12bb14f0" - -SRC_URI = "git://github.com/libguestfs/nbdkit.git;protocol=https;branch=master \ -" - -SRCREV = "7c0e2d19d30eb0bd2e079febb5a2c31f65e5023d" - -S = "${WORKDIR}/git" - -DEPENDS = "curl xz e2fsprogs zlib" - -# autotools-brokensep is needed as nbdkit does not support build in external directory -inherit pkgconfig python3native perlnative bash-completion autotools-brokensep - -# Those are required to build standalone -EXTRA_OECONF = " --without-libvirt --without-libguestfs --disable-perl" - -# Disable some extended support (not desired for small embedded systems) -#EXTRA_OECONF += " --disable-python" -#EXTRA_OECONF += " --disable-ocaml" -#EXTRA_OECONF += " --disable-rust" -#EXTRA_OECONF += " --disable-ruby" -#EXTRA_OECONF += " --disable-tcl" -#EXTRA_OECONF += " --disable-lua" -#EXTRA_OECONF += " --disable-vddk" diff --git a/meta-openembedded/meta-networking/recipes-support/netperf/files/netserver_permissions.patch b/meta-openembedded/meta-networking/recipes-support/netperf/files/netserver_permissions.patch new file mode 100644 index 0000000000..55316363e0 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/netperf/files/netserver_permissions.patch @@ -0,0 +1,29 @@ +From 78c9ae7d9a6735575bc72dd28a19b2bc3a251981 Mon Sep 17 00:00:00 2001 +From: Andrew Elble +Date: Mon, 8 Oct 2018 14:31:20 -0400 +Subject: [PATCH] netserver: don't change permissions on /dev/null + +the (now default) suppress_debug=1 changes permissions on /dev/null +to 0644. Don't do this. + +Upstream-Status: Pending [https://github.com/HewlettPackard/netperf/pull/27/commits/78c9ae7d9a6735575bc72dd28a19b2bc3a251981] +Signed-off-by: Ashish Sharma + +--- + src/netserver.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/netserver.c b/src/netserver.c +index 00c8d23..86a1c45 100644 +--- a/src/netserver.c ++++ b/src/netserver.c +@@ -278,7 +278,8 @@ open_debug_file() + + #if !defined(WIN32) + +- chmod(FileName,0644); ++ if (!suppress_debug) ++ chmod(FileName,0644); + + /* redirect stdin to "/dev/null" */ + rd_null_fp = fopen(NETPERF_NULL,"r"); diff --git a/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb index 62ba966d01..06b2eddbb6 100644 --- a/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/HewlettPackard/netperf.git;branch=master;protocol=ht file://netserver.service \ file://0001-netlib.c-Move-including-sched.h-out-og-function.patch \ file://0001-nettest_omni-Remove-duplicate-variable-definitions.patch \ + file://netserver_permissions.patch \ " SRCREV = "3bc455b23f901dae377ca0a558e1e32aa56b31c4" diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb index fe2bd0773c..a30f720bb5 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb @@ -29,7 +29,31 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g SRC_URI[sha256sum] = "f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19" # CVE-2016-9312 is only for windows. -CVE_CHECK_IGNORE += "CVE-2016-9312" +# The other CVEs are not correctly identified because cve-check +# is not able to check the version correctly (it only checks for 4.2.8 omitting p15 that makes the difference) +CVE_CHECK_IGNORE += "\ + CVE-2016-9312 \ + CVE-2015-5146 \ + CVE-2015-5300 \ + CVE-2015-7975 \ + CVE-2015-7976 \ + CVE-2015-7977 \ + CVE-2015-7978 \ + CVE-2015-7979 \ + CVE-2015-8138 \ + CVE-2015-8139 \ + CVE-2015-8140 \ + CVE-2015-8158 \ + CVE-2016-1547 \ + CVE-2016-2516 \ + CVE-2016-2517 \ + CVE-2016-2519 \ + CVE-2016-7429 \ + CVE-2016-7433 \ + CVE-2016-9310 \ + CVE-2016-9311 \ +" + inherit autotools update-rc.d useradd systemd pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch new file mode 100644 index 0000000000..03b454d625 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch @@ -0,0 +1,48 @@ +From ea179d83b0aa62719d90748cd1fb260f40055f15 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Mon, 13 Jun 2022 22:44:28 +0800 +Subject: [PATCH] configure.ac: eliminate build path from openvpn --version + option + +Before the patch: +$ openvpn --version +OpenVPN 2.5.7 x86_64-poky-linux-gnu [SSL (OpenSSL)] [LZO] [LZ4] [EPOLL] +[snip] +Compile time defines: enable_async_push=no enable_comp_stub=no +[snip] +with_crypto_library=openssl with_gnu_ld=yes +with_libtool_sysroot=/buildarea/build/tmp/work/core2-64-poky-linux/openvpn/2.5.7-r0/recipe-sysroot +with_mem_check=no with_openssl_engine=auto + +After the patch: +$ openvpn --version +OpenVPN 2.5.7 x86_64-poky-linux-gnu [SSL (OpenSSL)] [LZO] [LZ4] [EPOLL] +[snip] +Compile time defines: enable_async_push=no enable_comp_stub=no +[snip] +with_crypto_library=openssl with_gnu_ld=yes with_mem_check=no +with_openssl_engine=auto + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2f5f6bc..eddcbc5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1377,7 +1377,7 @@ if test "${enable_async_push}" = "yes"; then + esac + fi + +-CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*='`" ++CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*=' | grep -v 'libtool_sysroot'`" + AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings]) + + TAP_WIN_COMPONENT_ID="PRODUCT_TAP_WIN_COMPONENT_ID" +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn old mode 100755 new mode 100644 diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf deleted file mode 100644 index 1205806d52..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf +++ /dev/null @@ -1 +0,0 @@ -d @LOCALSTATEDIR@/run/openvpn 0755 root root - diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn@.service b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn@.service deleted file mode 100644 index 01dd2e8c25..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenVPN Robust And Highly Flexible Tunneling Application On %I -After=syslog.target network.target - -[Service] -PrivateTmp=true -Type=forking -PIDFile=/var/run/openvpn/%i.pid -ExecStart=/usr/sbin/openvpn --daemon --writepid /var/run/openvpn/%i.pid --cd /etc/openvpn/ --cipher AES-256-GCM --data-ciphers AES-256-GCM:AES-128-GCM:AES-256-CBC:AES-128-CBC:BF-CBC --config %i.conf - -[Install] -WantedBy=multi-user.target diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.7.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.7.bb index 3ed90a7c8d..a28c73ab5a 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.7.bb +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.7.bb @@ -5,12 +5,12 @@ 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 +inherit autotools systemd update-rc.d pkgconfig SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ + file://0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch \ file://openvpn \ - file://openvpn@.service \ - file://openvpn-volatile.conf" + " UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" @@ -19,9 +19,6 @@ SRC_URI[sha256sum] = "08340a389905c84196b6cd750add1bc0fa2d46a1afebfd589c24120946 # 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 ." @@ -35,31 +32,36 @@ EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-p # Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host. EXTRA_OECONF += "IPROUTE=${base_sbindir}/ip" +EXTRA_OECONF += "SYSTEMD_UNIT_DIR=${systemd_system_unitdir} \ + TMPFILES_DIR=${nonarch_libdir}/tmpfiles.d \ + " + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ + " + +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" + 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/server + install -d ${D}/${sysconfdir}/openvpn/client + 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 -m 644 ${S}/sample/sample-config-files/loopback-server ${D}${sysconfdir}/openvpn/sample/loopback-server.conf + install -m 644 ${S}/sample/sample-config-files/loopback-client ${D}${sysconfdir}/openvpn/sample/loopback-client.conf + install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-config-files install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys + install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-scripts + install -m 644 ${S}/sample/sample-config-files/* ${D}${sysconfdir}/openvpn/sample/sample-config-files install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys + install -m 644 ${S}/sample/sample-scripts/* ${D}${sysconfdir}/openvpn/sample/sample-scripts - 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 + install -d -m 710 ${D}/${localstatedir}/lib/openvpn } PACKAGES =+ " ${PN}-sample " @@ -67,9 +69,9 @@ 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} += "${systemd_system_unitdir}/openvpn-server@.service \ + ${systemd_system_unitdir}/openvpn-client@.service \ + ${nonarch_libdir}/tmpfiles.d \ " -FILES:${PN}-sample += "${systemd_unitdir}/system/openvpn@loopback-server.service \ - ${systemd_unitdir}/system/openvpn@loopback-client.service \ - ${sysconfdir}/openvpn/sample/" +FILES:${PN}-sample = "${sysconfdir}/openvpn/sample/ \ + " diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_40.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_40.0.bb deleted file mode 100644 index c567e3314b..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_40.0.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Userspace support for InfiniBand/RDMA verbs" -DESCRIPTION = "This is the userspace components for the Linux Kernel's drivers Infiniband/RDMA subsystem." -SECTION = "libs" - -DEPENDS = "libnl" -RDEPENDS:${PN} = "bash perl" - -SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https" -SRCREV = "a3e69268892bbd5ab30123748e89a26509a25ac5" -S = "${WORKDIR}/git" - -#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md -LICENSE = "BSD-2-Clause | GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ - file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -EXTRA_OECMAKE = " \ - -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ - -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ - -DNO_MAN_PAGES=1 \ -" - -LTO = "" - -FILES_SOLIBSDEV = "" -FILES:${PN} += "${libdir}/*" -INSANE_SKIP:${PN} += "dev-so" - -inherit cmake cpan-base pkgconfig python3native systemd - -SYSTEMD_SERVICE:${PN} = " \ - srp_daemon.service \ - iwpmd.service \ - ibacm.socket \ - rdma-load-modules@.service \ - srp_daemon_port@.service \ - rdma-hw.target \ - ibacm.service \ -" -SYSTEMD_AUTO_ENABLE = "disable" - -OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_41.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_41.0.bb new file mode 100644 index 0000000000..e5ecc5cd62 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_41.0.bb @@ -0,0 +1,42 @@ +SUMMARY = "Userspace support for InfiniBand/RDMA verbs" +DESCRIPTION = "This is the userspace components for the Linux Kernel's drivers Infiniband/RDMA subsystem." +SECTION = "libs" + +DEPENDS = "libnl" +RDEPENDS:${PN} = "bash perl" + +SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https" +SRCREV = "467363efbc0fea706752c1ba7a21c313823017e7" +S = "${WORKDIR}/git" + +#Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md +LICENSE = "BSD-2-Clause | GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING.BSD_FB;md5=0ec18bae1a9df92c8d6ae01f94a289ae \ + file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +EXTRA_OECMAKE = " \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=${systemd_system_unitdir} \ + -DCMAKE_INSTALL_PERLDIR=${libdir}/perl5/${@get_perl_version(d)} \ + -DNO_MAN_PAGES=1 \ +" + +LTO = "" + +FILES_SOLIBSDEV = "" +FILES:${PN} += "${libdir}/*" +INSANE_SKIP:${PN} += "dev-so" + +inherit cmake cpan-base pkgconfig python3native systemd + +SYSTEMD_SERVICE:${PN} = " \ + srp_daemon.service \ + iwpmd.service \ + ibacm.socket \ + rdma-load-modules@.service \ + srp_daemon_port@.service \ + rdma-hw.target \ + ibacm.service \ +" +SYSTEMD_AUTO_ENABLE = "disable" + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb index d9083bcbe8..1887a5582f 100644 --- a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb @@ -30,6 +30,12 @@ SRC_URI = " \ S = "${WORKDIR}/git" +CVE_CHECK_IGNORE += "\ + CVE-2016-0749 \ + CVE-2016-2150 \ + CVE-2018-10893 \ +" + inherit autotools gettext python3native python3-dir pkgconfig DEPENDS += "spice-protocol jpeg pixman alsa-lib glib-2.0 python3-pyparsing-native python3-six-native glib-2.0-native" diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch b/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch new file mode 100644 index 0000000000..e730fe1cd0 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch @@ -0,0 +1,31 @@ +From d23c0ea81e630af3cfda89aeeb52146c0c84c960 Mon Sep 17 00:00:00 2001 +From: Tobias Brunner +Date: Mon, 2 May 2022 09:31:49 +0200 +Subject: [PATCH] enum: Fix compiler warning + +Closes strongswan/strongswan#1025 + +Upstream-Status: Backport +[https://github.com/strongswan/strongswan/commit/d23c0ea81e630af3cfda89aeeb52146c0c84c960] + +Signed-off-by: Yi Zhao +--- + src/libstrongswan/utils/enum.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libstrongswan/utils/enum.c b/src/libstrongswan/utils/enum.c +index 79da450f0c..1e77489f6f 100644 +--- a/src/libstrongswan/utils/enum.c ++++ b/src/libstrongswan/utils/enum.c +@@ -97,7 +97,7 @@ char *enum_flags_to_string(enum_name_t *e, u_int val, char *buf, size_t len) + return buf; + } + +- if (snprintf(buf, len, e->names[0]) >= len) ++ if (snprintf(buf, len, "%s", e->names[0]) >= len) + { + return NULL; + } +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-openssl-Don-t-unload-providers.patch b/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-openssl-Don-t-unload-providers.patch deleted file mode 100644 index 7da48cd2cf..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-openssl-Don-t-unload-providers.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 3eecd40cec6415fc033f8d9141ab652047e71524 Mon Sep 17 00:00:00 2001 -From: Tobias Brunner -Date: Wed, 23 Feb 2022 17:29:02 +0100 -Subject: [PATCH] openssl: Don't unload providers - -There is a conflict between atexit() handlers registered by OpenSSL and -some executables (e.g. swanctl or pki) to deinitialize libstrongswan. -Because plugins are usually loaded after atexit() has been called, the -handler registered by OpenSSL will run before our handler. So when the -latter destroys the plugins it's a bad idea to try to access any OpenSSL -objects as they might already be invalid. - -Fixes: f556fce16b60 ("openssl: Load "legacy" provider in OpenSSL 3 for algorithms like MD4, DES etc.") -Closes strongswan/strongswan#921 - -Upstream-Status: Backport -[https://github.com/strongswan/strongswan/commit/3eecd40cec6415fc033f8d9141ab652047e71524] - -Signed-off-by: Yi Zhao ---- - .../plugins/openssl/openssl_plugin.c | 27 +++---------------- - 1 file changed, 3 insertions(+), 24 deletions(-) - -diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c -index 6b4923649..1491d5cf8 100644 ---- a/src/libstrongswan/plugins/openssl/openssl_plugin.c -+++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c -@@ -16,7 +16,6 @@ - - #include - #include --#include - #include - #include - #include -@@ -74,13 +73,6 @@ struct private_openssl_plugin_t { - * public functions - */ - openssl_plugin_t public; -- --#if OPENSSL_VERSION_NUMBER >= 0x30000000L -- /** -- * Loaded providers -- */ -- array_t *providers; --#endif - }; - - /** -@@ -887,15 +879,6 @@ METHOD(plugin_t, get_features, int, - METHOD(plugin_t, destroy, void, - private_openssl_plugin_t *this) - { --#if OPENSSL_VERSION_NUMBER >= 0x30000000L -- OSSL_PROVIDER *provider; -- while (array_remove(this->providers, ARRAY_TAIL, &provider)) -- { -- OSSL_PROVIDER_unload(provider); -- } -- array_destroy(this->providers); --#endif /* OPENSSL_VERSION_NUMBER */ -- - /* OpenSSL 1.1.0 cleans up itself at exit and while OPENSSL_cleanup() exists we - * can't call it as we couldn't re-initialize the library (as required by the - * unit tests and the Android app) */ -@@ -1009,20 +992,16 @@ plugin_t *openssl_plugin_create() - DBG1(DBG_LIB, "unable to load OpenSSL FIPS provider"); - return NULL; - } -- array_insert_create(&this->providers, ARRAY_TAIL, fips); - /* explicitly load the base provider containing encoding functions */ -- array_insert_create(&this->providers, ARRAY_TAIL, -- OSSL_PROVIDER_load(NULL, "base")); -+ OSSL_PROVIDER_load(NULL, "base"); - } - else if (lib->settings->get_bool(lib->settings, "%s.plugins.openssl.load_legacy", - TRUE, lib->ns)) - { - /* load the legacy provider for algorithms like MD4, DES, BF etc. */ -- array_insert_create(&this->providers, ARRAY_TAIL, -- OSSL_PROVIDER_load(NULL, "legacy")); -+ OSSL_PROVIDER_load(NULL, "legacy"); - /* explicitly load the default provider, as mentioned by crypto(7) */ -- array_insert_create(&this->providers, ARRAY_TAIL, -- OSSL_PROVIDER_load(NULL, "default")); -+ OSSL_PROVIDER_load(NULL, "default"); - } - ossl_provider_names_t data = {}; - OSSL_PROVIDER_do_all(NULL, concat_ossl_providers, &data); --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.5.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.5.bb deleted file mode 100644 index cfb7b41fa4..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.5.bb +++ /dev/null @@ -1,186 +0,0 @@ -DESCRIPTION = "strongSwan is an OpenSource IPsec implementation for the \ -Linux operating system." -SUMMARY = "strongSwan is an OpenSource IPsec implementation" -HOMEPAGE = "http://www.strongswan.org" -SECTION = "net" -LICENSE = "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)}" - -SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ - file://0001-openssl-Don-t-unload-providers.patch \ - " - -SRC_URI[sha256sum] = "983e4ef4a4c6c9d69f5fe6707c7fe0b2b9a9291943bbf4e008faab6bf91c0bdd" - -UPSTREAM_CHECK_REGEX = "strongswan-(?P\d+(\.\d+)+)\.tar" - -EXTRA_OECONF = " \ - --without-lib-prefix \ - --with-dev-headers=${includedir}/strongswan \ -" - -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" - -PACKAGECONFIG ?= "curl gmp openssl sqlite3 swanctl curve25519\ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-charon', 'charon', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'tpm2', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'tnc-imc imc-hcd imc-os imc-scanner imc-attestation', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'tnc-imv imv-hcd imv-os imv-scanner imv-attestation', '', d)} \ -" - -PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni" -PACKAGECONFIG[bfd] = "--enable-bfd-backtraces,--disable-bfd-backtraces,binutils" -PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl" -PACKAGECONFIG[eap-identity] = "--enable-eap-identity,--disable-eap-identity,,${PN}-plugin-eap-identity" -PACKAGECONFIG[eap-mschapv2] = "--enable-eap-mschapv2,--disable-eap-mschapv2,,${PN}-plugin-eap-mschapv2" -PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp" -PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap" -PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql" -PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,${PN}-plugin-openssl" -PACKAGECONFIG[scep] = "--enable-scepclient,--disable-scepclient," -PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-soup" -PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite" -PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke" -PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc" -PACKAGECONFIG[curve25519] = "--enable-curve25519,--disable-curve25519,, ${PN}-plugin-curve25519" - -# requires swanctl -PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd," - -# tpm needs meta-tpm layer -PACKAGECONFIG[tpm2] = "--enable-tpm,--disable-tpm,,${PN}-plugin-tpm" - - -# integraty configuration needs meta-integraty -#imc -PACKAGECONFIG[tnc-imc] = "--enable-tnc-imc,--disable-tnc-imc,, ${PN}-plugin-tnc-imc ${PN}-plugin-tnc-tnccs" -PACKAGECONFIG[imc-test] = "--enable-imc-test,--disable-imc-test,," -PACKAGECONFIG[imc-scanner] = "--enable-imc-scanner,--disable-imc-scanner,," -PACKAGECONFIG[imc-os] = "--enable-imc-os,--disable-imc-os,," -PACKAGECONFIG[imc-attestation] = "--enable-imc-attestation,--disable-imc-attestation,," -PACKAGECONFIG[imc-swima] = "--enable-imc-swima, --disable-imc-swima, json-c," -PACKAGECONFIG[imc-hcd] = "--enable-imc-hcd, --disable-imc-hcd,," - -#imv set -PACKAGECONFIG[tnc-imv] = "--enable-tnc-imv,--disable-tnc-imv,, ${PN}-plugin-tnc-imv ${PN}-plugin-tnc-tnccs" -PACKAGECONFIG[imv-test] = "--enable-imv-test,--disable-imv-test,," -PACKAGECONFIG[imv-scanner] = "--enable-imv-scanner,--disable-imv-scanner,," -PACKAGECONFIG[imv-os] = "--enable-imv-os,--disable-imv-os,," -PACKAGECONFIG[imv-attestation] = "--enable-imv-attestation,--disable-imv-attestation,," -PACKAGECONFIG[imv-swima] = "--enable-imv-swima, --disable-imv-swima, json-c," -PACKAGECONFIG[imv-hcd] = "--enable-imv-hcd, --disable-imv-hcd,," - -PACKAGECONFIG[tnc-ifmap] = "--enable-tnc-ifmap,--disable-tnc-ifmap, libxml2, ${PN}-plugin-tnc-ifmap" -PACKAGECONFIG[tnc-pdp] = "--enable-tnc-pdp,--disable-tnc-pdp,, ${PN}-plugin-tnc-pdp" - -PACKAGECONFIG[tnccs-11] = "--enable-tnccs-11,--disable-tnccs-11,libxml2, ${PN}-plugin-tnccs-11" -PACKAGECONFIG[tnccs-20] = "--enable-tnccs-20,--disable-tnccs-20,, ${PN}-plugin-tnccs-20" -PACKAGECONFIG[tnccs-dynamic] = "--enable-tnccs-dynamic,--disable-tnccs-dynamic,,${PN}-plugin-tnccs-dynamic" - -inherit autotools systemd pkgconfig - -RRECOMMENDS:${PN} = "kernel-module-ah4 \ - kernel-module-esp4 \ - kernel-module-xfrm-user \ - " - -FILES:${PN} += "${libdir}/ipsec/lib*${SOLIBS}" -FILES:${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" -FILES:${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la ${libdir}/ipsec/include/config.h" -FILES:${PN}-staticdev += "${libdir}/ipsec/*.a" - -CONFFILES:${PN} = "${sysconfdir}/*.conf ${sysconfdir}/ipsec.d/*.conf ${sysconfdir}/strongswan.d/*.conf" - -PACKAGES += "${PN}-plugins" -ALLOW_EMPTY:${PN}-plugins = "1" - -PACKAGE_BEFORE_PN = "${PN}-imcvs ${PN}-imcvs-dbg" -ALLOW_EMPTY:${PN}-imcvs = "1" - -FILES:${PN}-imcvs = "${libdir}/ipsec/imcvs/*.so" -FILES:${PN}-imcvs-dbg += "${libdir}/ipsec/imcvs/.debug" - -PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" -NOAUTOPACKAGEDEBUG = "1" - -python split_strongswan_plugins () { - sysconfdir = d.expand('${sysconfdir}/strongswan.d/charon') - libdir = d.expand('${libdir}/ipsec/plugins') - dbglibdir = os.path.join(libdir, '.debug') - - def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename): - dvar = d.getVar('PKGD') - oldfiles = d.getVar('CONFFILES:' + pkg) - newfile = '/' + os.path.relpath(f, dvar) - - if not oldfiles: - d.setVar('CONFFILES:' + pkg, newfile) - else: - d.setVar('CONFFILES:' + pkg, oldfiles + " " + newfile) - - split_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.so', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True) - do_split_packages(d, sysconfdir, r'(.*)\.conf', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True, hook=add_plugin_conf) - - split_dbg_packages = do_split_packages(d, dbglibdir, r'libstrongswan-(.*)\.so', '${PN}-plugin-%s-dbg', 'strongSwan %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg') - split_dev_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.la', '${PN}-plugin-%s-dev', 'strongSwan %s plugin - Development files', prepend=True, extra_depends='${PN}-dev') - split_staticdev_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.a', '${PN}-plugin-%s-staticdev', 'strongSwan %s plugin - Development files (Static Libraries)', prepend=True, extra_depends='${PN}-staticdev') - - if split_packages: - pn = d.getVar('PN') - d.setVar('RRECOMMENDS:' + pn + '-plugins', ' '.join(split_packages)) - d.appendVar('RRECOMMENDS:' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) - d.appendVar('RRECOMMENDS:' + pn + '-dev', ' ' + ' '.join(split_dev_packages)) - d.appendVar('RRECOMMENDS:' + pn + '-staticdev', ' ' + ' '.join(split_staticdev_packages)) -} - -PACKAGESPLITFUNCS:prepend = "split_strongswan_plugins " - -# Install some default plugins based on default strongSwan ./configure options -# See https://wiki.strongswan.org/projects/strongswan/wiki/Pluginlist -RDEPENDS:${PN} += "\ - ${PN}-plugin-aes \ - ${PN}-plugin-attr \ - ${PN}-plugin-cmac \ - ${PN}-plugin-constraints \ - ${PN}-plugin-des \ - ${PN}-plugin-dnskey \ - ${PN}-plugin-hmac \ - ${PN}-plugin-kernel-netlink \ - ${PN}-plugin-md5 \ - ${PN}-plugin-nonce \ - ${PN}-plugin-pem \ - ${PN}-plugin-pgp \ - ${PN}-plugin-pkcs1 \ - ${PN}-plugin-pkcs7 \ - ${PN}-plugin-pkcs8 \ - ${PN}-plugin-pkcs12 \ - ${PN}-plugin-pubkey \ - ${PN}-plugin-random \ - ${PN}-plugin-rc2 \ - ${PN}-plugin-resolve \ - ${PN}-plugin-revocation \ - ${PN}-plugin-sha1 \ - ${PN}-plugin-sha2 \ - ${PN}-plugin-socket-default \ - ${PN}-plugin-sshkey \ - ${PN}-plugin-updown \ - ${PN}-plugin-vici \ - ${PN}-plugin-x509 \ - ${PN}-plugin-xauth-generic \ - ${PN}-plugin-xcbc \ - " - -RPROVIDES:${PN} += "${PN}-systemd" -RREPLACES:${PN} += "${PN}-systemd" -RCONFLICTS:${PN} += "${PN}-systemd" - -# The deprecated legacy 'strongswan-starter' service should only be used when charon and -# stroke are enabled. When swanctl is in use, 'strongswan.service' is needed. -# See: https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd -SYSTEMD_SERVICE:${PN} = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'charon', '${BPN}-starter.service', '', d)} \ -" diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb new file mode 100644 index 0000000000..1b82dceac2 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb @@ -0,0 +1,186 @@ +DESCRIPTION = "strongSwan is an OpenSource IPsec implementation for the \ +Linux operating system." +SUMMARY = "strongSwan is an OpenSource IPsec implementation" +HOMEPAGE = "http://www.strongswan.org" +SECTION = "net" +LICENSE = "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)}" + +SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ + file://0001-enum-Fix-compiler-warning.patch \ + " + +SRC_URI[sha256sum] = "91d0978ac448912759b85452d8ff0d578aafd4507aaf4f1c1719f9d0c7318ab7" + +UPSTREAM_CHECK_REGEX = "strongswan-(?P\d+(\.\d+)+)\.tar" + +EXTRA_OECONF = " \ + --without-lib-prefix \ + --with-dev-headers=${includedir}/strongswan \ +" + +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" + +PACKAGECONFIG ?= "curl gmp openssl sqlite3 swanctl curve25519\ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-charon', 'charon', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', 'tpm2', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'tnc-imc imc-hcd imc-os imc-scanner imc-attestation', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ima', 'tnc-imv imv-hcd imv-os imv-scanner imv-attestation', '', d)} \ +" + +PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni,,${PN}-plugin-aesni" +PACKAGECONFIG[bfd] = "--enable-bfd-backtraces,--disable-bfd-backtraces,binutils" +PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,${PN}-plugin-curl" +PACKAGECONFIG[eap-identity] = "--enable-eap-identity,--disable-eap-identity,,${PN}-plugin-eap-identity" +PACKAGECONFIG[eap-mschapv2] = "--enable-eap-mschapv2,--disable-eap-mschapv2,,${PN}-plugin-eap-mschapv2" +PACKAGECONFIG[gmp] = "--enable-gmp,--disable-gmp,gmp,${PN}-plugin-gmp" +PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap,${PN}-plugin-ldap" +PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5,${PN}-plugin-mysql" +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl,${PN}-plugin-openssl" +PACKAGECONFIG[scep] = "--enable-scepclient,--disable-scepclient," +PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4,${PN}-plugin-soup" +PACKAGECONFIG[sqlite3] = "--enable-sqlite,--disable-sqlite,sqlite3,${PN}-plugin-sqlite" +PACKAGECONFIG[stroke] = "--enable-stroke,--disable-stroke,,${PN}-plugin-stroke" +PACKAGECONFIG[swanctl] = "--enable-swanctl,--disable-swanctl,,libgcc" +PACKAGECONFIG[curve25519] = "--enable-curve25519,--disable-curve25519,, ${PN}-plugin-curve25519" + +# requires swanctl +PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd," + +# tpm needs meta-tpm layer +PACKAGECONFIG[tpm2] = "--enable-tpm,--disable-tpm,,${PN}-plugin-tpm" + + +# integraty configuration needs meta-integraty +#imc +PACKAGECONFIG[tnc-imc] = "--enable-tnc-imc,--disable-tnc-imc,, ${PN}-plugin-tnc-imc ${PN}-plugin-tnc-tnccs" +PACKAGECONFIG[imc-test] = "--enable-imc-test,--disable-imc-test,," +PACKAGECONFIG[imc-scanner] = "--enable-imc-scanner,--disable-imc-scanner,," +PACKAGECONFIG[imc-os] = "--enable-imc-os,--disable-imc-os,," +PACKAGECONFIG[imc-attestation] = "--enable-imc-attestation,--disable-imc-attestation,," +PACKAGECONFIG[imc-swima] = "--enable-imc-swima, --disable-imc-swima, json-c," +PACKAGECONFIG[imc-hcd] = "--enable-imc-hcd, --disable-imc-hcd,," + +#imv set +PACKAGECONFIG[tnc-imv] = "--enable-tnc-imv,--disable-tnc-imv,, ${PN}-plugin-tnc-imv ${PN}-plugin-tnc-tnccs" +PACKAGECONFIG[imv-test] = "--enable-imv-test,--disable-imv-test,," +PACKAGECONFIG[imv-scanner] = "--enable-imv-scanner,--disable-imv-scanner,," +PACKAGECONFIG[imv-os] = "--enable-imv-os,--disable-imv-os,," +PACKAGECONFIG[imv-attestation] = "--enable-imv-attestation,--disable-imv-attestation,," +PACKAGECONFIG[imv-swima] = "--enable-imv-swima, --disable-imv-swima, json-c," +PACKAGECONFIG[imv-hcd] = "--enable-imv-hcd, --disable-imv-hcd,," + +PACKAGECONFIG[tnc-ifmap] = "--enable-tnc-ifmap,--disable-tnc-ifmap, libxml2, ${PN}-plugin-tnc-ifmap" +PACKAGECONFIG[tnc-pdp] = "--enable-tnc-pdp,--disable-tnc-pdp,, ${PN}-plugin-tnc-pdp" + +PACKAGECONFIG[tnccs-11] = "--enable-tnccs-11,--disable-tnccs-11,libxml2, ${PN}-plugin-tnccs-11" +PACKAGECONFIG[tnccs-20] = "--enable-tnccs-20,--disable-tnccs-20,, ${PN}-plugin-tnccs-20" +PACKAGECONFIG[tnccs-dynamic] = "--enable-tnccs-dynamic,--disable-tnccs-dynamic,,${PN}-plugin-tnccs-dynamic" + +inherit autotools systemd pkgconfig + +RRECOMMENDS:${PN} = "kernel-module-ah4 \ + kernel-module-esp4 \ + kernel-module-xfrm-user \ + " + +FILES:${PN} += "${libdir}/ipsec/lib*${SOLIBS}" +FILES:${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" +FILES:${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la ${libdir}/ipsec/include/config.h" +FILES:${PN}-staticdev += "${libdir}/ipsec/*.a" + +CONFFILES:${PN} = "${sysconfdir}/*.conf ${sysconfdir}/ipsec.d/*.conf ${sysconfdir}/strongswan.d/*.conf" + +PACKAGES += "${PN}-plugins" +ALLOW_EMPTY:${PN}-plugins = "1" + +PACKAGE_BEFORE_PN = "${PN}-imcvs ${PN}-imcvs-dbg" +ALLOW_EMPTY:${PN}-imcvs = "1" + +FILES:${PN}-imcvs = "${libdir}/ipsec/imcvs/*.so" +FILES:${PN}-imcvs-dbg += "${libdir}/ipsec/imcvs/.debug" + +PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" +NOAUTOPACKAGEDEBUG = "1" + +python split_strongswan_plugins () { + sysconfdir = d.expand('${sysconfdir}/strongswan.d/charon') + libdir = d.expand('${libdir}/ipsec/plugins') + dbglibdir = os.path.join(libdir, '.debug') + + def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename): + dvar = d.getVar('PKGD') + oldfiles = d.getVar('CONFFILES:' + pkg) + newfile = '/' + os.path.relpath(f, dvar) + + if not oldfiles: + d.setVar('CONFFILES:' + pkg, newfile) + else: + d.setVar('CONFFILES:' + pkg, oldfiles + " " + newfile) + + split_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.so', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True) + do_split_packages(d, sysconfdir, r'(.*)\.conf', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True, hook=add_plugin_conf) + + split_dbg_packages = do_split_packages(d, dbglibdir, r'libstrongswan-(.*)\.so', '${PN}-plugin-%s-dbg', 'strongSwan %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg') + split_dev_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.la', '${PN}-plugin-%s-dev', 'strongSwan %s plugin - Development files', prepend=True, extra_depends='${PN}-dev') + split_staticdev_packages = do_split_packages(d, libdir, r'libstrongswan-(.*)\.a', '${PN}-plugin-%s-staticdev', 'strongSwan %s plugin - Development files (Static Libraries)', prepend=True, extra_depends='${PN}-staticdev') + + if split_packages: + pn = d.getVar('PN') + d.setVar('RRECOMMENDS:' + pn + '-plugins', ' '.join(split_packages)) + d.appendVar('RRECOMMENDS:' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) + d.appendVar('RRECOMMENDS:' + pn + '-dev', ' ' + ' '.join(split_dev_packages)) + d.appendVar('RRECOMMENDS:' + pn + '-staticdev', ' ' + ' '.join(split_staticdev_packages)) +} + +PACKAGESPLITFUNCS:prepend = "split_strongswan_plugins " + +# Install some default plugins based on default strongSwan ./configure options +# See https://wiki.strongswan.org/projects/strongswan/wiki/Pluginlist +RDEPENDS:${PN} += "\ + ${PN}-plugin-aes \ + ${PN}-plugin-attr \ + ${PN}-plugin-cmac \ + ${PN}-plugin-constraints \ + ${PN}-plugin-des \ + ${PN}-plugin-dnskey \ + ${PN}-plugin-hmac \ + ${PN}-plugin-kernel-netlink \ + ${PN}-plugin-md5 \ + ${PN}-plugin-nonce \ + ${PN}-plugin-pem \ + ${PN}-plugin-pgp \ + ${PN}-plugin-pkcs1 \ + ${PN}-plugin-pkcs7 \ + ${PN}-plugin-pkcs8 \ + ${PN}-plugin-pkcs12 \ + ${PN}-plugin-pubkey \ + ${PN}-plugin-random \ + ${PN}-plugin-rc2 \ + ${PN}-plugin-resolve \ + ${PN}-plugin-revocation \ + ${PN}-plugin-sha1 \ + ${PN}-plugin-sha2 \ + ${PN}-plugin-socket-default \ + ${PN}-plugin-sshkey \ + ${PN}-plugin-updown \ + ${PN}-plugin-vici \ + ${PN}-plugin-x509 \ + ${PN}-plugin-xauth-generic \ + ${PN}-plugin-xcbc \ + " + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" + +# The deprecated legacy 'strongswan-starter' service should only be used when charon and +# stroke are enabled. When swanctl is in use, 'strongswan.service' is needed. +# See: https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd +SYSTEMD_SERVICE:${PN} = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'charon', '${BPN}-starter.service', '', d)} \ +" 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 deleted file mode 100644 index f1dba227ac..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.11.bb +++ /dev/null @@ -1,88 +0,0 @@ -DESCRIPTION = "wireshark - a popular network protocol analyzer" -HOMEPAGE = "http://www.wireshark.org" -SECTION = "net" -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" - -DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native " - -SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz" - -SRC_URI += " \ - file://0001-wireshark-src-improve-reproducibility.patch \ - file://0002-flex-Remove-line-directives.patch \ - file://0003-bison-Remove-line-directives.patch \ - file://0004-lemon-Remove-line-directives.patch \ -" - -UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" - -SRC_URI[sha256sum] = "a0e227bce2cc3a51ef3301891a0243231990b52a39b68a84a6e32f69c4e75279" - -PE = "1" - -inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg - -PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" - -PACKAGECONFIG:class-native = "libpcap gnutls ssl libssh" - -PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap" -PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap" -PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" -PACKAGECONFIG[libnl] = ",,libnl" -PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" -PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" -PACKAGECONFIG[ssl] = ",,openssl" -PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" -PACKAGECONFIG[lua] = "-DENABLE_LUA=ON,-DENABLE_LUA=OFF, lua" -PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib" -PACKAGECONFIG[geoip] = ",, geoip" -PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" -PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" -PACKAGECONFIG[libssh] = ",,libssh2" -PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" -PACKAGECONFIG[zstd] = "-DENABLE_STTD=ON,-DENABLE_ZSTD=OFF, zstd" - -# these next two options require addional layers -PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ - -DBUILD_mmdbresolve=OFF \ - -DBUILD_randpktdump=OFF \ - -DBUILD_androiddump=OFF \ - -DBUILD_dcerpcidl2wrs=OFF \ - -DM_INCLUDE_DIR=${includedir} \ - -DM_LIBRARY=${libdir} \ - " -CFLAGS:append = " -lm" - -do_install:append:class-native() { - install -d ${D}${bindir} - for f in lemon - do - install -m 0755 ${B}/run/$f ${D}${bindir} - done -} - -do_install:append:class-target() { - for f in `find ${D}${libdir} ${D}${bindir} -type f -executable` - do - chrpath --delete $f - done -} - -PACKAGE_BEFORE_PN += "tshark" - -FILES:tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" - -FILES:${PN} += "${datadir}*" - -RDEPENDS:tshark = "wireshark" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.12.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.12.bb new file mode 100644 index 0000000000..38fdbce892 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.12.bb @@ -0,0 +1,88 @@ +DESCRIPTION = "wireshark - a popular network protocol analyzer" +HOMEPAGE = "http://www.wireshark.org" +SECTION = "net" +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" + +DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native " + +SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz" + +SRC_URI += " \ + file://0001-wireshark-src-improve-reproducibility.patch \ + file://0002-flex-Remove-line-directives.patch \ + file://0003-bison-Remove-line-directives.patch \ + file://0004-lemon-Remove-line-directives.patch \ +" + +UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" + +SRC_URI[sha256sum] = "881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca" + +PE = "1" + +inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg + +PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" + +PACKAGECONFIG:class-native = "libpcap gnutls ssl libssh" + +PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap" +PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap" +PACKAGECONFIG[libsmi] = "-DENABLE_SMI=ON,-DENABLE_SMI=OFF,libsmi" +PACKAGECONFIG[libnl] = ",,libnl" +PACKAGECONFIG[portaudio] = "-DENABLE_PORTAUDIO=ON,-DENABLE_PORTAUDIO=OFF, portaudio-v19" +PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF, gnutls" +PACKAGECONFIG[ssl] = ",,openssl" +PACKAGECONFIG[krb5] = "-DENABLE_KRB5=ON,-DENABLE_KRB5=OFF, krb5" +PACKAGECONFIG[lua] = "-DENABLE_LUA=ON,-DENABLE_LUA=OFF, lua" +PACKAGECONFIG[zlib] = "-DENABLE_ZLIB=ON,-DENABLE_ZLIB=OFF, zlib" +PACKAGECONFIG[geoip] = ",, geoip" +PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" +PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" +PACKAGECONFIG[libssh] = ",,libssh2" +PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" +PACKAGECONFIG[zstd] = "-DENABLE_STTD=ON,-DENABLE_ZSTD=OFF, zstd" + +# these next two options require addional layers +PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ + -DBUILD_mmdbresolve=OFF \ + -DBUILD_randpktdump=OFF \ + -DBUILD_androiddump=OFF \ + -DBUILD_dcerpcidl2wrs=OFF \ + -DM_INCLUDE_DIR=${includedir} \ + -DM_LIBRARY=${libdir} \ + " +CFLAGS:append = " -lm" + +do_install:append:class-native() { + install -d ${D}${bindir} + for f in lemon + do + install -m 0755 ${B}/run/$f ${D}${bindir} + done +} + +do_install:append:class-target() { + for f in `find ${D}${libdir} ${D}${bindir} -type f -executable` + do + chrpath --delete $f + done +} + +PACKAGE_BEFORE_PN += "tshark" + +FILES:tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" + +FILES:${PN} += "${datadir}*" + +RDEPENDS:tshark = "wireshark" + +BBCLASSEXTEND = "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 1406f68b05..2a3e74f025 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -18,12 +18,12 @@ SRC_URI = " \ file://0001-fix-dispmanx-build.patch \ file://0002-run-dispmanx-fullscreen.patch \ file://0001-libmatrix-Include-missing-utility-header.patch \ - " +" SRCREV = "0858b450cd88c84a15b99dda9698d44e7f7e8c70" S = "${WORKDIR}/git" -inherit waf pkgconfig features_check +inherit meson pkgconfig features_check ANY_OF_DISTRO_FEATURES = "opengl dispmanx" @@ -59,6 +59,6 @@ python __anonymous() { if "dispmanx" in packageconfig: flavors = ["dispmanx-glesv2"] if flavors: - d.appendVar("EXTRA_OECONF", " --with-flavors=%s" % ",".join(flavors)) + d.appendVar("EXTRA_OEMESON", " -Dflavors=%s" % ",".join(flavors)) } diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb index 4a520e3be5..86e5fef530 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb @@ -19,3 +19,5 @@ EXTRA_OECONF = "--exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +CVE_PRODUCT = "iperf_project:iperf" 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 index a6af23aec9..2142a8ef1d 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.11.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.11.bb @@ -30,3 +30,5 @@ PACKAGECONFIG[lksctp] = "ac_cv_header_netinet_sctp_h=yes,ac_cv_header_netinet_sc PACKAGECONFIG[openssl] = "--with-openssl=${RECIPE_SYSROOT}${prefix},--without-openssl,openssl" CFLAGS += "-D_GNU_SOURCE" + +CVE_PRODUCT = "iperf_project:iperf" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.3.bb b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.3.bb deleted file mode 100644 index a4d586ebc1..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.3.bb +++ /dev/null @@ -1,40 +0,0 @@ -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 = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SECTION = "console/tests" - -SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz" -SRC_URI[sha256sum] = "4b742e28a9542fe2b57aacb691159d69d3e1c77d95da6d24b7867889ce84ba80" - -S = "${WORKDIR}/phoronix-test-suite" - -inherit systemd allarch mime mime-xdg - -do_install() { - DESTDIR=${D} ./install-sh ${exec_prefix} - - if [ "${systemd_unitdir}" != "/usr/lib/systemd" ]; then - install -d ${D}/${systemd_unitdir}/system/ - mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/ - rm -rf ${D}/usr/lib/ - fi -} - -# It is not advisable to enable these services by default since they can cause -# continual target reboots if they encounter network problems. -# -SYSTEMD_AUTO_ENABLE = "disable" -SYSTEMD_SERVICE:${PN} = "phoromatic-client.service phoromatic-server.service" - -RDEPENDS:${PN} += "bash python3-core php-cli util-linux-lscpu os-release lsb-release" - -FILES:${PN} += " \ - ${datadir}/phoronix-test-suite \ - ${datadir}/appdata/phoronix-test-suite.appdata.xml \ - ${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \ - ${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \ - ${datadir}/mime/packages/openbenchmarking-mime.xml \ - ${systemd_unitdir}/* \ -" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb new file mode 100644 index 0000000000..be9756d9a7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_10.8.4.bb @@ -0,0 +1,40 @@ +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 = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +SECTION = "console/tests" + +SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz" +SRC_URI[sha256sum] = "1f2092d536c0a3193efc53e4a50f3cee65c0ef1a78d31e5404f1c663fff7b7f4" + +S = "${WORKDIR}/phoronix-test-suite" + +inherit systemd allarch mime mime-xdg + +do_install() { + DESTDIR=${D} ./install-sh ${exec_prefix} + + if [ "${systemd_unitdir}" != "/usr/lib/systemd" ]; then + install -d ${D}/${systemd_unitdir}/system/ + mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/ + rm -rf ${D}/usr/lib/ + fi +} + +# It is not advisable to enable these services by default since they can cause +# continual target reboots if they encounter network problems. +# +SYSTEMD_AUTO_ENABLE = "disable" +SYSTEMD_SERVICE:${PN} = "phoromatic-client.service phoromatic-server.service" + +RDEPENDS:${PN} += "bash python3-core php-cli util-linux-lscpu os-release lsb-release" + +FILES:${PN} += " \ + ${datadir}/phoronix-test-suite \ + ${datadir}/appdata/phoronix-test-suite.appdata.xml \ + ${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \ + ${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \ + ${datadir}/mime/packages/openbenchmarking-mime.xml \ + ${systemd_unitdir}/* \ +" 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 deleted file mode 100644 index 53f1720b04..0000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.7.6.bb +++ /dev/null @@ -1,127 +0,0 @@ -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/fwupd/fwupd_1.8.1.bb b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.1.bb new file mode 100644 index 0000000000..7576b846fb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.1.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] = "5756466442eb9134fb40cdc8a46f9e01003247c8eac82fa5d8b16f6420375b79" + +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-connectivity/irssi/irssi_1.2.3.bb b/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.2.3.bb deleted file mode 100644 index b0fde5ed14..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.2.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "ncurses IRC client" -DESCRIPTION = "Irssi is an ncurses IRC client" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=55fdc1113306167d6ea2561404ce02f8" - -DEPENDS = "glib-2.0 ncurses openssl" - -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" -SRC_URI[md5sum] = "381d3af259ad15d658be50c0a01f0c28" -SRC_URI[sha256sum] = "a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f" - -UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" - -inherit autotools pkgconfig - -EXTRA_OECONF += "--with-textui \ - --with-proxy \ - --with-bot \ - --with-perl=no \ - --enable-true-color" - -FILES:${PN}-staticdev += "${libdir}/${BPN}/modules/*.a" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.4.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.4.1.bb new file mode 100644 index 0000000000..40ce935adf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.4.1.bb @@ -0,0 +1,21 @@ +SUMMARY = "ncurses IRC client" +DESCRIPTION = "Irssi is an ncurses IRC client" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=55fdc1113306167d6ea2561404ce02f8" + +DEPENDS = "glib-2.0 ncurses openssl" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" +SRC_URI[sha256sum] = "6a7692741bba16f3ba6f97cf7246421ac57055dcedcca9a4d21663f8efe47501" + +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" + +inherit autotools pkgconfig + +EXTRA_OECONF += "--with-textui \ + --with-proxy \ + --with-bot \ + --with-perl=no \ + --enable-true-color" + +FILES:${PN}-staticdev += "${libdir}/${BPN}/modules/*.a" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.27.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.27.bb deleted file mode 100644 index dc29bc3fd5..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.27.bb +++ /dev/null @@ -1,55 +0,0 @@ -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] = "013b4a0a79629c20d915954fc3b5d0620ef6e0d6065db3c342f4b3f9111f46ec" - -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.28.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.28.bb new file mode 100644 index 0000000000..40f35b15a0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.28.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] = "ee538c720ad15335ece81a52a4b8a11820236df9ed9a5a72a2e64d74c652f0b0" + +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/libqmi/libqmi_1.30.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb deleted file mode 100644 index 4807244a58..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.4.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol" -DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \ - devices which speak the Qualcomm MSM Interface (QMI) protocol" -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi" -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ -" - -DEPENDS = "glib-2.0 glib-2.0-native" - -inherit meson pkgconfig bash-completion gobject-introspection - -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 \ -" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "udev mbim" -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/libqmi/libqmi_1.30.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.8.bb new file mode 100644 index 0000000000..a1cfe29cca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.30.8.bb @@ -0,0 +1,32 @@ +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 = "GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ +" + +DEPENDS = "glib-2.0 glib-2.0-native" + +inherit meson pkgconfig bash-completion gobject-introspection + +SRCREV ?= "95108b6eebfefa6621a1c34565f562eeca9308b9" +# 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 \ +" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "udev mbim" +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/thrift/thrift_0.16.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.16.0.bb index 2d601a2f9d..8141abef51 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.16.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.16.0.bb @@ -15,6 +15,8 @@ SRC_URI[sha256sum] = "f460b5c1ca30d8918ff95ea3eb6291b3951cf518553566088f3f2be898 BBCLASSEXTEND = "native nativesdk" +CVE_PRODUCT = "apache:thrift" + inherit pkgconfig cmake python3native export STAGING_INCDIR diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb index dfb0b14e3e..7189115092 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb @@ -18,3 +18,4 @@ EXTRA_OECMAKE = "-DCPPZMQ_BUILD_TESTS=OFF" PACKAGES = "${PN}-dev" RDEPENDS:${PN}-dev = "zeromq-dev" +DEV_PKG_DEPENDENCY = "" diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/emlog_git.bb b/meta-openembedded/meta-oe/recipes-core/emlog/emlog_git.bb index be9ae58232..05fa0c334c 100644 --- a/meta-openembedded/meta-oe/recipes-core/emlog/emlog_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/emlog/emlog_git.bb @@ -24,3 +24,14 @@ do_install() { } RRECOMMENDS:${PN} += "kernel-module-emlog" + +# The NVD database doesn't have a CPE for this product, +# the name of this product is exactly the same as github.com/emlog/emlog +# but it's not related in any way. The following CVEs are from that project +# so they can be safely ignored +CVE_CHECK_IGNORE += "\ + CVE-2019-16868 \ + CVE-2019-17073 \ + CVE-2021-44584 \ + CVE-2022-1526 \ +" 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 f75568a1d9..7347e30f34 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 @@ -27,6 +27,8 @@ do_compile_ptest() { oe_runmake -C examples buildtest } +PTEST_PARALLEL_MAKE = "" + FILES:${PN}-doc += "${datadir}/devhelp" FILES:${PN}-dev += "${libdir}/libxml++-2.6/include/libxml++config.h" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb index 435b554777..652fd66614 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.4.3.bb @@ -14,7 +14,6 @@ DEPENDS = " \ libdevmapper \ popt \ util-linux-libuuid \ - libssh \ " DEPENDS:append:libc-musl = " argp-standalone" @@ -39,6 +38,7 @@ PACKAGECONFIG ??= " \ blkid \ luks-adjust-xts-keysize \ openssl \ + ssh-token \ " PACKAGECONFIG:append:class-target = " \ udev \ @@ -69,7 +69,7 @@ PACKAGECONFIG[nss] = "--with-crypto_backend=nss,,nss" PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel" PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle" PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1" - +PACKAGECONFIG[ssh-token] = "--enable-ssh-token,--disable-ssh-token,libssh" EXTRA_OECONF = "--enable-static" # Building without largefile is not supported by upstream @@ -90,6 +90,14 @@ EXTRA_OECONF += "--with-luks2-pbkdf=${LUKS2_PBKDF} \ --with-luks2-parallel-threads=${LUKS2_PARALLEL_THREADS} \ --with-luks2-iter-time=${LUKS2_ITERTIME}" +do_install:append() { + # The /usr/lib/cryptsetup directory is always created, even when ssh-token + # is disabled. In that case it is empty and causes a packaging error. Since + # there is no reason to distribute the empty directory, the easiest solution + # is to remove it if it is empty. + rmdir -p --ignore-fail-on-non-empty ${D}${libdir}/${BPN} +} + FILES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" RDEPENDS:${PN} = " \ diff --git a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb index 87750ec79d..6afc45ab7e 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/google/leveldb" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d" -SRC_URI = "git://github.com/google/${BPN}.git;branch=master;protocol=https \ +SRC_URI = "git://github.com/google/${BPN}.git;branch=main;protocol=https \ file://run-ptest" SRCREV = "78b39d68c15ba020c0d60a3906fb66dbf1697595" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.7.4.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.7.4.bb deleted file mode 100644 index e38726d3f9..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.7.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.8.3.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.8.3.bb new file mode 100644 index 0000000000..e38726d3f9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.8.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 922373b633..fa32e6844e 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -19,11 +19,10 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://ssize_t.patch \ file://mm_malloc.patch \ file://sys_futex.patch \ - file://mariadb-openssl3.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "73dd9c9d325520f20ca5e0ef16f94b7be1146bed7e4a78e735c20daebf3a4173" +SRC_URI[sha256sum] = "887eadc55176ac1ead1fccfc89ade4b5990ef192745ad4dcd879acb41c050892" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -66,7 +65,6 @@ 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 @@ -176,6 +174,13 @@ do_install() { if [ -f ${D}${datadir}/doc/README ]; then mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/ fi + + # mini-benchmark used for Gitlab-CI to run on every commit to catch + # if there are severe performance regressions. + # remove it to avoid introducing bash dependency + if [ -f ${D}${datadir}/mysql/mini-benchmark ]; then + rm -rf ${D}${datadir}/mysql/mini-benchmark + fi if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then pam_so=$(find ${D} -name pam_user_map.so) if [ x"${pam_so}" != x ]; then 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 deleted file mode 100644 index 878675f30d..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mariadb-openssl3.patch +++ /dev/null @@ -1,416 +0,0 @@ -From 1626955f3a2107ec4c7fd927ebfa3c6c1d2b09b8 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: Backport [https://github.com/MariaDB/server/commit/d42c2efbaa06a0307c2f0fd8fa87819ff50bbd7e] -Signed-off-by: Khem Raj -Signed-off-by: Mingli Yu ---- - cmake/ssl.cmake | 21 +++++- - include/mysql/service_my_crypt.h | 2 +- - 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 ++++++++++++++++++++++-------- - 8 files changed, 143 insertions(+), 60 deletions(-) - -diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake -index a6793cf3..64c93ff9 100644 ---- 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") -diff --git a/include/mysql/service_my_crypt.h b/include/mysql/service_my_crypt.h -index 2a232117..bb038aaa 100644 ---- a/include/mysql/service_my_crypt.h -+++ b/include/mysql/service_my_crypt.h -@@ -45,7 +45,7 @@ extern "C" { - /* The max key length of all supported algorithms */ - #define MY_AES_MAX_KEY_LENGTH 32 - --#define MY_AES_CTX_SIZE 656 -+#define MY_AES_CTX_SIZE 672 - - enum my_aes_mode { - MY_AES_ECB, MY_AES_CBC -diff --git a/include/ssl_compat.h b/include/ssl_compat.h -index 8dc12254..6db1baab 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 -@@ -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) - -diff --git a/mysql-test/lib/openssl.cnf b/mysql-test/lib/openssl.cnf -index b9ab37ac..7cd6f748 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 930d384e..66d817b7 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 36549d76..d4cdcffb 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 e512eee9..4d7ebc7b 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 34704e06..cbec2760 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.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.7.4.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.7.4.bb deleted file mode 100644 index c800c4c56c..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.7.4.bb +++ /dev/null @@ -1,28 +0,0 @@ -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/mariadb_10.8.3.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.8.3.bb new file mode 100644 index 0000000000..20bb5fc1fe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.8.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 zstd" + +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/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch index 78f24585e8..2256bccece 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch @@ -1,4 +1,4 @@ -From f7084ba49758a6b8db46b917b7c0f831bd65a08f Mon Sep 17 00:00:00 2001 +From 07e605015fad0621c3e67133ff9330a5c6318daa Mon Sep 17 00:00:00 2001 From: Yi Fan Yu Date: Fri, 5 Feb 2021 17:15:42 -0500 Subject: [PATCH] configure.ac: bypass autoconf 2.69 version check @@ -14,12 +14,12 @@ Signed-off-by: Yi Fan Yu 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac -index d3c55f2..9120184 100644 +index 04ef7be..0eb595b 100644 --- a/configure.ac +++ b/configure.ac @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [14.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [14.4], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.3.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.3.bb deleted file mode 100644 index c686c9b358..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -require postgresql.inc - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=75af6e3eeec4a06cdd2e578673236fc3" - -SRC_URI += "\ - file://not-check-libperl.patch \ - file://0001-Add-support-for-RISC-V.patch \ - file://0001-Improve-reproducibility.patch \ - file://0001-configure.ac-bypass-autoconf-2.69-version-check.patch \ - file://remove_duplicate.patch \ -" - -SRC_URI[sha256sum] = "279057368bf59a919c05ada8f95c5e04abb43e74b9a2a69c3d46a20e07a9af38" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb new file mode 100644 index 0000000000..01a6ee635e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb @@ -0,0 +1,13 @@ +require postgresql.inc + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=75af6e3eeec4a06cdd2e578673236fc3" + +SRC_URI += "\ + file://not-check-libperl.patch \ + file://0001-Add-support-for-RISC-V.patch \ + file://0001-Improve-reproducibility.patch \ + file://0001-configure.ac-bypass-autoconf-2.69-version-check.patch \ + file://remove_duplicate.patch \ +" + +SRC_URI[sha256sum] = "c23b6237c5231c791511bdc79098617d6852e9e3bdf360efd8b5d15a1a3d8f6a" diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch index 2bafcc6b13..5242b29e06 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From 8f21fdfb83b0fa844a9f1f03a86a9ca46642d85e Mon Sep 17 00:00:00 2001 +From 738549dea7a4e6c462a79962c414eaa450c2cffd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 9 Apr 2020 13:06:27 -0700 -Subject: [PATCH 1/2] absl: always use +Subject: [PATCH 1/3] absl: always use Fixes mips/musl build, since sgidefs.h is not present on all C libraries but on linux asm/sgidefs.h is there and contains same definitions, using @@ -10,26 +10,27 @@ that makes it portable. Upstream-Status: Pending Signed-off-by: Khem Raj + --- absl/base/internal/direct_mmap.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h -index 16accf096604..ba7936cc934e 100644 +index e492bb0..c8a4fba 100644 --- a/absl/base/internal/direct_mmap.h +++ b/absl/base/internal/direct_mmap.h @@ -41,13 +41,9 @@ #ifdef __mips__ // Include definitions of the ABI currently in use. --#ifdef __BIONIC__ +-#if defined(__BIONIC__) || !defined(__GLIBC__) -// Android doesn't have sgidefs.h, but does have asm/sgidefs.h, which has the +// bionic/musl C libs don't have sgidefs.h, but do have asm/sgidefs.h, which has the // definitions we need. #include -#else -#include --#endif // __BIONIC__ +-#endif // __BIONIC__ || !__GLIBC__ #endif // __mips__ // SYS_mmap and SYS_munmap are not defined in Android. diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch index da9dbd9367..7b7244b491 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch @@ -1,7 +1,7 @@ -From a9e15a4855c82eb948dedeecd83d5e17c3c8f767 Mon Sep 17 00:00:00 2001 +From d25cf3b9aa873595a19e197cc29ab46c0093bff1 Mon Sep 17 00:00:00 2001 From: Sinan Kaya Date: Mon, 3 Feb 2020 03:25:57 +0000 -Subject: [PATCH 2/2] Remove maes option from cross-compilation +Subject: [PATCH 2/3] Remove maes option from cross-compilation --- absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- @@ -9,10 +9,10 @@ Subject: [PATCH 2/2] Remove maes option from cross-compilation 2 files changed, 8 deletions(-) diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake -index 97bd283eb739..ce29ac031b9c 100644 +index a4ab1aa2041e..23b9253c1f00 100644 --- a/absl/copts/GENERATED_AbseilCopts.cmake +++ b/absl/copts/GENERATED_AbseilCopts.cmake -@@ -210,7 +210,3 @@ list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS +@@ -158,7 +158,3 @@ list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS ) @@ -21,10 +21,10 @@ index 97bd283eb739..ce29ac031b9c 100644 - "-msse4.1" -) diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl -index bcdd61ef8211..3e8eddd4bb08 100644 +index a6efc98e11d4..1e847f769501 100644 --- a/absl/copts/GENERATED_copts.bzl +++ b/absl/copts/GENERATED_copts.bzl -@@ -211,7 +211,3 @@ ABSL_RANDOM_HWAES_ARM64_FLAGS = [ +@@ -159,7 +159,3 @@ ABSL_RANDOM_HWAES_ARM64_FLAGS = [ ABSL_RANDOM_HWAES_MSVC_X64_FLAGS = [ ] @@ -33,5 +33,5 @@ index bcdd61ef8211..3e8eddd4bb08 100644 - "-msse4.1", -] -- -2.25.1 +2.36.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch new file mode 100644 index 0000000000..c0039c2107 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch @@ -0,0 +1,47 @@ +From fb24c3e3539b5743d398a429a302a3886186f261 Mon Sep 17 00:00:00 2001 +From: Jonas Gorski +Date: Thu, 16 Jun 2022 11:46:31 +0000 +Subject: [PATCH 3/3] Remove neon option from cross compilation + +Not every arm platform supports neon instructions, so do not enforce +them. + +Signed-off-by: Jonas Gorski +--- + absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- + absl/copts/GENERATED_copts.bzl | 4 ---- + 2 files changed, 8 deletions(-) + +diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake +index 23b9253c1f00..5d112a97f3e4 100644 +--- a/absl/copts/GENERATED_AbseilCopts.cmake ++++ b/absl/copts/GENERATED_AbseilCopts.cmake +@@ -147,10 +147,6 @@ list(APPEND ABSL_MSVC_TEST_FLAGS + "/DNOMINMAX" + ) + +-list(APPEND ABSL_RANDOM_HWAES_ARM32_FLAGS +- "-mfpu=neon" +-) +- + list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS + "-march=armv8-a+crypto" + ) +diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl +index 1e847f769501..3e10db204faf 100644 +--- a/absl/copts/GENERATED_copts.bzl ++++ b/absl/copts/GENERATED_copts.bzl +@@ -148,10 +148,6 @@ ABSL_MSVC_TEST_FLAGS = [ + "/DNOMINMAX", + ] + +-ABSL_RANDOM_HWAES_ARM32_FLAGS = [ +- "-mfpu=neon", +-] +- + ABSL_RANDOM_HWAES_ARM64_FLAGS = [ + "-march=armv8-a+crypto", + ] +-- +2.36.1 + 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 1bb27d4369..b3dc06ca14 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,13 +7,14 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" -PV = "20211102.0+git${SRCPV}" -SRCREV = "7c6608d0dbe43cf9bdf7f77787bc6bc89cc42f8b" -BRANCH = "master" +PV = "20220623.0" +SRCREV = "273292d1cfc0a94a65082ee350509af1d113344d" +BRANCH = "lts_2022_06_23" 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://0003-Remove-neon-option-from-cross-compilation.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.10.2.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.10.2.bb new file mode 100644 index 0000000000..3d4f549b62 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.10.2.bb @@ -0,0 +1,29 @@ +SUMMARY = "Cap'n Proto serialization/RPC system" +DESCRIPTION = "Cap’n Proto is an insanely fast data interchange format and capability-based RPC system. " +HOMEPAGE = "https://github.com/sandstorm-io/capnproto" +SECTION = "console/tools" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" + +SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https \ + " +SRCREV = "2e88221d3dde22266bfccf40eaee6ff9b40d113d" + +S = "${WORKDIR}/git/c++" + +inherit cmake + +CXXFLAGS:append:mips = " -latomic" +CXXFLAGS:append:powerpc = " -latomic" +CXXFLAGS:append:riscv32 = " -latomic" + +EXTRA_OECMAKE += "\ + -DBUILD_TESTING=OFF \ +" + +FILES:${PN}-compiler = "${bindir}" + +PACKAGE_BEFORE_PN = "${PN}-compiler" +RDEPENDS:${PN}-dev += "${PN}-compiler" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.9.1.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.9.1.bb deleted file mode 100644 index d14bd843ef..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.9.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Cap'n Proto serialization/RPC system" -DESCRIPTION = "Cap’n Proto is an insanely fast data interchange format and capability-based RPC system. " -HOMEPAGE = "https://github.com/sandstorm-io/capnproto" -SECTION = "console/tools" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" - -SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https \ - " -SRCREV = "b49431c48d40490ef979247d308af63345376cee" - -S = "${WORKDIR}/git/c++" - -inherit cmake - -CXXFLAGS:append:mips = " -latomic" -CXXFLAGS:append:powerpc = " -latomic" -CXXFLAGS:append:riscv32 = " -latomic" - -EXTRA_OECMAKE += "\ - -DBUILD_TESTING=OFF \ -" - -FILES:${PN}-compiler = "${bindir}" - -PACKAGE_BEFORE_PN = "${PN}-compiler" -RDEPENDS:${PN}-dev += "${PN}-compiler" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.92.bb b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.92.bb deleted file mode 100644 index 766d34f69c..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.92.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Count blank lines, comment lines, and physical lines of source code \ -in many programming languages." -AUTHOR = "Al Danial" - -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" -SRC_URI[sha256sum] = "73570f9da159fab13846038de7c3d8772554117c04117281dcbe6e5c7b988264" - -UPSTREAM_CHECK_URI = "https://github.com/AlDanial/${BPN}/releases" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - install -D -m 0755 ${S}/cloc ${D}${bindir}/cloc -} - -RDEPENDS:${PN} = "perl perl-modules" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.94.bb b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.94.bb new file mode 100644 index 0000000000..2f92d81001 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.94.bb @@ -0,0 +1,20 @@ +SUMMARY = "Count blank lines, comment lines, and physical lines of source code \ +in many programming languages." +AUTHOR = "Al Danial" + +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" +SRC_URI[sha256sum] = "08212290c4e9b21c7bb1abc0a9b4a365ce1c5eb0d8f3ebb74d50b29559a71a9c" + +UPSTREAM_CHECK_URI = "https://github.com/AlDanial/${BPN}/releases" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -D -m 0755 ${S}/cloc ${D}${bindir}/cloc +} + +RDEPENDS:${PN} = "perl perl-modules" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20220529.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20220529.0.bb deleted file mode 100644 index 1ec8d0e13a..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20220529.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2015 Igor Santos -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Universal Ctags" -DESCRIPTION = "Universal Ctags is a multilanguage reimplementation of the \ - Unix ctags utility. Ctags generates an index of source code \ - definitions which is used by numerous editors and utilities \ - to instantly locate the definitions." - -HOMEPAGE = "https://ctags.io/" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -inherit autotools-brokensep pkgconfig manpages - -SRCREV = "fff389b94b8e3fb53bdb59789dabc2693c534804" -SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= " \ - readcmd \ - xml \ - json \ - yaml \ -" -PACKAGECONFIG[readcmd] = "--enable-readcmd,--disable-readcmd" -PACKAGECONFIG[etags] = "--enable-etags,--disable-etags" -PACKAGECONFIG[xml] = "--enable-xml,--disable-xml,libxml2" -PACKAGECONFIG[json] = "--enable-json,--disable-json,jansson" -PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" -PACKAGECONFIG[yaml] = "--enable-yaml,--disable-yaml,libyaml" -PACKAGECONFIG[manpages] = ",,python3-docutils-native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20220703.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20220703.0.bb new file mode 100644 index 0000000000..fb736db574 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20220703.0.bb @@ -0,0 +1,34 @@ +# Copyright (C) 2015 Igor Santos +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Universal Ctags" +DESCRIPTION = "Universal Ctags is a multilanguage reimplementation of the \ + Unix ctags utility. Ctags generates an index of source code \ + definitions which is used by numerous editors and utilities \ + to instantly locate the definitions." + +HOMEPAGE = "https://ctags.io/" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +inherit autotools-brokensep pkgconfig manpages + +SRCREV = "787811b6eac03ab81ccf5b6957432d893eb982cb" +SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= " \ + readcmd \ + xml \ + json \ + yaml \ +" +PACKAGECONFIG[readcmd] = "--enable-readcmd,--disable-readcmd" +PACKAGECONFIG[etags] = "--enable-etags,--disable-etags" +PACKAGECONFIG[xml] = "--enable-xml,--disable-xml,libxml2" +PACKAGECONFIG[json] = "--enable-json,--disable-json,jansson" +PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" +PACKAGECONFIG[yaml] = "--enable-yaml,--disable-yaml,libyaml" +PACKAGECONFIG[manpages] = ",,python3-docutils-native" 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 a82387a705..ccbea58f18 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master;protocol=https" -SRCREV = "7c45fd65dcd811def66161f6d572c3930f2ba4d8" +SRCREV = "f6ee3fa8fe6f3d7ca8d5b104aa73c1a5c938a403" PV = "1.3" SRC_URI:append:class-target = " file://oe-remote.repo.sample" diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb deleted file mode 100644 index bf74f1229f..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.0.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Memory Efficient Serialization Library" -HOMEPAGE = "https://github.com/google/flatbuffers" -SECTION = "console/tools" -LICENSE = "Apache-2.0" - -inherit python3-dir - -PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-${PYTHON_PN}" - -RDEPENDS:${PN}-compiler = "${PN}" -RDEPENDS:${PN}-${PYTHON_PN} = "${PN}" -RDEPENDS:${PN}-dev += "${PN}-compiler" - -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRCREV = "a9a295fecf3fbd5a4f571f53b01f63202a3e2113" -SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https" -S = "${WORKDIR}/git" - -CVE_CHECK_IGNORE += "CVE-2020-35864" - -CXXFLAGS += "-fPIC" -BUILD_CXXFLAGS += "-fPIC" - -# BUILD_TYPE=Release is required, otherwise flatc is not installed -EXTRA_OECMAKE += "\ - -DCMAKE_BUILD_TYPE=Release \ - -DFLATBUFFERS_BUILD_TESTS=OFF \ - -DFLATBUFFERS_BUILD_SHAREDLIB=ON \ -" - -inherit cmake - -do_install:append() { - install -d ${D}${PYTHON_SITEPACKAGES_DIR} - cp -rf ${S}/python/flatbuffers ${D}${PYTHON_SITEPACKAGES_DIR} -} - -FILES:${PN}-compiler = "${bindir}" - -FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb new file mode 100644 index 0000000000..3ca4772100 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb @@ -0,0 +1,31 @@ +SUMMARY = "Memory Efficient Serialization Library" +HOMEPAGE = "https://github.com/google/flatbuffers" +SECTION = "console/tools" +LICENSE = "Apache-2.0" + +PACKAGE_BEFORE_PN = "${PN}-compiler" + +DEPENDS = "flatbuffers-native" + +RDEPENDS:${PN}-compiler = "${PN}" +RDEPENDS:${PN}-dev += "${PN}-compiler" + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRCREV = "615616cb5549a34bdf288c04bc1b94bd7a65c396" +SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https" +S = "${WORKDIR}/git" + +CVE_CHECK_IGNORE += "CVE-2020-35864" + +EXTRA_OECMAKE += " \ + -DFLATBUFFERS_BUILD_TESTS=OFF \ + -DFLATBUFFERS_BUILD_SHAREDLIB=ON \ +" +EXTRA_OECMAKE:append:class-target = " -DFLATBUFFERS_FLATC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/flatc" + +inherit cmake python3native + +FILES:${PN}-compiler = "${bindir}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb new file mode 100644 index 0000000000..7c05e76d9a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.6.bb @@ -0,0 +1,16 @@ +SUMMARY = "Memory Efficient Serialization Library - Python3 Modules" +HOMEPAGE = "https://github.com/google/flatbuffers" +SECTION = "console/tools" +LICENSE = "Apache-2.0" + +LIC_FILES_CHKSUM = "file://../LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRCREV = "615616cb5549a34bdf288c04bc1b94bd7a65c396" +SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https" +S = "${WORKDIR}/git/python" + +RDEPENDS:${PN} = "flatbuffers" + +inherit setuptools3 + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch deleted file mode 100644 index 6fee0526d2..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8c0e4b7907eb577b1e5214f9a7bc75d5c3263b0a Mon Sep 17 00:00:00 2001 -From: Ariadne Conill -Date: Sat, 14 Nov 2020 22:55:30 -0700 -Subject: [PATCH] Fix build under GCC -fno-common. - -Upstream-Status: Submitted [https://github.com/pikhq/musl-nscd/pull/11] -Signed-off-by: Khem Raj ---- - include/modules.h | 4 ++-- - src/main.c | 3 +++ - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/include/modules.h b/include/modules.h -index 70c1960..e77ec58 100644 ---- a/include/modules.h -+++ b/include/modules.h -@@ -28,7 +28,7 @@ struct mod_passwd { - link_t link; - }; - --list_t passwd_mods; --list_t group_mods; -+extern list_t passwd_mods; -+extern list_t group_mods; - - #endif -diff --git a/src/main.c b/src/main.c -index c1a78bb..808ef74 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -18,6 +18,9 @@ - #include "parse.h" - #include "util.h" - -+list_t passwd_mods; -+list_t group_mods; -+ - static void *get_dll(const char *service) - { - char *path; --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch deleted file mode 100644 index 691aa3d2ac..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4d09032741475c4e9d3de62c8187597f3f72f934 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 22 Nov 2020 12:32:01 -0800 -Subject: [PATCH] configure: Check for flex if lex is not found - -lex is already checked by this time, therefore check should be to find -flex -Upstream-Status: Submitted [https://github.com/pikhq/musl-nscd/pull/12] -Signed-off-by: Khem Raj ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 256824a..4c94568 100755 ---- a/configure -+++ b/configure -@@ -249,7 +249,7 @@ printf "checking for lex... " - trylex ${CROSS_COMPILE}lex - trylex lex - trylex ${CROSS_COMPILE}flex --trylex lex -+trylex flex - printf "%s\n" "$LEX" - test -n "$LEX" || echo "$0: cannot find lex. Will try to use pre-provided source." - --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb index ac2b5a266b..82e5c3bc5e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/musl/musl-nscd_git.bb @@ -4,17 +4,15 @@ DESCRIPTION = "Musl-nscd is an implementation of the NSCD protocol, suitable for use with musl and with standard NSS modules" HOMEPAGE = "https://github.com/pikhq/musl-nscd" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9bf479a145bcaff8489e743da58afeee" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fff9baeb9a392879d7fb25ba3a2696e4" SECTION = "utils" DEPENDS += "flex-native bison-native flex bison" -PV = "1.0.2" +PV = "1.1.0" -SRCREV = "af581482a3e1059458f3c8b20a56f82807ca3bd4" +SRCREV = "cddd6be6c629ca96f2d2e74ee52daf12bbef1f83" SRC_URI = "git://github.com/pikhq/musl-nscd;branch=master;protocol=https \ - file://0001-Fix-build-under-GCC-fno-common.patch \ - file://0001-configure-Check-for-flex-if-lex-is-not-found.patch \ file://0001-nsswitch.y-Replace-empty-bison-extension.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb index 94f98fe40f..1fee83a8fd 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb @@ -29,6 +29,11 @@ do_install:prepend() { rm -rf ${B}/t/z*.t } +do_install:append() { + sed -i "s:^#!.*:#!/usr/bin/env perl:" ${D}${bindir}/dbiproxy \ + ${D}${bindir}/dbiprof ${D}${bindir}/dbilogstrip +} + RDEPENDS:${PN}:class-target = " \ perl \ perl-module-carp \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.14.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.14.bb index 6dfff781b1..0863bb862d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.14.bb @@ -18,4 +18,12 @@ S = "${WORKDIR}/Devel-CheckLib-${PV}" inherit cpan +do_install:append() { + # update interpreter on shebang line + # since old version env doesn't support multiple arguments, replace option + # '-w' with 'use warnings;' + sed -i -e "s:^#!.*:#!/usr/bin/env perl:" \ + -e "/use strict;/ause warnings;" ${D}${bindir}/use-devel-checklib +} + BBCLASSEXTEND="native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb index d7959df66e..be9704a313 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb @@ -18,4 +18,8 @@ S = "${WORKDIR}/Parse-Yapp-${PV}" inherit cpan +do_install:append() { + sed -i "s:^#!.*:#!/usr/bin/env perl:" ${D}${bindir}/yapp +} + BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch index 26872d1204..acf2940839 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch @@ -18,11 +18,9 @@ Signed-off-by: Claude Bing ext/phar/Makefile.frag | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) -diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag -index 58789cae25..c02af1b186 100644 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag -@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar +@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 PHP_PHARCMD_EXECUTABLE = ` \ @@ -42,10 +40,7 @@ index 58789cae25..c02af1b186 100644 -PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` + $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; ` + -+PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` ++PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "/usr/bin/env $(program_prefix)php$(program_suffix)$(EXEEXT)";` $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc -@test -d $(builddir)/phar || mkdir $(builddir)/phar --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_8.1.6.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_8.1.6.bb deleted file mode 100644 index 96af595a45..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_8.1.6.bb +++ /dev/null @@ -1,280 +0,0 @@ -SUMMARY = "A server-side, HTML-embedded scripting language" -HOMEPAGE = "http://www.php.net" -SECTION = "console/network" - -LICENSE = "PHP-3.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=99532e0f6620bc9bca34f12fadaee33c" - -BBCLASSEXTEND = "native" -DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native" -DEPENDS:append:libc-musl = " libucontext" -DEPENDS:class-native = "zlib-native libxml2-native" - -PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}" - -SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ - file://0002-build-php.m4-don-t-unset-cache-variables.patch \ - file://0003-php-remove-host-specific-info-from-header-file.patch \ - file://0004-configure.ac-don-t-include-build-libtool.m4.patch \ - file://0009-php-don-t-use-broken-wrapper-for-mkdir.patch \ - file://0010-iconv-fix-detection.patch \ - " - -SRC_URI:append:class-target = " \ - file://0001-ext-opcache-config.m4-enable-opcache.patch \ - file://0005-pear-fix-Makefile.frag-for-Yocto.patch \ - file://0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch \ - file://0007-sapi-cli-config.m4-fix-build-directory.patch \ - file://0008-ext-imap-config.m4-fix-include-paths.patch \ - file://php-fpm.conf \ - file://php-fpm-apache.conf \ - file://70_mod_php${PHP_MAJOR_VERSION}.conf \ - file://php-fpm.service \ - " - -S = "${WORKDIR}/php-${PV}" -SRC_URI[sha256sum] = "7b353304b7407554f70d3e101a226a1fc22decae5c4c42ed270c4e389bfa1b66" - -inherit autotools pkgconfig python3native gettext - -# phpize is not scanned for absolute paths by default (but php-config is). -# -SSTATE_SCAN_FILES += "phpize" -SSTATE_SCAN_FILES += "build-defs.h" - -PHP_LIBDIR = "${libdir}/php${PHP_MAJOR_VERSION}" - -# Common EXTRA_OECONF -COMMON_EXTRA_OECONF = "--enable-sockets \ - --enable-pcntl \ - --enable-shared \ - --disable-rpath \ - --with-pic \ - --libdir=${PHP_LIBDIR} \ -" -EXTRA_OECONF = "--enable-mbstring \ - --enable-fpm \ - --with-libdir=${baselib} \ - --with-gettext=${STAGING_LIBDIR}/.. \ - --with-zlib=${STAGING_LIBDIR}/.. \ - --with-iconv=${STAGING_LIBDIR}/.. \ - --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ - --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \ - ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \ - ${COMMON_EXTRA_OECONF} \ -" - -EXTRA_OECONF:append:riscv64 = " --with-pcre-jit=no" -EXTRA_OECONF:append:riscv32 = " --with-pcre-jit=no" -# Needs fibers assembly implemented for rv32 -# for example rv64 implementation is below -# see https://github.com/php/php-src/commit/70b02d75f2abe3a292d49c4a4e9e4f850c2fee68 -EXTRA_OECONF:append:riscv32:libc-musl = " --disable-fiber-asm" - -CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=yes" - -EXTRA_OECONF:class-native = " \ - --with-zlib=${STAGING_LIBDIR_NATIVE}/.. \ - --without-iconv \ - ${COMMON_EXTRA_OECONF} \ -" - -PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ -" -PACKAGECONFIG:class-native = "" - -PACKAGECONFIG[zip] = "--with-zip --with-zlib-dir=${STAGING_EXECPREFIXDIR},,libzip" - -PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ - --with-pdo-mysql=mysqlnd \ - ,--without-mysqli --without-pdo-mysql \ - ,mysql5" - -PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \ - --with-pdo-sqlite=${STAGING_LIBDIR}/.. \ - ,--without-sqlite3 --without-pdo-sqlite \ - ,sqlite3" -PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql" -PACKAGECONFIG[soap] = "--enable-soap, --disable-soap, libxml2" -PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2" -PACKAGECONFIG[pam] = ",,libpam" -PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \ - --with-imap-ssl=${STAGING_DIR_HOST} \ - ,--without-imap --without-imap-ssl \ - ,uw-imap" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache" -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" -PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" -PACKAGECONFIG[mbregex] = "--enable-mbregex, --disable-mbregex, oniguruma" -PACKAGECONFIG[mbstring] = "--enable-mbstring,," - -export HOSTCC = "${BUILD_CC}" -export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" -export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" -CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2" - -# Adding these flags enables dynamic library support, which is disabled by -# default when cross compiling -# See https://bugs.php.net/bug.php?id=60109 -CFLAGS += " -DHAVE_LIBDL " -LDFLAGS += " -ldl " -LDFLAGS:append:libc-musl = " -lucontext " - -EXTRA_OEMAKE = "INSTALL_ROOT=${D}" - -acpaths = "" - -do_configure:prepend () { - rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4 - find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_SBINDIR_NATIVE}/httpd!' -} - -do_configure:append() { - # No, libtool, we really don't want rpath set... - sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool - sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -} - -do_install:append:class-native() { - rm -rf ${D}/${PHP_LIBDIR}/php/.registry - rm -rf ${D}/${PHP_LIBDIR}/php/.channels - rm -rf ${D}/${PHP_LIBDIR}/php/.[a-z]* -} - -do_install:prepend() { - cat ${ACLOCALDIR}/libtool.m4 ${ACLOCALDIR}/lt~obsolete.m4 ${ACLOCALDIR}/ltoptions.m4 \ - ${ACLOCALDIR}/ltsugar.m4 ${ACLOCALDIR}/ltversion.m4 > ${S}/build/libtool.m4 -} - -do_install:prepend:class-target() { - if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then - # Install dummy config file so apxs doesn't fail - install -d ${D}${sysconfdir}/apache2 - printf "\nLoadModule dummy_module modules/mod_dummy.so\n" > ${D}${sysconfdir}/apache2/httpd.conf - fi -} - -# fixme -do_install:append:class-target() { - install -d ${D}${sysconfdir}/ - rm -rf ${D}/.registry - rm -rf ${D}/.channels - rm -rf ${D}/.[a-z]* - rm -rf ${D}/var - rm -f ${D}/${sysconfdir}/php-fpm.conf.default - install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf - install -d ${D}/${sysconfdir}/apache2/conf.d - install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf - install -d ${D}${sysconfdir}/init.d - sed -i 's:=/usr/sbin:=${sbindir}:g' ${B}/sapi/fpm/init.d.php-fpm - sed -i 's:=/etc:=${sysconfdir}:g' ${B}/sapi/fpm/init.d.php-fpm - sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm - install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm - install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/php-fpm.service ${D}${systemd_unitdir}/system/ - sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ - ${D}${systemd_unitdir}/system/php-fpm.service - fi - - if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/apache2/modules.d - install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} - install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d - sed -i s,lib/,${libexecdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf - cat ${S}/php.ini-production | \ - sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ - > ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}/php.ini - rm -f ${D}${sysconfdir}/apache2/httpd.conf* - fi -} - -SYSROOT_PREPROCESS_FUNCS += "php_sysroot_preprocess" - -php_sysroot_preprocess () { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 755 ${D}${bindir}/phpize ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 755 ${D}${bindir}/php-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - - sed -i 's!eval echo /!eval echo ${STAGING_DIR_HOST}/!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/phpize - sed -i 's!^include_dir=.*!include_dir=${STAGING_INCDIR}/php!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/php-config -} - -MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', '${PN}-modphp', '', d)}" - -PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-phpdbg ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-opcache ${PN}" - -RDEPENDS:${PN} += "libgcc" -RDEPENDS:${PN}-pear = "${PN}" -RDEPENDS:${PN}-phar = "${PN}-cli" -RDEPENDS:${PN}-cli = "${PN}" -RDEPENDS:${PN}-modphp = "${PN} apache2" -RDEPENDS:${PN}-opcache = "${PN}" - -ALLOW_EMPTY:${PN} = "1" - -INITSCRIPT_PACKAGES = "${PN}-fpm" -inherit update-rc.d - -# WARNING: lib32-php-8.0.12-r0 do_package_qa: QA Issue: lib32-php: ELF binary /usr/libexec/apache2/modules/libphp.so has relocations in .text [textrel] -#WARNING: lib32-php-8.0.12-r0 do_package_qa: QA Issue: lib32-php-opcache: ELF binary /usr/lib/php8/extensions/no-debug-zts-20200930/opcache.so has relocations in .text [textrel] -INSANE_SKIP:${PN}:append:x86 = " textrel" -INSANE_SKIP:${PN}-opcache:append:x86 = " textrel" - -FILES:${PN}-dbg =+ "${bindir}/.debug \ - ${libexecdir}/apache2/modules/.debug" -FILES:${PN}-doc += "${PHP_LIBDIR}/php/doc" -FILES:${PN}-cli = "${bindir}/php" -FILES:${PN}-phpdbg = "${bindir}/phpdbg" -FILES:${PN}-phar = "${bindir}/phar*" -FILES:${PN}-cgi = "${bindir}/php-cgi" -FILES:${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm ${systemd_unitdir}/system/php-fpm.service ${sysconfdir}/php-fpm.d/www.conf.default" -FILES:${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" -CONFFILES:${PN}-fpm = "${sysconfdir}/php-fpm.conf" -CONFFILES:${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" -INITSCRIPT_NAME:${PN}-fpm = "php-fpm" -INITSCRIPT_PARAMS:${PN}-fpm = "defaults 60" -FILES:${PN}-pear = "${bindir}/pear* ${bindir}/pecl ${PHP_LIBDIR}/php/PEAR \ - ${PHP_LIBDIR}/php/PEAR*.php ${PHP_LIBDIR}/php/System.php \ - ${PHP_LIBDIR}/php/peclcmd.php ${PHP_LIBDIR}/php/pearcmd.php \ - ${PHP_LIBDIR}/php/.channels ${PHP_LIBDIR}/php/.channels/.alias \ - ${PHP_LIBDIR}/php/.registry ${PHP_LIBDIR}/php/Archive/Tar.php \ - ${PHP_LIBDIR}/php/Console/Getopt.php ${PHP_LIBDIR}/php/OS/Guess.php \ - ${PHP_LIBDIR}/php/data/PEAR \ - ${sysconfdir}/pear.conf" -FILES:${PN}-dev = "${includedir}/php ${PHP_LIBDIR}/build ${bindir}/phpize \ - ${bindir}/php-config ${PHP_LIBDIR}/php/.depdb \ - ${PHP_LIBDIR}/php/.depdblock ${PHP_LIBDIR}/php/.filemap \ - ${PHP_LIBDIR}/php/.lock ${PHP_LIBDIR}/php/test" -FILES:${PN}-staticdev += "${PHP_LIBDIR}/extensions/*/*.a" -FILES:${PN}-opcache = "${PHP_LIBDIR}/extensions/*/opcache${SOLIBSDEV}" -FILES:${PN} = "${PHP_LIBDIR}/php" -FILES:${PN} += "${bindir} ${libexecdir}/apache2" - -SUMMARY:${PN}-modphp = "PHP module for the Apache HTTP server" -FILES:${PN}-modphp = "${libdir}/apache2 ${sysconfdir}" - -MODPHP_OLDPACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'modphp', '', d)}" -RPROVIDES:${PN}-modphp = "${MODPHP_OLDPACKAGE}" -RREPLACES:${PN}-modphp = "${MODPHP_OLDPACKAGE}" -RCONFLICTS:${PN}-modphp = "${MODPHP_OLDPACKAGE}" - -do_install:append:class-native() { - create_wrapper ${D}${bindir}/php \ - PHP_PEAR_SYSCONF_DIR=${sysconfdir}/ -} - -# Fails to build with thumb-1 (qemuarm) -# | {standard input}: Assembler messages: -# | {standard input}:3719: Error: selected processor does not support Thumb mode `smull r0,r2,r9,r3' -# | {standard input}:3720: Error: unshifted register required -- `sub r2,r2,r0,asr#31' -# | {standard input}:3796: Error: selected processor does not support Thumb mode `smull r0,r2,r3,r3' -# | {standard input}:3797: Error: unshifted register required -- `sub r2,r2,r0,asr#31' -# | make: *** [ext/standard/math.lo] Error 1 -ARM_INSTRUCTION_SET = "arm" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_8.1.7.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_8.1.7.bb new file mode 100644 index 0000000000..043f3a81b2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_8.1.7.bb @@ -0,0 +1,280 @@ +SUMMARY = "A server-side, HTML-embedded scripting language" +HOMEPAGE = "http://www.php.net" +SECTION = "console/network" + +LICENSE = "PHP-3.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=99532e0f6620bc9bca34f12fadaee33c" + +BBCLASSEXTEND = "native" +DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native" +DEPENDS:append:libc-musl = " libucontext" +DEPENDS:class-native = "zlib-native libxml2-native" + +PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}" + +SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \ + file://0002-build-php.m4-don-t-unset-cache-variables.patch \ + file://0003-php-remove-host-specific-info-from-header-file.patch \ + file://0004-configure.ac-don-t-include-build-libtool.m4.patch \ + file://0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch \ + file://0009-php-don-t-use-broken-wrapper-for-mkdir.patch \ + file://0010-iconv-fix-detection.patch \ + " + +SRC_URI:append:class-target = " \ + file://0001-ext-opcache-config.m4-enable-opcache.patch \ + file://0005-pear-fix-Makefile.frag-for-Yocto.patch \ + file://0007-sapi-cli-config.m4-fix-build-directory.patch \ + file://0008-ext-imap-config.m4-fix-include-paths.patch \ + file://php-fpm.conf \ + file://php-fpm-apache.conf \ + file://70_mod_php${PHP_MAJOR_VERSION}.conf \ + file://php-fpm.service \ + " + +S = "${WORKDIR}/php-${PV}" +SRC_URI[sha256sum] = "b816753eb005511e695d90945c27093c3236cc73db1262656d9fadd73ead7e9d" + +inherit autotools pkgconfig python3native gettext + +# phpize is not scanned for absolute paths by default (but php-config is). +# +SSTATE_SCAN_FILES += "phpize" +SSTATE_SCAN_FILES += "build-defs.h" + +PHP_LIBDIR = "${libdir}/php${PHP_MAJOR_VERSION}" + +# Common EXTRA_OECONF +COMMON_EXTRA_OECONF = "--enable-sockets \ + --enable-pcntl \ + --enable-shared \ + --disable-rpath \ + --with-pic \ + --libdir=${PHP_LIBDIR} \ +" +EXTRA_OECONF = "--enable-mbstring \ + --enable-fpm \ + --with-libdir=${baselib} \ + --with-gettext=${STAGING_LIBDIR}/.. \ + --with-zlib=${STAGING_LIBDIR}/.. \ + --with-iconv=${STAGING_LIBDIR}/.. \ + --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ + --with-config-file-path=${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} \ + ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'ac_cv_c_bigendian_php=no', 'ac_cv_c_bigendian_php=yes', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'pam', '', 'ac_cv_lib_pam_pam_start=no', d)} \ + ${COMMON_EXTRA_OECONF} \ +" + +EXTRA_OECONF:append:riscv64 = " --with-pcre-jit=no" +EXTRA_OECONF:append:riscv32 = " --with-pcre-jit=no" +# Needs fibers assembly implemented for rv32 +# for example rv64 implementation is below +# see https://github.com/php/php-src/commit/70b02d75f2abe3a292d49c4a4e9e4f850c2fee68 +EXTRA_OECONF:append:riscv32:libc-musl = " --disable-fiber-asm" + +CACHED_CONFIGUREVARS += "ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=yes" + +EXTRA_OECONF:class-native = " \ + --with-zlib=${STAGING_LIBDIR_NATIVE}/.. \ + --without-iconv \ + ${COMMON_EXTRA_OECONF} \ +" + +PACKAGECONFIG ??= "mysql sqlite3 imap opcache openssl \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ +" +PACKAGECONFIG:class-native = "" + +PACKAGECONFIG[zip] = "--with-zip --with-zlib-dir=${STAGING_EXECPREFIXDIR},,libzip" + +PACKAGECONFIG[mysql] = "--with-mysqli=mysqlnd \ + --with-pdo-mysql=mysqlnd \ + ,--without-mysqli --without-pdo-mysql \ + ,mysql5" + +PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_LIBDIR}/.. \ + --with-pdo-sqlite=${STAGING_LIBDIR}/.. \ + ,--without-sqlite3 --without-pdo-sqlite \ + ,sqlite3" +PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--without-pgsql,postgresql" +PACKAGECONFIG[soap] = "--enable-soap, --disable-soap, libxml2" +PACKAGECONFIG[apache2] = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs,,apache2-native apache2" +PACKAGECONFIG[pam] = ",,libpam" +PACKAGECONFIG[imap] = "--with-imap=${STAGING_DIR_HOST} \ + --with-imap-ssl=${STAGING_DIR_HOST} \ + ,--without-imap --without-imap-ssl \ + ,uw-imap" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[opcache] = "--enable-opcache,--disable-opcache" +PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" +PACKAGECONFIG[valgrind] = "--with-valgrind=${STAGING_DIR_TARGET}/usr,--with-valgrind=no,valgrind" +PACKAGECONFIG[mbregex] = "--enable-mbregex, --disable-mbregex, oniguruma" +PACKAGECONFIG[mbstring] = "--enable-mbstring,," + +export HOSTCC = "${BUILD_CC}" +export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" +export PHP_PEAR_PHP_BIN = "${STAGING_BINDIR_NATIVE}/php" +CFLAGS += " -D_GNU_SOURCE -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR}/apache2" + +# Adding these flags enables dynamic library support, which is disabled by +# default when cross compiling +# See https://bugs.php.net/bug.php?id=60109 +CFLAGS += " -DHAVE_LIBDL " +LDFLAGS += " -ldl " +LDFLAGS:append:libc-musl = " -lucontext " + +EXTRA_OEMAKE = "INSTALL_ROOT=${D}" + +acpaths = "" + +do_configure:prepend () { + rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4 + find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_SBINDIR_NATIVE}/httpd!' +} + +do_configure:append() { + # No, libtool, we really don't want rpath set... + sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool + sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +} + +do_install:append:class-native() { + rm -rf ${D}/${PHP_LIBDIR}/php/.registry + rm -rf ${D}/${PHP_LIBDIR}/php/.channels + rm -rf ${D}/${PHP_LIBDIR}/php/.[a-z]* +} + +do_install:prepend() { + cat ${ACLOCALDIR}/libtool.m4 ${ACLOCALDIR}/lt~obsolete.m4 ${ACLOCALDIR}/ltoptions.m4 \ + ${ACLOCALDIR}/ltsugar.m4 ${ACLOCALDIR}/ltversion.m4 > ${S}/build/libtool.m4 +} + +do_install:prepend:class-target() { + if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then + # Install dummy config file so apxs doesn't fail + install -d ${D}${sysconfdir}/apache2 + printf "\nLoadModule dummy_module modules/mod_dummy.so\n" > ${D}${sysconfdir}/apache2/httpd.conf + fi +} + +# fixme +do_install:append:class-target() { + install -d ${D}${sysconfdir}/ + rm -rf ${D}/.registry + rm -rf ${D}/.channels + rm -rf ${D}/.[a-z]* + rm -rf ${D}/var + rm -f ${D}/${sysconfdir}/php-fpm.conf.default + install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf + install -d ${D}/${sysconfdir}/apache2/conf.d + install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf + install -d ${D}${sysconfdir}/init.d + sed -i 's:=/usr/sbin:=${sbindir}:g' ${B}/sapi/fpm/init.d.php-fpm + sed -i 's:=/etc:=${sysconfdir}:g' ${B}/sapi/fpm/init.d.php-fpm + sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm + install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm + install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/php-fpm.service ${D}${systemd_unitdir}/system/ + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ + ${D}${systemd_unitdir}/system/php-fpm.service + fi + + if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/apache2/modules.d + install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} + install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d + sed -i s,lib/,${libexecdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf + cat ${S}/php.ini-production | \ + sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ + > ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION}/php.ini + rm -f ${D}${sysconfdir}/apache2/httpd.conf* + fi +} + +SYSROOT_PREPROCESS_FUNCS += "php_sysroot_preprocess" + +php_sysroot_preprocess () { + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/phpize ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/php-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + + sed -i 's!eval echo /!eval echo ${STAGING_DIR_HOST}/!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/phpize + sed -i 's!^include_dir=.*!include_dir=${STAGING_INCDIR}/php!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/php-config +} + +MODPHP_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', '${PN}-modphp', '', d)}" + +PACKAGES = "${PN}-dbg ${PN}-cli ${PN}-phpdbg ${PN}-cgi ${PN}-fpm ${PN}-fpm-apache2 ${PN}-pear ${PN}-phar ${MODPHP_PACKAGE} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-opcache ${PN}" + +RDEPENDS:${PN} += "libgcc" +RDEPENDS:${PN}-pear = "${PN}" +RDEPENDS:${PN}-phar = "${PN}-cli" +RDEPENDS:${PN}-cli = "${PN}" +RDEPENDS:${PN}-modphp = "${PN} apache2" +RDEPENDS:${PN}-opcache = "${PN}" + +ALLOW_EMPTY:${PN} = "1" + +INITSCRIPT_PACKAGES = "${PN}-fpm" +inherit update-rc.d + +# WARNING: lib32-php-8.0.12-r0 do_package_qa: QA Issue: lib32-php: ELF binary /usr/libexec/apache2/modules/libphp.so has relocations in .text [textrel] +#WARNING: lib32-php-8.0.12-r0 do_package_qa: QA Issue: lib32-php-opcache: ELF binary /usr/lib/php8/extensions/no-debug-zts-20200930/opcache.so has relocations in .text [textrel] +INSANE_SKIP:${PN}:append:x86 = " textrel" +INSANE_SKIP:${PN}-opcache:append:x86 = " textrel" + +FILES:${PN}-dbg =+ "${bindir}/.debug \ + ${libexecdir}/apache2/modules/.debug" +FILES:${PN}-doc += "${PHP_LIBDIR}/php/doc" +FILES:${PN}-cli = "${bindir}/php" +FILES:${PN}-phpdbg = "${bindir}/phpdbg" +FILES:${PN}-phar = "${bindir}/phar*" +FILES:${PN}-cgi = "${bindir}/php-cgi" +FILES:${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm ${systemd_unitdir}/system/php-fpm.service ${sysconfdir}/php-fpm.d/www.conf.default" +FILES:${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" +CONFFILES:${PN}-fpm = "${sysconfdir}/php-fpm.conf" +CONFFILES:${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" +INITSCRIPT_NAME:${PN}-fpm = "php-fpm" +INITSCRIPT_PARAMS:${PN}-fpm = "defaults 60" +FILES:${PN}-pear = "${bindir}/pear* ${bindir}/pecl ${PHP_LIBDIR}/php/PEAR \ + ${PHP_LIBDIR}/php/PEAR*.php ${PHP_LIBDIR}/php/System.php \ + ${PHP_LIBDIR}/php/peclcmd.php ${PHP_LIBDIR}/php/pearcmd.php \ + ${PHP_LIBDIR}/php/.channels ${PHP_LIBDIR}/php/.channels/.alias \ + ${PHP_LIBDIR}/php/.registry ${PHP_LIBDIR}/php/Archive/Tar.php \ + ${PHP_LIBDIR}/php/Console/Getopt.php ${PHP_LIBDIR}/php/OS/Guess.php \ + ${PHP_LIBDIR}/php/data/PEAR \ + ${sysconfdir}/pear.conf" +FILES:${PN}-dev = "${includedir}/php ${PHP_LIBDIR}/build ${bindir}/phpize \ + ${bindir}/php-config ${PHP_LIBDIR}/php/.depdb \ + ${PHP_LIBDIR}/php/.depdblock ${PHP_LIBDIR}/php/.filemap \ + ${PHP_LIBDIR}/php/.lock ${PHP_LIBDIR}/php/test" +FILES:${PN}-staticdev += "${PHP_LIBDIR}/extensions/*/*.a" +FILES:${PN}-opcache = "${PHP_LIBDIR}/extensions/*/opcache${SOLIBSDEV}" +FILES:${PN} = "${PHP_LIBDIR}/php" +FILES:${PN} += "${bindir} ${libexecdir}/apache2" + +SUMMARY:${PN}-modphp = "PHP module for the Apache HTTP server" +FILES:${PN}-modphp = "${libdir}/apache2 ${sysconfdir}" + +MODPHP_OLDPACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'modphp', '', d)}" +RPROVIDES:${PN}-modphp = "${MODPHP_OLDPACKAGE}" +RREPLACES:${PN}-modphp = "${MODPHP_OLDPACKAGE}" +RCONFLICTS:${PN}-modphp = "${MODPHP_OLDPACKAGE}" + +do_install:append:class-native() { + create_wrapper ${D}${bindir}/php \ + PHP_PEAR_SYSCONF_DIR=${sysconfdir}/ +} + +# Fails to build with thumb-1 (qemuarm) +# | {standard input}: Assembler messages: +# | {standard input}:3719: Error: selected processor does not support Thumb mode `smull r0,r2,r9,r3' +# | {standard input}:3720: Error: unshifted register required -- `sub r2,r2,r0,asr#31' +# | {standard input}:3796: Error: selected processor does not support Thumb mode `smull r0,r2,r3,r3' +# | {standard input}:3797: Error: unshifted register required -- `sub r2,r2,r0,asr#31' +# | make: *** [ext/standard/math.lo] Error 1 +ARM_INSTRUCTION_SET = "arm" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb deleted file mode 100644 index b3423ba84d..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Protocol Buffers - structured data serialisation mechanism" -DESCRIPTION = "This is protobuf-c, a C implementation of the Google Protocol Buffers data \ -serialization format. It includes libprotobuf-c, a pure C library that \ -implements protobuf encoding and decoding, and protoc-c, a code generator that \ -converts Protocol Buffer .proto files to C descriptor code, based on the \ -original protoc. protobuf-c formerly included an RPC implementation; that code \ -has been split out into the protobuf-c-rpc project." -HOMEPAGE = "https://github.com/protobuf-c/protobuf-c" -SECTION = "console/tools" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cb901168715f4782a2b06c3ddaefa558" - -DEPENDS = "protobuf-native protobuf" - -SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https" -SRCREV = "f224ab2eeb648a818eb20687d7150a285442c907" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -export PROTOC = "${STAGING_BINDIR_NATIVE}/protoc" - -# After several fix attempts there is still a race between generating -# t.test-full.pb.h and compiling cxx_generate_packed_data.c despite -# BUILT_SOURCES and explicit dependencies. -PARALLEL_MAKE = "" - -PACKAGE_BEFORE_PN = "${PN}-compiler" - -FILES:${PN}-compiler = "${bindir}" - -RDEPENDS:${PN}-compiler = "protobuf-compiler" -RDEPENDS:${PN}-dev += "${PN}-compiler" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb new file mode 100644 index 0000000000..d724287d66 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb @@ -0,0 +1,36 @@ +SUMMARY = "Protocol Buffers - structured data serialisation mechanism" +DESCRIPTION = "This is protobuf-c, a C implementation of the Google Protocol Buffers data \ +serialization format. It includes libprotobuf-c, a pure C library that \ +implements protobuf encoding and decoding, and protoc-c, a code generator that \ +converts Protocol Buffer .proto files to C descriptor code, based on the \ +original protoc. protobuf-c formerly included an RPC implementation; that code \ +has been split out into the protobuf-c-rpc project." +HOMEPAGE = "https://github.com/protobuf-c/protobuf-c" +SECTION = "console/tools" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9f725889e0d77383e26cb42b0b62cea2" + +DEPENDS = "protobuf-native protobuf" + +SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https" +SRCREV = "abc67a11c6db271bedbb9f58be85d6f4e2ea8389" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +export PROTOC = "${STAGING_BINDIR_NATIVE}/protoc" + +# After several fix attempts there is still a race between generating +# t.test-full.pb.h and compiling cxx_generate_packed_data.c despite +# BUILT_SOURCES and explicit dependencies. +PARALLEL_MAKE = "" + +PACKAGE_BEFORE_PN = "${PN}-compiler" + +FILES:${PN}-compiler = "${bindir}" + +RDEPENDS:${PN}-compiler = "protobuf-compiler" +RDEPENDS:${PN}-dev += "${PN}-compiler" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.11.bb b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.11.bb deleted file mode 100644 index 6d7696c06e..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.11.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Trace and analyze execution of a program written in C/C++" -HOMEPAGE = "https://github.com/namhyung/uftrace" -BUGTRACKER = "https://github.com/namhyung/uftrace/issues" -SECTION = "devel" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "elfutils" -DEPENDS:append:libc-musl = " argp-standalone" - -inherit autotools - -SRCREV = "304a492652dc0fd220f601167c4ebb30e2ae4a39" -SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https \ - " -S = "${WORKDIR}/git" - -LDFLAGS:append:libc-musl = " -largp" - -def set_target_arch(d): - import re - arch = d.getVar('TARGET_ARCH') - if re.match(r'i.86', arch, re.I): - return 'i386' - elif re.match('armeb', arch, re.I): - return 'arm' - else: - return arch - -EXTRA_UFTRACE_OECONF = "ARCH=${@set_target_arch(d)} \ - with_elfutils=/use/libelf/from/sysroot" - -do_configure() { - ${S}/configure ${EXTRA_UFTRACE_OECONF} -} - -FILES_SOLIBSDEV = "" -FILES:${PN} += "${libdir}/*.so" - -COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm)" - -# uftrace supports armv6 and above -COMPATIBLE_HOST:armv4 = 'null' -COMPATIBLE_HOST:armv5 = 'null' diff --git a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.12.bb b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.12.bb new file mode 100644 index 0000000000..111e948669 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.12.bb @@ -0,0 +1,44 @@ +SUMMARY = "Trace and analyze execution of a program written in C/C++" +HOMEPAGE = "https://github.com/namhyung/uftrace" +BUGTRACKER = "https://github.com/namhyung/uftrace/issues" +SECTION = "devel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "elfutils" +DEPENDS:append:libc-musl = " argp-standalone" + +inherit autotools + +SRCREV = "46d536709451609e5e99099216d9dcf567ceeaca" +SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https \ + " +S = "${WORKDIR}/git" + +LDFLAGS:append:libc-musl = " -largp" + +def set_target_arch(d): + import re + arch = d.getVar('TARGET_ARCH') + if re.match(r'i.86', arch, re.I): + return 'i386' + elif re.match('armeb', arch, re.I): + return 'arm' + else: + return arch + +EXTRA_UFTRACE_OECONF = "ARCH=${@set_target_arch(d)} \ + with_elfutils=/use/libelf/from/sysroot" + +do_configure() { + ${S}/configure ${EXTRA_UFTRACE_OECONF} +} + +FILES_SOLIBSDEV = "" +FILES:${PN} += "${libdir}/*.so" + +COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm)" + +# uftrace supports armv6 and above +COMPATIBLE_HOST:armv4 = 'null' +COMPATIBLE_HOST:armv5 = 'null' diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb index 2cea50dfb0..7a613bcc93 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.8.bb @@ -19,7 +19,7 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https;branch=master \ file://0004-Modify-systemd-config-directory.patch \ file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ " -SRCREV = "0138c00811c86eab4ff6bff3c6528163885ade19" +SRCREV = "6a3bd901d825c7206797e36ea98e10a218f5aad2" PV .= "+2.18.9git${SRCPV}" @@ -27,7 +27,7 @@ S = "${WORKDIR}/git" LDFLAGS:append:riscv64 = " -latomic" -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-console ', '', d)} \ +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-adaptor-udp dlt-console ', '', d)} \ udp-connection dlt-system dlt-filetransfer " # dlt-dbus @@ -44,6 +44,7 @@ PACKAGECONFIG[udp-connection] = "-DWITH_UDP_CONNECTION=ON,-DWITH_UDP_CONNECTION= # Command line options PACKAGECONFIG[dlt-system] = "-DWITH_DLT_SYSTEM=ON,-DWITH_DLT_SYSTEM=OFF" PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF,,dlt-daemon-systemd" +PACKAGECONFIG[dlt-adaptor-udp] = "-DWITH_DLT_ADAPTOR_UDP=ON,-DWITH_DLT_ADAPTOR_UDP=OFF,,dlt-daemon-systemd" PACKAGECONFIG[dlt-filetransfer] = "-DWITH_DLT_FILETRANSFER=ON,-DWITH_DLT_FILETRANSFER=OFF" PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd" @@ -58,7 +59,7 @@ SYSTEMD_SERVICE:${PN} = " ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'dlt. ${@bb.utils.contains('PACKAGECONFIG', 'dlt-dbus', 'dlt-dbus.service', '', d)}" SYSTEMD_AUTO_ENABLE:${PN} = "enable" SYSTEMD_SERVICE:${PN}-systemd = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-adaptor', 'dlt-adaptor-udp.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-adaptor-udp', 'dlt-adaptor-udp.service', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples', 'dlt-example-user.service', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples dlt-console', 'dlt-receive.service', '', d)} \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb index 583e8337e7..22b6c782a6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb @@ -37,4 +37,4 @@ do_install_ptest() { install -m 0755 "${WORKDIR}/duktape-2.7.0/examples/eventloop/ecma_eventloop.js" "${D}${PTEST_PATH}" } -RDEPENDS_${PN}-ptest += "make" +RDEPENDS:${PN}-ptest += "make" diff --git a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.13.1.bb b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.13.1.bb deleted file mode 100644 index d6e56ea768..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.13.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Jansson is a C library for encoding, decoding and manipulating JSON data" -HOMEPAGE = "http://www.digip.org/jansson/" -BUGTRACKER = "https://github.com/akheron/jansson/issues" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=afd92c4cfc08f4896003251b878cc0bf" - -SRC_URI = "http://www.digip.org/jansson/releases/${BPN}-${PV}.tar.gz" - -SRC_URI[md5sum] = "570af45b8203e95876d71fecd56cee20" -SRC_URI[sha256sum] = "f4f377da17b10201a60c1108613e78ee15df6b12016b116b6de42209f47a474f" - -inherit autotools pkgconfig - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.14.bb b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.14.bb new file mode 100644 index 0000000000..945b31f580 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.14.bb @@ -0,0 +1,15 @@ +SUMMARY = "Jansson is a C library for encoding, decoding and manipulating JSON data" +HOMEPAGE = "http://www.digip.org/jansson/" +BUGTRACKER = "https://github.com/akheron/jansson/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=afd92c4cfc08f4896003251b878cc0bf" + +SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2" +SRC_URI[sha256sum] = "fba956f27c6ae56ce6dfd52fbf9d20254aad42821f74fa52f83957625294afb9" + +UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "${BPN}-(?P\d+(\.\d+)+)\.tar" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb deleted file mode 100644 index 71072a5927..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "libzip is a C library for reading, creating, and modifying zip archives." -HOMEPAGE = "https://libzip.org/" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=067e9870bba57e1ce20695c4d5672f30" - -DEPENDS = "zlib bzip2" - -PACKAGECONFIG[ssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" -PACKAGECONFIG[lzma] = "-DENABLE_LZMA=ON,-DENABLE_LZMA=OFF,xz" -PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF,gnutls nettle" -PACKAGECONFIG[zstd] = "-DENABLE_ZSTD=ON,-DENABLE_ZSTD=OFF,zstd" -PACKAGECONFIG[mbedtls] = "-DENABLE_MBEDTLS=ON,-DENABLE_MBEDTLS=OFF,mbedtls" -PACKAGECONFIG[examples] = "-DENABLE_EXAMPLES=ON,-DENABLE_EXAMPLES=OFF," -PACKAGECONFIG[tools] = "-DENABLE_TOOLS=ON,-DENABLE_TOOLS=OFF," -PACKAGECONFIG[tests] = "-DBUILD_REGRESS=ON,-DBUILD_REGRESS=OFF," - -PACKAGECONFIG ?= "ssl lzma tools examples" - -inherit cmake - -SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" - -SRC_URI[sha256sum] = "f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e" - -# Patch for CVE-2017-12858 is applied in version 1.2.0. -CVE_CHECK_IGNORE += "CVE-2017-12858" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.9.2.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.9.2.bb new file mode 100644 index 0000000000..f4de8607a0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.9.2.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "libzip is a C library for reading, creating, and modifying zip archives." +HOMEPAGE = "https://libzip.org/" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d8a9d2078f35e61cf1122ccd440687cf" + +DEPENDS = "zlib bzip2" + +PACKAGECONFIG[ssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" +PACKAGECONFIG[lzma] = "-DENABLE_LZMA=ON,-DENABLE_LZMA=OFF,xz" +PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF,gnutls nettle" +PACKAGECONFIG[zstd] = "-DENABLE_ZSTD=ON,-DENABLE_ZSTD=OFF,zstd" +PACKAGECONFIG[mbedtls] = "-DENABLE_MBEDTLS=ON,-DENABLE_MBEDTLS=OFF,mbedtls" +PACKAGECONFIG[examples] = "-DENABLE_EXAMPLES=ON,-DENABLE_EXAMPLES=OFF," +PACKAGECONFIG[tools] = "-DENABLE_TOOLS=ON,-DENABLE_TOOLS=OFF," +PACKAGECONFIG[tests] = "-DBUILD_REGRESS=ON,-DBUILD_REGRESS=OFF," + +PACKAGECONFIG ?= "ssl lzma tools examples" + +inherit cmake + +SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" + +SRC_URI[sha256sum] = "c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937" + +# Patch for CVE-2017-12858 is applied in version 1.2.0. +CVE_CHECK_IGNORE += "CVE-2017-12858" diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.5.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.5.bb deleted file mode 100644 index b4e0d17b37..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.5.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" -HOMEPAGE="https://github.com/taocpp/PEGTL" -LICENSE="MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5b6701671289d12b7ffa69138832c006" - -SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=3.x" -SRCREV = "eeba7fa1180655bd683be620cc31be35607442ca" - -inherit cmake - -S = "${WORKDIR}/git" - -CXXFLAGS += " -Wno-error=type-limits" diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.6.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.6.bb new file mode 100644 index 0000000000..7fb6850134 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.6.bb @@ -0,0 +1,13 @@ +DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" +HOMEPAGE="https://github.com/taocpp/PEGTL" +LICENSE="MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dccf35ef30bf912bb07b01d469965293" + +SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=3.x" +SRCREV = "464d866d8bbf4c8ddc5b67422d09b60ad3b918fc" + +inherit cmake + +S = "${WORKDIR}/git" + +CXXFLAGS += " -Wno-error=type-limits" diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb index ae024d0328..db2ed015b4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb @@ -7,7 +7,7 @@ require polkit-group-rule.inc # The file originates from https://github.com/coldfix/udiskie/wiki/Permissions SRC_URI = "file://50-org.freedesktop.udiskie.rules" -RDEPENDS_${PN} += "udisks2" +RDEPENDS:${PN} += "udisks2" do_install() { install -m 0755 ${WORKDIR}/50-org.freedesktop.udiskie.rules ${D}${sysconfdir}/polkit-1/rules.d diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0002-jsauthority-port-to-mozjs-91.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0002-jsauthority-port-to-mozjs-91.patch new file mode 100644 index 0000000000..5b3660da2f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0002-jsauthority-port-to-mozjs-91.patch @@ -0,0 +1,38 @@ +From 4ce27b66bb07b72cb96d3d43a75108a5a6e7e156 Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao +Date: Tue, 10 Aug 2021 19:09:42 +0800 +Subject: [PATCH] jsauthority: port to mozjs-91 + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/92] +Signed-off-by: Alexander Kanavin +--- + configure.ac | 2 +- + meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d807086..5a7fc11 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -80,7 +80,7 @@ PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-unix-2.0 >= 2.30.0]) + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + +-PKG_CHECK_MODULES(LIBJS, [mozjs-78]) ++PKG_CHECK_MODULES(LIBJS, [mozjs-91]) + + AC_SUBST(LIBJS_CFLAGS) + AC_SUBST(LIBJS_CXXFLAGS) +diff --git a/meson.build b/meson.build +index b3702be..733bbff 100644 +--- a/meson.build ++++ b/meson.build +@@ -126,7 +126,7 @@ expat_dep = dependency('expat') + assert(cc.has_header('expat.h', dependencies: expat_dep), 'Can\'t find expat.h. Please install expat.') + assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t find expat library. Please install expat.') + +-mozjs_dep = dependency('mozjs-78') ++mozjs_dep = dependency('mozjs-91') + + dbus_dep = dependency('dbus-1') + dbus_confdir = dbus_dep.get_pkgconfig_variable('datadir', define_variable: ['datadir', pk_prefix / pk_datadir]) #changed from sysconfdir with respect to commit#8eada3836465838 diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0003-jsauthority-ensure-to-call-JS_Init-and-JS_ShutDown-e.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0003-jsauthority-ensure-to-call-JS_Init-and-JS_ShutDown-e.patch new file mode 100644 index 0000000000..9e9755e44f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0003-jsauthority-ensure-to-call-JS_Init-and-JS_ShutDown-e.patch @@ -0,0 +1,63 @@ +From 7799441b9aa55324160deefbc65f9d918b8c94c1 Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao +Date: Tue, 10 Aug 2021 18:52:56 +0800 +Subject: [PATCH] jsauthority: ensure to call JS_Init() and JS_ShutDown() + exactly once + +Before this commit, we were calling JS_Init() in +polkit_backend_js_authority_class_init and never called JS_ShutDown. +This is actually a misusage of SpiderMonkey API. Quote from a comment +in js/Initialization.h (both mozjs-78 and mozjs-91): + + It is currently not possible to initialize SpiderMonkey multiple + times (that is, calling JS_Init/JSAPI methods/JS_ShutDown in that + order, then doing so again). + +This misusage does not cause severe issues with mozjs-78. However, when +we eventually port jsauthority to use mozjs-91, bad thing will happen: +see the test failure mentioned in #150. + +This commit is tested with both mozjs-78 and mozjs-91, all tests pass +with it. + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/91] +Signed-off-by: Alexander Kanavin +--- + src/polkitbackend/polkitbackendjsauthority.cpp | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp +index 41d8d5c..38dc001 100644 +--- a/src/polkitbackend/polkitbackendjsauthority.cpp ++++ b/src/polkitbackend/polkitbackendjsauthority.cpp +@@ -75,6 +75,13 @@ + + /* ---------------------------------------------------------------------------------------------------- */ + ++static class JsInitHelperType ++{ ++public: ++ JsInitHelperType() { JS_Init(); } ++ ~JsInitHelperType() { JS_ShutDown(); } ++} JsInitHelper; ++ + struct _PolkitBackendJsAuthorityPrivate + { + gchar **rules_dirs; +@@ -589,7 +596,6 @@ polkit_backend_js_authority_finalize (GObject *object) + delete authority->priv->js_polkit; + + JS_DestroyContext (authority->priv->cx); +- /* JS_ShutDown (); */ + + G_OBJECT_CLASS (polkit_backend_js_authority_parent_class)->finalize (object); + } +@@ -665,8 +671,6 @@ polkit_backend_js_authority_class_init (PolkitBackendJsAuthorityClass *klass) + + + g_type_class_add_private (klass, sizeof (PolkitBackendJsAuthorityPrivate)); +- +- JS_Init (); + } + + /* ---------------------------------------------------------------------------------------------------- */ diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.119.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.119.bb index 66bbf735f0..bf160053d9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.119.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.119.bb @@ -5,7 +5,7 @@ LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4" -DEPENDS = "expat glib-2.0 intltool-native duktape" +DEPENDS = "expat glib-2.0 intltool-native" inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection features_check @@ -14,6 +14,7 @@ REQUIRED_DISTRO_FEATURES = "polkit" PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ + mozjs \ " PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" @@ -21,20 +22,32 @@ PACKAGECONFIG[systemd] = "--enable-libsystemd-login=yes --with-systemdsystemunit # there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to RDEPENDS PACKAGECONFIG[consolekit] = ",,,consolekit" +# Default to mozjs javascript library +PACKAGECONFIG[mozjs] = ",,mozjs-91,,,duktape" +# duktape javascript engine is much smaller and faster but is not compatible with +# same javascript standards as mozjs. For example array.includes() function is not +# supported. Test rule compatibility when switching to duktape. +PACKAGECONFIG[duktape] = "--with-duktape,,duktape,,,mozjs" + +MOZJS_PATCHES = "\ + file://0002-jsauthority-port-to-mozjs-91.patch \ + file://0003-jsauthority-ensure-to-call-JS_Init-and-JS_ShutDown-e.patch \ +" +DUKTAPE_PATCHES = "file://0003-Added-support-for-duktape-as-JS-engine.patch" PAM_SRC_URI = "file://polkit-1_pam.patch" SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'mozjs', '${MOZJS_PATCHES}', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'duktape', '${DUKTAPE_PATCHES}', '', d)} \ file://0003-make-netgroup-support-optional.patch \ file://0001-pkexec-local-privilege-escalation-CVE-2021-4034.patch \ file://0002-CVE-2021-4115-GHSL-2021-077-fix.patch \ - file://0003-Added-support-for-duktape-as-JS-engine.patch \ " SRC_URI[sha256sum] = "c8579fdb86e94295404211285fee0722ad04893f0213e571bd75c00972fd1f5c" EXTRA_OECONF = "--with-os-type=moblin \ --disable-man-pages \ --disable-libelogind \ - --with-duktape \ " do_configure:prepend () { diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch index 12994da569..20f689bd0b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch @@ -1,4 +1,4 @@ -From 18dc1457db8f66237e016b85a04dc50833c33c50 Mon Sep 17 00:00:00 2001 +From 98d526f76049be21bf3d77158236b2189419a78e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 21 Dec 2019 12:09:51 -0800 Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER @@ -10,20 +10,22 @@ Fixes Upstream-Status: Pending Signed-off-by: Khem Raj - --- src/zmalloc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/zmalloc.c b/src/zmalloc.c -index ba03685..322304f 100644 +index 1f33d09..5e182d1 100644 --- a/src/zmalloc.c +++ b/src/zmalloc.c -@@ -32,6 +32,7 @@ - #include "config.h" - #include "solarisfixes.h" +@@ -28,6 +28,7 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ +#define _GNU_SOURCE #include #include #include +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.6.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.6.bb deleted file mode 100644 index 87fade7e04..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.6.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "Redis key-value store" -DESCRIPTION = "Redis is an open source, advanced key-value store." -HOMEPAGE = "http://redis.io" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" -DEPENDS = "readline lua ncurses" - -SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ - file://redis.conf \ - file://init-redis-server \ - file://redis.service \ - file://hiredis-use-default-CC-if-it-is-set.patch \ - file://lua-update-Makefile-to-use-environment-build-setting.patch \ - file://oe-use-libc-malloc.patch \ - file://0001-src-Do-not-reset-FINAL_LIBS.patch \ - file://GNU_SOURCE.patch \ - file://0006-Define-correct-gregs-for-RISCV32.patch \ - " -SRC_URI[sha256sum] = "5b2b8b7a50111ef395bf1c1d5be11e6e167ac018125055daa8b5c2317ae131ab" - -inherit autotools-brokensep update-rc.d systemd useradd - -FINAL_LIBS:x86:toolchain-clang = "-latomic" -FINAL_LIBS:riscv32:toolchain-clang = "-latomic" -FINAL_LIBS:mips = "-latomic" -FINAL_LIBS:arm = "-latomic" -FINAL_LIBS:powerpc = "-latomic" - -export FINAL_LIBS - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" -GROUPADD_PARAM:${PN} = "--system redis" - -REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" - -do_compile:prepend() { - (cd deps && oe_runmake hiredis lua linenoise) -} - -do_install() { - export PREFIX=${D}/${prefix} - oe_runmake install - install -d ${D}/${sysconfdir}/redis - install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server - install -d ${D}/var/lib/redis/ - chown redis.redis ${D}/var/lib/redis/ - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service - - if [ "${REDIS_ON_SYSTEMD}" = true ]; then - sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf - fi -} - -CONFFILES:${PN} = "${sysconfdir}/redis/redis.conf" - -INITSCRIPT_NAME = "redis-server" -INITSCRIPT_PARAMS = "defaults 87" - -SYSTEMD_SERVICE:${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.7.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.7.bb new file mode 100644 index 0000000000..7f922a4e0f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.7.bb @@ -0,0 +1,66 @@ +SUMMARY = "Redis key-value store" +DESCRIPTION = "Redis is an open source, advanced key-value store." +HOMEPAGE = "http://redis.io" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" +DEPENDS = "readline lua ncurses" + +SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ + file://redis.conf \ + file://init-redis-server \ + file://redis.service \ + file://hiredis-use-default-CC-if-it-is-set.patch \ + file://lua-update-Makefile-to-use-environment-build-setting.patch \ + file://oe-use-libc-malloc.patch \ + file://0001-src-Do-not-reset-FINAL_LIBS.patch \ + file://GNU_SOURCE.patch \ + file://0006-Define-correct-gregs-for-RISCV32.patch \ + " +SRC_URI[sha256sum] = "b7a79cc3b46d3c6eb52fa37dde34a4a60824079ebdfb3abfbbfa035947c55319" + +inherit autotools-brokensep update-rc.d systemd useradd + +FINAL_LIBS:x86:toolchain-clang = "-latomic" +FINAL_LIBS:riscv32:toolchain-clang = "-latomic" +FINAL_LIBS:mips = "-latomic" +FINAL_LIBS:arm = "-latomic" +FINAL_LIBS:powerpc = "-latomic" + +export FINAL_LIBS + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" +GROUPADD_PARAM:${PN} = "--system redis" + +REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" + +do_compile:prepend() { + (cd deps && oe_runmake hiredis lua linenoise) +} + +do_install() { + export PREFIX=${D}/${prefix} + oe_runmake install + install -d ${D}/${sysconfdir}/redis + install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server + install -d ${D}/var/lib/redis/ + chown redis.redis ${D}/var/lib/redis/ + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service + + if [ "${REDIS_ON_SYSTEMD}" = true ]; then + sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf + fi +} + +CONFFILES:${PN} = "${sysconfdir}/redis/redis.conf" + +INITSCRIPT_NAME = "redis-server" +INITSCRIPT_PARAMS = "defaults 87" + +SYSTEMD_SERVICE:${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.0.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.0.bb deleted file mode 100644 index 3b49d2006b..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.0.bb +++ /dev/null @@ -1,68 +0,0 @@ -SUMMARY = "Redis key-value store" -DESCRIPTION = "Redis is an open source, advanced key-value store." -HOMEPAGE = "http://redis.io" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" -DEPENDS = "readline lua ncurses" - -FILESPATH =. "${FILE_DIRNAME}/${PN}-7:" - -SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ - file://redis.conf \ - file://init-redis-server \ - file://redis.service \ - file://hiredis-use-default-CC-if-it-is-set.patch \ - file://lua-update-Makefile-to-use-environment-build-setting.patch \ - file://oe-use-libc-malloc.patch \ - file://0001-src-Do-not-reset-FINAL_LIBS.patch \ - file://GNU_SOURCE.patch \ - file://0006-Define-correct-gregs-for-RISCV32.patch \ - " -SRC_URI[sha256sum] = "284d8bd1fd85d6a55a05ee4e7c31c31977ad56cbf344ed83790beeb148baa720" - -inherit autotools-brokensep update-rc.d systemd useradd - -FINAL_LIBS:x86:toolchain-clang = "-latomic" -FINAL_LIBS:riscv32:toolchain-clang = "-latomic" -FINAL_LIBS:mips = "-latomic" -FINAL_LIBS:arm = "-latomic" -FINAL_LIBS:powerpc = "-latomic" - -export FINAL_LIBS - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" -GROUPADD_PARAM:${PN} = "--system redis" - -REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" - -do_compile:prepend() { - (cd deps && oe_runmake hiredis lua linenoise) -} - -do_install() { - export PREFIX=${D}/${prefix} - oe_runmake install - install -d ${D}/${sysconfdir}/redis - install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server - install -d ${D}/var/lib/redis/ - chown redis.redis ${D}/var/lib/redis/ - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service - - if [ "${REDIS_ON_SYSTEMD}" = true ]; then - sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf - fi -} - -CONFFILES:${PN} = "${sysconfdir}/redis/redis.conf" - -INITSCRIPT_NAME = "redis-server" -INITSCRIPT_PARAMS = "defaults 87" - -SYSTEMD_SERVICE:${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.2.bb new file mode 100644 index 0000000000..b188278e1c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.2.bb @@ -0,0 +1,68 @@ +SUMMARY = "Redis key-value store" +DESCRIPTION = "Redis is an open source, advanced key-value store." +HOMEPAGE = "http://redis.io" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2" +DEPENDS = "readline lua ncurses" + +FILESPATH =. "${FILE_DIRNAME}/${PN}-7:" + +SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ + file://redis.conf \ + file://init-redis-server \ + file://redis.service \ + file://hiredis-use-default-CC-if-it-is-set.patch \ + file://lua-update-Makefile-to-use-environment-build-setting.patch \ + file://oe-use-libc-malloc.patch \ + file://0001-src-Do-not-reset-FINAL_LIBS.patch \ + file://GNU_SOURCE.patch \ + file://0006-Define-correct-gregs-for-RISCV32.patch \ + " +SRC_URI[sha256sum] = "5e57eafe7d4ac5ecb6a7d64d6b61db775616dbf903293b3fcc660716dbda5eeb" + +inherit autotools-brokensep update-rc.d systemd useradd + +FINAL_LIBS:x86:toolchain-clang = "-latomic" +FINAL_LIBS:riscv32:toolchain-clang = "-latomic" +FINAL_LIBS:mips = "-latomic" +FINAL_LIBS:arm = "-latomic" +FINAL_LIBS:powerpc = "-latomic" + +export FINAL_LIBS + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" +GROUPADD_PARAM:${PN} = "--system redis" + +REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" + +do_compile:prepend() { + (cd deps && oe_runmake hiredis lua linenoise) +} + +do_install() { + export PREFIX=${D}/${prefix} + oe_runmake install + install -d ${D}/${sysconfdir}/redis + install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server + install -d ${D}/var/lib/redis/ + chown redis.redis ${D}/var/lib/redis/ + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service + + if [ "${REDIS_ON_SYSTEMD}" = true ]; then + sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/redis/redis.conf + fi +} + +CONFFILES:${PN} = "${sysconfdir}/redis/redis.conf" + +INITSCRIPT_NAME = "redis-server" +INITSCRIPT_PARAMS = "defaults 87" + +SYSTEMD_SERVICE:${PN} = "redis.service" diff --git a/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch b/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch new file mode 100644 index 0000000000..2afaaac016 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch @@ -0,0 +1,68 @@ +From 9db4c0f6bc0dd11c77b54296fce6b8afe18f4325 Mon Sep 17 00:00:00 2001 +From: Steffen Nurpmeso +Date: Thu, 9 Jun 2022 18:26:38 +0800 +Subject: [PATCH] su_INLINE: eh no; give up, share detection with clang but for + a thing + +Upstream-Status: Backport[https://git.sdaoden.eu/browse/s-nail.git/commit/?id=de2a44c393a39d80ddf12154aec94cace84b19c1] + +Signed-off-by: Mingli Yu +--- + include/su/code.h | 34 +++++++++------------------------- + 1 file changed, 9 insertions(+), 25 deletions(-) + +diff --git a/include/su/code.h b/include/su/code.h +index 9683f4a..c7a2af3 100644 +--- a/include/su/code.h ++++ b/include/su/code.h +@@ -308,29 +308,8 @@ do{\ + # ifdef DOXYGEN + # define su_INLINE inline + # define su_SINLINE inline +-# elif su_CC_GCC +-# if !su_CC_VCHECK_GCC(3, 1) +-# define su_INLINE extern __inline__ +-# define su_SINLINE static __inline__ +-# elif !defined __GNUC_GNU_INLINE__ /*4.1.3; !su_CC_VCHECK_GCC(4, 2)*/ +-# define su_INLINE extern __inline __attribute__((always_inline)) +-# define su_SINLINE static __inline __attribute__((always_inline)) +- /* gcc 8.3.0 bug: does not gracefully inline with -Os +- * gcc 12.1.0 bug: ditto, -Og +- * Thus: always gcc-specific! */ +-# elif 1 /*!defined __OPTIMIZE__ || \ +- !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L*/ +-# define su_INLINE extern __inline __attribute__((gnu_inline)) +-# define su_SINLINE static __inline __attribute__((gnu_inline)) +-# elif !defined NDEBUG || !defined __OPTIMIZE__ +-# define su_INLINE static inline +-# define su_SINLINE static inline +-# else +-# define su_INLINE inline +-# define su_SINLINE static inline +-# endif +-# elif su_CC_CLANG || su_CC_PCC +-# if defined __STDC_VERSION__ && __STDC_VERSION__ +0 >= 199901L ++# elif su_CC_CLANG || su_CC_GCC || su_CC_PCC ++# if defined __STDC_VERSION__ && __STDC_VERSION__ +0 >= 199901l + # if !defined NDEBUG || !defined __OPTIMIZE__ + # define su_INLINE static inline + # define su_SINLINE static inline +@@ -340,8 +319,13 @@ do{\ + # define su_SINLINE static inline __attribute__((always_inline)) + # endif + # else +-# define su_INLINE static __inline +-# define su_SINLINE static __inline ++# if su_CC_VCHECK_GCC(3, 1) ++# define su_INLINE static __inline __attribute__((always_inline)) ++# define su_SINLINE static __inline __attribute__((always_inline)) ++# else ++# define su_INLINE static __inline ++# define su_SINLINE static __inline ++# endif + # endif + # else + # define su_INLINE static /* TODO __attribute__((unused)) alike? */ +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch b/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch new file mode 100644 index 0000000000..e011f5c712 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch @@ -0,0 +1,45 @@ +From 5429b9e343c808951b1418d8626e544c9dcb28de Mon Sep 17 00:00:00 2001 +From: Steffen Nurpmeso +Date: Thu, 9 Jun 2022 18:06:04 +0800 +Subject: [PATCH] su_INLINE: gcc: only GNU specifics after -Og + +Upstream-Status: Backport[https://git.sdaoden.eu/browse/s-nail.git/commit/?id=c5544b66c3b4b2e161166562349908a07e324b38] + +Signed-off-by: Mingli Yu +--- + include/su/code.h | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/include/su/code.h b/include/su/code.h +index 4d552c1..9683f4a 100644 +--- a/include/su/code.h ++++ b/include/su/code.h +@@ -309,16 +309,17 @@ do{\ + # define su_INLINE inline + # define su_SINLINE inline + # elif su_CC_GCC +- /* After lots of trouble with OpenBSD/gcc 4.2.1 and SunOS/gcc 3.4.3 */ +-# if !su_CC_VCHECK_GCC(3, 2) /* Unsure: only used C++ at that time */ +-# define su_INLINE extern __inline +-# define su_SINLINE static __inline +-# elif !su_CC_VCHECK_GCC(4, 3) ++# if !su_CC_VCHECK_GCC(3, 1) ++# define su_INLINE extern __inline__ ++# define su_SINLINE static __inline__ ++# elif !defined __GNUC_GNU_INLINE__ /*4.1.3; !su_CC_VCHECK_GCC(4, 2)*/ + # define su_INLINE extern __inline __attribute__((always_inline)) + # define su_SINLINE static __inline __attribute__((always_inline)) +- /* xxx gcc 8.3.0 bug: does not truly inline with -Os */ +-# elif !su_CC_VCHECK_GCC(8, 3) || !defined __OPTIMIZE__ ||\ +- !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L ++ /* gcc 8.3.0 bug: does not gracefully inline with -Os ++ * gcc 12.1.0 bug: ditto, -Og ++ * Thus: always gcc-specific! */ ++# elif 1 /*!defined __OPTIMIZE__ || \ ++ !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L*/ + # define su_INLINE extern __inline __attribute__((gnu_inline)) + # define su_SINLINE static __inline __attribute__((gnu_inline)) + # elif !defined NDEBUG || !defined __OPTIMIZE__ +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb b/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb index 539f9c3c82..6e004fc90b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb +++ b/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb @@ -7,7 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=87266591c81260f10221f1f38872d023" SRC_URI = "https://ftp.sdaoden.eu/${BP}.tar.xz \ file://make-errors.patch \ - file://0001-make.rc-set-VAL_MTA.patch" + file://0001-make.rc-set-VAL_MTA.patch \ + file://0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch \ + file://0001-su_INLINE-eh-no-give-up-share-detection.patch \ +" SRC_URI[sha256sum] = "2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c" DEPENDS = "coreutils-native" diff --git a/meta-openembedded/meta-oe/recipes-gnome/pyxdg/pyxdg_0.27.bb b/meta-openembedded/meta-oe/recipes-gnome/pyxdg/pyxdg_0.27.bb deleted file mode 100644 index abc1c23277..0000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/pyxdg/pyxdg_0.27.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "A Python module to deal with freedesktop.org specifications" -HOMEPAGE = "http://freedesktop.org/wiki/Software/pyxdg" -SECTION = "devel/python" -LICENSE = "LGPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" - -SRCREV = "f097a66923a65e93640c48da83e6e9cfbddd86ba" -SRC_URI = "git://anongit.freedesktop.org/xdg/pyxdg;branch=master" - -inherit setuptools3 - -S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-gnome/pyxdg/pyxdg_0.28.bb b/meta-openembedded/meta-oe/recipes-gnome/pyxdg/pyxdg_0.28.bb new file mode 100644 index 0000000000..0c9599a49c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/pyxdg/pyxdg_0.28.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "A Python module to deal with freedesktop.org specifications" +HOMEPAGE = "http://freedesktop.org/wiki/Software/pyxdg" +SECTION = "devel/python" +LICENSE = "LGPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" + +SRCREV = "1d23e483ae869ee9532aca43b133cc43f63626a3" +SRC_URI = "git://anongit.freedesktop.org/xdg/pyxdg;branch=master" + +inherit setuptools3 + +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.8.bb b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.8.bb deleted file mode 100644 index 12951e28c5..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.8.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "X11 image viewer aimed mostly at console users" -AUTHOR = "Tom Gilbert & Daniel Friesel" -HOMEPAGE = "https://feh.finalrewind.org/" -SECTION = "x11/utils" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=f91bd06901085c94bdc50649d98c5059" -DEPENDS = "\ - imlib2 \ - virtual/libx11 libxt\ -" - -SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" -SRC_URI[sha256sum] = "7f3c34552b39336d7ebee2d7c4bf5697aaaa2c6c102c357f6e82ea240bd62ba9" - -inherit mime-xdg features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OEMAKE = "curl=0 xinerama=0 PREFIX=/usr" - -do_compile () { - oe_runmake -} - -do_install () { - oe_runmake install app=1 'DESTDIR=${D}' 'ICON_PREFIX=${D}${datadir}/icons' -} - -RDEPENDS:${PN} += "imlib2-loaders" - -FILES:${PN} += "${datadir}/icons" diff --git a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.9.bb b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.9.bb new file mode 100644 index 0000000000..e4422668f5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.9.bb @@ -0,0 +1,31 @@ +SUMMARY = "X11 image viewer aimed mostly at console users" +AUTHOR = "Tom Gilbert & Daniel Friesel" +HOMEPAGE = "https://feh.finalrewind.org/" +SECTION = "x11/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=f91bd06901085c94bdc50649d98c5059" +DEPENDS = "\ + imlib2 \ + virtual/libx11 libxt\ +" + +SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" +SRC_URI[sha256sum] = "8649962c41d2c7ec4cc3f438eb327638a1820ad5a66df6a9995964601ae6bca0" + +inherit mime-xdg features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OEMAKE = "curl=0 xinerama=0 PREFIX=/usr" + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake install app=1 'DESTDIR=${D}' 'ICON_PREFIX=${D}${datadir}/icons' +} + +RDEPENDS:${PN} += "imlib2-loaders" + +FILES:${PN} += "${datadir}/icons" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-cmake-Use-alternate-way-to-detect-libm.patch b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-cmake-Use-alternate-way-to-detect-libm.patch new file mode 100644 index 0000000000..dd799e7485 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-cmake-Use-alternate-way-to-detect-libm.patch @@ -0,0 +1,67 @@ +From 6d3c48d1b01943a467928235c3affbab463c25ab Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 7 Jul 2022 12:32:47 -0700 +Subject: [PATCH] cmake: Use alternate way to detect libm + +The standard package provided with MathLib cmake module does not work +when libm is folded into libc starting glibc 2.35+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 7 ++++++- + contrib/fonttools/CMakeLists.txt | 2 +- + fontforge/CMakeLists.txt | 2 +- + fontforgeexe/CMakeLists.txt | 4 ++-- + 4 files changed, 10 insertions(+), 5 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -111,9 +111,14 @@ find_package_with_target(Intl REQUIRED) + find_package(GLIB 2.6 REQUIRED COMPONENTS gio gobject) + find_package(Iconv REQUIRED) + find_package(LibXml2 REQUIRED) +-find_package(MathLib REQUIRED) + find_package(ZLIB REQUIRED) + ++include(CheckLibraryExists) ++CHECK_LIBRARY_EXISTS(m pow "" HAVE_LIB_M) ++if (HAVE_LIB_M) ++ set(EXTRA_LIBS ${EXTRA_LIBS} m) ++endif (HAVE_LIB_M) ++ + check_include_file(pthread.h HAVE_PTHREAD_H) + if(HAVE_PTHREAD_H) + find_package(Threads) +--- a/contrib/fonttools/CMakeLists.txt ++++ b/contrib/fonttools/CMakeLists.txt +@@ -15,6 +15,6 @@ add_executable(woff woff.c) + + target_link_libraries(acorn2sfd PRIVATE fontforge) + target_link_libraries(dewoff PRIVATE ZLIB::ZLIB) +-target_link_libraries(pcl2ttf PRIVATE MathLib::MathLib) ++target_link_libraries(pcl2ttf PRIVATE ${EXTRA_LIBS}) + target_link_libraries(ttf2eps PRIVATE fontforge) + target_link_libraries(woff PRIVATE ZLIB::ZLIB) +--- a/fontforge/CMakeLists.txt ++++ b/fontforge/CMakeLists.txt +@@ -237,7 +237,7 @@ target_link_libraries(fontforge + GLIB::GLIB + Intl::Intl + PRIVATE +- MathLib::MathLib ++ ${EXTRA_LIBS} + Iconv::Iconv + ZLIB::ZLIB + ) +--- a/fontforgeexe/CMakeLists.txt ++++ b/fontforgeexe/CMakeLists.txt +@@ -110,7 +110,7 @@ if(ENABLE_PYTHON_SCRIPTING_RESULT) + target_link_libraries(fontforgeexe PRIVATE Python3::Python) + endif() + +-target_link_libraries(fontforgeexe PRIVATE fontforge Iconv::Iconv MathLib::MathLib) ++target_link_libraries(fontforgeexe PRIVATE fontforge Iconv::Iconv ${EXTRA_LIBS}) + install(TARGETS fontforgeexe RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if(UNIX) diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-fontforgeexe-Use-env-to-find-fontforge.patch b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-fontforgeexe-Use-env-to-find-fontforge.patch new file mode 100644 index 0000000000..e8c1a11d48 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-fontforgeexe-Use-env-to-find-fontforge.patch @@ -0,0 +1,29 @@ +From f5a19ad9b2aea85dab28e7c61ac39404631fad2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 6 Jul 2022 04:54:23 -0700 +Subject: [PATCH] fontforgeexe: Use env to find fontforge + +This helps in avoiding to encode build paths into interpeter + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + fontforgeexe/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fontforgeexe/CMakeLists.txt b/fontforgeexe/CMakeLists.txt +index b2d663b88..e2a8fee54 100644 +--- a/fontforgeexe/CMakeLists.txt ++++ b/fontforgeexe/CMakeLists.txt +@@ -118,7 +118,7 @@ if(UNIX) + foreach(_script fontimage.pe fontlint.pe sfddiff.pe) + get_filename_component(_output \"\${_script}\" NAME_WE) + file(READ \"${CMAKE_CURRENT_SOURCE_DIR}/\${_script}\" _input) +- file(WRITE \"${CMAKE_CURRENT_BINARY_DIR}/\${_output}\" \"#!\${CMAKE_INSTALL_PREFIX}/bin/fontforge -lang=ff\\n\${_input}\") ++ file(WRITE \"${CMAKE_CURRENT_BINARY_DIR}/\${_output}\" \"#!/usr/bin/env fontforge -lang=ff\\n\${_input}\") + endforeach() + " COMPONENT nativescripts) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/fontimage" "${CMAKE_CURRENT_BINARY_DIR}/fontlint" "${CMAKE_CURRENT_BINARY_DIR}/sfddiff" +-- +2.37.0 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-include-sys-select-on-non-glibc-platforms.patch b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-include-sys-select-on-non-glibc-platforms.patch index 54ff7b76d2..27de27d57d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-include-sys-select-on-non-glibc-platforms.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-include-sys-select-on-non-glibc-platforms.patch @@ -11,19 +11,14 @@ Signed-off-by: Khem Raj gdraw/gdraw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/gdraw/gdraw.c b/gdraw/gdraw.c -index 24591b778..217c63140 100644 --- a/gdraw/gdraw.c +++ b/gdraw/gdraw.c -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ #include "gkeysym.h" #include "ustring.h" --#if __Mac || __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ -+#if __Mac || __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ || !defined(__GLIBC__) +-#if __Mac ++#if __Mac || (defined(__linux__) && !defined(__GLIBC__)) # include #endif --- -2.23.0 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb deleted file mode 100644 index cb5f4d5ea1..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "A font editor" -HOMEPAGE = "http://fontforge.github.io/en-US/" -LICENSE = "BSD-3-Clause & GPL-3.0-only" -LIC_FILES_CHKSUM = " \ - file://COPYING.gplv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE;md5=d042f3d2a8fd7208b704a499168e3c89 \ -" - -DEPENDS = "python3 glib-2.0 pango giflib tiff libxml2 jpeg libtool uthash gettext-native" -DEPENDS:append:class-target = " libxi" - -inherit autotools pkgconfig python3native features_check gettext gtk-icon-cache mime mime-xdg - -REQUIRED_DISTRO_FEATURES:append:class-target = " x11" - -# tag 20190801 -SRCREV = "ac635b818e38ddb8e7e2e1057330a32b4e25476e" -SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \ - file://0001-include-sys-select-on-non-glibc-platforms.patch \ -" -S = "${WORKDIR}/git" - -EXTRA_OECONF += "--without-libuninameslist --enable-python-scripting --enable-python-extension" -EXTRA_OECONF:append:class-native = " with_x=no" - -LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" -BUILD_LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" - -#do_configure:prepend() { -# uthash sources are expected in uthash/src -# mkdir -p ${S}/uthash/src -# cp ${STAGING_INCDIR}/ut*.h ${S}/uthash/src -#} - -PACKAGES =+ "${PN}-python" - -FILES:${PN} += " \ - ${datadir}/appdata \ - ${datadir}/metainfo \ - ${datadir}/mime \ -" - -FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR} ${datadir}/${BPN}/python" -RDEPENDS:${PN}-python = "python3" - -# for e.g kde's oxygen-fonts -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20220308.bb b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20220308.bb new file mode 100644 index 0000000000..c53f2db01b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20220308.bb @@ -0,0 +1,49 @@ +SUMMARY = "A font editor" +HOMEPAGE = "http://fontforge.github.io/en-US/" +LICENSE = "BSD-3-Clause & GPL-3.0-only" +LIC_FILES_CHKSUM = " \ + file://COPYING.gplv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE;md5=d042f3d2a8fd7208b704a499168e3c89 \ +" + +DEPENDS = "python3 glib-2.0 pango giflib tiff libxml2 jpeg libtool uthash gettext-native libspiro" +DEPENDS:append:class-target = " libxi" + +inherit cmake pkgconfig python3native features_check gettext gtk-icon-cache mime mime-xdg + +REQUIRED_DISTRO_FEATURES:append:class-target = " x11" + +# tag 20220308 +SRCREV = "582bd41a9bf04326300fc02a677fe3610d6d3ccd" +SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \ + file://0001-include-sys-select-on-non-glibc-platforms.patch \ + file://0001-fontforgeexe-Use-env-to-find-fontforge.patch \ + file://0001-cmake-Use-alternate-way-to-detect-libm.patch \ +" +S = "${WORKDIR}/git" + +EXTRA_OECMAKE = "-DENABLE_DOCS=OFF" + +CFLAGS += "-fno-strict-aliasing" +LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" +BUILD_LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" + +#do_configure:prepend() { +# uthash sources are expected in uthash/src +# mkdir -p ${S}/uthash/src +# cp ${STAGING_INCDIR}/ut*.h ${S}/uthash/src +#} + +PACKAGES =+ "${PN}-python" + +FILES:${PN} += " \ + ${datadir}/appdata \ + ${datadir}/metainfo \ + ${datadir}/mime \ +" + +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR} ${datadir}/${BPN}/python" +RDEPENDS:${PN}-python = "python3" + +# for e.g kde's oxygen-fonts +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/libspiro_20200505.bb b/meta-openembedded/meta-oe/recipes-graphics/fontforge/libspiro_20200505.bb new file mode 100644 index 0000000000..c885a00c5b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fontforge/libspiro_20200505.bb @@ -0,0 +1,14 @@ +# Copyright (C) 2022 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "LibSpiro is an adaptation of Spiro formula and functions into a sharable library" +HOMEPAGE = "https://github.com/fontforge/libspiro" +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "https://github.com/fontforge/libspiro/releases/download/20200505/libspiro-dist-20200505.tar.gz" +SRC_URI[sha256sum] = "06c69a1e8dcbcabcf009fd96fd90b1a244d0257246e376c2c4d57c4ea4af0e49" + +inherit autotools + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb index b077a0bdf8..666442fba2 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb @@ -3,7 +3,7 @@ SECTION = "libs" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d1de21f0b70830e299905eac3419084" -DEPENDS = "virtual/libsdl" +DEPENDS = "libsdl" SRC_URI = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz" SRC_URI[md5sum] = "ea24ed4b82ff1304809c363494fa8e16" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb index 14f30e097a..5a93dc19a8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227" -DEPENDS = "tiff zlib libpng jpeg virtual/libsdl" +DEPENDS = "tiff zlib libpng jpeg libsdl" SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \ file://configure.patch" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb index c83fcc8daa..a470ee81d0 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb @@ -1,6 +1,6 @@ SUMMARY = "Simple DirectMedia Layer mixer library" SECTION = "libs" -DEPENDS = "virtual/libsdl flac libmikmod libvorbis" +DEPENDS = "libsdl flac libmikmod libvorbis" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://COPYING;md5=a37a47a0e579e461474cd03b9e05199d" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb index b021e565ef..49b1ef2879 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9cf3de2d872bf510f88eb20d06d700b5" inherit autotools pkgconfig -DEPENDS = "virtual/libsdl" +DEPENDS = "libsdl" SRC_URI = " \ https://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb index 6673ba3d4b..797c38d8e1 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb @@ -1,6 +1,6 @@ SUMMARY = "Simple DirectMedia Layer truetype font library" SECTION = "libs" -DEPENDS = "virtual/libsdl freetype" +DEPENDS = "libsdl freetype" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://COPYING;md5=22800d1b3701377aae0b61ee36f5c303" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb index 1218b68804..57f0f99794 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=822edb694b20ff16ceef85b27f61c11f" -DEPENDS = "tiff zlib libpng jpeg virtual/libsdl2 libwebp" +DEPENDS = "tiff zlib libpng jpeg libsdl2 libwebp" SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz" SRC_URI[md5sum] = "f26f3a153360a8f09ed5220ef7b07aea" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb index 897a33f084..dbcb2a193b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb @@ -1,6 +1,6 @@ SUMMARY = "Simple DirectMedia Layer mixer library V2" SECTION = "libs" -DEPENDS = "virtual/libsdl2 flac libmikmod libvorbis" +DEPENDS = "libsdl2 flac libmikmod libvorbis" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=516daf7a177ad4c8874bb9efa1a69c1f" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb index f09dc5efb2..35369e8731 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/SDL2_net-${PV}" inherit autotools pkgconfig -DEPENDS = "virtual/libsdl2" +DEPENDS = "libsdl2" SRC_URI[md5sum] = "5c1d9d1cfa63301b141cb5c0de2ea7c4" SRC_URI[sha256sum] = "15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.18.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.18.bb index 0951d721ba..aae803f2eb 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.18.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.18.bb @@ -1,6 +1,6 @@ SUMMARY = "Simple DirectMedia Layer truetype font library" SECTION = "libs" -DEPENDS = "virtual/libsdl2 freetype virtual/egl" +DEPENDS = "libsdl2 freetype virtual/egl" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=e98cfd01ca78f683e9d035795810ce87" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb index 9085c6d2fe..e2992b5dd9 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -10,8 +10,6 @@ SECTION = "libs" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" -PROVIDES = "virtual/libsdl" - PR = "r3" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb index 2f7fcac784..0d45ee765c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_4.1.0.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV = "4767ea922bcc460e70b87b1d303ebdfed0897da8" -SRC_URI = "git://github.com/tesseract-ocr/tessdata.git;branch=master;protocol=https" +SRC_URI = "git://github.com/tesseract-ocr/tessdata.git;branch=main;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-retry-elf-parsing-as-long-as-needed.patch b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-retry-elf-parsing-as-long-as-needed.patch new file mode 100644 index 0000000000..8d5b8b6cbb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-retry-elf-parsing-as-long-as-needed.patch @@ -0,0 +1,128 @@ +From 7a8c6a06c86e133e4346b1dc66483bd8d0d3c716 Mon Sep 17 00:00:00 2001 +From: John Ogness +Date: Tue, 24 Aug 2021 21:10:43 +0200 +Subject: [PATCH] minicoredumper: retry elf parsing as long as needed + +As was reported in github issue #2 ("maximum number of tries +insufficient, in rare cases, for elf parse"), the number of retries +for parsing a process may be insufficient. Rather than setting an +upper limit on the maximum number of retries, track the number of +headers seen. As long as the number of seen headers is greater than +the previous try, try again. + +In order to avoid introducing any new issues, preserve the behavior +of retrying at least 10 times, even if no new headers are seen. + +Reported-by: github.com/ssajal-wr +Signed-off-by: John Ogness + +Upstream-Status: Backport [7a8c6a06c86e133e4346b1dc66483bd8d0d3c716] + +Signed-off-by: Sakib Sajal +--- + src/minicoredumper/corestripper.c | 30 +++++++++++++++++++++++------- + 1 file changed, 23 insertions(+), 7 deletions(-) + +diff --git a/src/minicoredumper/corestripper.c b/src/minicoredumper/corestripper.c +index d96d1df..c96b350 100644 +--- a/src/minicoredumper/corestripper.c ++++ b/src/minicoredumper/corestripper.c +@@ -761,7 +761,7 @@ static int init_log(struct dump_info *di) + typedef int elf_parse_cb(struct dump_info *di, Elf *elf, GElf_Phdr *phdr); + + static int do_elf_ph_parse(struct dump_info *di, GElf_Phdr *type, +- elf_parse_cb *callback) ++ elf_parse_cb *callback, size_t *phnum_found) + { + GElf_Ehdr ehdr_mem; + GElf_Ehdr *ehdr; +@@ -770,6 +770,9 @@ static int do_elf_ph_parse(struct dump_info *di, GElf_Phdr *type, + size_t phnum; + size_t cnt; + ++ if (phnum_found) ++ *phnum_found = 0; ++ + /* start from beginning of core */ + if (lseek64(di->elf_fd, 0, SEEK_SET) == -1) { + info("lseek failed: %s", strerror(errno)); +@@ -809,6 +812,9 @@ static int do_elf_ph_parse(struct dump_info *di, GElf_Phdr *type, + goto out; + } + ++ if (phnum_found) ++ *phnum_found = phnum; ++ + for (cnt = 0; cnt < phnum; cnt++) { + GElf_Phdr phdr_mem; + GElf_Phdr *phdr; +@@ -891,7 +897,7 @@ static int vma_cb(struct dump_info *di, Elf *elf, GElf_Phdr *phdr) + /* + * Tries to parse the found ELF headers and reads all vmas from it. + */ +-static int parse_vma_info(struct dump_info *di) ++static int parse_vma_info(struct dump_info *di, size_t *phnum_found) + { + unsigned long min_off = ULONG_MAX; + unsigned long max_len = 0; +@@ -911,7 +917,7 @@ static int parse_vma_info(struct dump_info *di) + memset(&type, 0, sizeof(type)); + type.p_type = PT_LOAD; + type.p_flags = PF_R; +- if (do_elf_ph_parse(di, &type, vma_cb) != 0) ++ if (do_elf_ph_parse(di, &type, vma_cb, phnum_found) != 0) + return -1; + + for (v = di->vma; v; v = v->next) { +@@ -1614,8 +1620,10 @@ int add_core_data(struct dump_info *di, off64_t dest_offset, size_t len, + */ + static int init_src_core(struct dump_info *di, int src) + { ++ size_t last_phnum = 0; + int tries = 0; + int ret = -1; ++ size_t phnum; + size_t len; + char *buf; + long pos; +@@ -1642,7 +1650,7 @@ again: + goto out; + + /* try to elf-parse the core to read vma info */ +- ret = parse_vma_info(di); ++ ret = parse_vma_info(di, &phnum); + + /* restore our position */ + if (lseek64(di->elf_fd, pos, SEEK_SET) == -1) +@@ -1653,9 +1661,17 @@ again: + + tries++; + +- /* maybe try again */ +- if (tries < 10) ++ if (phnum > last_phnum) { ++ /* new headers found, keep trying */ ++ last_phnum = phnum; + goto again; ++ } else if (tries < 10) { ++ /* ++ * even if no new headers are found, ++ * retry at least 10 times ++ */ ++ goto again; ++ } + + goto out; + } +@@ -2106,7 +2122,7 @@ static int dump_stacks(struct dump_info *di) + /* find and set the first task */ + memset(&type, 0, sizeof(type)); + type.p_type = PT_NOTE; +- do_elf_ph_parse(di, &type, note_cb); ++ do_elf_ph_parse(di, &type, note_cb, NULL); + } + + if (di->first_pid) +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb index bf99152942..0b934ee2d8 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.1.bb @@ -17,6 +17,7 @@ SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https;branch=master \ file://0001-replace-pthread_mutexattr_setrobust_np-with-pthread_.patch \ file://minicoredumper.service \ file://minicoredumper.init \ + file://0001-minicoredumper-retry-elf-parsing-as-long-as-needed.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.11.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.11.0.bb deleted file mode 100644 index 8fd4f698d7..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.11.0.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "VPX multi-format codec" -DESCRIPTION = "The BSD-licensed libvpx reference implementation provides en- and decoders for VP8 and VP9 bitstreams." -HOMEPAGE = "http://www.webmproject.org/code/" -BUGTRACKER = "http://code.google.com/p/webm/issues/list" -SECTION = "libs/multimedia" -LICENSE = "BSD-3-Clause" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" - -SRCREV = "626ff35955c2c35b806b3e0ecf551a1a8611cdbf" -SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main \ - file://libvpx-configure-support-blank-prefix.patch \ - " - -S = "${WORKDIR}/git" - -# ffmpeg links with this and fails -# sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4' -ARM_INSTRUCTION_SET = "arm" - -CFLAGS += "-fPIC" - -export CC -export LD = "${CC}" - -VPXTARGET:armv5te = "armv5te-linux-gcc" -VPXTARGET:armv6 = "armv6-linux-gcc" -VPXTARGET:armv7a = "armv7-linux-gcc" -VPXTARGET ?= "generic-gnu" - -CONFIGUREOPTS = " \ - --target=${VPXTARGET} \ - --enable-vp9 \ - --enable-libs \ - --disable-install-docs \ - --disable-static \ - --enable-shared \ - --prefix=${prefix} \ - --libdir=${libdir} \ - --size-limit=16384x16384 \ -" - -do_configure() { - ${S}/configure ${CONFIGUREOPTS} -} - -do_install() { - oe_runmake install DESTDIR=${D} - chown -R root:root ${D} -} diff --git a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.12.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.12.0.bb new file mode 100644 index 0000000000..066d7cc815 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.12.0.bb @@ -0,0 +1,50 @@ +SUMMARY = "VPX multi-format codec" +DESCRIPTION = "The BSD-licensed libvpx reference implementation provides en- and decoders for VP8 and VP9 bitstreams." +HOMEPAGE = "http://www.webmproject.org/code/" +BUGTRACKER = "http://code.google.com/p/webm/issues/list" +SECTION = "libs/multimedia" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" + +SRCREV = "03265cd42b3783532de72f2ded5436652e6f5ce3" +SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main \ + file://libvpx-configure-support-blank-prefix.patch \ + " + +S = "${WORKDIR}/git" + +# ffmpeg links with this and fails +# sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4' +ARM_INSTRUCTION_SET = "arm" + +CFLAGS += "-fPIC" + +export CC +export LD = "${CC}" + +VPXTARGET:armv5te = "armv5te-linux-gcc" +VPXTARGET:armv6 = "armv6-linux-gcc" +VPXTARGET:armv7a = "armv7-linux-gcc" +VPXTARGET ?= "generic-gnu" + +CONFIGUREOPTS = " \ + --target=${VPXTARGET} \ + --enable-vp9 \ + --enable-libs \ + --disable-install-docs \ + --disable-static \ + --enable-shared \ + --prefix=${prefix} \ + --libdir=${libdir} \ + --size-limit=16384x16384 \ +" + +do_configure() { + ${S}/configure ${CONFIGUREOPTS} +} + +do_install() { + oe_runmake install DESTDIR=${D} + chown -R root:root ${D} +} diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch b/meta-openembedded/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch deleted file mode 100644 index 645e6f62a5..0000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9d51027c228dafd7db2d0cffca1f0fc695e950fd Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Mon, 2 Dec 2013 11:33:26 -0200 -Subject: [PATCH] geos-config: Add includedir variable - -This fixes cross-compile as it is easier to mangle the includedir -during sysroot generation. - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador ---- - tools/geos-config.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/geos-config.in b/tools/geos-config.in -index 9b45b5f..1749892 100644 ---- a/tools/geos-config.in -+++ b/tools/geos-config.in -@@ -1,6 +1,7 @@ - #!/bin/sh - prefix=@prefix@ - exec_prefix=@exec_prefix@ -+includedir=@includedir@ - libdir=@libdir@ - - usage() -@@ -38,7 +39,7 @@ case $1 in - echo @VERSION@ - ;; - --cflags) -- echo -I${prefix}/include -+ echo -I${includedir} - ;; - --libs) - # TODO: make an alias for --clibs --- -1.7.10.4 - diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc b/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc index bfac69b094..484ca9154f 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc +++ b/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc @@ -9,6 +9,8 @@ SRC_URI = "http://download.osgeo.org/geos/geos-${PV}.tar.bz2" inherit autotools pkgconfig binconfig +EXTRA_OECONF += "--enable-inline=no" + PACKAGES =+ "geoslib ${PN}-c1" DESCRIPTION:${PN}lib = "Geometry engine for Geographic Information Systems - C++ Library" diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.3.bb b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.3.bb deleted file mode 100644 index 538456cc27..0000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require geos.inc - -SRC_URI += "file://geos-config-Add-includedir-variable.patch \ -" - -SRC_URI[md5sum] = "77f2c2cca1e9f49bc1bece9037ac7a7a" -SRC_URI[sha256sum] = "cfbf68079117c1c2b76411636444ff41d73c31093c4cab9dcc9a8c1bbe7e3897" diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.3.bb b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.3.bb new file mode 100644 index 0000000000..fdb72204ea --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.3.bb @@ -0,0 +1,3 @@ +require geos.inc + +SRC_URI[sha256sum] = "f8b2314e311456f7a449144efb5e3188c2a28774752bc50fc882a3cd5c89ee35" diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb index 9c1db3a6b0..4ced1c98db 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb @@ -5,3 +5,4 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;m # empty by default # BSP layers can add stuff like meta-openmoko example: # +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/geos-config.patch b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/geos-config.patch deleted file mode 100644 index 28bd7dad87..0000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/geos-config.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://www.gaia-gis.it/fossil/libspatialite/tktview?name=abeeaad448 - -Upstream-Status: Submitted [rpm5-devel@rpm5.org] - -Index: libspatialite-4.2.0/configure.ac -=================================================================== ---- libspatialite-4.2.0.orig/configure.ac -+++ libspatialite-4.2.0/configure.ac -@@ -260,7 +260,7 @@ if test x"$enable_geos" != "xno"; then - fi - # Extract the linker and include flags - GEOS_LDFLAGS=`$GEOSCONFIG --ldflags` -- GEOS_CFLAGS=-I`$GEOSCONFIG --includes` -+ GEOS_CFLAGS=`$GEOSCONFIG --cflags` - AC_SUBST([GEOS_LDFLAGS]) - AC_SUBST([GEOS_CFLAGS]) - # Ensure that we can parse geos_c.h diff --git a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_geos.patch b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_geos.patch new file mode 100644 index 0000000000..7d8d2c2e46 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_geos.patch @@ -0,0 +1,43 @@ +diff -rupN --no-dereference libspatialite-5.0.1/configure.ac libspatialite-5.0.1-new/configure.ac +--- libspatialite-5.0.1/configure.ac 2021-03-08 08:57:19.015858195 +0100 ++++ libspatialite-5.0.1-new/configure.ac 2021-03-08 08:57:19.017858195 +0100 +@@ -312,35 +312,10 @@ AC_ARG_ENABLE(geos, [AS_HELP_STRING( + [], [enable_geos=yes]) + if test x"$enable_geos" != "xno"; then + #----------------------------------------------------------------------- +- # --with-geosconfig +- # +- AC_ARG_WITH([geosconfig], +- [AS_HELP_STRING([--with-geosconfig=FILE], [specify an alternative geos-config file])], +- [GEOSCONFIG="$withval"], [GEOSCONFIG=""]) +- if test "x$GEOSCONFIG" = "x"; then +- # GEOSCONFIG was not specified, so search within the current path +- AC_PATH_PROG([GEOSCONFIG], [geos-config]) +- # If we couldn't find geos-config, display an error +- if test "x$GEOSCONFIG" = "x"; then +- AC_MSG_ERROR([could not find geos-config within the current path. You may need to try re-running configure with a --with-geosconfig parameter.]) +- fi +- else +- # GEOSCONFIG was specified; display a message to the user +- if test "x$GEOSCONFIG" = "xyes"; then +- AC_MSG_ERROR([you must specify a parameter to --with-geosconfig, e.g. --with-geosconfig=/path/to/geos-config]) +- else +- if test -f $GEOSCONFIG; then +- AC_MSG_RESULT([Using user-specified geos-config file: $GEOSCONFIG]) +- else +- AC_MSG_ERROR([the user-specified geos-config file $GEOSCONFIG does not exist]) +- fi +- fi +- fi +- # Extract the linker and include flags +- GEOS_LDFLAGS=`$GEOSCONFIG --ldflags` +- GEOS_CFLAGS=-I`$GEOSCONFIG --includes` +- AC_SUBST([GEOS_LDFLAGS]) +- AC_SUBST([GEOS_CFLAGS]) ++ PKG_CHECK_MODULES([GEOS], [geos], , AC_MSG_ERROR(['geos' is required but it doesn't seem to be installed on this system.])) ++ GEOS_LDFLAGS="$GEOS_LIBS" ++ AC_SUBST(GEOS_CFLAGS) ++ AC_SUBST(GEOS_LDFLAGS) + # Ensure that we can parse geos_c.h + CPPFLAGS_SAVE="$CPPFLAGS" + CPPFLAGS="$GEOS_CFLAGS" diff --git a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch new file mode 100644 index 0000000000..9b71ab7658 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch @@ -0,0 +1,12 @@ +diff -rupN --no-dereference libspatialite-5.0.1/configure.ac libspatialite-5.0.1-new/configure.ac +--- libspatialite-5.0.1/configure.ac 2021-03-08 08:57:18.748858216 +0100 ++++ libspatialite-5.0.1-new/configure.ac 2021-03-08 08:57:18.751858215 +0100 +@@ -96,7 +96,7 @@ AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_MAKE_SET + AC_LIBTOOL_WIN32_DLL +-AC_PROG_LIBTOOL ++LT_INIT + + # Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST diff --git a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch new file mode 100644 index 0000000000..149c126768 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch @@ -0,0 +1,11 @@ +diff -rupN libspatialite-5.0.1/spatialite.pc.in libspatialite-5.0.1-new/spatialite.pc.in +--- libspatialite-5.0.1/spatialite.pc.in 2021-02-07 16:53:46.000000000 +0100 ++++ libspatialite-5.0.1-new/spatialite.pc.in 2021-02-10 09:54:09.647552994 +0100 +@@ -8,5 +8,6 @@ includedir=@includedir@ + Name: spatialite + Description: Spatial SQL database engine based on SQLite + Version: @VERSION@ +-Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ -lm ++Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ -lm ++Libs: -L${libdir} -lspatialite + Cflags: -I${includedir} diff --git a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_4.3.0a.bb b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_4.3.0a.bb deleted file mode 100644 index f6c7655194..0000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_4.3.0a.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Library extending the SQLite core to support fully fledged Spatial SQL capabilities" -HOMEPAGE = "https://www.gaia-gis.it/fossil/libspatialite/" -SECTION = "libs" -DEPENDS = "proj geos sqlite3 libxml2 zlib" - -LICENSE = "MPL-1.1 & GPL-2.0-or-later & LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=0e92e1a36cc384b60f5b31dde0bdd39e" - -SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz \ - file://geos-config.patch" -SRC_URI[md5sum] = "6b380b332c00da6f76f432b10a1a338c" -SRC_URI[sha256sum] = "88900030a4762904a7880273f292e5e8ca6b15b7c6c3fb88ffa9e67ee8a5a499" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-freexl=no" -CFLAGS += "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" - -# package plugins for SQLite3 -PACKAGES += "${PN}-plugin" -INSANE_SKIP:${PN}-plugin = "dev-so" -FILES:${PN}-plugin += "${libdir}/mod_*" diff --git a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb new file mode 100644 index 0000000000..f46b1083e1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Library extending the SQLite core to support fully fledged Spatial SQL capabilities" +HOMEPAGE = "https://www.gaia-gis.it/fossil/libspatialite/" +SECTION = "libs" +DEPENDS = "proj geos sqlite3 libxml2 zlib" + +LICENSE = "MPL-1.1 & GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=0e92e1a36cc384b60f5b31dde0bdd39e" + +SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz \ + file://libspatialite_geos.patch \ + file://libspatialite_macros.patch \ + file://libspatialite_pkgconfig.patch \ +" + +SRC_URI[sha256sum] = "eecbc94311c78012d059ebc0fae86ea5ef6eecb13303e6e82b3753c1b3409e98" + +inherit autotools-brokensep pkgconfig + +EXTRA_OECONF = "--enable-freexl=no --disable-rttopo --disable-minizip" + +# package plugins for SQLite3 +PACKAGES += "${PN}-plugin" +INSANE_SKIP:${PN}-plugin = "dev-so" +FILES:${PN}-plugin += "${libdir}/mod_*" diff --git a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_7.0.1.bb b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_7.0.1.bb deleted file mode 100644 index 98e57f21e4..0000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_7.0.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "PROJ.4 - Cartographic Projections library" -HOMEPAGE = "http://trac.osgeo.org/proj/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=74d9aaec5fa0cd734341e8c4dc91b608" - -SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.gz" - -SRC_URI[md5sum] = "5ba7536b579a6c9e0ad822dbdd455985" -SRC_URI[sha256sum] = "a7026d39c9c80d51565cfc4b33d22631c11e491004e19020b3ff5a0791e1779f" - -DEPENDS = "sqlite3 sqlite3-native tiff" - -inherit autotools pkgconfig lib_package - -PACKAGECONFIG ?= "curl" - -PACKAGECONFIG[curl] = ",--without-curl,curl" - -FILES:${PN} += "${datadir}/proj" diff --git a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_8.2.1.bb b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_8.2.1.bb new file mode 100644 index 0000000000..0c1104926f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_8.2.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "PROJ.4 - Cartographic Projections library" +HOMEPAGE = "http://trac.osgeo.org/proj/" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27445198ba1500f508fce2b183ce0ff" + +SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.gz" + +SRC_URI[sha256sum] = "76ed3d0c3a348a6693dfae535e5658bbfd47f71cb7ff7eb96d9f12f7e068b1cf" + +DEPENDS = "sqlite3 sqlite3-native tiff" + +inherit autotools pkgconfig lib_package + +PACKAGECONFIG ?= "curl" + +PACKAGECONFIG[curl] = ",--without-curl,curl" + +FILES:${PN} += "${datadir}/proj" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/CVE-2022-24407.patch b/meta-openembedded/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/CVE-2022-24407.patch new file mode 100644 index 0000000000..3d67f47414 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/CVE-2022-24407.patch @@ -0,0 +1,27 @@ +From 078f98ea154475d953ce5b7cd851732f4dc270a7 Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Tue, 5 Jul 2022 09:31:07 +0530 +Subject: [PATCH] CVE-2022-24407 + +Upstream-Status: Backport [https://github.com/cyrusimap/cyrus-sasl/commit/9eff746c9daecbcc0041b09a5a51ba30738cdcbc] +CVE: CVE-2022-24407 +Signed-off-by: Hitendra Prajapati +--- + plugins/sql.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/sql.c b/plugins/sql.c +index 6ac81c2f..d90dbac9 100644 +--- a/plugins/sql.c ++++ b/plugins/sql.c +@@ -1127,6 +1127,7 @@ static int sql_auxprop_lookup(void *glob_context, + done: + if (escap_userid) sparams->utils->free(escap_userid); + if (escap_realm) sparams->utils->free(escap_realm); ++ if (escap_passwd) sparams->utils->free(escap_passwd); + if (conn) settings->sql_engine->sql_close(conn); + if (userid) sparams->utils->free(userid); + if (realm) sparams->utils->free(realm); +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb b/meta-openembedded/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb index 98899dfd5e..e344733ef4 100644 --- a/meta-openembedded/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb +++ b/meta-openembedded/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/cyrusimap/cyrus-sasl;protocol=https;branch=cyrus-sas file://saslauthd.service \ file://saslauthd.conf \ file://CVE-2019-19906.patch \ + file://CVE-2022-24407.patch \ " UPSTREAM_CHECK_URI = "https://github.com/cyrusimap/cyrus-sasl/archives" diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch index 4cf182ad64..d06b6af229 100644 --- a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch +++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch @@ -1,10 +1,21 @@ -Compatibility fixes for musl. +From 328805fd16930deefda400a77e9c2c5d17d04d29 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 13 Mar 2021 00:42:25 -0800 +Subject: [PATCH] Compatibility fixes for musl. +--- + m4/pc_from_ucontext.m4 | 4 +++- + src/getpc.h | 3 +++ + src/stacktrace_powerpc-linux-inl.h | 8 ++++++-- + 3 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/m4/pc_from_ucontext.m4 b/m4/pc_from_ucontext.m4 +index 7f09dd7..5f4ee8c 100644 --- a/m4/pc_from_ucontext.m4 +++ b/m4/pc_from_ucontext.m4 @@ -34,6 +34,7 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT], + pc_fields="$pc_fields uc_mcontext.gregs[[R15]]" # Linux (arm old [untested]) pc_fields="$pc_fields uc_mcontext.arm_pc" # Linux (arm arch 5) - pc_fields="$pc_fields uc_mcontext.cr0_hi" # Linux (e2k) pc_fields="$pc_fields uc_mcontext.gp_regs[[PT_NIP]]" # Suse SLES 11 (ppc64) + pc_fields="$pc_fields uc_mcontext.gregs[[PT_NIP]]" pc_fields="$pc_fields uc_mcontext.mc_eip" # FreeBSD (i386) @@ -20,6 +31,8 @@ Compatibility fixes for musl. [ucontext_t u; return u.$pc_field == 0;], AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field, How to access the PC from a struct ucontext) +diff --git a/src/getpc.h b/src/getpc.h +index 9605363..cd8ccfa 100644 --- a/src/getpc.h +++ b/src/getpc.h @@ -68,6 +68,9 @@ @@ -32,6 +45,8 @@ Compatibility fixes for musl. // Take the example where function Foo() calls function Bar(). For // many architectures, Bar() is responsible for setting up and tearing +diff --git a/src/stacktrace_powerpc-linux-inl.h b/src/stacktrace_powerpc-linux-inl.h +index a301a46..efca426 100644 --- a/src/stacktrace_powerpc-linux-inl.h +++ b/src/stacktrace_powerpc-linux-inl.h @@ -186,7 +186,7 @@ static int GET_STACK_TRACE_OR_FRAMES { diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.10.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.10.bb new file mode 100644 index 0000000000..602a7e263a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.10.bb @@ -0,0 +1,67 @@ +SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" +HOMEPAGE = "https://github.com/gperftools/gperftools" +DESCRIPTION = "The gperftools, previously called google-perftools, package contains some \ +utilities to improve and analyze the performance of C++ programs. \ +Included are an optimized thread-caching malloc() and cpu and heap profiling utilities. \ +" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" + +DEPENDS:append:libc-musl = " libucontext" + +SRCREV = "bf8b714bf5075d0a6f2f28504b43095e2b1e11c5" +SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https \ + file://0001-Support-Atomic-ops-on-clang.patch \ + file://0001-fix-build-with-musl-libc.patch \ + file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \ + file://disable_libunwind_aarch64.patch \ + file://sgidef.patch \ + " + +SRC_URI:append:libc-musl = " file://ppc-musl.patch" + +inherit autotools + +S = "${WORKDIR}/git" + +# On mips, we have the following error. +# do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 +# Segmentation fault (core dumped) +COMPATIBLE_HOST:mipsarch = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" + +# Disable thumb1 +# {standard input}: Assembler messages: +# {standard input}:434: Error: lo register required -- `ldr pc,[sp]' +# Makefile:4538: recipe for target 'src/base/libtcmalloc_la-linuxthreads.lo' failed +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:toolchain-clang:arm = "arm" + +EXTRA_OECONF:append:libc-musl:powerpc64le = " --disable-cpu-profiler" +EXTRA_OECONF:append:libc-musl:powerpc = " --disable-cpu-profiler" +PACKAGECONFIG ?= "libunwind static" +PACKAGECONFIG:remove:arm:libc-musl = "libunwind" +PACKAGECONFIG:remove:riscv64 = "libunwind" +PACKAGECONFIG:remove:riscv32 = "libunwind" + +PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" +PACKAGECONFIG[static] = "--enable-static,--disable-static," + +PACKAGE_BEFORE_PN += "libtcmalloc-minimal" +FILES:libtcmalloc-minimal = "${libdir}/libtcmalloc_minimal*${SOLIBS} ${libdir}/libtcmalloc_minimal_debug*${SOLIBS}" + +# pprof tool requires Getopt::long and POSIX perl5 modules. +# Also runs `objdump` on each cpuprofile data file +RDEPENDS:${PN} += " \ + binutils \ + curl \ + perl-module-carp \ + perl-module-cwd \ + perl-module-getopt-long \ + perl-module-overloading \ + perl-module-posix \ +" + +RDEPENDS:${PN} += "libtcmalloc-minimal (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb deleted file mode 100644 index d056622b2b..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" -HOMEPAGE = "https://github.com/gperftools/gperftools" -DESCRIPTION = "The gperftools, previously called google-perftools, package contains some \ -utilities to improve and analyze the performance of C++ programs. \ -Included are an optimized thread-caching malloc() and cpu and heap profiling utilities. \ -" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" - -DEPENDS:append:libc-musl = " libucontext" - -SRCREV = "f7c6fb6c8e99d6b1b725e5994373bcd19ffdf8fd" -SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https \ - file://0001-Support-Atomic-ops-on-clang.patch \ - file://0001-fix-build-with-musl-libc.patch \ - file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \ - file://disable_libunwind_aarch64.patch \ - file://sgidef.patch \ - " - -SRC_URI:append:libc-musl = " file://ppc-musl.patch" - -inherit autotools - -S = "${WORKDIR}/git" - -# On mips, we have the following error. -# do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 -# Segmentation fault (core dumped) -COMPATIBLE_HOST:mipsarch = "null" -COMPATIBLE_HOST:riscv64 = "null" -COMPATIBLE_HOST:riscv32 = "null" - -# Disable thumb1 -# {standard input}: Assembler messages: -# {standard input}:434: Error: lo register required -- `ldr pc,[sp]' -# Makefile:4538: recipe for target 'src/base/libtcmalloc_la-linuxthreads.lo' failed -ARM_INSTRUCTION_SET:armv5 = "arm" -ARM_INSTRUCTION_SET:toolchain-clang:arm = "arm" - -EXTRA_OECONF:append:libc-musl:powerpc64le = " --disable-cpu-profiler" -EXTRA_OECONF:append:libc-musl:powerpc = " --disable-cpu-profiler" -PACKAGECONFIG ?= "libunwind static" -PACKAGECONFIG:remove:arm:libc-musl = "libunwind" -PACKAGECONFIG:remove:riscv64 = "libunwind" -PACKAGECONFIG:remove:riscv32 = "libunwind" - -PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" -PACKAGECONFIG[static] = "--enable-static,--disable-static," - -PACKAGE_BEFORE_PN += "libtcmalloc-minimal" -FILES:libtcmalloc-minimal = "${libdir}/libtcmalloc_minimal*${SOLIBS} ${libdir}/libtcmalloc_minimal_debug*${SOLIBS}" - -# pprof tool requires Getopt::long and POSIX perl5 modules. -# Also runs `objdump` on each cpuprofile data file -RDEPENDS:${PN} += " \ - binutils \ - curl \ - perl-module-carp \ - perl-module-cwd \ - perl-module-getopt-long \ - perl-module-overloading \ - perl-module-posix \ -" - -RDEPENDS:${PN} += "libtcmalloc-minimal (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.360.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.360.bb deleted file mode 100644 index b395409c63..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.360.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Hardware identification and configuration data" -HOMEPAGE = "https://github.com/vcrhonek/hwdata" -SECTION = "System/Base" - -LICENSE = "GPL-2.0-or-later | XFree86-1.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" - -SRCREV = "5e1a17e536de5b2888ecb7ae58ded885a53eddfd" -SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" -S = "${WORKDIR}/git" - -inherit allarch - -do_configure() { - ${S}/configure --datadir=${datadir} --libdir=${libdir} -} - -do_compile[noexec] = "1" - -do_install() { - oe_runmake install DESTDIR=${D} -} - -FILES:${PN} = "${libdir}/* \ - ${datadir}/* " diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.361.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.361.bb new file mode 100644 index 0000000000..c8daf7d5f9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.361.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Hardware identification and configuration data" +HOMEPAGE = "https://github.com/vcrhonek/hwdata" +SECTION = "System/Base" + +LICENSE = "GPL-2.0-or-later | XFree86-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" + +SRCREV = "a934c616e2e666552586caa85af9fc583855df49" +SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" +S = "${WORKDIR}/git" + +inherit allarch + +do_configure() { + ${S}/configure --datadir=${datadir} --libdir=${libdir} +} + +do_compile[noexec] = "1" + +do_install() { + oe_runmake install DESTDIR=${D} +} + +FILES:${PN} = "${libdir}/* \ + ${datadir}/* " diff --git a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index 008a83f46d..b8167f5a72 100644 --- a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -4,15 +4,15 @@ HOMEPAGE = "https://www.imagemagick.org/" DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \ editing raster and vector image files. It can read and write over 200 image file formats." LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=41b4fa9af60c88e61484b02c0561181a \ - file://NOTICE;md5=a2aa6e41f8a40700196a9ce301693e34" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b97c12a9213df1499565d69b92c73dd7 \ + file://NOTICE;md5=d8b9d2ccf273687ad12ebd06e5d8478f" # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" BASE_PV := "${PV}" -PV .= "_25" +PV .= "-62" SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https" -SRCREV = "8b4e00829eb84d4e7b4da11acf1f98f1e8166e5b" +SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.1.0.bb b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.1.0.bb deleted file mode 100644 index 4e6bfbbc27..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.1.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Command line tools and C library providing a simple interface to inotify" -AUTHOR = "Rohan McGovern " -HOMEPAGE = "http://wiki.github.com/rvoicilas/inotify-tools" -SECTION = "console/devel" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" - -SRCREV = "4b72dcd15299e1d0cb096397d9aab513ffed1657" - -SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https \ - file://0002-libinotifytools-Bridge-differences-between-musl-glib.patch \ - " - -S = "${WORKDIR}/git" - -inherit autotools - -EXTRA_OECONF = "--disable-doxygen" - -# workaround until glibc 2.35 is fixed for this [1] -# [1] https://sourceware.org/pipermail/libc-alpha/2021-December/134215.html -CFLAGS += "-Wno-error" - -PACKAGES =+ "libinotifytools" - -FILES:libinotifytools = "${libdir}/lib*.so.*" diff --git a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb new file mode 100644 index 0000000000..3d25eecb34 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "Command line tools and C library providing a simple interface to inotify" +AUTHOR = "Rohan McGovern " +HOMEPAGE = "http://wiki.github.com/rvoicilas/inotify-tools" +SECTION = "console/devel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" + +SRCREV = "c8bdbc0a2ed822fc7c67c5c3e102d89fe27fb2d0" + +SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https \ + file://0002-libinotifytools-Bridge-differences-between-musl-glib.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools + +EXTRA_OECONF = "--disable-doxygen" + +# workaround until glibc 2.35 is fixed for this [1] +# [1] https://sourceware.org/pipermail/libc-alpha/2021-December/134215.html +CFLAGS += "-Wno-error" + +PACKAGES =+ "libinotifytools" + +FILES:libinotifytools = "${libdir}/lib*.so.*" diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Use-syscall-wrappers-instead-of-using-syscall-2.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Use-syscall-wrappers-instead-of-using-syscall-2.patch deleted file mode 100644 index 2777a94045..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Use-syscall-wrappers-instead-of-using-syscall-2.patch +++ /dev/null @@ -1,59 +0,0 @@ -From cb350a8989adbd65db574325d9a86d5437d800da Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Mon, 13 Sep 2021 23:56:08 +0200 -Subject: [PATCH] test: Use syscall wrappers instead of using syscall(2) directly - -Some of these syscalls have different entry points depending on the -architecture. Use the wrappers to avoid having to reimplement them -portably. - -Fixes build failures on Debian armel and armhf builds. - -Upstream-Status: Backport [https://github.com/kraj/liburing/commit/cb350a8989adbd65db574325d9a86d5437d800da] -Signed-off-by: Guillem Jover ---- - test/sqpoll-cancel-hang.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/test/sqpoll-cancel-hang.c b/test/sqpoll-cancel-hang.c -index c9032c8..e561478 100644 ---- a/test/sqpoll-cancel-hang.c -+++ b/test/sqpoll-cancel-hang.c -@@ -4,7 +4,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -29,8 +28,6 @@ static uint64_t current_time_ms(void) - - #define IORING_OFF_SQES 0x10000000ULL - --#define sys_io_uring_setup 425 -- - static void kill_and_wait(int pid, int* status) - { - kill(-pid, SIGKILL); -@@ -53,7 +50,7 @@ a5) - void* vma2 = (void*)a3; - void** ring_ptr_out = (void**)a4; - void** sqes_ptr_out = (void**)a5; -- uint32_t fd_io_uring = syscall(sys_io_uring_setup, entries, setup_params); -+ uint32_t fd_io_uring = __sys_io_uring_setup(entries, setup_params); - uint32_t sq_ring_sz = setup_params->sq_off.array + - setup_params->sq_entries * sizeof(uint32_t); - uint32_t cq_ring_sz = setup_params->cq_off.cqes + -@@ -135,7 +132,7 @@ void trigger_bug(void) - } - int main(void) - { -- syscall(__NR_mmap, 0x20000000ul, 0x1000000ul, 7ul, 0x32ul, -1, 0ul); -+ mmap((void *)0x20000000ul, 0x1000000ul, 7ul, 0x32ul, -1, 0ul); - int pid = fork(); - if (pid < 0) - exit(1); --- -2.33.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.1.bb b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.1.bb deleted file mode 100644 index da8e6d3338..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "This is the io_uring library, liburing." -DESCRIPTION = "liburing provides helpers to setup and teardown io_uring \ -instances, and also a simplified interface for applications that don't need \ -(or want) to deal with the full kernel side implementation." -HOMEPAGE = "https://github.com/axboe/liburing" -BUGTRACKER = "https://github.com/axboe/liburing/issues" -SECTION = "libs" - -LICENSE = "LGPL-2.1-only | MIT" -LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=d51b5805e2a675685e6a66ca50904cf9" - -SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \ - file://0001-test-Use-syscall-wrappers-instead-of-using-syscall-2.patch \ - " -SRC_URI:append:libc-musl:riscv64 = " file://0001-do-not-build-examples.patch " -SRC_URI:append:libc-musl:riscv32 = " file://0001-do-not-build-examples.patch " -SRCREV = "41a61c97c2e3df4475c93fdf5026d575ce3f1377" - -S = "${WORKDIR}/git" - -DEPENDS:append:libc-musl = " libucontext" -XCFLAGS = "-pthread" -XCFLAGS:append:libc-musl = " -lucontext" - -EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" -do_configure() { - ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} -} -do_install () { - oe_runmake install DESTDIR=${D} -} diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.2.bb b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.2.bb new file mode 100644 index 0000000000..8cc7d74f9f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.2.bb @@ -0,0 +1,29 @@ +SUMMARY = "This is the io_uring library, liburing." +DESCRIPTION = "liburing provides helpers to setup and teardown io_uring \ +instances, and also a simplified interface for applications that don't need \ +(or want) to deal with the full kernel side implementation." +HOMEPAGE = "https://github.com/axboe/liburing" +BUGTRACKER = "https://github.com/axboe/liburing/issues" +SECTION = "libs" + +LICENSE = "LGPL-2.1-only | MIT" +LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af" + +SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https" +SRC_URI:append:libc-musl:riscv64 = " file://0001-do-not-build-examples.patch " +SRC_URI:append:libc-musl:riscv32 = " file://0001-do-not-build-examples.patch " +SRCREV = "dda4848a9911120a903bef6284fb88286f4464c9" + +S = "${WORKDIR}/git" + +DEPENDS:append:libc-musl = " libucontext" +XCFLAGS = "-pthread" +XCFLAGS:append:libc-musl = " -lucontext" + +EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" +do_configure() { + ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} +} +do_install () { + oe_runmake install DESTDIR=${D} +} diff --git a/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_3.0.21.02.21.bb b/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_3.0.21.02.21.bb index 35b5a000e1..781e698cbf 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_3.0.21.02.21.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_3.0.21.02.21.bb @@ -13,7 +13,7 @@ SRCREV = "d34bc1a3bdc148e2e1fe64998398e1a0552ab04c" S = "${WORKDIR}/git" -DEPENDS += "opencl-headers opencl-icd-loader" +DEPENDS += "opencl-headers virtual/opencl-icd" do_install() { install -D -m 755 clinfo ${D}${bindir}/clinfo diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-core-vsx-update-vec_absd-workaround-condition.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-core-vsx-update-vec_absd-workaround-condition.patch deleted file mode 100644 index d2d3b81fbe..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-core-vsx-update-vec_absd-workaround-condition.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c7ce902eed0eb7926c0973b1127037fdd27b99ca Mon Sep 17 00:00:00 2001 -From: Alexander Alekhin -Date: Tue, 15 Feb 2022 07:23:32 +0300 -Subject: [PATCH] core(vsx): update vec_absd() workaround condition - -Upstream-Status: Backport [https://github.com/opencv/opencv/commit/8d88bb06b230b5c4b5bca78d84102f5d1adf48cf] -Signed-off-by: Khem Raj ---- - modules/core/include/opencv2/core/vsx_utils.hpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/modules/core/include/opencv2/core/vsx_utils.hpp b/modules/core/include/opencv2/core/vsx_utils.hpp -index 68863ffb36..5cbc066784 100644 ---- a/modules/core/include/opencv2/core/vsx_utils.hpp -+++ b/modules/core/include/opencv2/core/vsx_utils.hpp -@@ -684,7 +684,8 @@ VSX_IMPL_LOAD_L8(vec_double2, double) - #endif - - // absolute difference --#ifndef vec_absd -+#ifndef _ARCH_PWR9 -+# undef vec_absd - # define vec_absd(a, b) vec_sub(vec_max(a, b), vec_min(a, b)) - #endif - --- -2.36.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.5.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.5.bb deleted file mode 100644 index e4fb676f7e..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.5.bb +++ /dev/null @@ -1,239 +0,0 @@ -SUMMARY = "Opencv : The Open Computer Vision Library" -HOMEPAGE = "http://opencv.org/" -SECTION = "libs" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -ARM_INSTRUCTION_SET:armv4 = "arm" -ARM_INSTRUCTION_SET:armv5 = "arm" - -DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" - -SRCREV_opencv = "dad26339a975b49cfb6c7dbe4bd5276c9dcb36e2" -SRCREV_contrib = "49e8f123ca08e76891856a1ecce491b62d08ba20" -SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" -SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" -SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" -SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" -SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252" - -def ipp_filename(d): - import re - arch = d.getVar('TARGET_ARCH') - if re.match("i.86$", arch): - return "ippicv_2020_lnx_ia32_20191018_general.tgz" - else: - return "ippicv_2020_lnx_intel64_20191018_general.tgz" - -def ipp_md5sum(d): - import re - arch = d.getVar('TARGET_ARCH') - if re.match("i.86$", arch): - return "ad189a940fb60eb71f291321322fe3e8" - else: - return "7421de0095c7a39162ae13a6098782f9" - -IPP_FILENAME = "${@ipp_filename(d)}" -IPP_MD5 = "${@ipp_md5sum(d)}" - -SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" -SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \ - git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib;branch=master;protocol=https \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp;protocol=https \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc;protocol=https \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg;protocol=https \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face;protocol=https \ - git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode;protocol=https \ - file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ - file://0003-To-fix-errors-as-following.patch \ - file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ - file://0001-Dont-use-isystem.patch \ - file://download.patch \ - file://0001-Make-ts-module-external.patch \ - file://0001-core-vsx-update-vec_absd-workaround-condition.patch \ - " -SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" - -S = "${WORKDIR}/git" - -# OpenCV wants to download more files during configure. We download these in -# do_fetch and construct a source cache in the format it expects -OPENCV_DLDIR = "${WORKDIR}/downloads" - -do_unpack_extra() { - tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} - - md5() { - # Return the MD5 of $1 - echo $(md5sum $1 | cut -d' ' -f1) - } - cache() { - TAG=$1 - shift - mkdir --parents ${OPENCV_DLDIR}/$TAG - for F in $*; do - DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F) - test -e $DEST || ln -s $F $DEST - done - } - cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i - cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i - cache data ${WORKDIR}/face/*.dat - cache wechat_qrcode ${WORKDIR}/wechat_qrcode/*.caffemodel - cache wechat_qrcode ${WORKDIR}/wechat_qrcode/*.prototxt -} -addtask unpack_extra after do_unpack before do_patch - -CMAKE_VERBOSE = "VERBOSE=1" - -EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ - -DWITH_1394=OFF \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DOPENCV_ICV_HASH=${IPP_MD5} \ - -DIPPROOT=${WORKDIR}/ippicv_lnx \ - -DOPENCV_GENERATE_PKGCONFIG=ON \ - -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ - -DOPENCV_ALLOW_DOWNLOADS=OFF \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ - ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ -" -EXTRA_OECMAKE:append:x86 = " -DX86=ON" -# disable sse4.1 and sse4.2 to fix 32bit build failure -# https://github.com/opencv/opencv/issues/21597 -EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1" - -PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ - " - -# TBB does not build for powerpc so disable that package config -PACKAGECONFIG:remove:powerpc = "tbb" -# tbb now needs getcontect/setcontext which is not there for all arches on musl -PACKAGECONFIG:remove:libc-musl:riscv64 = "tbb" -PACKAGECONFIG:remove:libc-musl:riscv32 = "tbb" - -PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" -PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," -PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," -PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," -PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," -PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," -PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," -PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," -PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," -PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," -PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," -PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," -PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," -PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," -PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," -PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," -PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," -PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," -PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," -PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON,-DBUILD_TESTS=OFF,," -PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," -PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," - -inherit pkgconfig cmake - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'setuptools3-base', '', d)} -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} - -export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" -export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" -export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" -export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" -export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" - -TARGET_CC_ARCH += "-I${S}/include " - -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ - ${PN}-apps" - -python populate_packages:prepend () { - cv_libdir = d.expand('${libdir}') - do_split_packages(d, cv_libdir, r'^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, cv_libdir, r'^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, r'^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) - - pn = d.getVar('PN') - metapkg = pn + '-dev' - d.setVar('ALLOW_EMPTY:' + metapkg, "1") - blacklist = [ metapkg ] - metapkg_rdepends = [ ] - packages = d.getVar('PACKAGES').split() - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): - metapkg_rdepends.append(pkg) - d.setVar('RRECOMMENDS:' + metapkg, ' '.join(metapkg_rdepends)) - - metapkg = pn - d.setVar('ALLOW_EMPTY:' + metapkg, "1") - blacklist = [ metapkg, "libopencv-ts" ] - metapkg_rdepends = [ ] - for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): - metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends)) -} - -PACKAGES_DYNAMIC += "^libopencv-.*" - -FILES:${PN} = "" -FILES:${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" -FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/cmake/opencv4/*.cmake" -FILES:${PN}-staticdev += "${libdir}/opencv4/3rdparty/*.a" -FILES:${PN}-apps = "${bindir}/* ${datadir}/opencv4 ${datadir}/licenses" -FILES:${PN}-java = "${datadir}/OpenCV/java" -FILES:${PN}-samples = "${datadir}/opencv4/samples/" - -INSANE_SKIP:${PN}-java = "libdir" -INSANE_SKIP:${PN}-dbg = "libdir" - -ALLOW_EMPTY:${PN} = "1" - -SUMMARY:python-opencv = "Python bindings to opencv" -FILES:python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS:python-opencv = "python-core python-numpy" - -SUMMARY:python3-opencv = "Python bindings to opencv" -FILES:python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS:python3-opencv = "python3-core python3-numpy" - -RDEPENDS:${PN}-apps = "bash" - -do_compile:prepend() { - # remove the build host info to improve reproducibility - if [ -f ${WORKDIR}/build/modules/core/version_string.inc ]; then - sed -i "s#${WORKDIR}#/workdir#g" ${WORKDIR}/build/modules/core/version_string.inc - fi -} - -do_install:append() { - # Move Python files into correct library folder (for multilib build) - if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then - mv ${D}/usr/lib/* ${D}/${libdir}/ - rm -rf ${D}/usr/lib - fi - # remove build host path to improve reproducibility - if [ -f ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake ]; then - sed -e 's@${STAGING_DIR_HOST}@@g' \ - -i ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake - fi - # remove setup_vars_opencv4.sh as its content is confusing and useless - if [ -f ${D}${bindir}/setup_vars_opencv4.sh ]; then - rm -rf ${D}${bindir}/setup_vars_opencv4.sh - fi -} diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.6.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.6.0.bb new file mode 100644 index 0000000000..f6c10054c2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.6.0.bb @@ -0,0 +1,241 @@ +SUMMARY = "Opencv : The Open Computer Vision Library" +HOMEPAGE = "http://opencv.org/" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" + +DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" + +SRCREV_opencv = "b0dc474160e389b9c9045da5db49d03ae17c6a6b" +SRCREV_contrib = "7b77c355a8fdc97667b3fa1e7a0d37e4973fc868" +SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" +SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" +SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" +SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" +SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252" + +def ipp_filename(d): + import re + arch = d.getVar('TARGET_ARCH') + if re.match("i.86$", arch): + return "ippicv_2020_lnx_ia32_20191018_general.tgz" + else: + return "ippicv_2020_lnx_intel64_20191018_general.tgz" + +def ipp_md5sum(d): + import re + arch = d.getVar('TARGET_ARCH') + if re.match("i.86$", arch): + return "ad189a940fb60eb71f291321322fe3e8" + else: + return "7421de0095c7a39162ae13a6098782f9" + +IPP_FILENAME = "${@ipp_filename(d)}" +IPP_MD5 = "${@ipp_md5sum(d)}" + +SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" +SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=master;protocol=https \ + git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib;branch=master;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face;protocol=https \ + git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode;protocol=https \ + file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ + file://0003-To-fix-errors-as-following.patch \ + file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ + file://0001-Dont-use-isystem.patch \ + file://download.patch \ + file://0001-Make-ts-module-external.patch \ + " +SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" + +S = "${WORKDIR}/git" + +# OpenCV wants to download more files during configure. We download these in +# do_fetch and construct a source cache in the format it expects +OPENCV_DLDIR = "${WORKDIR}/downloads" + +do_unpack_extra() { + tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} + + md5() { + # Return the MD5 of $1 + echo $(md5sum $1 | cut -d' ' -f1) + } + cache() { + TAG=$1 + shift + mkdir --parents ${OPENCV_DLDIR}/$TAG + for F in $*; do + DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F) + test -e $DEST || ln -s $F $DEST + done + } + cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i + cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i + cache data ${WORKDIR}/face/*.dat + cache wechat_qrcode ${WORKDIR}/wechat_qrcode/*.caffemodel + cache wechat_qrcode ${WORKDIR}/wechat_qrcode/*.prototxt +} +addtask unpack_extra after do_unpack before do_patch + +CMAKE_VERBOSE = "VERBOSE=1" + +EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ + -DWITH_1394=OFF \ + -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DOPENCV_ICV_HASH=${IPP_MD5} \ + -DIPPROOT=${WORKDIR}/ippicv_lnx \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ + -DOPENCV_ALLOW_DOWNLOADS=OFF \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ +" +LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed" +LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed" + +EXTRA_OECMAKE:append:x86 = " -DX86=ON" +# disable sse4.1 and sse4.2 to fix 32bit build failure +# https://github.com/opencv/opencv/issues/21597 +EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1" + +PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" + +# TBB does not build for powerpc so disable that package config +PACKAGECONFIG:remove:powerpc = "tbb" +# tbb now needs getcontect/setcontext which is not there for all arches on musl +PACKAGECONFIG:remove:libc-musl:riscv64 = "tbb" +PACKAGECONFIG:remove:libc-musl:riscv32 = "tbb" + +PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" +PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," +PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," +PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," +PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," +PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," +PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," +PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," +PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," +PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," +PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," +PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," +PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," +PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," +PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," +PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," +PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," +PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," +PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," +PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON,-DBUILD_TESTS=OFF,," +PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," +PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," + +inherit pkgconfig cmake + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'setuptools3-base', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} + +export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" +export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" +export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" +export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" +export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" + +TARGET_CC_ARCH += "-I${S}/include " + +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ + ${PN}-apps" + +python populate_packages:prepend () { + cv_libdir = d.expand('${libdir}') + do_split_packages(d, cv_libdir, r'^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, r'^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, r'^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) + + pn = d.getVar('PN') + metapkg = pn + '-dev' + d.setVar('ALLOW_EMPTY:' + metapkg, "1") + blacklist = [ metapkg ] + metapkg_rdepends = [ ] + packages = d.getVar('PACKAGES').split() + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): + metapkg_rdepends.append(pkg) + d.setVar('RRECOMMENDS:' + metapkg, ' '.join(metapkg_rdepends)) + + metapkg = pn + d.setVar('ALLOW_EMPTY:' + metapkg, "1") + blacklist = [ metapkg, "libopencv-ts" ] + metapkg_rdepends = [ ] + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): + metapkg_rdepends.append(pkg) + d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends)) +} + +PACKAGES_DYNAMIC += "^libopencv-.*" + +FILES:${PN} = "" +FILES:${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" +FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/cmake/opencv4/*.cmake" +FILES:${PN}-staticdev += "${libdir}/opencv4/3rdparty/*.a" +FILES:${PN}-apps = "${bindir}/* ${datadir}/opencv4 ${datadir}/licenses" +FILES:${PN}-java = "${datadir}/OpenCV/java" +FILES:${PN}-samples = "${datadir}/opencv4/samples/" + +INSANE_SKIP:${PN}-java = "libdir" +INSANE_SKIP:${PN}-dbg = "libdir" + +ALLOW_EMPTY:${PN} = "1" + +SUMMARY:python-opencv = "Python bindings to opencv" +FILES:python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS:python-opencv = "python-core python-numpy" + +SUMMARY:python3-opencv = "Python bindings to opencv" +FILES:python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS:python3-opencv = "python3-core python3-numpy" + +RDEPENDS:${PN}-apps = "bash" + +do_compile:prepend() { + # remove the build host info to improve reproducibility + if [ -f ${WORKDIR}/build/modules/core/version_string.inc ]; then + sed -i "s#${WORKDIR}#/workdir#g" ${WORKDIR}/build/modules/core/version_string.inc + fi +} + +do_install:append() { + # Move Python files into correct library folder (for multilib build) + if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then + mv ${D}/usr/lib/* ${D}/${libdir}/ + rm -rf ${D}/usr/lib + fi + # remove build host path to improve reproducibility + if [ -f ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake ]; then + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake + fi + # remove setup_vars_opencv4.sh as its content is confusing and useless + if [ -f ${D}${bindir}/setup_vars_opencv4.sh ]; then + rm -rf ${D}${bindir}/setup_vars_opencv4.sh + fi +} diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.5.12.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.5.12.bb index a0ca2b5d39..c01db08e46 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.5.12.bb +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.5.12.bb @@ -131,7 +131,7 @@ PACKAGES += "${PN}-overlay-proxycache" # Append URANDOM_DEVICE='/dev/urandom' to CPPFLAGS: # This allows tls to obtain random bits from /dev/urandom, by default # it was disabled for cross-compiling. -CPPFLAGS:append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\'/dev/urandom\' -fPIC" +CPPFLAGS:append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\\"/dev/urandom\\" -fPIC" LDFLAGS:append = " -pthread" diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-fix-unbundled-PCRE2-dependency.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-fix-unbundled-PCRE2-dependency.patch new file mode 100644 index 0000000000..1a9d23cee4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-fix-unbundled-PCRE2-dependency.patch @@ -0,0 +1,25 @@ +From f049898c8bf058ed187de8e5fab20abeaab1f3b6 Mon Sep 17 00:00:00 2001 +From: Alex Fabijanic +Date: Sat, 9 Jul 2022 19:13:04 +0200 +Subject: [PATCH] fix(cmake): PocoFoundationConfig.cmake should now check for + PCRE2 #3677 + +Upstream-Status: Backport [https://github.com/pocoproject/poco/issues/3677] + +--- + Foundation/cmake/PocoFoundationConfig.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Foundation/cmake/PocoFoundationConfig.cmake b/Foundation/cmake/PocoFoundationConfig.cmake +index 46c2d3fc00..82c5788940 100644 +--- a/Foundation/cmake/PocoFoundationConfig.cmake ++++ b/Foundation/cmake/PocoFoundationConfig.cmake +@@ -2,7 +2,7 @@ if(@POCO_UNBUNDLED@) + include(CMakeFindDependencyMacro) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + find_dependency(ZLIB REQUIRED) +- find_dependency(PCRE REQUIRED) ++ find_dependency(PCRE2 REQUIRED) + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/PocoFoundationTargets.cmake") diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0002-remove-providers-unitialization.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0002-remove-providers-unitialization.patch new file mode 100644 index 0000000000..7d24b79f14 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco/0002-remove-providers-unitialization.patch @@ -0,0 +1,35 @@ +From c976c32e5249cb8a2433e7abfa095c1fe8dc4f8e Mon Sep 17 00:00:00 2001 +From: Alex Fabijanic +Date: Wed, 13 Jul 2022 12:53:52 +0200 +Subject: [PATCH] fix(OpenSSLInitializer): remove providers unitialization + #3562 #3567 + +Upstream-Status: Backport [https://github.com/pocoproject/poco/issues/3562] + +--- + Crypto/src/OpenSSLInitializer.cpp | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/Crypto/src/OpenSSLInitializer.cpp b/Crypto/src/OpenSSLInitializer.cpp +index 4678d22299..c537c3f9c2 100644 +--- a/Crypto/src/OpenSSLInitializer.cpp ++++ b/Crypto/src/OpenSSLInitializer.cpp +@@ -157,18 +157,6 @@ void OpenSSLInitializer::uninitialize() + #endif + delete [] _mutexes; + #endif +- +-#if OPENSSL_VERSION_NUMBER >= 0x30000000L +- OSSL_PROVIDER* provider = nullptr; +- if ((provider = _defaultProvider.exchange(nullptr))) +- { +- OSSL_PROVIDER_unload(provider); +- } +- if ((provider = _legacyProvider.exchange(nullptr))) +- { +- OSSL_PROVIDER_unload(provider); +- } +-#endif + } + } + diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.2.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.2.bb deleted file mode 100644 index 8694983e7c..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.11.2.bb +++ /dev/null @@ -1,101 +0,0 @@ -SUMMARY = "Modern, powerful open source cross-platform C++ class libraries" -DESCRIPTION = "Modern, powerful open source C++ class libraries and frameworks for building network- and internet-based applications that run on desktop, server, mobile and embedded systems." -HOMEPAGE = "http://pocoproject.org/" -SECTION = "libs" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" - -# These dependencies are required by Foundation -DEPENDS = "libpcre zlib" - -SRC_URI = " \ - git://github.com/pocoproject/poco.git;branch=master;protocol=https \ - file://run-ptest \ - " -SRCREV = "9d1c428c861f2e5ccf09149bbe8d2149720c5896" - -UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit cmake ptest - -# By default the most commonly used poco components are built -# Foundation is built anyway and doesn't need to be listed explicitly -# these don't have dependencies outside oe-core -PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto JWT Data DataSQLite Zip Encodings Redis" - -PACKAGECONFIG[XML] = "-DENABLE_XML=ON,-DENABLE_XML=OFF,expat" -PACKAGECONFIG[JSON] = "-DENABLE_JSON=ON,-DENABLE_JSON=OFF" -PACKAGECONFIG[MongoDB] = "-DENABLE_MONGODB=ON,-DENABLE_MONGODB=OFF" -PACKAGECONFIG[PDF] = "-DENABLE_PDF=ON,-DENABLE_PDF=OFF,zlib" -PACKAGECONFIG[Util] = "-DENABLE_UTIL=ON,-DENABLE_UTIL=OFF" -PACKAGECONFIG[Net] = "-DENABLE_NET=ON,-DENABLE_NET=OFF" -PACKAGECONFIG[NetSSL] = "-DENABLE_NETSSL=ON,-DENABLE_NETSSL=OFF,openssl" -PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON,-DENABLE_CRYPTO=OFF,openssl" -PACKAGECONFIG[JWT] = "-DENABLE_JWT=ON,-DENABLE_JWT=OFF,openssl" -PACKAGECONFIG[Data] = "-DENABLE_DATA=ON,-DENABLE_DATA=OFF" -PACKAGECONFIG[DataSQLite] = "-DENABLE_DATA_SQLITE=ON -DSQLITE3_LIBRARY:STRING=sqlite3,-DENABLE_DATA_SQLITE=OFF,sqlite3" -PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF" -PACKAGECONFIG[Encodings] = "-DENABLE_ENCODINGS=ON,-DENABLE_ENCODINGS=OFF" -PACKAGECONFIG[Redis] = "-DENABLE_REDIS=ON,-DENABLE_REDIS=OFF" - -# Additional components not build by default, -# they might have dependencies not included in oe-core -# or they don't work on all architectures -PACKAGECONFIG[mod_poco] = "-DENABLE_APACHECONNECTOR=ON,-DENABLE_APACHECONNECTOR=OFF,apr apache2" -PACKAGECONFIG[CppParser] = "-DENABLE_CPPPARSER=ON,-DENABLE_CPPPARSER=OFF" -PACKAGECONFIG[DataMySQL] = "-DENABLE_DATA_MYSQL=ON -DMYSQL_LIB:STRING=mysqlclient_r,-DENABLE_DATA_MYSQL=OFF,mariadb" -PACKAGECONFIG[DataODBC] = "-DENABLE_DATA_ODBC=ON,-DENABLE_DATA_ODBC=OFF,libiodbc" -PACKAGECONFIG[PageCompiler] = "-DENABLE_PAGECOMPILER=ON,-DENABLE_PAGECOMPILER=OFF" -PACKAGECONFIG[PageCompilerFile2Page] = "-DENABLE_PAGECOMPILER_FILE2PAGE=ON,-DENABLE_PAGECOMPILER_FILE2PAGE=OFF" -PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF" - -EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ - ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}" - -# For the native build we want to use the bundled version -EXTRA_OECMAKE:append:class-native = " -DPOCO_UNBUNDLED=OFF" - -# do not use rpath -EXTRA_OECMAKE:append = " -DCMAKE_SKIP_RPATH=ON" - -python populate_packages:prepend () { - poco_libdir = d.expand('${libdir}') - pn = d.getVar("PN") - packages = [] - testrunners = [] - - def hook(f, pkg, file_regex, output_pattern, modulename): - packages.append(pkg) - testrunners.append(modulename) - - do_split_packages(d, poco_libdir, r'^libPoco(.*)\.so\..*$', - 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) - - d.setVar("RRECOMMENDS:%s" % pn, " ".join(packages)) - d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners)) -} - -do_install_ptest () { - cp -rf ${B}/bin/ ${D}${PTEST_PATH} - cp -f ${B}/lib/libCppUnit.so* ${D}${libdir} - cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/ - find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \; - echo "${POCO_TESTRUNNERS}" > "${D}${PTEST_PATH}/testrunners" -} - -PACKAGES_DYNAMIC = "poco-.*" - -# "poco" is a metapackage which pulls in all Poco components -ALLOW_EMPTY:${PN} = "1" - -# cppunit is only built if tests are enabled -PACKAGES =+ "${PN}-cppunit" -FILES:${PN}-cppunit += "${libdir}/libCppUnit.so*" -ALLOW_EMPTY:${PN}-cppunit = "1" - -RDEPENDS:${PN}-ptest += "${PN}-cppunit" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.0.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.0.bb new file mode 100644 index 0000000000..6fff0707d3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.0.bb @@ -0,0 +1,106 @@ +SUMMARY = "Modern, powerful open source cross-platform C++ class libraries" +DESCRIPTION = "Modern, powerful open source C++ class libraries and frameworks for building network- and internet-based applications that run on desktop, server, mobile and embedded systems." +HOMEPAGE = "http://pocoproject.org/" +SECTION = "libs" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" + +# These dependencies are required by Foundation +DEPENDS = "libpcre2 zlib" + +SRC_URI = " \ + git://github.com/pocoproject/poco.git;branch=master;protocol=https \ + file://0001-fix-unbundled-PCRE2-dependency.patch \ + file://0002-remove-providers-unitialization.patch \ + file://run-ptest \ + " +SRCREV = "4ba8595ed83841d1fa240716b5652adc3772c36b" + +UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit cmake ptest + +# By default the most commonly used poco components are built +# Foundation is built anyway and doesn't need to be listed explicitly +# these don't have dependencies outside oe-core +PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto JWT Data DataSQLite Zip Encodings Redis Prometheus" + +PACKAGECONFIG[XML] = "-DENABLE_XML=ON,-DENABLE_XML=OFF,expat" +PACKAGECONFIG[JSON] = "-DENABLE_JSON=ON,-DENABLE_JSON=OFF" +PACKAGECONFIG[MongoDB] = "-DENABLE_MONGODB=ON,-DENABLE_MONGODB=OFF" +PACKAGECONFIG[PDF] = "-DENABLE_PDF=ON,-DENABLE_PDF=OFF,zlib" +PACKAGECONFIG[Util] = "-DENABLE_UTIL=ON,-DENABLE_UTIL=OFF" +PACKAGECONFIG[Net] = "-DENABLE_NET=ON,-DENABLE_NET=OFF" +PACKAGECONFIG[NetSSL] = "-DENABLE_NETSSL=ON,-DENABLE_NETSSL=OFF,openssl" +PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON,-DENABLE_CRYPTO=OFF,openssl" +PACKAGECONFIG[JWT] = "-DENABLE_JWT=ON,-DENABLE_JWT=OFF,openssl" +PACKAGECONFIG[Data] = "-DENABLE_DATA=ON,-DENABLE_DATA=OFF" +PACKAGECONFIG[DataSQLite] = "-DENABLE_DATA_SQLITE=ON -DSQLITE3_LIBRARY:STRING=sqlite3,-DENABLE_DATA_SQLITE=OFF,sqlite3" +PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF" +PACKAGECONFIG[Encodings] = "-DENABLE_ENCODINGS=ON,-DENABLE_ENCODINGS=OFF" +PACKAGECONFIG[Redis] = "-DENABLE_REDIS=ON,-DENABLE_REDIS=OFF" +PACKAGECONFIG[Prometheus] = "-DENABLE_PROMETHEUS=ON,-DENABLE_PROMETHEUS=OFF" + +# Additional components not build by default, +# they might have dependencies not included in oe-core +# or they don't work on all architectures +PACKAGECONFIG[mod_poco] = "-DENABLE_APACHECONNECTOR=ON,-DENABLE_APACHECONNECTOR=OFF,apr apache2" +PACKAGECONFIG[CppParser] = "-DENABLE_CPPPARSER=ON,-DENABLE_CPPPARSER=OFF" +PACKAGECONFIG[DataMySQL] = "-DENABLE_DATA_MYSQL=ON -DMYSQL_LIB:STRING=mysqlclient_r,-DENABLE_DATA_MYSQL=OFF,mariadb" +PACKAGECONFIG[DataODBC] = "-DENABLE_DATA_ODBC=ON,-DENABLE_DATA_ODBC=OFF,libiodbc" +PACKAGECONFIG[ActiveRecord] = "-DENABLE_ACTIVERECORD=ON,-DENABLE_ACTIVERECORD=OFF" +PACKAGECONFIG[ActiveRecordCompiler] = "-DENABLE_ACTIVERECORD_COMPILER=ON,-DENABLE_ACTIVERECORD_COMPILER=OFF" +PACKAGECONFIG[PageCompiler] = "-DENABLE_PAGECOMPILER=ON,-DENABLE_PAGECOMPILER=OFF" +PACKAGECONFIG[PageCompilerFile2Page] = "-DENABLE_PAGECOMPILER_FILE2PAGE=ON,-DENABLE_PAGECOMPILER_FILE2PAGE=OFF" +PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF" + +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}" + +# For the native build we want to use the bundled version +EXTRA_OECMAKE:append:class-native = " -DPOCO_UNBUNDLED=OFF" + +# do not use rpath +EXTRA_OECMAKE:append = " -DCMAKE_SKIP_RPATH=ON" + +python populate_packages:prepend () { + poco_libdir = d.expand('${libdir}') + pn = d.getVar("PN") + packages = [] + testrunners = [] + + def hook(f, pkg, file_regex, output_pattern, modulename): + packages.append(pkg) + testrunners.append(modulename) + + do_split_packages(d, poco_libdir, r'^libPoco(.*)\.so\..*$', + 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) + + d.setVar("RRECOMMENDS:%s" % pn, " ".join(packages)) + d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners)) +} + +do_install_ptest () { + cp -rf ${B}/bin/ ${D}${PTEST_PATH} + cp -f ${B}/lib/libCppUnit.so* ${D}${libdir} + cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/ + find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \; + echo "${POCO_TESTRUNNERS}" > "${D}${PTEST_PATH}/testrunners" +} + +PACKAGES_DYNAMIC = "poco-.*" + +# "poco" is a metapackage which pulls in all Poco components +ALLOW_EMPTY:${PN} = "1" + +# cppunit is only built if tests are enabled +PACKAGES =+ "${PN}-cppunit" +FILES:${PN}-cppunit += "${libdir}/libCppUnit.so*" +ALLOW_EMPTY:${PN}-cppunit = "1" + +RDEPENDS:${PN}-ptest += "${PN}-cppunit" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.06.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.06.0.bb deleted file mode 100644 index 989b35a5b1..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.06.0.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE = "https://poppler.freedesktop.org/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ - file://0001-Do-not-overwrite-all-our-build-flags.patch \ - file://basename-include.patch \ - " -SRC_URI[sha256sum] = "a0f9aaa3918bad781039fc307a635652a14d1b391cd559b66edec4bedba3c5d7" - -DEPENDS = "fontconfig zlib cairo lcms glib-2.0" - -inherit cmake pkgconfig gobject-introspection - -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" -PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" -PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" -PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" -PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON -DENABLE_BOOST=ON,-DENABLE_SPLASH=OFF -DENABLE_BOOST=OFF,boost" - -# surprise - did not expect this to work :) -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -EXTRA_OECMAKE += " \ - -DENABLE_CMS=lcms2 \ - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ - -DBUILD_GTK_TESTS=OFF \ - -DENABLE_ZLIB=ON \ - -DRUN_GPERF_IF_PRESENT=OFF \ - -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ -" -EXTRA_OECMAKE:append:class-native = " -DENABLE_CPP=OFF" - -do_configure:append() { - # poppler macro uses pkg-config to check for g-ir runtimes. Something - # makes them point to /usr/bin. Align them to sysroot - that's where the - # gir-wrappers are: - sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja -} - -PACKAGES =+ "libpoppler libpoppler-glib" -FILES:libpoppler = "${libdir}/libpoppler.so.*" -FILES:libpoppler-glib = "${libdir}/libpoppler-glib.so.*" - -RDEPENDS:libpoppler = "poppler-data" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.07.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.07.0.bb new file mode 100644 index 0000000000..33723a560d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_22.07.0.bb @@ -0,0 +1,55 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE = "https://poppler.freedesktop.org/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ + file://0001-Do-not-overwrite-all-our-build-flags.patch \ + file://basename-include.patch \ + " +SRC_URI[sha256sum] = "420230c5c43782e2151259b3e523e632f4861342aad70e7e20b8773d9eaf3428" + +DEPENDS = "fontconfig zlib cairo lcms glib-2.0" + +inherit cmake pkgconfig gobject-introspection + +PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" +PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" +PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" +PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" +PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON -DENABLE_BOOST=ON,-DENABLE_SPLASH=OFF -DENABLE_BOOST=OFF,boost" + +# surprise - did not expect this to work :) +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +EXTRA_OECMAKE += " \ + -DENABLE_CMS=lcms2 \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -DBUILD_GTK_TESTS=OFF \ + -DENABLE_ZLIB=ON \ + -DRUN_GPERF_IF_PRESENT=OFF \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ +" +EXTRA_OECMAKE:append:class-native = " -DENABLE_CPP=OFF" + +do_configure:append() { + # poppler macro uses pkg-config to check for g-ir runtimes. Something + # makes them point to /usr/bin. Align them to sysroot - that's where the + # gir-wrappers are: + sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja +} + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES:libpoppler = "${libdir}/libpoppler.so.*" +FILES:libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + +RDEPENDS:libpoppler = "poppler-data" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd index b63f46ddc3..851bf252b7 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd @@ -1,4 +1,4 @@ -@version: 3.31 +@version: 3.36 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit index 07cd3b0868..70afd0da84 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit @@ -1,4 +1,4 @@ -@version: 3.31 +@version: 3.36 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.36.1.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.36.1.bb deleted file mode 100644 index 40bbfe495a..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.36.1.bb +++ /dev/null @@ -1,140 +0,0 @@ -SUMMARY = "Alternative system logger daemon" -DESCRIPTION = "syslog-ng, as the name shows, is a syslogd replacement, \ -but with new functionality for the new generation. The original syslogd \ -allows messages only to be sorted based on priority/facility pairs; \ -syslog-ng adds the possibility to filter based on message contents using \ -regular expressions. The new configuration scheme is intuitive and powerful. \ -Forwarding logs over TCP and remembering all forwarding hops makes it \ -ideal for firewalled environments. \ -" -HOMEPAGE = "http://www.balabit.com/network-security/syslog-ng/opensource-logging-system" - -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=189c3826d32deaf83ad8d0d538a10023" - -# util-linux added to get libuuid -DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native" - -SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ - file://syslog-ng.conf.systemd \ - file://syslog-ng.conf.sysvinit \ - file://initscript \ - file://volatiles.03_syslog-ng \ - file://syslog-ng-tmp.conf \ - file://syslog-ng.service-the-syslog-ng-service.patch \ -" - -SRC_URI[sha256sum] = "90a25c9767fe749db50f118ddfc92ec71399763d2ecd5ad4f11ff5eea049e60b" - -UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" - -inherit autotools gettext systemd pkgconfig update-rc.d multilib_header - -EXTRA_OECONF = " \ - --enable-dynamic-linking \ - --disable-sub-streams \ - --disable-pacct \ - --localstatedir=${localstatedir}/lib/${BPN} \ - --sysconfdir=${sysconfdir}/${BPN} \ - --with-module-dir=${libdir}/${BPN} \ - --with-sysroot=${STAGING_DIR_HOST} \ - --without-mongoc --disable-mongodb \ - --with-librabbitmq-client=no \ - --disable-python \ - --disable-java --disable-java-modules \ - --with-pidfile-dir=${localstatedir}/run/${BPN} \ -" - -PACKAGECONFIG ??= " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \ -" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," -PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd," -PACKAGECONFIG[linux-caps] = "--enable-linux-caps,--disable-linux-caps,libcap," -PACKAGECONFIG[dbi] = "--enable-sql,--disable-sql,libdbi," -PACKAGECONFIG[spoof-source] = "--enable-spoof-source --with-libnet=${STAGING_BINDIR_CROSS},--disable-spoof-source,libnet," -PACKAGECONFIG[http] = "--enable-http,--disable-http,curl," -PACKAGECONFIG[smtp] = "--enable-smtp --with-libesmtp=${STAGING_LIBDIR},--disable-smtp,libesmtp," -PACKAGECONFIG[json] = "--enable-json,--disable-json,json-c," -PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wrappers," -PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," -PACKAGECONFIG[native] = "--enable-native,--disable-native,," - -do_configure:prepend() { - olddir=$(pwd) - cd ${AUTOTOOLS_SCRIPT_PATH} - - ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} -I ${S}/m4 ${ACLOCALEXTRAPATH} || die "extra autoreconf execution failed." - - cd $olddir -} - -do_install:append() { - install -d ${D}${sysconfdir}/${BPN} - install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog - - install -d ${D}${sysconfdir}/default/volatiles/ - install -m 644 ${WORKDIR}/volatiles.03_syslog-ng ${D}${sysconfdir}/default/volatiles/03_syslog-ng - install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 644 ${WORKDIR}/syslog-ng-tmp.conf ${D}${sysconfdir}/tmpfiles.d/syslog-ng.conf - - install -d ${D}${localstatedir}/lib/${BPN} - # Remove /var/run as it is created on startup - rm -rf ${D}${localstatedir}/run - - # support for systemd - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -m 644 ${WORKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf - - install -d ${D}${systemd_unitdir}/system/ - install -m 644 ${S}/contrib/systemd/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service - install -m 644 ${S}/contrib/systemd/${BPN}@default ${D}${sysconfdir}/default/${BPN}@default - - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default - sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default - sed -i -e 's,@BASEBINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default - - install -d ${D}${systemd_unitdir}/system/multi-user.target.wants - ln -sf ../${BPN}@.service ${D}${systemd_unitdir}/system/multi-user.target.wants/${BPN}@default.service - else - install -m 644 ${WORKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf - fi - - oe_multilib_header syslog-ng/syslog-ng-config.h -} - -FILES:${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools ${systemd_unitdir}/system/multi-user.target.wants/*" -RDEPENDS:${PN} += "gawk ${@bb.utils.contains('PACKAGECONFIG','json','${PN}-jconf','',d)}" - -FILES:${PN}-jconf += " \ -${datadir}/${BPN}/include/scl/cim \ -${datadir}/${BPN}/include/scl/elasticsearch \ -${datadir}/${BPN}/include/scl/ewmm \ -${datadir}/${BPN}/include/scl/graylog2 \ -${datadir}/${BPN}/include/scl/loggly \ -${datadir}/${BPN}/include/scl/logmatic \ -" - -# This overcomes the syslog-ng rdepends on syslog-ng-dev QA Error -PACKAGES =+ "${PN}-jconf ${PN}-libs ${PN}-libs-dev" -RPROVIDES:${PN}-dbg += "${PN}-libs-dbg" -FILES:${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" -FILES:${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" -FILES:${PN}-staticdev += "${libdir}/${BPN}/libtest/*.a" -FILES:${PN} += "${systemd_unitdir}/system/*.service" -INSANE_SKIP:${PN}-libs = "dev-so" -RDEPENDS:${PN} += "${PN}-libs" - -CONFFILES:${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf" - -RCONFLICTS:${PN} = "busybox-syslog sysklogd rsyslog" -RCONFLICTS:${PN}-libs = "busybox-syslog sysklogd rsyslog" - -RPROVIDES:${PN} += "${PN}-systemd" -RREPLACES:${PN} += "${PN}-systemd" -RCONFLICTS:${PN} += "${PN}-systemd" -SYSTEMD_SERVICE:${PN} = "${BPN}@.service" - -INITSCRIPT_NAME = "syslog" -INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 90 0 1 6 ." diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.37.1.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.37.1.bb new file mode 100644 index 0000000000..10d63ccc68 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.37.1.bb @@ -0,0 +1,140 @@ +SUMMARY = "Alternative system logger daemon" +DESCRIPTION = "syslog-ng, as the name shows, is a syslogd replacement, \ +but with new functionality for the new generation. The original syslogd \ +allows messages only to be sorted based on priority/facility pairs; \ +syslog-ng adds the possibility to filter based on message contents using \ +regular expressions. The new configuration scheme is intuitive and powerful. \ +Forwarding logs over TCP and remembering all forwarding hops makes it \ +ideal for firewalled environments. \ +" +HOMEPAGE = "http://www.balabit.com/network-security/syslog-ng/opensource-logging-system" + +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=189c3826d32deaf83ad8d0d538a10023" + +# util-linux added to get libuuid +DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native" + +SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ + file://syslog-ng.conf.systemd \ + file://syslog-ng.conf.sysvinit \ + file://initscript \ + file://volatiles.03_syslog-ng \ + file://syslog-ng-tmp.conf \ + file://syslog-ng.service-the-syslog-ng-service.patch \ +" + +SRC_URI[sha256sum] = "d67a320cb896cd5d62f24d9e1bec138847fa4618ae13a3946cae2b75c528ee14" + +UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" + +inherit autotools gettext systemd pkgconfig update-rc.d multilib_header + +EXTRA_OECONF = " \ + --enable-dynamic-linking \ + --disable-sub-streams \ + --disable-pacct \ + --localstatedir=${localstatedir}/lib/${BPN} \ + --sysconfdir=${sysconfdir}/${BPN} \ + --with-module-dir=${libdir}/${BPN} \ + --with-sysroot=${STAGING_DIR_HOST} \ + --without-mongoc --disable-mongodb \ + --with-librabbitmq-client=no \ + --disable-python \ + --disable-java --disable-java-modules \ + --with-pidfile-dir=${localstatedir}/run/${BPN} \ +" + +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \ +" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," +PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd," +PACKAGECONFIG[linux-caps] = "--enable-linux-caps,--disable-linux-caps,libcap," +PACKAGECONFIG[dbi] = "--enable-sql,--disable-sql,libdbi," +PACKAGECONFIG[spoof-source] = "--enable-spoof-source --with-libnet=${STAGING_BINDIR_CROSS},--disable-spoof-source,libnet," +PACKAGECONFIG[http] = "--enable-http,--disable-http,curl," +PACKAGECONFIG[smtp] = "--enable-smtp --with-libesmtp=${STAGING_LIBDIR},--disable-smtp,libesmtp," +PACKAGECONFIG[json] = "--enable-json,--disable-json,json-c," +PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wrappers," +PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," +PACKAGECONFIG[native] = "--enable-native,--disable-native,," + +do_configure:prepend() { + olddir=$(pwd) + cd ${AUTOTOOLS_SCRIPT_PATH} + + ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} -I ${S}/m4 ${ACLOCALEXTRAPATH} || die "extra autoreconf execution failed." + + cd $olddir +} + +do_install:append() { + install -d ${D}${sysconfdir}/${BPN} + install -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog + + install -d ${D}${sysconfdir}/default/volatiles/ + install -m 644 ${WORKDIR}/volatiles.03_syslog-ng ${D}${sysconfdir}/default/volatiles/03_syslog-ng + install -d ${D}${sysconfdir}/tmpfiles.d/ + install -m 644 ${WORKDIR}/syslog-ng-tmp.conf ${D}${sysconfdir}/tmpfiles.d/syslog-ng.conf + + install -d ${D}${localstatedir}/lib/${BPN} + # Remove /var/run as it is created on startup + rm -rf ${D}${localstatedir}/run + + # support for systemd + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -m 644 ${WORKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf + + install -d ${D}${systemd_unitdir}/system/ + install -m 644 ${S}/contrib/systemd/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service + install -m 644 ${S}/contrib/systemd/${BPN}@default ${D}${sysconfdir}/default/${BPN}@default + + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default + sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default + sed -i -e 's,@BASEBINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default + + install -d ${D}${systemd_unitdir}/system/multi-user.target.wants + ln -sf ../${BPN}@.service ${D}${systemd_unitdir}/system/multi-user.target.wants/${BPN}@default.service + else + install -m 644 ${WORKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf + fi + + oe_multilib_header syslog-ng/syslog-ng-config.h +} + +FILES:${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools ${systemd_unitdir}/system/multi-user.target.wants/*" +RDEPENDS:${PN} += "gawk ${@bb.utils.contains('PACKAGECONFIG','json','${PN}-jconf','',d)}" + +FILES:${PN}-jconf += " \ +${datadir}/${BPN}/include/scl/cim \ +${datadir}/${BPN}/include/scl/elasticsearch \ +${datadir}/${BPN}/include/scl/ewmm \ +${datadir}/${BPN}/include/scl/graylog2 \ +${datadir}/${BPN}/include/scl/loggly \ +${datadir}/${BPN}/include/scl/logmatic \ +" + +# This overcomes the syslog-ng rdepends on syslog-ng-dev QA Error +PACKAGES =+ "${PN}-jconf ${PN}-libs ${PN}-libs-dev" +RPROVIDES:${PN}-dbg += "${PN}-libs-dbg" +FILES:${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" +FILES:${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" +FILES:${PN}-staticdev += "${libdir}/${BPN}/libtest/*.a" +FILES:${PN} += "${systemd_unitdir}/system/*.service" +INSANE_SKIP:${PN}-libs = "dev-so" +RDEPENDS:${PN} += "${PN}-libs" + +CONFFILES:${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf" + +RCONFLICTS:${PN} = "busybox-syslog sysklogd rsyslog" +RCONFLICTS:${PN}-libs = "busybox-syslog sysklogd rsyslog" + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "${BPN}@.service" + +INITSCRIPT_NAME = "syslog" +INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 90 0 1 6 ." diff --git a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.6.1.bb b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.6.1.bb deleted file mode 100644 index 7d72a5198b..0000000000 --- a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.6.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Bash Automated Testing System" -DESCRIPTION = "Bats is a TAP-compliant testing framework for Bash. It \ -provides a simple way to verify that the UNIX programs you write behave as expected." -AUTHOR = "Sam Stephenson & bats-core organization" -HOMEPAGE = "https://github.com/bats-core/bats-core" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2970203aedf9e829edb96a137a4fe81b" - -SRC_URI = "\ - git://github.com/bats-core/bats-core.git;branch=version/1.6.x;protocol=https \ - " - -# v1.6.1 -SRCREV = "1977254c2a7faa2e0af17355856f91dc471d1daa" - -S = "${WORKDIR}/git" - -do_configure:prepend() { - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-file - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-test -} - -do_install() { - # Just a bunch of bash scripts to install - ${S}/install.sh ${D}${prefix} ${baselib} -} - -RDEPENDS:${PN} = "bash" -FILES:${PN} += "${libdir}/bats-core/*" - -PACKAGECONFIG ??= "pretty" -PACKAGECONFIG[pretty] = ",,,ncurses" diff --git a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.7.0.bb b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.7.0.bb new file mode 100644 index 0000000000..81235e29b0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.7.0.bb @@ -0,0 +1,33 @@ +SUMMARY = "Bash Automated Testing System" +DESCRIPTION = "Bats is a TAP-compliant testing framework for Bash. It \ +provides a simple way to verify that the UNIX programs you write behave as expected." +AUTHOR = "Sam Stephenson & bats-core organization" +HOMEPAGE = "https://github.com/bats-core/bats-core" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2970203aedf9e829edb96a137a4fe81b" + +SRC_URI = "\ + git://github.com/bats-core/bats-core.git;branch=master;protocol=https \ + " + +# v1.7.0 +SRCREV = "410dd229a5ed005c68167cc90ed0712ad2a1c909" + +S = "${WORKDIR}/git" + +do_configure:prepend() { + sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats + sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-file + sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-test +} + +do_install() { + # Just a bunch of bash scripts to install + ${S}/install.sh ${D}${prefix} ${baselib} +} + +RDEPENDS:${PN} = "bash" +FILES:${PN} += "${libdir}/bats-core/*" + +PACKAGECONFIG ??= "pretty" +PACKAGECONFIG[pretty] = ",,,ncurses" diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb index 869c2c86b6..edca0bc462 100644 --- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb @@ -4,13 +4,13 @@ SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" -PV = "1.11.0+git${SRCPV}" +PV = "1.12.1" PROVIDES += "gmock gtest" S = "${WORKDIR}/git" -SRCREV = "9e712372214d75bb30ec2847a44bf124d48096f3" -SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https" +SRCREV = "58d77fa8070e8cec2dc1ed015d66b454c8d78850" +SRC_URI = "git://github.com/google/googletest.git;branch=v1.12.x;protocol=https" inherit cmake diff --git a/meta-openembedded/meta-perl/recipes-perl/libcrypt/files/0001-Fix-for-Issue-31.patch b/meta-openembedded/meta-perl/recipes-perl/libcrypt/files/0001-Fix-for-Issue-31.patch deleted file mode 100644 index a5ea43f88b..0000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libcrypt/files/0001-Fix-for-Issue-31.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5e8202458e41ba1f7801746c503fe7c60ae340d5 Mon Sep 17 00:00:00 2001 -From: kambe-mikb <77083885+kambe-mikb@users.noreply.github.com> -Date: Tue, 28 Sep 2021 17:40:18 +1000 -Subject: [PATCH] Fix for Issue 31 - -Fix Issue 31 by removing reference to RSA_SSLV23_PADDING (removed from OpenSSL starting from v3.0.0) - -Upstream-Status: Submitted [https://github.com/toddr/Crypt-OpenSSL-RSA/pull/32] -Signed-off-by: Khem Raj ---- - RSA.xs | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/RSA.xs b/RSA.xs -index 46cb199..4f65dfc 100644 ---- a/RSA.xs -+++ b/RSA.xs -@@ -640,12 +640,16 @@ use_pkcs1_oaep_padding(p_rsa) - CODE: - p_rsa->padding = RSA_PKCS1_OAEP_PADDING; - -+#if OPENSSL_VERSION_NUMBER < 0x30000000L -+ - void - use_sslv23_padding(p_rsa) - rsaData* p_rsa; - CODE: - p_rsa->padding = RSA_SSLV23_PADDING; - -+#endif -+ - # Sign text. Returns the signature. - - SV* --- -2.33.1 - diff --git a/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess-perl_0.15.bb b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess-perl_0.15.bb index 3f004bb2ec..d64fc296e2 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess-perl_0.15.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess-perl_0.15.bb @@ -29,7 +29,7 @@ inherit cpan ptest-perl BBCLASSEXTEND = "native" # for backwards compatibility -PROVIDES_${PN} += "libcrypt-openssl-guess" +PROVIDES += "libcrypt-openssl-guess" RDEPENDS:${PN}-ptest += "\ perl-module-test-more \ diff --git a/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.32.bb b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.32.bb deleted file mode 100644 index fd92c8a8db..0000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.32.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Crypt Openssl RSA cpan module" -SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a67ceecc5d9a91a5a0d003ba50c26346" - -SRC_URI = "http://www.cpan.org/modules/by-module/Crypt/Crypt-OpenSSL-RSA-${PV}.tar.gz \ - file://0001-Fix-for-Issue-31.patch \ -" - -SRC_URI[sha256sum] = "adc74f0ae125c77f65d5dd32abb9c3429300a79543bf263494f333f9c0b62a61" - -DEPENDS += "libcrypt-openssl-guess-perl-native openssl" - -RDEPENDS:${PN} = " \ - libcrypt-openssl-random-perl \ - perl-module-autoloader \ - perl-module-carp \ - perl-module-strict \ - perl-module-warnings \ - perl-module-xsloader \ -" - -EXTRA_CPANFLAGS = "INC='-I${STAGING_INCDIR}' LIBS='-L${STAGING_LIBDIR} -lssl -L${STAGING_DIR_TARGET}${base_libdir} -lcrypto'" - -S = "${WORKDIR}/Crypt-OpenSSL-RSA-${PV}" - -inherit cpan ptest-perl - -do_compile() { - export OTHERLDFLAGS='-Wl,-rpath' - cpan_do_compile -} - -RDEPENDS:${PN}-ptest = " \ - ${PN} \ - perl-module-file-copy \ - perl-module-test \ - perl-module-test-more \ -" diff --git a/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.33.bb b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.33.bb new file mode 100644 index 0000000000..aa8d138f2c --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.33.bb @@ -0,0 +1,38 @@ +SUMMARY = "Crypt Openssl RSA cpan module" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a67ceecc5d9a91a5a0d003ba50c26346" + +SRC_URI = "http://www.cpan.org/modules/by-module/Crypt/Crypt-OpenSSL-RSA-${PV}.tar.gz \ +" + +SRC_URI[sha256sum] = "bdbe630f6d6f540325746ad99977272ac8664ff81bd19f0adaba6d6f45efd864" + +DEPENDS += "libcrypt-openssl-guess-perl-native openssl" + +RDEPENDS:${PN} = " \ + libcrypt-openssl-random-perl \ + perl-module-autoloader \ + perl-module-carp \ + perl-module-strict \ + perl-module-warnings \ + perl-module-xsloader \ +" + +EXTRA_CPANFLAGS = "INC='-I${STAGING_INCDIR}' LIBS='-L${STAGING_LIBDIR} -lssl -L${STAGING_DIR_TARGET}${base_libdir} -lcrypto'" + +S = "${WORKDIR}/Crypt-OpenSSL-RSA-${PV}" + +inherit cpan ptest-perl + +do_compile() { + export OTHERLDFLAGS='-Wl,-rpath' + cpan_do_compile +} + +RDEPENDS:${PN}-ptest = " \ + ${PN} \ + perl-module-file-copy \ + perl-module-test \ + perl-module-test-more \ +" diff --git a/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.17.bb b/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.17.bb deleted file mode 100644 index 8b4f292a35..0000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.17.bb +++ /dev/null @@ -1,105 +0,0 @@ -# NOTE: -# You should use perl-module-encode rather than this package -# unless you specifically need a version newer than what is -# provided by perl. - -SUMMARY = "Encode - character encodings" -DESCRIPTION = "The \"Encode\" module provides the interfaces between \ -Perl's strings and the rest of the system. Perl strings are sequences \ -of characters." - -AUTHOR = "Dan Kogai " -HOMEPAGE = "https://metacpan.org/release/Encode" -SECTION = "lib" -LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://META.json;beginline=8;endline=10;md5=b12e3be1e17a7e99ca4f429ff32c28b5" - -SRC_URI = "${CPAN_MIRROR}/authors/id/D/DA/DANKOGAI/Encode-${PV}.tar.gz" -SRC_URI[sha256sum] = "b44cbf7dd60ec6128ec575dd348484975086522611bc7580cfd305a095faa6d2" - -UPSTREAM_CHECK_REGEX = "Encode\-(?P(\d+\.\d+))(?!_\d+).tar" - -S = "${WORKDIR}/Encode-${PV}" - -inherit cpan ptest-perl - -do_install:prepend() { - # Requires "-T" (taint) option on command line - rm -rf ${B}/t/taint.t - # Circular dependency of perl-module-open on perl-module-encode - # and we cannot load perl-module-encode because we are providing - # an alternative - rm -rf ${B}/t/use-Encode-Alias.t -} - -do_install_ptest() { - mkdir ${D}${PTEST_PATH}/bin - cp -r ${B}/bin/piconv ${D}${PTEST_PATH}/bin - cp -r ${B}/blib ${D}${PTEST_PATH} - chown -R root:root ${D}${PTEST_PATH} -} - -# file /usr/bin/enc2xs from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 -# file /usr/bin/encguess from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 -# file /usr/bin/piconv from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 -RCONFLICTS:${PN} = "perl-misc perl-module-encode" - -RDEPENDS:${PN} += " \ - perl-module-bytes \ - perl-module-constant \ - perl-module-parent \ - perl-module-storable \ - perl-module-xsloader \ - " - -RPROVIDES:${PN} += " \ - libencode-alias-perl \ - libencode-byte-perl \ - libencode-cjkconstants-perl \ - libencode-cn-perl \ - libencode-cn-hz-perl \ - libencode-config-perl \ - libencode-ebcdic-perl \ - libencode-encoder-perl \ - libencode-encoding-perl \ - libencode-gsm0338-perl \ - libencode-guess-perl \ - libencode-jp-perl \ - libencode-jp-h2z-perl \ - libencode-jp-jis7-perl \ - libencode-kr-perl \ - libencode-kr-2022_kr-perl \ - libencode-mime-header-perl \ - libencode-mime-name-perl \ - libencode-symbol-perl \ - libencode-tw-perl \ - libencode-unicode-perl \ - libencode-unicode-utf7-perl \ - libencoding-perl \ - libencode-internal-perl \ - libencode-mime-header-iso_2022_jp-perl \ - libencode-utf8-perl \ - libencode-utf_ebcdic-perl \ - " - -RDEPENDS:${PN}-ptest += " \ - perl-module-blib \ - perl-module-charnames \ - perl-module-file-compare \ - perl-module-file-copy \ - perl-module-filehandle \ - perl-module-findbin \ - perl-module-integer \ - perl-module-io-select \ - perl-module-ipc-open3 \ - perl-module-mime-base64 \ - perl-module-perlio \ - perl-module-perlio-encoding \ - perl-module-perlio-scalar \ - perl-module-test-more \ - perl-module-tie-scalar \ - perl-module-unicore \ - perl-module-utf8 \ - " - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.18.bb b/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.18.bb new file mode 100644 index 0000000000..999863b1fe --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.18.bb @@ -0,0 +1,105 @@ +# NOTE: +# You should use perl-module-encode rather than this package +# unless you specifically need a version newer than what is +# provided by perl. + +SUMMARY = "Encode - character encodings" +DESCRIPTION = "The \"Encode\" module provides the interfaces between \ +Perl's strings and the rest of the system. Perl strings are sequences \ +of characters." + +AUTHOR = "Dan Kogai " +HOMEPAGE = "https://metacpan.org/release/Encode" +SECTION = "lib" +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" +LIC_FILES_CHKSUM = "file://META.json;beginline=8;endline=10;md5=b12e3be1e17a7e99ca4f429ff32c28b5" + +SRC_URI = "${CPAN_MIRROR}/authors/id/D/DA/DANKOGAI/Encode-${PV}.tar.gz" +SRC_URI[sha256sum] = "74dcbd851171a68cf3ef225568ece47b0959b8e3cda887482fde97c1ae1691e2" + +UPSTREAM_CHECK_REGEX = "Encode\-(?P(\d+\.\d+))(?!_\d+).tar" + +S = "${WORKDIR}/Encode-${PV}" + +inherit cpan ptest-perl + +do_install:prepend() { + # Requires "-T" (taint) option on command line + rm -rf ${B}/t/taint.t + # Circular dependency of perl-module-open on perl-module-encode + # and we cannot load perl-module-encode because we are providing + # an alternative + rm -rf ${B}/t/use-Encode-Alias.t +} + +do_install_ptest() { + mkdir ${D}${PTEST_PATH}/bin + cp -r ${B}/bin/piconv ${D}${PTEST_PATH}/bin + cp -r ${B}/blib ${D}${PTEST_PATH} + chown -R root:root ${D}${PTEST_PATH} +} + +# file /usr/bin/enc2xs from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 +# file /usr/bin/encguess from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 +# file /usr/bin/piconv from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 +RCONFLICTS:${PN} = "perl-misc perl-module-encode" + +RDEPENDS:${PN} += " \ + perl-module-bytes \ + perl-module-constant \ + perl-module-parent \ + perl-module-storable \ + perl-module-xsloader \ + " + +RPROVIDES:${PN} += " \ + libencode-alias-perl \ + libencode-byte-perl \ + libencode-cjkconstants-perl \ + libencode-cn-perl \ + libencode-cn-hz-perl \ + libencode-config-perl \ + libencode-ebcdic-perl \ + libencode-encoder-perl \ + libencode-encoding-perl \ + libencode-gsm0338-perl \ + libencode-guess-perl \ + libencode-jp-perl \ + libencode-jp-h2z-perl \ + libencode-jp-jis7-perl \ + libencode-kr-perl \ + libencode-kr-2022_kr-perl \ + libencode-mime-header-perl \ + libencode-mime-name-perl \ + libencode-symbol-perl \ + libencode-tw-perl \ + libencode-unicode-perl \ + libencode-unicode-utf7-perl \ + libencoding-perl \ + libencode-internal-perl \ + libencode-mime-header-iso_2022_jp-perl \ + libencode-utf8-perl \ + libencode-utf_ebcdic-perl \ + " + +RDEPENDS:${PN}-ptest += " \ + perl-module-blib \ + perl-module-charnames \ + perl-module-file-compare \ + perl-module-file-copy \ + perl-module-filehandle \ + perl-module-findbin \ + perl-module-integer \ + perl-module-io-select \ + perl-module-ipc-open3 \ + perl-module-mime-base64 \ + perl-module-perlio \ + perl-module-perlio-encoding \ + perl-module-perlio-scalar \ + perl-module-test-more \ + perl-module-tie-scalar \ + perl-module-unicore \ + perl-module-utf8 \ + " + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/classes/python_hatchling.bbclass b/meta-openembedded/meta-python/classes/python_hatchling.bbclass deleted file mode 100644 index b3cbe23601..0000000000 --- a/meta-openembedded/meta-python/classes/python_hatchling.bbclass +++ /dev/null @@ -1,5 +0,0 @@ -inherit python_pep517 python3native python3-dir setuptools3-base - -DEPENDS += "python3-hatchling-native" - -PEP517_BUILD_API = "hatchling.build" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.2.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.2.0.bb index 045655caa4..359a2918cf 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.2.0.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python3-pyconnman_0.2.0.bb @@ -9,4 +9,4 @@ SRC_URI[sha256sum] = "d3a63a039c82b08a1171b003eafa62c6f128aa4eaa1ce7a55a9401b48f inherit pypi setuptools3 -RDEPENDS:${PN} = "connman python3-dbus python3-pprint" +RDEPENDS:${PN} = "connman python3-dbus python3-pprint python3-future" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_1.0.0.bb deleted file mode 100644 index 736e6a9444..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_1.0.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Abseil Python Common Libraries" -HOMEPAGE = "https://github.com/abseil/abseil-py" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI[sha256sum] = "ac511215c01ee9ae47b19716599e8ccfa746f2e18de72bdf641b79b22afa27ea" - -PYPI_PACKAGE = "absl-py" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_1.1.0.bb new file mode 100644 index 0000000000..e3f7c4c6ae --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_1.1.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Abseil Python Common Libraries" +HOMEPAGE = "https://github.com/abseil/abseil-py" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI[sha256sum] = "3aa39f898329c2156ff525dfa69ce709e42d77aab18bf4917719d6f260aa6a08" + +PYPI_PACKAGE = "absl-py" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.4.1.bb deleted file mode 100644 index b3a88fb677..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.4.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Asynchronous library to control Philips Hue" -HOMEPAGE = "https://pypi.org/project/aiohue/" -SECTION = "devel/python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dab31a1d28183826937f4b152143a33f" - -SRC_URI[sha256sum] = "fa3bb0cf68aefdd0710704443c896abda69ae227500ad9539ac6c3d1d6dad804" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-aiohttp \ - ${PYTHON_PN}-asyncio-throttle \ - ${PYTHON_PN}-profile \ - ${PYTHON_PN}-awesomeversion \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.4.2.bb new file mode 100644 index 0000000000..63d29a48fb --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.4.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Asynchronous library to control Philips Hue" +HOMEPAGE = "https://pypi.org/project/aiohue/" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dab31a1d28183826937f4b152143a33f" + +SRC_URI[sha256sum] = "871c27da3d5a5b7d7c5049e6d23713425a2f251639ff1fb5fac460724ba42f15" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-aiohttp \ + ${PYTHON_PN}-asyncio-throttle \ + ${PYTHON_PN}-profile \ + ${PYTHON_PN}-awesomeversion \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.7.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.7.7.bb deleted file mode 100644 index 6b7ac4a99c..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.7.7.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "A database migration tool for SQLAlchemy" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f5a8522010db1a393833988dbe2c7f0b" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "4961248173ead7ce8a21efb3de378f13b8398e6630fab0eb258dc74a8af24c58" - -PYPI_PACKAGE = "alembic" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-editor \ - ${PYTHON_PN}-mako \ - ${PYTHON_PN}-sqlalchemy \ - ${PYTHON_PN}-misc \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.8.0.bb new file mode 100644 index 0000000000..3b12439cbc --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.8.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "A database migration tool for SQLAlchemy" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f5a8522010db1a393833988dbe2c7f0b" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "a2d4d90da70b30e70352cd9455e35873a255a31402a438fe24815758d7a0e5e1" + +PYPI_PACKAGE = "alembic" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-dateutil \ + ${PYTHON_PN}-editor \ + ${PYTHON_PN}-mako \ + ${PYTHON_PN}-sqlalchemy \ + ${PYTHON_PN}-misc \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.7.0.bb deleted file mode 100644 index 0f1804de88..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.7.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRPTION = "ansi2html - Convert text with ANSI color codes to HTML or to LaTeX" -HOMEPAGE = "https://github.com/ralphbean/ansi2html" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3000208d539ec061b899bce1d9ce9404" -LICENSE = "GPL-3.0-only" - -PYPI_PACKAGE = "ansi2html" - -SRC_URI[sha256sum] = "69316be8c68ac91c5582d397c2890e69c993cc7cda52062ac7e45fcb660d8edc" - -inherit pypi python_setuptools_build_meta - -DEPENDS += " \ - ${PYTHON_PN}-setuptools-scm-native \ - ${PYTHON_PN}-toml-native \ -" - -RDEPENDS:${PN} = " \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-compression \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.8.0.bb new file mode 100644 index 0000000000..21095cb7d6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.8.0.bb @@ -0,0 +1,20 @@ +DESCRPTION = "ansi2html - Convert text with ANSI color codes to HTML or to LaTeX" +HOMEPAGE = "https://github.com/ralphbean/ansi2html" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3000208d539ec061b899bce1d9ce9404" +LICENSE = "GPL-3.0-only" + +PYPI_PACKAGE = "ansi2html" + +SRC_URI[sha256sum] = "38b82a298482a1fa2613f0f9c9beb3db72a8f832eeac58eb2e47bf32cd37f6d5" + +inherit pypi python_setuptools_build_meta + +DEPENDS += " \ + ${PYTHON_PN}-setuptools-scm-native \ + ${PYTHON_PN}-toml-native \ +" + +RDEPENDS:${PN} = " \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-compression \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.11.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.11.5.bb deleted file mode 100644 index f11a4a13d6..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.11.5.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "An abstract syntax tree for Python with inference support." -HOMEPAGE = "https://pypi.python.org/pypi/astroid" -SECTION = "devel/python" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" - -SRC_URI[sha256sum] = "f4e4ec5294c4b07ac38bab9ca5ddd3914d4bf46f9006eb5c0ae755755061044e" - -inherit pypi setuptools3 - -DEPENDS += "${PYTHON_PN}-pytest-runner-native" - -PACKAGES =+ "${PN}-tests" - -FILES:${PN}-tests += " \ - ${PYTHON_SITEPACKAGES_DIR}/astroid/test* \ - ${PYTHON_SITEPACKAGES_DIR}/astroid/__pycache__/test* \ -" - -RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-distutils \ - ${PYTHON_PN}-lazy-object-proxy \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-wrapt \ - ${PYTHON_PN}-setuptools \ -" - -RDEPENDS:${PN}-tests:class-target += "\ - ${PYTHON_PN}-unittest \ - ${PYTHON_PN}-xml \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.11.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.11.6.bb new file mode 100644 index 0000000000..4f9d1af939 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.11.6.bb @@ -0,0 +1,32 @@ +SUMMARY = "An abstract syntax tree for Python with inference support." +HOMEPAGE = "https://pypi.python.org/pypi/astroid" +SECTION = "devel/python" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" + +SRC_URI[sha256sum] = "4f933d0bf5e408b03a6feb5d23793740c27e07340605f236496cd6ce552043d6" + +inherit pypi setuptools3 + +DEPENDS += "${PYTHON_PN}-pytest-runner-native" + +PACKAGES =+ "${PN}-tests" + +FILES:${PN}-tests += " \ + ${PYTHON_SITEPACKAGES_DIR}/astroid/test* \ + ${PYTHON_SITEPACKAGES_DIR}/astroid/__pycache__/test* \ +" + +RDEPENDS:${PN}:class-target += "\ + ${PYTHON_PN}-distutils \ + ${PYTHON_PN}-lazy-object-proxy \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-wrapt \ + ${PYTHON_PN}-setuptools \ +" + +RDEPENDS:${PN}-tests:class-target += "\ + ${PYTHON_PN}-unittest \ + ${PYTHON_PN}-xml \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.3.bb deleted file mode 100644 index 189547bae7..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.3.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "A simple optionally-async python inotify library, focused on simplicity of use and operation, and leveraging modern Python features" -HOMEPAGE = "https://gitlab.com/Taywee/asyncinotify" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec941a1cd6616454970d03cb9c9e8f8" - -SRC_URI[sha256sum] = "a14baf680a3d3e1cf54e082ab56f56c475d59d3644cfc25c00c460e56d9bbdf7" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - python3-asyncio \ - python3-core \ - python3-ctypes \ - python3-io \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.5.bb new file mode 100644 index 0000000000..4c64508752 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-asyncinotify_2.0.5.bb @@ -0,0 +1,15 @@ +SUMMARY = "A simple optionally-async python inotify library, focused on simplicity of use and operation, and leveraging modern Python features" +HOMEPAGE = "https://gitlab.com/Taywee/asyncinotify" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec941a1cd6616454970d03cb9c9e8f8" + +SRC_URI[sha256sum] = "e4d95cba362f10d33b6fdd558afd39f0ea7a5be1a9694434e738141cbed366d9" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-asyncio \ + python3-core \ + python3-ctypes \ + python3-io \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_22.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_22.4.2.bb deleted file mode 100644 index 3dc308385b..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_22.4.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "WebSocket client & server library, WAMP real-time framework" -HOMEPAGE = "http://crossbar.io/autobahn" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" - -SRC_URI[sha256sum] = "57b7acf228d50d83cf327372b889e2a168a869275b26e17917ed0b4cf4d823a6" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-twisted \ - ${PYTHON_PN}-zopeinterface \ - ${PYTHON_PN}-py-ubjson \ - ${PYTHON_PN}-cbor2 \ - ${PYTHON_PN}-u-msgpack-python \ - ${PYTHON_PN}-lz4 \ - ${PYTHON_PN}-snappy \ - ${PYTHON_PN}-pyopenssl \ - ${PYTHON_PN}-txaio \ - ${PYTHON_PN}-six \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_22.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_22.6.1.bb new file mode 100644 index 0000000000..71da18f812 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_22.6.1.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "WebSocket client & server library, WAMP real-time framework" +HOMEPAGE = "http://crossbar.io/autobahn" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=97c0bda20ad1d845c6369c0e47a1cd98" + +SRC_URI[sha256sum] = "fb63e946d5c2dd0df680851e84e65624a494ce87c999f2a4944e4f2d81bf4498" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-twisted \ + ${PYTHON_PN}-zopeinterface \ + ${PYTHON_PN}-py-ubjson \ + ${PYTHON_PN}-cbor2 \ + ${PYTHON_PN}-u-msgpack-python \ + ${PYTHON_PN}-lz4 \ + ${PYTHON_PN}-snappy \ + ${PYTHON_PN}-pyopenssl \ + ${PYTHON_PN}-txaio \ + ${PYTHON_PN}-six \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_22.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_22.5.2.bb deleted file mode 100644 index c43f9ee544..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_22.5.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "One version package to rule them all, One version package to find them, One version package to bring them all, and in the darkness bind them." -HOMEPAGE = "https://pypi.org/project/awesomeversion/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE.md;md5=92622b5a8e216099be741d78328bae5d" - -SRC_URI[sha256sum] = "051f89efd8ba0b157fb516bda5e1dad4d63f87e8f9c0c148930023d984fce62f" - -RDEPENDS:${PN} += "python3-profile python3-logging" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_22.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_22.6.0.bb new file mode 100644 index 0000000000..cadb6f502d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_22.6.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "One version package to rule them all, One version package to find them, One version package to bring them all, and in the darkness bind them." +HOMEPAGE = "https://pypi.org/project/awesomeversion/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE.md;md5=92622b5a8e216099be741d78328bae5d" + +SRC_URI[sha256sum] = "38f580bfacf1c06b674bcd0f68e0c445ebb03fcd3700c6a2c588fb9313308e0f" + +RDEPENDS:${PN} += "python3-profile python3-logging" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.14.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.14.1.bb deleted file mode 100644 index 77ef98570f..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.14.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "This module performs conversions between Python values and C bit field structs represented as Python byte strings." -HOMEPAGE = "https://github.com/eerimoq/bitstruct" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" - -SRC_URI[sha256sum] = "d38131bd447b6af5b8f464c4878797c87a5d9da1c95b9357e071c424fde5f055" - -PYPI_PACKAGE = "bitstruct" - -inherit pypi setuptools3 - -CLEANBROKEN = "1" - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.15.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.15.1.bb new file mode 100644 index 0000000000..fe3aeb7b58 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.15.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "This module performs conversions between Python values and C bit field structs represented as Python byte strings." +HOMEPAGE = "https://github.com/eerimoq/bitstruct" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" + +SRC_URI[sha256sum] = "6fa6adbfb8f3b8cb68c21b13aa65d23eb2c3ac32419ab926f3fd1fff717a9125" + +PYPI_PACKAGE = "bitstruct" + +inherit pypi setuptools3 + +CLEANBROKEN = "1" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-can_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-can_4.0.0.bb index 2cd2e624b9..b1ba6849be 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-can_4.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-can_4.0.0.bb @@ -21,6 +21,7 @@ RDEPENDS:${PN}:class-target += "\ ${PYTHON_PN}-sqlite3 \ ${PYTHON_PN}-wrapt \ ${PYTHON_PN}-pkg-resources \ + ${PYTHON_PN}-typing-extensions \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_37.0.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_37.0.7.bb deleted file mode 100644 index c179071afa..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_37.0.7.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "CAN BUS tools in Python 3." -HOMEPAGE = "https://github.com/eerimoq/cantools" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" - -SRC_URI[sha256sum] = "e603a7e1e40f5b4963c4c64cf4b013264afa009e232a878c73d31c29942e4466" - -PYPI_PACKAGE = "cantools" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-can \ - ${PYTHON_PN}-bitstruct \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-textparser \ - ${PYTHON_PN}-typing-extensions \ - ${PYTHON_PN}-diskcache \ -" - -CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_37.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_37.1.0.bb new file mode 100644 index 0000000000..1af1310aba --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_37.1.0.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "CAN BUS tools in Python 3." +HOMEPAGE = "https://github.com/eerimoq/cantools" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" + +SRC_URI[sha256sum] = "9f2449e94a7698bd44bb50d9b464788053a0bf070faa09a132535c3aa07e7e6a" + +PYPI_PACKAGE = "cantools" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-can \ + ${PYTHON_PN}-bitstruct \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-textparser \ + ${PYTHON_PN}-typing-extensions \ + ${PYTHON_PN}-diskcache \ + ${PYTHON_PN}-asyncio \ +" + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.4.2.bb deleted file mode 100644 index cafc32ad10..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.4.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "An implementation of RFC 7049 - Concise Binary Object Representation (CBOR)." -DEPENDS +="${PYTHON_PN}-setuptools-scm-native" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -SRC_URI[sha256sum] = "e283e70b55a049ff364cc5e648fde587e4d9b0e87e4b2664c69e639135e6b3b8" - -inherit pypi python_setuptools_build_meta ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-unixadmin \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-datetime \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.4.3.bb new file mode 100644 index 0000000000..0890b99c08 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.4.3.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "An implementation of RFC 7049 - Concise Binary Object Representation (CBOR)." +DEPENDS +="${PYTHON_PN}-setuptools-scm-native" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +SRC_URI[sha256sum] = "62b863c5ee6ced4032afe948f3c1484f375550995d3b8498145237fe28e546c2" + +inherit pypi python_setuptools_build_meta ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unixadmin \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-datetime \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_2.0.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_2.0.12.bb deleted file mode 100644 index 47b8579a1a..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_2.0.12.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -HOMEPAGE = "https://github.com/ousret/charset_normalizer" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0974a390827087287db39928f7c524b5" - -SRC_URI[sha256sum] = "2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-json \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_2.1.0.bb new file mode 100644 index 0000000000..7c3d3ffc14 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_2.1.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." +HOMEPAGE = "https://github.com/ousret/charset_normalizer" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0974a390827087287db39928f7c524b5" + +SRC_URI[sha256sum] = "575e708016ff3a5e3681541cb9d79312c416835686d054a23accb873b254f413" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-codecs \ + ${PYTHON_PN}-json \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.4.bb deleted file mode 100644 index 54640de04e..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Cross-platform colored terminal text." -HOMEPAGE = "https://github.com/tartley/colorama" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26" - -inherit pypi setuptools3 - -SRC_URI[md5sum] = "57b22f2597f63df051b69906fbf310cc" -SRC_URI[sha256sum] = "5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.5.bb new file mode 100644 index 0000000000..122ae53991 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.5.bb @@ -0,0 +1,10 @@ +SUMMARY = "Cross-platform colored terminal text." +HOMEPAGE = "https://github.com/tartley/colorama" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_6.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_6.3.2.bb deleted file mode 100644 index 3c6b45705e..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_6.3.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Code coverage measurement for Python" -HOMEPAGE = "https://coverage.readthedocs.io" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" - -SRC_URI[sha256sum] = "03e2a7826086b91ef345ff18742ee9fc47a6839ccd517061ef8fa1976e652ce9" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-sqlite3 \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-xml \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_6.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_6.4.1.bb new file mode 100644 index 0000000000..d352cdadff --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_6.4.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "Code coverage measurement for Python" +HOMEPAGE = "https://coverage.readthedocs.io" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" + +SRC_URI[sha256sum] = "4321f075095a096e70aff1d002030ee612b65a205a0a0f5b815280d5dc58100c" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-sqlite3 \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-xml \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-crc32c_2.2.post0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-crc32c_2.2.post0.bb deleted file mode 100644 index 4f6a3aba99..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-crc32c_2.2.post0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A python package implementing the crc32c algorithmin hardware and software" -HOMEPAGE = "https://github.com/ICRAR/crc32c" - -LICENSE = "BSD-2-Clause & BSD-3-Clause & CRC32C-ADLER & LGPL-2.0-or-later" -LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=4fbd65380cdd255951079008b364516c \ - file://LICENSE.google-crc32c;md5=e9ed01b5e5ac9eae23fc2bb33701220c \ - file://LICENSE.slice-by-8;md5=6b3bc7709d6b2db6646ec2467310ff6b \ - file://crc32c_adler.c;startline=9;endline=24;md5=c60e6e55d0e5d95effa6fad27db0711a \ -" - -SRC_URI[sha256sum] = "3d058e7a5e37e4985d1a7ad4cb702bca56b490daa658d4851377d13ead8b435e" - -inherit pypi setuptools3 - -do_compile:prepend() { - if ! grep 'platform =' setup.cfg; then - printf "[build_ext]\nplatform = ${TARGET_ARCH}" >> setup.cfg - fi -} - -RDEPENDS:${PN} += "python3-core" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb new file mode 100644 index 0000000000..2032568950 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb @@ -0,0 +1,22 @@ +SUMMARY = "A python package implementing the crc32c algorithmin hardware and software" +HOMEPAGE = "https://github.com/ICRAR/crc32c" + +LICENSE = "BSD-2-Clause & BSD-3-Clause & CRC32C-ADLER & LGPL-2.0-or-later" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE.google-crc32c;md5=e9ed01b5e5ac9eae23fc2bb33701220c \ + file://LICENSE.slice-by-8;md5=6b3bc7709d6b2db6646ec2467310ff6b \ + file://crc32c_adler.c;startline=9;endline=24;md5=c60e6e55d0e5d95effa6fad27db0711a \ +" + +SRC_URI[sha256sum] = "17ce6c596ad0d53df52dcd72defb66984aeabd98fbefea7ba848a6b6bdece36a" + +inherit pypi setuptools3 + +do_compile:prepend() { + if ! grep 'platform =' setup.cfg; then + printf "[build_ext]\nplatform = ${TARGET_ARCH}" >> setup.cfg + fi +} + +RDEPENDS:${PN} += "python3-core" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.4.bb deleted file mode 100644 index ff0104cc8a..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Serialize all of python" -HOMEPAGE = "https://pypi.org/project/dill/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=41adceb584fdde8323ddf9ad23c07fe5" - -SRC_URI[sha256sum] = "9f9734205146b2b353ab3fec9af0070237b6ddae78452af83d2fca84d739e675" - -inherit pypi setuptools3 - -PYPI_PACKAGE_EXT = "zip" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-multiprocessing \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.5.1.bb new file mode 100644 index 0000000000..d9110e3fd4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.5.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "Serialize all of python" +HOMEPAGE = "https://pypi.org/project/dill/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=61f24e44fc855bde43ed5a1524a37bc4" + +SRC_URI[sha256sum] = "d75e41f3eff1eee599d738e76ba8f4ad98ea229db8b085318aa2b3333a208c86" + +inherit pypi setuptools3 + +PYPI_PACKAGE_EXT = "tar.gz" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-logging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-editables_0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-editables_0.3.bb deleted file mode 100644 index b42ff06872..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-editables_0.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "A Python library for creating editable wheels" -HOMEPAGE = "https://github.com/pfmoore/editables" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=41bc1be47b7bb8240db3ef928c7cb0bf" - -SRC_URI[sha256sum] = "167524e377358ed1f1374e61c268f0d7a4bf7dbd046c656f7b410cde16161b1a" - -inherit pypi python_setuptools_build_meta - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.5.0.bb deleted file mode 100644 index e882952ac2..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.5.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Provide XPath 1.0 and 2.0 selectors for Python's ElementTree XML data structures, both for the standard ElementTree library and for the lxml.etree library." -HOMEPAGE = "https://github.com/sissaschool/elementpath" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" - -SRC_URI[sha256sum] = "3a27aaf3399929fccda013899cb76d3ff111734abf4281e5f9d3721ba0b9ffa3" - -PYPI_PACKAGE = "elementpath" -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-xml \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.5.3.bb new file mode 100644 index 0000000000..22f5aa099b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.5.3.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Provide XPath 1.0 and 2.0 selectors for Python's ElementTree XML data structures, both for the standard ElementTree library and for the lxml.etree library." +HOMEPAGE = "https://github.com/sissaschool/elementpath" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" + +SRC_URI[sha256sum] = "b8aeb6f27dddc10fb9201b62090628a846cbae8577f3544cb1075fa38d0817f6" + +PYPI_PACKAGE = "elementpath" +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-xml \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_1.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_1.1.3.bb deleted file mode 100644 index b81e39a151..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_1.1.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "A robust email address syntax and deliverability validation library." -SECTION = "devel/python" -LICENSE = "CC0-1.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032" - -SRC_URI[md5sum] = "25582cf3d415c7fdd44b980a095e0d53" -SRC_URI[sha256sum] = "aa237a65f6f4da067119b7df3f13e89c25c051327b2b5b66dc075f33d62480d7" - -PYPI_PACKAGE = "email_validator" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "python3-dnspython python3-idna" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_1.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_1.2.1.bb new file mode 100644 index 0000000000..a5cb09fd9b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_1.2.1.bb @@ -0,0 +1,12 @@ +SUMMARY = "A robust email address syntax and deliverability validation library." +SECTION = "devel/python" +LICENSE = "CC0-1.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032" + +SRC_URI[sha256sum] = "6757aea012d40516357c0ac2b1a4c31219ab2f899d26831334c5d069e8b6c3d8" + +PYPI_PACKAGE = "email_validator" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-dnspython python3-idna" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.3.2.bb deleted file mode 100644 index e9891bc272..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.3.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Engine.IO server" -HOMEPAGE = "https://github.com/miguelgrinberg/python-engineio/" -SECTION = "devel/python" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=42d0a9e728978f0eeb759c3be91536b8" - -inherit pypi python_setuptools_build_meta - -PYPI_PACKAGE = "python-engineio" - -RDEPENDS:${PN} += " \ - python3-netclient \ - python3-json \ - python3-logging \ - python3-compression \ - python3-asyncio \ -" - -SRC_URI[sha256sum] = "e02f8d6686663408533726be2d4ceb403914fd17285d247791c6a91623777bdd" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.3.3.bb new file mode 100644 index 0000000000..1a80a556ef --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.3.3.bb @@ -0,0 +1,20 @@ +SUMMARY = "Engine.IO server" +HOMEPAGE = "https://github.com/miguelgrinberg/python-engineio/" +SECTION = "devel/python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=42d0a9e728978f0eeb759c3be91536b8" + +inherit pypi python_setuptools_build_meta + +PYPI_PACKAGE = "python-engineio" + +RDEPENDS:${PN} += " \ + python3-netclient \ + python3-json \ + python3-logging \ + python3-compression \ + python3-asyncio \ +" + +SRC_URI[sha256sum] = "18474c452894c60590b2d2339d6c81b93fb9857f1be271a2e91fb2707eb4095d" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.3.2.bb deleted file mode 100644 index c9630b1721..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.3.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "The Ethereum hashing function, keccak256, sometimes (erroneously) called sha3." -HOMEPAGE = "https://github.com/ethereum/eth-hash" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=287820ad3553117aa2f92bf84c219324" - -SRC_URI[sha256sum] = "3f40cecd5ead88184aa9550afc19d057f103728108c5102f592f8415949b5a76" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.3.3.bb new file mode 100644 index 0000000000..c4e8e5e518 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.3.3.bb @@ -0,0 +1,14 @@ +SUMMARY = "The Ethereum hashing function, keccak256, sometimes (erroneously) called sha3." +HOMEPAGE = "https://github.com/ethereum/eth-hash" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=287820ad3553117aa2f92bf84c219324" + +SRC_URI[sha256sum] = "8cde211519ff1a98b46e9057cb909f12ab62e263eb30a0a94e2f7e1f46ac67a0" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = "\ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-pycryptodome \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_3.0.0.bb deleted file mode 100644 index a500d5b520..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_3.0.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Common type annotations for ethereum python packages." -HOMEPAGE = "https://github.com/ethereum/eth-typing" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bf9691ead96f1163622689e47ce3f366" - -SRC_URI[sha256sum] = "079e4c41e98cf2635d3830a99f3cbd7b1d73d2368464d4493c002bece545184a" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_3.1.0.bb new file mode 100644 index 0000000000..0e274c25d8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_3.1.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Common type annotations for ethereum python packages." +HOMEPAGE = "https://github.com/ethereum/eth-typing" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bf9691ead96f1163622689e47ce3f366" + +SRC_URI[sha256sum] = "92698268be83c75f65a028d47421f7c0aed459be76dd7ce916af166dca8bc53e" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_0.15.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_0.15.1.bb deleted file mode 100644 index aebc1344f8..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_0.15.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Simple integration of Flask and WTForms." -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3ca6bb31670492f791e6a9f2fb9f8a80" - -SRC_URI[sha256sum] = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc" - -PYPI_PACKAGE = "Flask-WTF" - -inherit pypi setuptools3 - -RDEPENDS:${PN} = "\ - ${PYTHON_PN}-flask \ - ${PYTHON_PN}-itsdangerous \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-wtforms \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.0.1.bb new file mode 100644 index 0000000000..678588265d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.0.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Simple integration of Flask and WTForms." +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=d98d089889e14b227732d45dac3aacc4" + +SRC_URI[sha256sum] = "34fe5c6fee0f69b50e30f81a3b7ea16aa1492a771fe9ad0974d164610c09a6c9" + +PYPI_PACKAGE = "Flask-WTF" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = "\ + ${PYTHON_PN}-flask \ + ${PYTHON_PN}-itsdangerous \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-wtforms \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.8.bb deleted file mode 100644 index b42225b620..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.8.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "A wrapper for the Gnu Privacy Guard (GPG or GnuPG)" -SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b0b7ac63b60085b23fa9f7e1951daa1d" - -PYPI_PACKAGE = "python-gnupg" -SRC_URI[sha256sum] = "b64de1ae5cedf872b437201a566fa2c62ce0c95ea2e30177eb53aee1258507d7" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - gnupg-gpg \ - python3-logging \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.9.bb new file mode 100644 index 0000000000..9e13e4c26f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.9.bb @@ -0,0 +1,14 @@ +SUMMARY = "A wrapper for the Gnu Privacy Guard (GPG or GnuPG)" +SECTION = "devel/python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5dabe659eadd6d97325b1582e41cfc11" + +PYPI_PACKAGE = "python-gnupg" +SRC_URI[sha256sum] = "aaa748795572591aaf127b4ac8985684f3673ff82b39f370c836b006e68fc537" + +inherit pypi python_setuptools_build_meta + +RDEPENDS:${PN} += " \ + gnupg-gpg \ + python3-logging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.8.0.bb deleted file mode 100644 index b7ff8bc291..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.8.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Google API client core library" -HOMEPAGE = "https://github.com/googleapis/python-api-core" -AUTHOR = "Google LLC" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "065bb8e11c605fd232707ae50963dc1c8af5b3c95b4568887515985e6c1156b3" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-asyncio \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ -" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-googleapis-common-protos \ - ${PYTHON_PN}-google-auth \ - ${PYTHON_PN}-grpcio \ - ${PYTHON_PN}-protobuf \ - ${PYTHON_PN}-pytz \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-six \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.8.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.8.2.bb new file mode 100644 index 0000000000..a2df7fb48a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.8.2.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Google API client core library" +HOMEPAGE = "https://github.com/googleapis/python-api-core" +AUTHOR = "Google LLC" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-asyncio \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-math \ +" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-googleapis-common-protos \ + ${PYTHON_PN}-google-auth \ + ${PYTHON_PN}-grpcio \ + ${PYTHON_PN}-protobuf \ + ${PYTHON_PN}-pytz \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-six \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.49.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.49.0.bb deleted file mode 100644 index 660262e629..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.49.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "The Google API Client for Python is a client library for accessing the Plus, \ -Moderator, and many other Google APIs." -HOMEPAGE = "https://github.com/googleapis/google-api-python-client" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI[sha256sum] = "629bbde991ce2d9697c6da37f2416f7aeb01ba01505b166066a415b3c3ce1dfc" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-httplib2 \ - ${PYTHON_PN}-uritemplate \ - ${PYTHON_PN}-google-api-core \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.51.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.51.0.bb new file mode 100644 index 0000000000..d52b34ade8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.51.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "The Google API Client for Python is a client library for accessing the Plus, \ +Moderator, and many other Google APIs." +HOMEPAGE = "https://github.com/googleapis/google-api-python-client" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRC_URI[sha256sum] = "a573373041b3f6ccbd04877b70e7425c52daec5b4fe5f440e8f5895c87d1a69c" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-httplib2 \ + ${PYTHON_PN}-uritemplate \ + ${PYTHON_PN}-google-api-core \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.6.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.6.6.bb deleted file mode 100644 index d51790f36c..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.6.6.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Google Authentication Library" -HOMEPAGE = "https://github.com/googleapis/google-auth-library-python" -AUTHOR = "Google Cloud Platform" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "1ba4938e032b73deb51e59c4656a00e0939cf0b1112575099f136babb4563312" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-asyncio \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ -" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-aiohttp \ - ${PYTHON_PN}-cachetools \ - ${PYTHON_PN}-pyasn1-modules \ - ${PYTHON_PN}-rsa \ - ${PYTHON_PN}-six \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.9.0.bb new file mode 100644 index 0000000000..868d70b4c8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.9.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Google Authentication Library" +HOMEPAGE = "https://github.com/googleapis/google-auth-library-python" +AUTHOR = "Google Cloud Platform" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "3b2f9d2f436cc7c3b363d0ac66470f42fede249c3bafcc504e9f0bcbe983cff0" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-asyncio \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ +" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-aiohttp \ + ${PYTHON_PN}-cachetools \ + ${PYTHON_PN}-pyasn1-modules \ + ${PYTHON_PN}-rsa \ + ${PYTHON_PN}-six \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.56.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.56.2.bb deleted file mode 100644 index 78b899ef14..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.56.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Common protobufs used in Google APIs" -HOMEPAGE = "https://github.com/googleapis/python-api-common-protos" -AUTHOR = "Google LLC" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "b09b56f5463070c2153753ef123f07d2e49235e89148e9b2459ec8ed2f68d7d3" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-grpcio \ - ${PYTHON_PN}-protobuf \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.56.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.56.3.bb new file mode 100644 index 0000000000..95823ea487 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.56.3.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Common protobufs used in Google APIs" +HOMEPAGE = "https://github.com/googleapis/python-api-common-protos" +AUTHOR = "Google LLC" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-grpcio \ + ${PYTHON_PN}-protobuf \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch index 4713da174f..4aa11bd57a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -26,6 +26,8 @@ Signed-off-by: Khem Raj setup.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) +diff --git a/setup.py b/setup.py +index cc53e79..be3bc78 100644 --- a/setup.py +++ b/setup.py @@ -87,8 +87,11 @@ def check_linker_need_libatomic(): @@ -33,12 +35,12 @@ Signed-off-by: Khem Raj code_test = (b'#include \n' + b'int main() { return std::atomic{}; }') - cxx = os.environ.get('CXX', 'c++') -- cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++11', '-'], +- cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++14', '-'], + cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++' + if not cxx_args: + cxx_args = "-g" + -+ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++11', '-'], ++ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++14', '-'], stdin=PIPE, stdout=PIPE, stderr=PIPE) @@ -46,8 +48,11 @@ Signed-off-by: Khem Raj # Double-check to see if -latomic actually can solve the problem. # https://github.com/grpc/grpc/issues/22491 cpp_test = subprocess.Popen( -- [cxx, '-x', 'c++', '-std=c++11', '-', '-latomic'], -+ [cxx, cxx_args, '-x', 'c++', '-std=c++11', '-', '-latomic'], +- [cxx, '-x', 'c++', '-std=c++14', '-', '-latomic'], ++ [cxx, cxx_args, '-x', 'c++', '-std=c++14', '-', '-latomic'], stdin=PIPE, stdout=PIPE, stderr=PIPE) +-- +2.25.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.46.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.46.3.bb deleted file mode 100644 index 221a05ef1a..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.46.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Google gRPC tools" -HOMEPAGE = "http://www.grpc.io/" -SECTION = "devel/python" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" - -inherit pypi setuptools3 - -DEPENDS += "${PYTHON_PN}-grpcio" - -SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" -SRC_URI[sha256sum] = "31fee436ace5b3bd950cc3a8e68d6b84de1d6dc755959db7badc3470cdf22f70" - -RDEPENDS:${PN} = "${PYTHON_PN}-grpcio" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.47.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.47.0.bb new file mode 100644 index 0000000000..90c8efeeca --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.47.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Google gRPC tools" +HOMEPAGE = "http://www.grpc.io/" +SECTION = "devel/python" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" + +inherit pypi setuptools3 + +DEPENDS += "${PYTHON_PN}-grpcio" + +SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" +SRC_URI[sha256sum] = "f64b5378484be1d6ce59311f86174be29c8ff98d8d90f589e1c56d5acae67d3c" + +RDEPENDS:${PN} = "${PYTHON_PN}-grpcio" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch index febe6c4c87..f416ca2728 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -28,42 +28,49 @@ Signed-off-by: Hongxu Jia src/python/grpcio/commands.py | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) +diff --git a/setup.py b/setup.py +index ec27fe4..b2d2d1a 100644 --- a/setup.py +++ b/setup.py -@@ -199,8 +199,11 @@ def check_linker_need_libatomic(): +@@ -206,8 +206,11 @@ def check_linker_need_libatomic(): """Test if linker on system needs libatomic.""" code_test = (b'#include \n' + b'int main() { return std::atomic{}; }') -- cxx = os.environ.get('CXX', 'c++') -- cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++11', '-'], +- cxx = shlex.split(os.environ.get('CXX', 'c++')) +- cpp_test = subprocess.Popen(cxx + ['-x', 'c++', '-std=c++14', '-'], + cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++' + if not cxx_args: + cxx_args = "-g" + -+ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++11', '-'], ++ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++14', '-'], stdin=PIPE, stdout=PIPE, stderr=PIPE) -@@ -210,7 +213,7 @@ def check_linker_need_libatomic(): +@@ -217,7 +220,7 @@ def check_linker_need_libatomic(): # Double-check to see if -latomic actually can solve the problem. # https://github.com/grpc/grpc/issues/22491 cpp_test = subprocess.Popen( -- [cxx, '-x', 'c++', '-std=c++11', '-', '-latomic'], -+ [cxx, cxx_args, '-x', 'c++', '-std=c++11', '-', '-latomic'], +- [cxx, '-x', 'c++', '-std=c++14', '-', '-latomic'], ++ [cxx, cxx_args, '-x', 'c++', '-std=c++14', '-', '-latomic'], stdin=PIPE, stdout=PIPE, stderr=PIPE) +diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py +index d93b6c7..a8c4a51 100644 --- a/src/python/grpcio/commands.py +++ b/src/python/grpcio/commands.py @@ -228,7 +228,10 @@ class BuildExt(build_ext.build_ext): """ try: # TODO(lidiz) Remove the generated a.out for success tests. -- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], +- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++14', '-'], + cc_test, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' + if not cc_args: + cc_args = "-g" -+ cc_test = subprocess.Popen([cc_test, cc_args, '-x', 'c', '-std=c++11', '-'], ++ cc_test = subprocess.Popen([cc_test, cc_args, '-x', 'c', '-std=c++14', '-'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +-- +2.25.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.45.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.45.0.bb deleted file mode 100644 index ca55a7f091..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.45.0.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "Google gRPC" -HOMEPAGE = "http://www.grpc.io/" -SECTION = "devel/python" -LICENSE = "Apache-2.0 & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6e4cf218112648d22420a84281b68b88" - -DEPENDS += "${PYTHON_PN}-protobuf" - -SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" -SRC_URI:append:class-target = " file://ppc-boringssl-support.patch \ - file://boring_ssl.patch \ - file://mips_bigendian.patch \ - file://0001-absl-always-use-asm-sgidefs.h.patch \ - file://abseil-ppc-fixes.patch;patchdir=third_party/abseil-cpp \ -" -SRC_URI[sha256sum] = "ff2c8b965b0fc25cf281961aa46619c10900543effe3f806ef818231c40aaff3" - -RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ -" - -inherit setuptools3 -inherit pypi - -export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1" - -BORING_SSL_PLATFORM:arm = "linux-arm" -BORING_SSL_PLATFORM:x86-64 = "linux-x86_64" -BORING_SSL_PLATFORM ?= "unsupported" -export GRPC_BORING_SSL_PLATFORM = "${BORING_SSL_PLATFORM}" - -BORING_SSL:x86-64 = "1" -BORING_SSL:arm = "1" -BORING_SSL ?= "0" -export GRPC_BUILD_WITH_BORING_SSL_ASM = "${BORING_SSL}" - -GRPC_CFLAGS ?= "" -GRPC_CFLAGS:append:toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" -export GRPC_PYTHON_CFLAGS = "${GRPC_CFLAGS}" - -CLEANBROKEN = "1" - -BBCLASSEXTEND = "native nativesdk" - -CCACHE_DISABLE = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.47.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.47.0.bb new file mode 100644 index 0000000000..24c6e53447 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.47.0.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "Google gRPC" +HOMEPAGE = "http://www.grpc.io/" +SECTION = "devel/python" +LICENSE = "Apache-2.0 & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6e4cf218112648d22420a84281b68b88" + +DEPENDS += "${PYTHON_PN}-protobuf" + +SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" +SRC_URI:append:class-target = " file://ppc-boringssl-support.patch \ + file://boring_ssl.patch \ + file://mips_bigendian.patch \ + file://0001-absl-always-use-asm-sgidefs.h.patch \ + file://abseil-ppc-fixes.patch;patchdir=third_party/abseil-cpp \ +" +SRC_URI[sha256sum] = "5dbba95fab9b35957b4977b8904fc1fa56b302f9051eff4d7716ebb0c087f801" + +RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-six \ +" + +inherit setuptools3 +inherit pypi + +export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY = "1" + +BORING_SSL_PLATFORM:arm = "linux-arm" +BORING_SSL_PLATFORM:x86-64 = "linux-x86_64" +BORING_SSL_PLATFORM ?= "unsupported" +export GRPC_BORING_SSL_PLATFORM = "${BORING_SSL_PLATFORM}" + +BORING_SSL:x86-64 = "1" +BORING_SSL:arm = "1" +BORING_SSL ?= "0" +export GRPC_BUILD_WITH_BORING_SSL_ASM = "${BORING_SSL}" + +GRPC_CFLAGS ?= "" +GRPC_CFLAGS:append:toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" +export GRPC_PYTHON_CFLAGS = "${GRPC_CFLAGS}" + +CLEANBROKEN = "1" + +BBCLASSEXTEND = "native nativesdk" + +CCACHE_DISABLE = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-hatchling_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-hatchling_1.3.0.bb deleted file mode 100644 index a6550a9732..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-hatchling_1.3.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "The extensible, standards compliant build backend used by Hatch" -HOMEPAGE = "https://hatch.pypa.io/latest/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cbe2fd33fc9297692812fc94b7d27fd9" - -inherit pypi python_hatchling - -DEPENDS += "python3-pluggy-native python3-tomli-native python3-pathspec-native python3-packaging-native python3-editables-native" -DEPENDS:remove:class-native = "python3-hatchling-native" - -SRC_URI[sha256sum] = "1401d45d3dd6a5910f64d539acaa943486d5e8b7dda1a97f2b0040fdddc5b85e" - -# Until we have a proper tool to invoke PEP517 builds, hatchling can't -# bootstrap itself automatically. -PEP517_BUILD_API = "hatchling.ouroboros" - -do_compile:prepend() { - export PYTHONPATH=src -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.1.0.bb deleted file mode 100644 index df5a4e9d52..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.1.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Python humanize utilities" -HOMEPAGE = "http://github.com/jmoiron/humanize" -SECTION = "devel/python" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" - -SRC_URI[sha256sum] = "3a119b242ec872c029d8b7bf8435a61a5798f124b244a08013aec5617302f80e" - -inherit pypi python_setuptools_build_meta - -DEPENDS += "\ - ${PYTHON_PN}-setuptools-scm-native \ -" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-setuptools \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.2.3.bb new file mode 100644 index 0000000000..2e4822cad8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.2.3.bb @@ -0,0 +1,21 @@ +SUMMARY = "Python humanize utilities" +HOMEPAGE = "http://github.com/jmoiron/humanize" +SECTION = "devel/python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" + +SRC_URI[sha256sum] = "2bc1fdd831cd00557d3010abdd84d3e41b4a96703a3eaf6c24ee290b26b75a44" + +inherit pypi python_setuptools_build_meta + +DEPENDS += "\ + ${PYTHON_PN}-setuptools-scm-native \ +" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-setuptools \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.1.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.1.7.bb deleted file mode 100644 index b73063eaaa..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.1.7.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Cross-platform network interface and IP address enumeration \ -library" -HOMEPAGE = "https://pypi.org/project/ifaddr/" -LICENSE = "MIT" - -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8debe8d42320ec0ff24665319b625a5e" - -SRC_URI[sha256sum] = "1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-ctypes \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.2.0.bb new file mode 100644 index 0000000000..6c97c374e0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.2.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Cross-platform network interface and IP address enumeration \ +library" +HOMEPAGE = "https://pypi.org/project/ifaddr/" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8debe8d42320ec0ff24665319b625a5e" + +SRC_URI[sha256sum] = "cc0cbfcaabf765d44595825fb96a99bb12c79716b73b44330ea38ee2b0c4aed4" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-ctypes \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-iperf_0.1.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-iperf_0.1.11.bb new file mode 100644 index 0000000000..36d6463051 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-iperf_0.1.11.bb @@ -0,0 +1,11 @@ +SUMMARY = "Python wrapper around iperf3" +HOMEPAGE = "https://github.com/thiezn/iperf3-python" +AUTHOR = "Mathijs Mortimer " +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f7d0900b3d30647cdda002c9549ca40f" + +PYPI_PACKAGE = "iperf3" + +SRC_URI[sha256sum] = "d50eebbf2dcf445a173f98a82f9c433e0302d3dfb7987e1f21b86b35ef63ce26" + +inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jmespath_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jmespath_1.0.0.bb deleted file mode 100644 index f454d6462e..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jmespath_1.0.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "JMESPath (pronounced 'james path') allows you to declaratively specify how to extract elements from a JSON document." -HOMEPAGE = "https://pypi.org/project/jmespath/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2683790f5fabb41a3f75b70558799eb4" - -SRC_URI[sha256sum] = "a490e280edd1f57d6de88636992d05b71e97d69a26a19f058ecf7d304474bf5e" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "python3-math python3-json python3-numbers" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jmespath_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jmespath_1.0.1.bb new file mode 100644 index 0000000000..73f5f4d025 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jmespath_1.0.1.bb @@ -0,0 +1,11 @@ +SUMMARY = "JMESPath (pronounced 'james path') allows you to declaratively specify how to extract elements from a JSON document." +HOMEPAGE = "https://pypi.org/project/jmespath/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2683790f5fabb41a3f75b70558799eb4" + +SRC_URI[sha256sum] = "90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-math python3-json python3-numbers" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.2.bb deleted file mode 100644 index 48ff7df52d..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A fast implementation of the Cassowary constraint solver" -HOMEPAGE = "https://github.com/nucleic/kiwi" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f137eeae9cf8004d06830f6ab25b2d52" - -SRC_URI[sha256sum] = "7f606d91b8a8816be476513a77fd30abe66227039bd6f8b406c348cb0247dcc9" - -inherit pypi python_setuptools_build_meta - -DEPENDS += "\ - python3-cppy-native \ -" - -RDEPENDS:${PN} += "\ - python3-core \ - python3-setuptools \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.3.bb new file mode 100644 index 0000000000..0280afc114 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.3.bb @@ -0,0 +1,19 @@ +SUMMARY = "A fast implementation of the Cassowary constraint solver" +HOMEPAGE = "https://github.com/nucleic/kiwi" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f137eeae9cf8004d06830f6ab25b2d52" + +SRC_URI[sha256sum] = "ab8a15c2750ae8d53e31f77a94f846d0a00772240f1c12817411fa2344351f86" + +inherit pypi python_setuptools_build_meta + +DEPENDS += "\ + python3-cppy-native \ +" + +RDEPENDS:${PN} += "\ + python3-core \ + python3-setuptools \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb deleted file mode 100644 index c4d4df383a..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.8.0.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." -DESCRIPTION = "lxml is a Pythonic, mature binding for the libxml2 and \ -libxslt libraries. It provides safe and convenient access to these \ -libraries using the ElementTree API. It extends the ElementTree API \ -significantly to offer support for XPath, RelaxNG, XML Schema, XSLT, \ -C14N and much more." -HOMEPAGE = "https://lxml.de/" -SECTION = "devel/python" -LICENSE = "BSD-3-Clause & GPL-2.0-only & MIT & PSF-2.0" -LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ - file://doc/licenses/elementtree.txt;md5=eb34d036a6e3d56314ee49a6852ac891 \ - file://doc/licenses/BSD.txt;md5=700a1fc17f4797d4f2d34970c8ee694b \ - file://doc/licenses/GPL.txt;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://src/lxml/isoschematron/resources/rng/iso-schematron.rng;beginline=2;endline=7;md5=fc85684a8dd5fa272c086bceb0d99e10 \ - file://src/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl;beginline=2;endline=24;md5=cc86b7b2bbc678e13f58ea403eb9929b \ - file://src/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl;beginline=2;endline=7;md5=5b03236d293dc3784205542b409d2f53 \ - " - -DEPENDS += "libxml2 libxslt" - -SRC_URI[sha256sum] = "f63f62fc60e6228a4ca9abae28228f35e1bd3ce675013d1dfb828688d50c6e23" - -SRC_URI += "${PYPI_SRC_URI}" -inherit pkgconfig pypi setuptools3 - -# {standard input}: Assembler messages: -# {standard input}:1488805: Error: branch out of range -DEBUG_OPTIMIZATION:remove:mips = " -Og" -DEBUG_OPTIMIZATION:append:mips = " -O" -BUILD_OPTIMIZATION:remove:mips = " -Og" -BUILD_OPTIMIZATION:append:mips = " -O" - -DEBUG_OPTIMIZATION:remove:mipsel = " -Og" -DEBUG_OPTIMIZATION:append:mipsel = " -O" -BUILD_OPTIMIZATION:remove:mipsel = " -Og" -BUILD_OPTIMIZATION:append:mipsel = " -O" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS:${PN} += "libxml2 libxslt ${PYTHON_PN}-compression" - -CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.9.1.bb new file mode 100644 index 0000000000..92a30f7907 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.9.1.bb @@ -0,0 +1,42 @@ +SUMMARY = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." +DESCRIPTION = "lxml is a Pythonic, mature binding for the libxml2 and \ +libxslt libraries. It provides safe and convenient access to these \ +libraries using the ElementTree API. It extends the ElementTree API \ +significantly to offer support for XPath, RelaxNG, XML Schema, XSLT, \ +C14N and much more." +HOMEPAGE = "https://lxml.de/" +SECTION = "devel/python" +LICENSE = "BSD-3-Clause & GPL-2.0-only & MIT & PSF-2.0" +LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ + file://doc/licenses/elementtree.txt;md5=eb34d036a6e3d56314ee49a6852ac891 \ + file://doc/licenses/BSD.txt;md5=700a1fc17f4797d4f2d34970c8ee694b \ + file://doc/licenses/GPL.txt;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://src/lxml/isoschematron/resources/rng/iso-schematron.rng;beginline=2;endline=7;md5=fc85684a8dd5fa272c086bceb0d99e10 \ + file://src/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl;beginline=2;endline=24;md5=cc86b7b2bbc678e13f58ea403eb9929b \ + file://src/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl;beginline=2;endline=7;md5=5b03236d293dc3784205542b409d2f53 \ + " + +DEPENDS += "libxml2 libxslt" + +SRC_URI[sha256sum] = "fe749b052bb7233fe5d072fcb549221a8cb1a16725c47c37e42b0b9cb3ff2c3f" + +SRC_URI += "${PYPI_SRC_URI}" +inherit pkgconfig pypi setuptools3 + +# {standard input}: Assembler messages: +# {standard input}:1488805: Error: branch out of range +DEBUG_OPTIMIZATION:remove:mips = " -Og" +DEBUG_OPTIMIZATION:append:mips = " -O" +BUILD_OPTIMIZATION:remove:mips = " -Og" +BUILD_OPTIMIZATION:append:mips = " -O" + +DEBUG_OPTIMIZATION:remove:mipsel = " -Og" +DEBUG_OPTIMIZATION:append:mipsel = " -O" +BUILD_OPTIMIZATION:remove:mipsel = " -Og" +BUILD_OPTIMIZATION:append:mipsel = " -O" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += "libxml2 libxslt ${PYTHON_PN}-compression" + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.15.0.bb deleted file mode 100644 index c8e0fa4dd3..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.15.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Simplified object serialization in python" -DESCRIPTION = "Marshmallow is an ORM/ODM/framework-agnostic library for converting complex datatypes, such as objects, to and from native Python datatypes." -AUTHOR = "Marius Kriegerowski " -HOMEPAGE = "https://github.com/marshmallow-code/marshmallow" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "\ - file://LICENSE;md5=5bccd400dedfa74364481e56aacc0b4a \ - file://docs/license.rst;md5=13da439ad060419fb7cf364523017cfb" - -SRC_URI = "git://github.com/marshmallow-code/marshmallow.git;protocol=https;branch=dev" - -SRCREV = "f251dfb08d79c755c2e95371f2c5580bf5937e60" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -PIP_INSTALL_PACKAGE = "marshmallow" - -RDEPENDS:${PN} += " \ - python3-core \ - python3-datetime \ - python3-netclient \ - python3-numbers \ - python3-json \ - python3-pprint \ - python3-packaging \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.17.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.17.0.bb new file mode 100644 index 0000000000..f2f5281d6c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.17.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "Simplified object serialization in python" +DESCRIPTION = "Marshmallow is an ORM/ODM/framework-agnostic library for converting complex datatypes, such as objects, to and from native Python datatypes." +AUTHOR = "Marius Kriegerowski " +HOMEPAGE = "https://github.com/marshmallow-code/marshmallow" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=5bccd400dedfa74364481e56aacc0b4a \ + file://docs/license.rst;md5=13da439ad060419fb7cf364523017cfb" + +SRC_URI = "git://github.com/marshmallow-code/marshmallow.git;protocol=https;branch=dev" + +SRCREV = "4a6c08d53f181195c78b505abe155b2f35cbc0c1" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +PIP_INSTALL_PACKAGE = "marshmallow" + +RDEPENDS:${PN} += " \ + python3-core \ + python3-datetime \ + python3-netclient \ + python3-numbers \ + python3-json \ + python3-pprint \ + python3-packaging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.3.bb deleted file mode 100644 index 92999255b6..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.3.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "MessagePack (de)serializer" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751" - -PYPI_PACKAGE = "msgpack" -inherit pypi setuptools3 ptest - -SRC_URI[sha256sum] = "51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e" - -RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-io \ -" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/test - cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.4.bb new file mode 100644 index 0000000000..a796d7cb57 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.4.bb @@ -0,0 +1,27 @@ +SUMMARY = "MessagePack (de)serializer" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751" + +PYPI_PACKAGE = "msgpack" +inherit pypi setuptools3 ptest + +SRC_URI[sha256sum] = "f5d869c18f030202eb412f08b28d2afeea553d6613aee89e200d7aca7ef01f5f" + +RDEPENDS:${PN}:class-target += "\ + ${PYTHON_PN}-io \ +" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.3.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.3.16.bb deleted file mode 100644 index a1572276be..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.3.16.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "A tool to help with creating, uploading, and upgrading Mycroft skills on the skills repo." -HOMEPAGE = "https://github.com/MycroftAI/mycroft-skills-kit" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://README.md;md5=2f90e43663eddf1c33087419fbb35e28" - -SRC_URI[md5sum] = "8a4fc92a074544f81f482da2c21ef989" -SRC_URI[sha256sum] = "c6a717fc068f7c69ddc8cb21dbeeda7cfa97a4e9f41690459c9fbec68b16ee87" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "python3-git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.4.0.bb new file mode 100644 index 0000000000..8fa2c62cc4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-msk_0.4.0.bb @@ -0,0 +1,10 @@ +SUMMARY = "A tool to help with creating, uploading, and upgrading Mycroft skills on the skills repo." +HOMEPAGE = "https://github.com/MycroftAI/mycroft-skills-kit" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.md;md5=f518abfcfc3935b1f0ec8f2332cb30d3" + +SRC_URI[sha256sum] = "f698f193112a8628e776e67b89a95c3f78095857c045dd9cde4cf915a5fbdd80" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.960.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.960.bb deleted file mode 100644 index 5d99b6468c..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.960.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Optional static typing for Python 3 and 2 (PEP 484)" -HOMEPAGE = "https://github.com/python/mypy" -LICENSE = "MIT & Python-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6ba8ec528da02073b7e1f4124c0f836f" - -PYPI_PACKAGE = "mypy" - -inherit pypi python_setuptools_build_meta - -SRC_URI[sha256sum] = "d4fccf04c1acf750babd74252e0f2db6bd2ac3aa8fe960797d9f3ef41cf2bfd4" - -BBCLASSEXTEND = "native" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-mypy-extensions \ - ${PYTHON_PN}-typed-ast \ - ${PYTHON_PN}-typing-extensions \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-toml \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.961.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.961.bb new file mode 100644 index 0000000000..02f7cce4ca --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.961.bb @@ -0,0 +1,23 @@ +SUMMARY = "Optional static typing for Python 3 and 2 (PEP 484)" +HOMEPAGE = "https://github.com/python/mypy" +LICENSE = "MIT & Python-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6ba8ec528da02073b7e1f4124c0f836f" + +PYPI_PACKAGE = "mypy" + +inherit pypi python_setuptools_build_meta + +SRC_URI[sha256sum] = "f730d56cb924d371c26b8eaddeea3cc07d78ff51c521c6d04899ac6904b75492" + +BBCLASSEXTEND = "native" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-mypy-extensions \ + ${PYTHON_PN}-typed-ast \ + ${PYTHON_PN}-typing-extensions \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-difflib \ + ${PYTHON_PN}-toml \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.7.1.bb deleted file mode 100644 index 9e5b086a99..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.7.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Python package for creating and manipulating graphs and networks" -HOMEPAGE = "http://networkx.github.io/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44614b6df7cf3c19be69d0a945e29904" - -SRC_URI[sha256sum] = "d1194ba753e5eed07cdecd1d23c5cd7a3c772099bd8dbd2fea366788cf4de7ba" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-decorator \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-xml \ - ${PYTHON_PN}-json \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.8.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.8.4.bb new file mode 100644 index 0000000000..8181d90c0f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.8.4.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Python package for creating and manipulating graphs and networks" +HOMEPAGE = "http://networkx.github.io/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=44614b6df7cf3c19be69d0a945e29904" + +SRC_URI[sha256sum] = "5e53f027c0d567cf1f884dbb283224df525644e43afd1145d64c9d88a3584762" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-decorator \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-html \ + ${PYTHON_PN}-xml \ + ${PYTHON_PN}-json \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.5.1.bb deleted file mode 100644 index ed0e980c8d..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.5.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "python-nmap is a python library which helps in using nmap port scanner" -HOMEPAGE = "https://www.nmmapper.com/" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -DEPENDS += "${PYTHON_PN}-wheel-native" - -PYPI_PACKAGE = "python3-nmap" - -SRC_URI[sha256sum] = "0e6667153a84938bdc0e95a64cd86397b4c46724c422873ea8f1d007d248926a" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "nmap \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-simplejson \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.5.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.5.4.bb new file mode 100644 index 0000000000..828d7089b2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.5.4.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "python-nmap is a python library which helps in using nmap port scanner" +HOMEPAGE = "https://www.nmmapper.com/" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +DEPENDS += "${PYTHON_PN}-wheel-native" + +PYPI_PACKAGE = "python3-nmap" + +SRC_URI[sha256sum] = "cd5b0180d4d8cfe96c33e5e7956fa011379af108e2e8291b84e933b6385856e9" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "nmap \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-simplejson \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.2.bb deleted file mode 100644 index 6d0f669d53..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.2.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "pandas library for high-performance data analysis tools" -DESCRIPTION = "pandas is an open source, BSD-licensed library providing \ -high-performance, easy-to-use data structures and data analysis tools for \ -the Python programming language." -HOMEPAGE = "http://pandas.pydata.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3f23c5c092b74d245d48eeef72bc3fd2" - -SRC_URI[sha256sum] = "92bc1fc585f1463ca827b45535957815b7deb218c549b7c18402c322c7549a12" - -inherit pypi setuptools3 - -DEPENDS += " \ - ${PYTHON_PN}-numpy-native ${PYTHON_PN}-cython-native \ -" - -CFLAGS:append:toolchain-clang = " -Wno-error=deprecated-declarations" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-numpy \ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-dateutil-zoneinfo \ - ${PYTHON_PN}-pytz \ - ${PYTHON_PN}-profile \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.3.bb new file mode 100644 index 0000000000..2d3333c3ea --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.4.3.bb @@ -0,0 +1,26 @@ +SUMMARY = "pandas library for high-performance data analysis tools" +DESCRIPTION = "pandas is an open source, BSD-licensed library providing \ +high-performance, easy-to-use data structures and data analysis tools for \ +the Python programming language." +HOMEPAGE = "http://pandas.pydata.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3f23c5c092b74d245d48eeef72bc3fd2" + +SRC_URI[sha256sum] = "2ff7788468e75917574f080cd4681b27e1a7bf36461fe968b49a87b5a54d007c" + +inherit pypi setuptools3 + +DEPENDS += " \ + ${PYTHON_PN}-numpy-native ${PYTHON_PN}-cython-native \ +" + +CFLAGS:append:toolchain-clang = " -Wno-error=deprecated-declarations" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-numpy \ + ${PYTHON_PN}-dateutil \ + ${PYTHON_PN}-dateutil-zoneinfo \ + ${PYTHON_PN}-pytz \ + ${PYTHON_PN}-profile \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pathspec_0.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pathspec_0.9.0.bb deleted file mode 100644 index 641f1cfd87..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pathspec_0.9.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Utility library for gitignore style pattern matching of file paths." -HOMEPAGE = "https://github.com/cpburnz/python-path-specification" -SECTION = "devel/python" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" - -SRC_URI[sha256sum] = "e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.2.1.bb deleted file mode 100644 index 38f84cf1ba..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.2.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Pika is a RabbitMQ (AMQP 0-9-1) client library for Python." -DESCRIPTION = " \ -Pika is a pure-Python implementation of the AMQP 0-9-1 protocol \ -including RabbitMQ’s extensions. \ -" -SECTION = "devel/python" -HOMEPAGE = "https://pika.readthedocs.io" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=678ec81495ba50edf81e84e4f1aa69f3" - -SRC_URI[sha256sum] = "e5fbf3a0a3599f4e114f6e4a7af096f9413a8f24f975c2657ba2fac3c931434f" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "pika" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-tornado \ - ${PYTHON_PN}-twisted \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.3.0.bb new file mode 100644 index 0000000000..7ffec26e55 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.3.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "Pika is a RabbitMQ (AMQP 0-9-1) client library for Python." +DESCRIPTION = " \ +Pika is a pure-Python implementation of the AMQP 0-9-1 protocol \ +including RabbitMQ's extensions. \ +" +SECTION = "devel/python" +HOMEPAGE = "https://pika.readthedocs.io" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=678ec81495ba50edf81e84e4f1aa69f3" + +SRC_URI[sha256sum] = "15357ddc47a5c28f0b07d80e93d504cbbf7a1ad5e1cd129ecd27afe76472c529" + +inherit pypi python_setuptools_build_meta + +PYPI_PACKAGE = "pika" + +DEPENDS += " \ + ${PYTHON_PN}-setuptools-scm-native \ + ${PYTHON_PN}-toml-native \ +" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-tornado \ + ${PYTHON_PN}-twisted \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.0.1.bb deleted file mode 100644 index fb86322f77..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.0.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Python Imaging Library (Fork). Pillow is the friendly PIL fork by Alex \ -Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and \ -Contributors." -HOMEPAGE = "https://pillow.readthedocs.io" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ad081a0aede51e89f8da13333a8fb849" - -SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=9.0.x;protocol=https \ - file://0001-support-cross-compiling.patch \ - file://0001-explicitly-set-compile-options.patch \ -" -SRCREV ?= "82541b6dec8452cb612067fcebba1c5a1a2bfdc8" - -inherit setuptools3 - -PIP_INSTALL_PACKAGE = "Pillow" -PIP_INSTALL_DIST_PATH = "${S}/dist" - -DEPENDS += " \ - zlib \ - jpeg \ - tiff \ - freetype \ - lcms \ - openjpeg \ -" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-numbers \ -" - -CVE_PRODUCT = "pillow" - -S = "${WORKDIR}/git" - -RPROVIDES:${PN} += "python3-imaging" - -BBCLASSEXTEND = "native" - -SRCREV = "6deac9e3a23caffbfdd75c00d3f0a1cd36cdbd5d" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.1.1.bb new file mode 100644 index 0000000000..00df22a3df --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.1.1.bb @@ -0,0 +1,42 @@ +SUMMARY = "Python Imaging Library (Fork). Pillow is the friendly PIL fork by Alex \ +Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and \ +Contributors." +HOMEPAGE = "https://pillow.readthedocs.io" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ad081a0aede51e89f8da13333a8fb849" + +SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=9.1.x;protocol=https \ + file://0001-support-cross-compiling.patch \ + file://0001-explicitly-set-compile-options.patch \ + " +SRCREV ?= "82541b6dec8452cb612067fcebba1c5a1a2bfdc8" + +inherit setuptools3 + +PIP_INSTALL_PACKAGE = "Pillow" +PIP_INSTALL_DIST_PATH = "${S}/dist" + +DEPENDS += " \ + zlib \ + jpeg \ + tiff \ + freetype \ + lcms \ + openjpeg \ +" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-misc \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-numbers \ +" + +CVE_PRODUCT = "pillow" + +S = "${WORKDIR}/git" + +RPROVIDES:${PN} += "python3-imaging" + +BBCLASSEXTEND = "native" + +SRCREV = "0f44136e720cd3b2db72bdf29614897b7aa3e868" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.20.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.20.1.bb deleted file mode 100644 index 976d2aa9b4..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.20.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Protocol Buffers" -HOMEPAGE = "https://developers.google.com/protocol-buffers/" -SECTION = "devel/python" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=53dbfa56f61b90215a9f8f0d527c043d" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "adc31566d027f45efe3f44eeb5b1f329da43891634d61c75a5944e9be6dd42c9" - -# http://errors.yoctoproject.org/Errors/Details/184715/ -# Can't find required file: ../src/google/protobuf/descriptor.proto -CLEANBROKEN = "1" - -UPSTREAM_CHECK_REGEX = "protobuf/(?P\d+(\.\d+)+)/" - -DEPENDS += "protobuf" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-unittest \ -" - -# For usage in other recipies when compiling protobuf files (e.g. by grpcio-tools) -BBCLASSEXTEND = "native nativesdk" - -DISTUTILS_BUILD_ARGS += "--cpp_implementation" -DISTUTILS_INSTALL_ARGS += "--cpp_implementation" - -do_compile:prepend:class-native () { - export KOKORO_BUILD_NUMBER="1" -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.21.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.21.2.bb new file mode 100644 index 0000000000..b8287a88e5 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.21.2.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Protocol Buffers" +HOMEPAGE = "https://developers.google.com/protocol-buffers/" +SECTION = "devel/python" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=53dbfa56f61b90215a9f8f0d527c043d" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "863f65e137d9de4a76cac39ae731a19bea1c30997f512ecf0dc9348112313401" + +# http://errors.yoctoproject.org/Errors/Details/184715/ +# Can't find required file: ../src/google/protobuf/descriptor.proto +CLEANBROKEN = "1" + +UPSTREAM_CHECK_REGEX = "protobuf/(?P\d+(\.\d+)+)/" + +DEPENDS += "protobuf" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-unittest \ +" + +# For usage in other recipies when compiling protobuf files (e.g. by grpcio-tools) +BBCLASSEXTEND = "native nativesdk" + +DISTUTILS_BUILD_ARGS += "--cpp_implementation" +DISTUTILS_INSTALL_ARGS += "--cpp_implementation" + +do_compile:prepend:class-native () { + export KOKORO_BUILD_NUMBER="1" +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.8.1.bb deleted file mode 100644 index 4d94e2033e..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.8.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Seamless operability between C++11 and Python" -HOMEPAGE = "https://github.com/wjakob/pybind11" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f" - -DEPENDS = "boost" - -SRC_URI = "git://github.com/pybind/pybind11.git;branch=master;protocol=https \ - file://0001-Do-not-strip-binaries.patch \ - file://0001-Do-not-check-pointer-size-when-cross-compiling.patch \ -" -SRCREV = "f7b499615e14d70ab098a20deb0cdb3889998a1a" - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native" - -EXTRA_OECMAKE = "-DPYBIND11_TEST=OFF" - -inherit cmake setuptools3 python3native - -PIP_INSTALL_DIST_PATH = "${S}/dist" -PIP_INSTALL_PACKAGE = "pybind11" - -do_configure() { - cmake_do_configure -} - -do_compile() { - setuptools3_do_compile - cmake_do_compile -} - -do_install() { - setuptools3_do_install - cmake_do_install -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.9.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.9.2.bb new file mode 100644 index 0000000000..433bfd60e8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.9.2.bb @@ -0,0 +1,39 @@ +SUMMARY = "Seamless operability between C++11 and Python" +HOMEPAGE = "https://github.com/wjakob/pybind11" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f" + +DEPENDS = "boost" + +SRC_URI = "git://github.com/pybind/pybind11.git;branch=stable;protocol=https \ + file://0001-Do-not-strip-binaries.patch \ + file://0001-Do-not-check-pointer-size-when-cross-compiling.patch \ +" +SRCREV = "914c06fb252b6cc3727d0eedab6736e88a3fcb01" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" + +EXTRA_OECMAKE = "-DPYBIND11_TEST=OFF" + +inherit cmake setuptools3 python3native + +PIP_INSTALL_DIST_PATH = "${S}/dist" +PIP_INSTALL_PACKAGE = "pybind11" + +do_configure() { + cmake_do_configure +} + +do_compile() { + setuptools3_do_compile + cmake_do_compile +} + +do_install() { + setuptools3_do_install + cmake_do_install +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez/0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez/0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch new file mode 100644 index 0000000000..9126aba8d3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez/0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch @@ -0,0 +1,153 @@ +From aa8ee5e5e934908f0357364f6ec90a3ecda62880 Mon Sep 17 00:00:00 2001 +From: Nicolas Schodet +Date: Mon, 3 Jan 2022 02:37:01 +0100 +Subject: [PATCH] Use Py_ssize_t when parsing buffer length, fix #426 (#427) + +From python 3.9 documentation: + +> For all # variants of formats (s#, y#, etc.), the macro +> PY_SSIZE_T_CLEAN must be defined before including Python.h. On Python +> 3.9 and older, the type of the length argument is Py_ssize_t if the +> PY_SSIZE_T_CLEAN macro is defined, or int otherwise. + +From python 3.8 changes: + +> Use of # variants of formats in parsing or building value (e.g. +> PyArg_ParseTuple(), Py_BuildValue(), PyObject_CallFunction(), etc.) +> without PY_SSIZE_T_CLEAN defined raises DeprecationWarning now. It +> will be removed in 3.10 or 4.0. Read Parsing arguments and building +> values for detail. (Contributed by Inada Naoki in bpo-36381.) + +Fixes https://github.com/pybluez/pybluez/issues/426 +--- +Upstream-Status: Accepted + + bluez/btmodule.c | 23 ++++++++++++++--------- + msbt/_msbt.c | 6 ++++-- + 2 files changed, 18 insertions(+), 11 deletions(-) + +diff --git a/bluez/btmodule.c b/bluez/btmodule.c +index 518b723..912a489 100644 +--- a/bluez/btmodule.c ++++ b/bluez/btmodule.c +@@ -16,7 +16,8 @@ Local naming conventions: + - names starting with bt_ are module-level functions + + */ +- ++#define PY_SSIZE_T_CLEAN 1 ++#include "Python.h" + #include "btmodule.h" + #include "structmember.h" + +@@ -732,7 +733,7 @@ sock_setsockopt(PySocketSockObject *s, PyObject *args) + int optname; + int res; + void *buf; +- int buflen; ++ Py_ssize_t buflen; + int flag; + + if (PyArg_ParseTuple(args, "iii:setsockopt", &level, &optname, &flag)) { +@@ -2001,7 +2002,8 @@ static PyObject * + bt_hci_send_cmd(PyObject *self, PyObject *args) + { + PySocketSockObject *socko = NULL; +- int err, plen = 0; ++ int err; ++ Py_ssize_t plen = 0; + uint16_t ogf, ocf; + char *param = NULL; + int dd = 0; +@@ -2036,6 +2038,7 @@ bt_hci_send_req(PyObject *self, PyObject *args, PyObject *kwds) + int err; + int to=0; + char rparam[256]; ++ Py_ssize_t req_clen; + struct hci_request req = { 0 }; + int dd = 0; + +@@ -2043,9 +2046,10 @@ bt_hci_send_req(PyObject *self, PyObject *args, PyObject *kwds) + "timeout", 0 }; + + if( !PyArg_ParseTupleAndKeywords(args, kwds, "OHHii|s#i", keywords, +- &socko, &req.ogf, &req.ocf, &req.event, &req.rlen, +- &req.cparam, &req.clen, &to) ) ++ &socko, &req.ogf, &req.ocf, &req.event, &req.rlen, ++ &req.cparam, &req_clen, &to) ) + return 0; ++ req.clen = req_clen; + + req.rparam = rparam; + dd = socko->sock_fd; +@@ -2274,7 +2278,8 @@ Returns the name of the device, or raises an error on failure"); + static PyObject * bt_hci_filter_ ## name (PyObject *self, PyObject *args )\ + { \ + char *param; \ +- int len, arg; \ ++ Py_ssize_t len; \ ++ int arg; \ + if( !PyArg_ParseTuple(args,"s#i", ¶m, &len, &arg) ) \ + return 0; \ + if( len != sizeof(struct hci_filter) ) { \ +@@ -2303,7 +2308,7 @@ DECL_HCI_FILTER_OP_1(test_opcode, "test opcode!") + static PyObject * bt_hci_filter_ ## name (PyObject *self, PyObject *args )\ + { \ + char *param; \ +- int len; \ ++ Py_ssize_t len; \ + if( !PyArg_ParseTuple(args,"s#", ¶m, &len) ) \ + return 0; \ + if( len != sizeof(struct hci_filter) ) { \ +@@ -2364,7 +2369,7 @@ static PyObject * + bt_ba2str(PyObject *self, PyObject *args) + { + char *data=NULL; +- int len=0; ++ Py_ssize_t len=0; + char ba_str[19] = {0}; + if (!PyArg_ParseTuple(args, "s#", &data, &len)) return 0; + ba2str((bdaddr_t*)data, ba_str); +@@ -2579,7 +2584,7 @@ bt_sdp_advertise_service( PyObject *self, PyObject *args ) + *provider = NULL, + *description = NULL; + PyObject *service_classes, *profiles, *protocols; +- int namelen = 0, provlen = 0, desclen = 0; ++ Py_ssize_t namelen = 0, provlen = 0, desclen = 0; + uuid_t svc_uuid = { 0 }; + int i; + char addrbuf[256] = { 0 }; +diff --git a/msbt/_msbt.c b/msbt/_msbt.c +index b3d27ff..81f5ee9 100644 +--- a/msbt/_msbt.c ++++ b/msbt/_msbt.c +@@ -2,6 +2,8 @@ + #define UNICODE + #endif + ++#define PY_SSIZE_T_CLEAN 1 ++ + #include + #include + #include +@@ -155,7 +157,7 @@ static PyObject * + msbt_bind(PyObject *self, PyObject *args) + { + wchar_t *addrstr = NULL; +- int addrstrlen = -1; ++ Py_ssize_t addrstrlen = -1; + int sockfd = -1; + int port = -1; + char buf[100] = { 0 }; +@@ -765,7 +767,7 @@ msbt_set_service_raw(PyObject *self, PyObject *args) + WSAESETSERVICEOP op; + + char *record = NULL; +- int reclen = -1; ++ Py_ssize_t reclen = -1; + BTH_SET_SERVICE *si = NULL; + int silen = -1; + ULONG sdpVersion = BTH_SDP_VERSION; +-- +2.34.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez_0.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez_0.23.bb index b32f3a3627..6a1df273a2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez_0.23.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez_0.23.bb @@ -7,6 +7,7 @@ DEPENDS = "bluez5" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543" +SRC_URI += "file://0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch" SRC_URI[md5sum] = "afbe8429bb82d2c46a3d0f5f4f898f9d" SRC_URI[sha256sum] = "c8f04d2e78951eaa9de486b4d49381704e8943d0a6e6e58f55fcd7b8582e90de" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_12.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_12.1.2.bb deleted file mode 100644 index c8686ab529..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_12.1.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." -HOMEPAGE = "https://github.com/balloob/pychromecast" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" - -SRC_URI[sha256sum] = "6be626e5ba2f6ffaefbc13ddced84e8b60a9ef1b012f71039fc0f7a0bcb4bda6" - -PYPI_PACKAGE = "PyChromecast" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-zeroconf \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-protobuf \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_12.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_12.1.4.bb new file mode 100644 index 0000000000..69372060bc --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_12.1.4.bb @@ -0,0 +1,19 @@ +SUMMARY = "Library for Python 3.6+ to communicate with the Google Chromecast." +HOMEPAGE = "https://github.com/balloob/pychromecast" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" + +SRC_URI[sha256sum] = "9e57dc985a4a05db5bdcd5da219cbf6ced25548ca093f8d74bc107b3c554ec00" + +PYPI_PACKAGE = "PyChromecast" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-zeroconf \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-protobuf \ + ${PYTHON_PN}-compression \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.13.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.13.9.bb deleted file mode 100644 index 1946a89230..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.13.9.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY="Pylint is a Python source code analyzer" -HOMEPAGE= "http://www.pylint.org/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" - -SRC_URI[sha256sum] = "095567c96e19e6f57b5b907e67d265ff535e588fe26b12b5ebe1fc5645b2c731" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "${PYTHON_PN}-astroid \ - ${PYTHON_PN}-isort \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-netserver \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.14.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.14.3.bb new file mode 100644 index 0000000000..835ed22036 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.14.3.bb @@ -0,0 +1,18 @@ +SUMMARY="Pylint is a Python source code analyzer" +HOMEPAGE= "http://www.pylint.org/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" + +SRC_URI[sha256sum] = "4e1378f815c63e7e44590d0d339ed6435f5281d0a0cc357d29a86ea0365ef868" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "${PYTHON_PN}-astroid \ + ${PYTHON_PN}-isort \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-difflib \ + ${PYTHON_PN}-netserver \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.3.1.bb new file mode 100644 index 0000000000..6085e48b3a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.3.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "Python interface to PROJ (cartographic projections and coordinate transformations library)" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dc4bb2668871655e24030dfe8d2a7ce7" +DEPENDS = "python3-cython proj" +DEPENDS:append:class-target = " python3-cython-native proj-native" + +PYPI_PACKAGE = "pyproj" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "b3d8e14d91cc95fb3dbc03a9d0588ac58326803eefa5bbb0978d109de3304fbe" + +RDEPENDS:${PN} = "${PYTHON_PN}-certifi proj" + +export PROJ_INCDIR = "${STAGING_INCDIR}" +export PROJ_LIBDIR = "${STAGING_LIBDIR}" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.2.2.bb deleted file mode 100644 index 5b61c06ad4..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.2.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Python project template generator with batteries included" -DESCRIPTION = "PyScaffold package helps to setup a new Python project. \ -After installation, it provides a new command [putup], which could be \ -used to create template Projects." - -HOMEPAGE = "https://github.com/pyscaffold/pyscaffold" -SECTION = "devel/python" -LICENSE = "0BSD & MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=14a49c74a1d91829908ac756c07e6b91" -DEPENDS += "python3-setuptools-scm-native" - -SRC_URI[sha256sum] = "11be56d21a0047ea604e7bc4349e95592cdc734b0a405082a6a4f2a7028dc896" - -inherit pypi python_setuptools_build_meta -PYPI_PACKAGE = "PyScaffold" - -RDEPENDS:${PN} += " \ - python3-email \ - python3-compression \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.2.3.bb new file mode 100644 index 0000000000..fe4f7e4eb7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyscaffold_4.2.3.bb @@ -0,0 +1,22 @@ +SUMMARY = "Python project template generator with batteries included" +DESCRIPTION = "PyScaffold package helps to setup a new Python project. \ +After installation, it provides a new command [putup], which could be \ +used to create template Projects." + +HOMEPAGE = "https://github.com/pyscaffold/pyscaffold" +SECTION = "devel/python" +LICENSE = "0BSD & MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=14a49c74a1d91829908ac756c07e6b91" +DEPENDS += "python3-setuptools-scm-native" + +SRC_URI[sha256sum] = "58c7d9ce296cc26ac377061365c2f87cd8e28f46e4fb2c96ee48f9c64e33ac4a" + +inherit pypi python_setuptools_build_meta +PYPI_PACKAGE = "PyScaffold" + +RDEPENDS:${PN} += " \ + python3-email \ + python3-compression \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.3.1.bb deleted file mode 100644 index c0d9c00645..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.3.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] = "94b617b4cd296e94991146f66fc5559756fbefe9493604f0312e4d3298ac63e9" - -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.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.3.3.bb new file mode 100644 index 0000000000..66051d420f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_4.3.3.bb @@ -0,0 +1,15 @@ +SUMMARY = "Python client for Redis key-value store" +DESCRIPTION = "The Python interface to the Redis key-value store." +HOMEPAGE = "http://github.com/andymccurdy/redis-py" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=51d9ad56299ab60ba7be65a621004f27" + +SRC_URI[sha256sum] = "2f7a57cf4af15cd543c4394bcbe2b9148db2606a37edba755368836e3a1d053e" + +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_2022.4.24.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.4.24.bb deleted file mode 100644 index 28e16001a1..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.4.24.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] = "92183e9180c392371079262879c6532ccf55f808e6900df5d9f03c9ca8807255" - -RDEPENDS:${PN} += " \ - python3-stringold \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.6.2.bb new file mode 100644 index 0000000000..3067c0df3c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2022.6.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] = "f7b43acb2c46fb2cd506965b2d9cf4c5e64c9c612bac26c1187933c7296bf08c" + +RDEPENDS:${PN} += " \ + python3-stringold \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary/e31d5fdf2ea00ac6349e64580a20816783064dd4.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary/e31d5fdf2ea00ac6349e64580a20816783064dd4.patch deleted file mode 100644 index 21e97fd93a..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary/e31d5fdf2ea00ac6349e64580a20816783064dd4.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e31d5fdf2ea00ac6349e64580a20816783064dd4 Mon Sep 17 00:00:00 2001 -From: Hideki Takeoka -Date: Sun, 25 Aug 2019 19:25:00 +0200 -Subject: [PATCH] Update setup.py for python3.7+ support - ---- - setup.py | 9 +++++---- - src/SerialLibrary/version.py | 3 +++ - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index 4c34705..70bb1af 100644 ---- a/setup.py -+++ b/setup.py -@@ -1,6 +1,5 @@ - #!/usr/bin/env python - --from imp import load_source - from os.path import abspath, dirname, join - from sys import platform - -@@ -18,9 +17,11 @@ - - - CURDIR = dirname(abspath(__file__)) --VERSION = load_source( -- 'version', 'version', -- open(join(CURDIR, 'src', 'SerialLibrary', 'version.py'))).VERSION -+ -+with open(join(CURDIR, 'src', 'SerialLibrary', 'version.py')) as f: -+ exec(f.read()) -+ VERSION = get_version() -+ - README = open(join(CURDIR, 'README.rst')).read() - CLASSIFIERS = '\n'.join( - map(' :: '.join, [ -diff --git a/src/SerialLibrary/version.py b/src/SerialLibrary/version.py -index 6ce65c4..19831bc 100644 ---- a/src/SerialLibrary/version.py -+++ b/src/SerialLibrary/version.py -@@ -1 +1,4 @@ - VERSION = (0, 3, 1) -+ -+def get_version(): -+ return VERSION; diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.3.1.bb deleted file mode 100644 index d9465af081..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.3.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Robot Framework test library for serial connection" -HOMEPAGE = "https://github.com/whosaysni/robotframework-seriallibrary" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" - -SRC_URI[md5sum] = "b7c9565d54c30df7cd3f3c0e29adffa3" -SRC_URI[sha256sum] = "256ad60fc0b7df4be44d82c302f5ed8fad4935cda99e4b45942e3c88179d1e19" - -PYPI_PACKAGE = "robotframework-seriallibrary" - -inherit pypi setuptools3 - -SRC_URI += "file://e31d5fdf2ea00ac6349e64580a20816783064dd4.patch" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-pyserial \ - ${PYTHON_PN}-robotframework \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.4.3.bb new file mode 100644 index 0000000000..4ad5c3601d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.4.3.bb @@ -0,0 +1,17 @@ +SUMMARY = "Robot Framework test library for serial connection" +HOMEPAGE = "https://github.com/whosaysni/robotframework-seriallibrary" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=1af2e051b493d9552af443cf2f99d480" + +SRC_URI[sha256sum] = "f20befe5c1106dd8ddca9f60a2f18bf5ec7d5f06f6f09a03fa66bae54777e6bb" + +PYPI_PACKAGE = "robotframework-seriallibrary" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-pyserial \ + ${PYTHON_PN}-robotframework \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.40.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.40.bb deleted file mode 100644 index 935531a856..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.40.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Serialization based on ast.literal_eval" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d7c28f460fafe7be454fcdcac0b60263" - -SRC_URI[sha256sum] = "10b34e7f8e3207ee6fb70dcdc9bce473851ee3daf0b47c58aec1b48032ac11ce" - -inherit pypi ptest setuptools3 - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytz \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.41.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.41.bb new file mode 100644 index 0000000000..480e3ab388 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.41.bb @@ -0,0 +1,26 @@ +SUMMARY = "Serialization based on ast.literal_eval" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d7c28f460fafe7be454fcdcac0b60263" + +SRC_URI[sha256sum] = "0407035fe3c6644387d48cff1467d5aa9feff814d07372b78677ed0ee3ed7095" + +inherit pypi ptest setuptools3 + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-pytz \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.1.bb deleted file mode 100644 index a277930126..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Drop-in replacement for smbus-cffi/smbus-python in pure Python" -DESCRIPTION = "smbus2 is a drop-in replacement for smbus-cffi/smbus-python in pure Python" -HOMEPAGE = "https://github.com/kplindegaard/smbus2" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "6276eb599b76c4e74372f2582d2282f03b4398f0da16bc996608e4f21557ca9b" - -CLEANBROKEN = "1" - -PYPI_PACKAGE = "smbus2" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-fcntl \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.2.bb new file mode 100644 index 0000000000..f22a402df1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.2.bb @@ -0,0 +1,18 @@ +SUMMARY = "Drop-in replacement for smbus-cffi/smbus-python in pure Python" +DESCRIPTION = "smbus2 is a drop-in replacement for smbus-cffi/smbus-python in pure Python" +HOMEPAGE = "https://github.com/kplindegaard/smbus2" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "634541ed794068a822fe7499f1577468b9d4641b68dd9bfb6d0eb7270f4d2a32" + +CLEANBROKEN = "1" + +PYPI_PACKAGE = "smbus2" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-fcntl \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.36.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.36.bb deleted file mode 100644 index b20c6c8bae..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.36.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] = "64678ac321d64a45901ef2e24725ec5e783f1f4a588305e196431447e7ace243" - -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.39.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.39.bb new file mode 100644 index 0000000000..0690a8b4a2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.39.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] = "8194896038753b46b08a0b0ae89a5d80c897fb601dd51e243ed5720f1f155d27" + +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-tabulate_0.8.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.8.10.bb new file mode 100644 index 0000000000..222e6e7bb4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.8.10.bb @@ -0,0 +1,8 @@ +SUMMARY = "Pretty-print tabular data" +HOMEPAGE = "https://github.com/astanin/python-tabulate" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6ad1430c0c4824ec6a5dbb9754b011d7" + +SRC_URI[sha256sum] = "6c57f3f3dd7ac2782770155f3adb2db0b1a269637e42f27599925e64b114f519" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.8.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.8.9.bb deleted file mode 100644 index 19261c3d1d..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.8.9.bb +++ /dev/null @@ -1,8 +0,0 @@ -SUMMARY = "Pretty-print tabular data" -HOMEPAGE = "https://github.com/astanin/python-tabulate" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fad5a39bdfe452b13775adda41023ba7" - -SRC_URI[sha256sum] = "eb1d13f25760052e8931f2ef80aaf6045a6cceb47514db8beab24cded16f13a7" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-toolz_0.11.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-toolz_0.11.2.bb deleted file mode 100644 index a597641e50..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-toolz_0.11.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "A set of utility functions for iterators, functions, and dictionaries." -HOMEPAGE = "https://github.com/pytoolz/toolz" -SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca09cab178326d18433aae982d1edf5d" - -SRC_URI[sha256sum] = "6b312d5e15138552f1bda8a4e66c30e236c831b612b2bf0005f8a1df10a4bc33" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - python3-json \ - python3-math \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-toolz_0.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-toolz_0.12.0.bb new file mode 100644 index 0000000000..4025fa3e0e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-toolz_0.12.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "A set of utility functions for iterators, functions, and dictionaries." +HOMEPAGE = "https://github.com/pytoolz/toolz" +SECTION = "devel/python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca09cab178326d18433aae982d1edf5d" + +SRC_URI[sha256sum] = "88c570861c440ee3f2f6037c4654613228ff40c93a6c25e0eba70d17282c6194" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-json \ + python3-math \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.1.bb deleted file mode 100644 index 1dedc51029..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.1.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Tornado is an open source version of the scalable, non-blocking web server and tools that power FriendFeed." -DESCRIPTION = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed. \ -By using non-blocking network I/O, Tornado can scale to tens of thousands of open connections, making it ideal for long \ -polling, WebSockets, and other applications that require a long-lived connection to each user." -HOMEPAGE = "http://www.tornadoweb.org/en/stable/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI[md5sum] = "f324f5e7607798552359d6ab054c4321" -SRC_URI[sha256sum] = "33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791" - -inherit pypi setuptools3 - -# Requires _compression which is currently located in misc -RDEPENDS:${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-numbers ${PYTHON_PN}-email \ - ${PYTHON_PN}-pkgutil ${PYTHON_PN}-html ${PYTHON_PN}-json ${PYTHON_PN}-certifi ${PYTHON_PN}-threading \ - ${PYTHON_PN}-ctypes ${PYTHON_PN}-misc" - -RDEPENDS:${PN}-test += "${PN} ${PYTHON_PN}-unittest" - -PACKAGES =+ "\ - ${PN}-test \ -" - -FILES:${PN}-test = " \ - ${libdir}/${PYTHON_DIR}/site-packages/*/test \ - ${libdir}/${PYTHON_DIR}/site-packages/*/testing.py* \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.2.bb new file mode 100644 index 0000000000..d94fd39273 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.2.bb @@ -0,0 +1,27 @@ +SUMMARY = "Tornado is an open source version of the scalable, non-blocking web server and tools that power FriendFeed." +DESCRIPTION = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed. \ +By using non-blocking network I/O, Tornado can scale to tens of thousands of open connections, making it ideal for long \ +polling, WebSockets, and other applications that require a long-lived connection to each user." +HOMEPAGE = "http://www.tornadoweb.org/en/stable/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI[sha256sum] = "9b630419bde84ec666bfd7ea0a4cb2a8a651c2d5cccdbdd1972a0c859dfc3c13" + +inherit pypi setuptools3 + +# Requires _compression which is currently located in misc +RDEPENDS:${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-numbers ${PYTHON_PN}-email \ + ${PYTHON_PN}-pkgutil ${PYTHON_PN}-html ${PYTHON_PN}-json ${PYTHON_PN}-certifi ${PYTHON_PN}-threading \ + ${PYTHON_PN}-ctypes ${PYTHON_PN}-misc" + +RDEPENDS:${PN}-test += "${PN} ${PYTHON_PN}-unittest" + +PACKAGES =+ "\ + ${PN}-test \ +" + +FILES:${PN}-test = " \ + ${libdir}/${PYTHON_DIR}/site-packages/*/test \ + ${libdir}/${PYTHON_DIR}/site-packages/*/testing.py* \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.2.1.bb deleted file mode 100644 index 3bc977279a..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.2.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Traitlets Python config system" -HOMEPAGE = "http://ipython.org" -AUTHOR = "IPython Development Team " -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING.md;md5=9c125dfc5ff5364d40b5f56f02cd9de3" - -SRC_URI[sha256sum] = "a415578cde1985f1b773faefe49e9f078d345f38665ce3e9e914ec7b41150ce9" - -inherit pypi python_hatchling - -RDEPENDS:${PN} = "\ - ${PYTHON_PN}-ipython-genutils \ - ${PYTHON_PN}-decorator \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.3.0.bb new file mode 100644 index 0000000000..7c81867075 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.3.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Traitlets Python config system" +HOMEPAGE = "http://ipython.org" +AUTHOR = "IPython Development Team " +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING.md;md5=9c125dfc5ff5364d40b5f56f02cd9de3" + +SRC_URI[sha256sum] = "0bb9f1f9f017aa8ec187d8b1b2a7a6626a2a1d877116baba52a129bfa124f8e2" + +inherit pypi python_hatchling + +RDEPENDS:${PN} = "\ + ${PYTHON_PN}-ipython-genutils \ + ${PYTHON_PN}-decorator \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.0.bb deleted file mode 100644 index 08252e837b..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.0.bb +++ /dev/null @@ -1,18 +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] = "817aa0c0bdc02a5ebe32051e168e23c71a0608334e624c793011f120dbbc05b7" - -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-twine_4.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.1.bb new file mode 100644 index 0000000000..0178dde738 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.1.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] = "96b1cf12f7ae611a4a40b6ae8e9570215daff0611828f5fe1f37a16255ab24a0" + +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-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch index 47da2b8cfc..42cd99a895 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch @@ -8,22 +8,28 @@ bitbake build errors related to already-stripped. Signed-off-by: Leon Anavi --- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + setup.py | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/setup.py b/setup.py -index 453dc31..962c507 100644 +index b98963b..d42f07a 100644 --- a/setup.py +++ b/setup.py -@@ -6,7 +6,7 @@ from setuptools import Extension, setup - dconv_source_files = glob("./deps/double-conversion/double-conversion/*.cc") +@@ -19,13 +19,7 @@ if not dconv_libs: + dconv_source_files.extend(glob("./deps/double-conversion/double-conversion/*.cc")) dconv_source_files.append("./lib/dconv_wrapper.cc") --strip_flags = ["-Wl,--strip-all"] if platform.system() == "Linux" else [] +-if platform.system() == "Linux" and environ.get("UJSON_BUILD_NO_STRIP", "0") not in ( +- "1", +- "True", +-): +- strip_flags = ["-Wl,--strip-all"] +-else: +- strip_flags = [] +strip_flags = [] module1 = Extension( "ujson", -- -2.30.2 +2.25.1 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.1.0.bb deleted file mode 100644 index 6c1bf7e82c..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.1.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Ultra fast JSON encoder and decoder for Python" -DESCRIPTION = "UltraJSON is an ultra fast JSON encoder and decoder written in pure C with bindings for Python 2.5+ and 3." - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=10fa10456417c0252bcb8a498e498ffe" - -SRC_URI[sha256sum] = "a88944d2f99db71a3ca0c63d81f37e55b660edde0b07216fb65a3e46403ef004" - -inherit pypi ptest setuptools3 - -SRC_URI += " \ - file://run-ptest \ - file://0001-setup.py-Do-not-strip-debugging-symbols.patch \ -" - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-numbers \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytz \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.3.0.bb new file mode 100644 index 0000000000..4c3ef82c92 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.3.0.bb @@ -0,0 +1,34 @@ +SUMMARY = "Ultra fast JSON encoder and decoder for Python" +DESCRIPTION = "UltraJSON is an ultra fast JSON encoder and decoder written in pure C with bindings for Python 2.5+ and 3." + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e0039a83d8a99726b5418f0b03302d0a" + +SRC_URI[sha256sum] = "ab938777b3ac0372231ee654a7f6a13787e587b1ca268d8aa7e6fb6846e477d0" + +inherit pypi ptest setuptools3 + +SRC_URI += " \ + file://run-ptest \ + file://0001-setup.py-Do-not-strip-debugging-symbols.patch \ +" + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-numbers \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-pytz \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.3.bb deleted file mode 100644 index dd5b0c3eb0..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.3.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Unified diff parsing/metadata extraction library" -HOMEPAGE = "http://github.com/matiasb/python-unidiff" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4c434b08ef42fea235bb019b5e5a97b3" - -SRC_URI[sha256sum] = "d5f2e53a9a00db3224a8c36349b5380e0e22d1aec6c694b14fb9483ee93c6205" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-io \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.4.bb new file mode 100644 index 0000000000..3f6d2850fd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.4.bb @@ -0,0 +1,26 @@ +SUMMARY = "Unified diff parsing/metadata extraction library" +HOMEPAGE = "http://github.com/matiasb/python-unidiff" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4c434b08ef42fea235bb019b5e5a97b3" + +SRC_URI[sha256sum] = "2bbcbc986e1fb97f04b1d7b864aa6002ab02f4d8a996bf03aa6e5a81447d1fc5" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-codecs \ + ${PYTHON_PN}-io \ +" 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 deleted file mode 100644 index b7f8099790..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.1.1.bb +++ /dev/null @@ -1,15 +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" - -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-waitress_2.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.1.2.bb new file mode 100644 index 0000000000..061586b5df --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.1.2.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] = "780a4082c5fbc0fde6a2fcfe5e26e6efc1e8f425730863c04085769781f51eba" + +inherit python_setuptools_build_meta pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.8.bb deleted file mode 100644 index 70af95157d..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.8.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] = "6d03149126864abd32715d4e9267d2754cede25a69052901399356ad3bc5ecff" - -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.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.9.bb new file mode 100644 index 0000000000..8c7c6dd476 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.9.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] = "43ce20ebb36a51f21fa376f76d1d4692452b2527ccd601950d69ed36b9e21609" + +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-web3_5.29.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_5.29.1.bb deleted file mode 100644 index b0b636b906..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_5.29.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A Python library for interacting with Ethereum." -HOMEPAGE = "https://github.com/ethereum/web3.py" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1dc2732bdc5e50382737979791cbb3b7" - -SRC_URI[sha256sum] = "14d0c4ef5d693b6cc9a36ad4ff31201add8ef1f4c1cdb920f7ce07f81841e6bc" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - python3-aiohttp \ - python3-distutils \ - python3-eth-account \ - python3-idna \ - python3-lru-dict \ - python3-requests \ - python3-setuptools \ - python3-websockets \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_5.29.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_5.29.2.bb new file mode 100644 index 0000000000..c9820ebdf8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_5.29.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "A Python library for interacting with Ethereum." +HOMEPAGE = "https://github.com/ethereum/web3.py" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1dc2732bdc5e50382737979791cbb3b7" + +SRC_URI[sha256sum] = "f37b01f3dc32010b176cef01c2107bc25b7cf94b63c3269d4ec52d7e5ded9a36" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-aiohttp \ + python3-distutils \ + python3-eth-account \ + python3-idna \ + python3-lru-dict \ + python3-requests \ + python3-setuptools \ + python3-websockets \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.2.bb deleted file mode 100644 index 3f09d267de..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.2.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=b969e9612325987c823fc0737063ebc8" - -SRC_URI[sha256sum] = "50b21db0058f7a953d67cc0445be4b948d7fc196ecbeb8083d68d94628e4abf6" - -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.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.3.bb new file mode 100644 index 0000000000..9c3ff02e9f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.3.3.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] = "d58c5f284d6a9bf8379dab423259fe8f85b70d5fa5d2916d5791a84594b122b1" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = "\ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-logging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.11.0.bb deleted file mode 100644 index 759cf029cc..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.11.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "The xmlschema library is an implementation of XML Schema for Python (supports Python 3.6+)." -HOMEPAGE = "https://github.com/sissaschool/xmlschema" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=47489cb18c469474afeb259ed1d4832f" - -SRC_URI[sha256sum] = "319f5e3e77beb6ab3b4166f699d9dafd59141487bd1a07675fd01af6483211a4" - -PYPI_PACKAGE = "xmlschema" -inherit pypi setuptools3 - -DEPENDS += "\ - ${PYTHON_PN}-elementpath-native \ -" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-elementpath \ - ${PYTHON_PN}-modules \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.11.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.11.3.bb new file mode 100644 index 0000000000..7837bc8a4a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_1.11.3.bb @@ -0,0 +1,20 @@ +SUMMARY = "The xmlschema library is an implementation of XML Schema for Python (supports Python 3.6+)." +HOMEPAGE = "https://github.com/sissaschool/xmlschema" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=47489cb18c469474afeb259ed1d4832f" + +SRC_URI[sha256sum] = "28a135028f7ab1e0c934fc0c6717a66b2dc5f166d123dfe6ce61afc671ad113f" + +PYPI_PACKAGE = "xmlschema" +inherit pypi setuptools3 + +DEPENDS += "\ + ${PYTHON_PN}-elementpath-native \ +" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-elementpath \ + ${PYTHON_PN}-modules \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.6.bb deleted file mode 100644 index bf97e4ff99..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.6.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)" -HOMEPAGE = "https://github.com/jstasiak/python-zeroconf" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bb705b228ea4a14ea2728215b780d80" - -SRC_URI[sha256sum] = "c98f87a9145c58ad544cf1708b5eb2f444d40cd5defc69c88eeaac0527a28795" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-ifaddr \ - ${PYTHON_PN}-asyncio \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.7.bb new file mode 100644 index 0000000000..3f67f5fc81 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.38.7.bb @@ -0,0 +1,13 @@ +SUMMARY = "Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)" +HOMEPAGE = "https://github.com/jstasiak/python-zeroconf" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bb705b228ea4a14ea2728215b780d80" + +SRC_URI[sha256sum] = "eaee2293e5f4e6d249f6155f9d3cca1668cb22b2545995ea72c6a03b4b7706d4" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-ifaddr \ + ${PYTHON_PN}-asyncio \ +" 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 5d82919685..3b080f54f6 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 37699e9be04d83c5923644e298f400e077f76e85 Mon Sep 17 00:00:00 2001 +From e47cc405eadcbe37a579c375e824e20a5c53bfad 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,13 +8,14 @@ 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 c799aec..76811e7 100644 +index ea6cec3..92b74b7 100644 --- a/configure.in +++ b/configure.in @@ -491,6 +491,11 @@ getloadavg @@ -30,7 +31,7 @@ index c799aec..76811e7 100644 [AC_TRY_RUN(#define _GNU_SOURCE #include diff --git a/server/core.c b/server/core.c -index 3020090..8fef5fd 100644 +index 4da7209..d3ca25b 100644 --- a/server/core.c +++ b/server/core.c @@ -65,6 +65,10 @@ @@ -43,7 +44,7 @@ index 3020090..8fef5fd 100644 + /* LimitRequestBody handling */ #define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1) - #define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 0) + #define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 1<<30) /* 1GB */ @@ -5126,6 +5130,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte } #endif @@ -73,6 +74,3 @@ index 3020090..8fef5fd 100644 return OK; } --- -2.25.1 - 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 deleted file mode 100644 index 8413f53790..0000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.53.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://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/apache2/apache2_2.4.54.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb new file mode 100644 index 0000000000..c5f014b3cd --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.54.bb @@ -0,0 +1,236 @@ +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] = "eb397feeefccaf254f8d45de3768d9d68e8e73851c49afd5b7176d1ecf80c340" + +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}-utils ${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/*" + +FILES:${PN}-utils = "${bindir}/ab \ + ${bindir}/htdbm \ + ${bindir}/htdigest \ + ${bindir}/htpasswd \ + ${bindir}/logresolve \ + ${bindir}/httxt2dbm \ + ${sbindir}/htcacheclean \ + ${sbindir}/fcgistarter \ + ${sbindir}/checkgid \ + ${sbindir}/rotatelogs \ + " + +# 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 ${PN}-utils" +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-webadmin/netdata/netdata/0001-Use-explicit-typecast-to-enum-rrdset_flags.patch b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Use-explicit-typecast-to-enum-rrdset_flags.patch deleted file mode 100644 index e3c7a7cd2b..0000000000 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Use-explicit-typecast-to-enum-rrdset_flags.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e8ec0a0f3a353a8167687a8fdb26773e45927aac Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 24 Apr 2022 09:49:12 -0700 -Subject: [PATCH] Use explicit typecast to enum rrdset_flags - -specifications say -An enumerator can be promoted to an integer value. However, -converting an integer to an enumerator requires an explicit -cast, and the results are not defined. - -Therefore The bitwise OR operation you are performing results -in an int, which you then attempt to assign to a variable of -type rrdset_flags without a cast. - -Fixes -| ml/Host.cc:167:9: error: assigning to 'RRDSET_FLAGS' (aka 'rrdset_flags') from incompatible type 'int' -| rrdset_flag_set(RS, RRDSET_FLAG_ANOMALY_DETECTION); -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Submitted [https://github.com/netdata/netdata/pull/12750] - -Signed-off-by: Khem Raj ---- - database/rrd.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/database/rrd.h -+++ b/database/rrd.h -@@ -489,8 +489,8 @@ typedef enum rrdset_flags { - #define rrdset_flag_clear(st, flag) __atomic_and_fetch(&((st)->flags), ~flag, __ATOMIC_SEQ_CST) - #else - #define rrdset_flag_check(st, flag) ((st)->flags & (flag)) --#define rrdset_flag_set(st, flag) (st)->flags |= (flag) --#define rrdset_flag_clear(st, flag) (st)->flags &= ~(flag) -+#define rrdset_flag_set(st, flag) (st)->flags = (RRDSET_FLAGS)((st)->flags | flag) -+#define rrdset_flag_clear(st, flag) (st)->flags = (RRDSET_FLAGS)((st)->flags & ~(flag)) - #endif - #define rrdset_flag_check_noatomic(st, flag) ((st)->flags & (flag)) - diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.34.1.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.34.1.bb deleted file mode 100644 index b777d20897..0000000000 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.34.1.bb +++ /dev/null @@ -1,83 +0,0 @@ -SUMMARY = "Real-time performance monitoring" -DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troubleshooting. \ - Open-source, free, preconfigured, opinionated, and always real-time." -HOMEPAGE = "https://github.com/netdata/netdata/" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" - -DEPENDS += "libuv util-linux zlib" - -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ - file://0001-Use-explicit-typecast-to-enum-rrdset_flags.patch \ -" -SRC_URI[sha256sum] = "8ea0786df0e952209c14efeb02e25339a0769aa3edc029e12816b8ead24a82d7" - -# default netdata.conf for netdata configuration -SRC_URI += "file://netdata.conf" - -# file for providing systemd service support -SRC_URI += "file://netdata.service" - -UPSTREAM_CHECK_URI = "https://github.com/netdata/netdata/releases" - -S = "${WORKDIR}/${BPN}-v${PV}" - -# Stop sending anonymous statistics to Google Analytics -NETDATA_ANONYMOUS ??= "enabled" - -inherit pkgconfig autotools-brokensep useradd systemd - -LIBS:toolchain-clang:x86 = "-latomic" -LIBS:riscv64 = "-latomic" -LIBS:riscv32 = "-latomic" -LIBS:mips = "-latomic" -export LIBS - -#systemd -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "netdata.service" -SYSTEMD_AUTO_ENABLE:${PN} = "enable" - -#User specific -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" - -# ebpf doesn't compile (or detect) the cross compilation well -EXTRA_OECONF += "--disable-ebpf" - -do_install:append() { - #set S UID for plugins - chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - # Install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/netdata.service ${D}${systemd_unitdir}/system - sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service - fi - - # Install default netdata.conf - install -d ${D}${sysconfdir}/netdata - install -m 0644 ${WORKDIR}/netdata.conf ${D}${sysconfdir}/netdata/ - sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf - sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf - sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf - - if [ "${NETDATA_ANONYMOUS}" = "enabled" ]; then - touch ${D}${sysconfdir}/netdata/.opt-out-from-anonymous-statistics - fi - - install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata - install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata - - chown -R netdata:netdata ${D}${datadir}/netdata/web -} - -FILES:${PN} += "${localstatedir}/cache/netdata/ ${localstatedir}/lib/netdata/" - -RDEPENDS:${PN} = "bash zlib" diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.35.1.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.35.1.bb new file mode 100644 index 0000000000..9decb63ddf --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.35.1.bb @@ -0,0 +1,82 @@ +SUMMARY = "Real-time performance monitoring" +DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troubleshooting. \ + Open-source, free, preconfigured, opinionated, and always real-time." +HOMEPAGE = "https://github.com/netdata/netdata/" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" + +DEPENDS += "libuv util-linux zlib" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ +" +SRC_URI[sha256sum] = "587f6cce421015f8e0a527e3964a4de8cc17085c354498150bc3ade21606bbf9" + +# default netdata.conf for netdata configuration +SRC_URI += "file://netdata.conf" + +# file for providing systemd service support +SRC_URI += "file://netdata.service" + +UPSTREAM_CHECK_URI = "https://github.com/netdata/netdata/releases" + +S = "${WORKDIR}/${BPN}-v${PV}" + +# Stop sending anonymous statistics to Google Analytics +NETDATA_ANONYMOUS ??= "enabled" + +inherit pkgconfig autotools-brokensep useradd systemd + +LIBS:toolchain-clang:x86 = "-latomic" +LIBS:riscv64 = "-latomic" +LIBS:riscv32 = "-latomic" +LIBS:mips = "-latomic" +export LIBS + +#systemd +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "netdata.service" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" + +#User specific +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" + +# ebpf doesn't compile (or detect) the cross compilation well +EXTRA_OECONF += "--disable-ebpf" + +do_install:append() { + #set S UID for plugins + chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + # Install systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/netdata.service ${D}${systemd_unitdir}/system + sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service + fi + + # Install default netdata.conf + install -d ${D}${sysconfdir}/netdata + install -m 0644 ${WORKDIR}/netdata.conf ${D}${sysconfdir}/netdata/ + sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf + sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf + sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf + + if [ "${NETDATA_ANONYMOUS}" = "enabled" ]; then + touch ${D}${sysconfdir}/netdata/.opt-out-from-anonymous-statistics + fi + + install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata + install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata + + chown -R netdata:netdata ${D}${datadir}/netdata/web +} + +FILES:${PN} += "${localstatedir}/cache/netdata/ ${localstatedir}/lib/netdata/" + +RDEPENDS:${PN} = "bash zlib" 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 deleted file mode 100644 index 32735bc6ec..0000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.3.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Application library for the Xfce desktop environment" -SECTION = "x11" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "gtk+3 libxfce4ui liburi-perl-native cairo" - -inherit xfce perlnative gtk-doc features_check mime-xdg - -# xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. -# cairo would at least needed to be built with xlib. -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -# SRC_URI must follow inherited one -SRC_URI += " \ - file://exo-no-tests-0.8.patch \ - file://configure.patch \ -" - -SRC_URI[sha256sum] = "722dff3c3fe23f0a65405e63889cf247c99d092d3f9fb16dec78d062cfb8fae6" - -# Note: python bindings did not work in oe-dev and are about to be moved to -# pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 -FILES:${PN} += " \ - ${datadir}/xfce4/ \ - ${libdir}/xfce4/exo* \ -" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.4.bb b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.4.bb new file mode 100644 index 0000000000..01c3bff062 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_4.16.4.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Application library for the Xfce desktop environment" +SECTION = "x11" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "gtk+3 libxfce4ui liburi-perl-native cairo" + +inherit xfce perlnative gtk-doc features_check mime-xdg + +# xfce4 depends on libwnck3, gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. +# cairo would at least needed to be built with xlib. +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +# SRC_URI must follow inherited one +SRC_URI += " \ + file://exo-no-tests-0.8.patch \ + file://configure.patch \ +" + +SRC_URI[sha256sum] = "82a50c67e78f1e5c420b7615515bcca759b86eeab99224ab8eca4306b89d2eca" + +# Note: python bindings did not work in oe-dev and are about to be moved to +# pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 +FILES:${PN} += " \ + ${datadir}/xfce4/ \ + ${libdir}/xfce4/exo* \ +" -- cgit v1.2.3