From 398afb76d72b06c33a92fb9e1fa7eec829fb7ff8 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 24 Nov 2023 16:08:11 -0600 Subject: meta-openembedded: revert to master/nanbield split - Revert "python3-rapidjson: add ptest" - 62039a2c3347841f0e5b2c46345c9bd2fe76805e - Revert "kernel-selftest: Use clang options when clang is available" - 6e0da8642ac8e6d277ee82ab91ce1248663fc58d. - Revert "kernel-selftest: Copy the .config from kernel build" - e65836d919e32e471192c47d39150298e97e141b. - Revert "opencv: Fix build with protobuf v22 and dnn enabled" - 225ce6a14a8110ab6b573b4dc9f5297a03d17e0f. - Revert "cpprestsdk: fix typo in comment, tag is actually 2.0.18" - 5596afa6508d8e603e257bcb604637e9fcabe2a6. - Revert "Add static-passwd and static-group files" - 2961a31a024bd9d41724b6d16f820baee2b390df. - Revert "Add static-passwd and static-group files" - 714156cc42cfc35dbd960e7755866fa257f67090. - Revert "Add static-passwd and static-group files" - 18f01d2b14a0f7789dfce6db12810a465804e23a. - Revert "Add static-passwd and static-group files" - 5ecda23c4ce2534f9f974b7bf066723a58e625aa. - Revert "Add static-passwd and static-group files" - 1a9892251bddf35d3a797d4968be2f69ac75976b. - Revert "Add static-passwd and static-group files" - 7d36797bef881cb5125259e33a4a245529f39112. - Revert "Add static-passwd and static-group files" - 84043e673b2c424e9fc8d2b349147f35c6828903. - Revert "meta-filesystems/layer.conf : Add meta-networking dependency" - 3801443f170c9c4db3c50e2c4ba7271d8d6f4633. - Revert "ptest-packagelists-meta-oe: Add kernel-selftest to x86/x86-64 images" - b729ec1b11d4b170a9e7a9c1ff8db5260ba1c7eb. - Revert "kernel-selftest: Build bpf tests again" - 30779662be112081096fb9a223acb0f8a4ccd6f3. - Revert "libnvme: apply patch already upstream to fix build with musl" - 8930d8798b44f538fcfb2013cf273c4534778404. - Revert "gnome-control-center: Fix polkit gettext issue" - 6ee4a15ce28b7f09fa80aad05276ad347a182cbd. - Revert "signing.bbclass: don't export OPENSSL environment variables globally" - 4ad790c7334b02d6d150285a952d84a02645773f. - Revert "libblockdev: fix QA error in case of multilib" - a76f0b1f7c9fc7ecb4ebaaf9862fff3624fdef53. - Revert "nvme-cli: upgrade 2.5 -> 2.6" - 719042228998484b9022676a2726002d10593343. - Revert "libnvme: Fix test builds on musl" - 29644952a6555849274b8ef8a8bd9fba2658dd76. - Revert "libnvme: upgrade 1.5 -> 1.6" - 9ef26775a5d9afad5277c8ef6c1f3332e4bbdf10. - Revert "klibc: Upgrade to 2.0.13 release" - 04ed4f1383314f0bd96ca3b4c04c64d998a0c0fb. - Revert "stressapptest: Upgrade to 1.0.11 release" - 350fd96f1e1271314855647981d0cc0ba6c155db. - Revert "pipewire: Upgrade 0.3.80 -> 0.3.81" - 9fc1b037e473cd77628c56fed5688e724ccb4ae9. - Revert "open62541: add Backport status and link to patch" - 0287a38fbcead63a16d8b6d931d5e0e70adfe494. - Revert "python3-boto3, python3-botocore: remove recipes" - bc98fb0765ab32aa98c7752306a3e314b13e85b5. - Revert "libbpf: add arm, powerpc and mips64 to COMPATIBLE_HOST" - bb8049afe96db57707afc259743e288bec456117. - Revert "dlt-daemon: Add an additional fix for non-systemd builds" - 13ab3b1a55f8ecbda99bf5a1b6dd36df2761051f. - Revert "dlt-daemon: do not disable dlt-system build when systemd is set to off" - 1fc2b9532b56685bd603fe93d867fc1268d7313f. - Revert "dlt-daemon: update patch 544.patch" - a5f0e3291b4947df76f5246ff0d246440e086816. - Revert "dlt-daemon: Enable experimental coredumphandler feature" - c065c929ab80c0ee5971c74d7e55559eebd78665. - Revert "dlt-daemon: Make it work without systemd" - f558bc9d3b2dab9e1a7824fad04f498839e140af. - Revert "ptest-image: Switch to using core-image-minimal" - d8d5444c25475f48df910888703e65edfece59db. - Revert "collectd: Use https in SRC_URI, add HOMEPAGE" - 99ef9c1969dfb3c0813570e401031fa051ec7a24. - Revert "images: Rename ptest images to rhyme with oe-core ptest images" - 7b5cb622b4e40ceb7b150c83ee98c40fd24ab9aa. - Revert "images: Rename -image to -image-all" - 0cb018059499f7531749ee1d5d1cbb02a6cf3f0a. - Revert "images: Delete layer specific base images" - e88b777cbecd85ff7d2916209774354a6a458101. - Revert "images: Inherit from core-image-base" - ef9d73fced12e7b2dab485f0443cec84e55d016b. - Revert "Revert "protobuf: stage protoc binary to sysroot"" - bfb626a23022d871ce3c0c64cb9e5d1cc17c737e. - Revert "bolt: change product name used for CVE checking" - c1ea15792baaa6c6c3d7005d110ad4689051ba20. - Revert "libnet: upgrade version v1.2 -> v1.3" - 780e779de71c0dfe04fee8a3f203fb1160b1e2c5. - Revert "nginx: add configure option" - e0ac8eec48ddddc93751cfcdef2557998bfe91c8. - Revert "graphviz: Fix build to not use $prefix as search dir" - 883860c40c67544dfe3e2d72732e2d8ef46b6f30. - Revert "libvpx: upgrade 1.13.0 -> 1.13.1" - 06faef7244794a076a64006c61774e7cef1217aa. - Revert "minicoredumber: Fix ptest reporting" - 7ddce1977953723091999ea70c0e1661748fbd77. - Revert "cukinia: Fix license field" - cb8908b91ead37c5d74b44f949c12c33354956a7. - Revert "pugixml: Update 1.13 -> 1.14" - 4b59083f4c50e097a09230bd533bdd9fbc8178ef. - Revert "recipes-connectivity: Add tayga recipe" - 470b24bc04b15d142714db7de048f1c046123fe1. - Revert "python3-lz4: use python3-unittest-automake-output" - e3f4956a2371a57a42f68d53baf466874dfc4806. - Revert "python3-pylint: Upgrade to 3.0.0" - 79eac8e59ff7be9247e67dfb9033312f9fb7cf0e. - Revert "python3-pyroute2: Add missing dependency on sqlite3 for ptests" - f46d4005229b5fc229e2c7e5bc5a6267211ff8de. - Revert "libcamera: Avoid build break in signature recalculation" - fe3a2def8838b734ba7f3fbe88172fedce721e75. - Revert "kernel-selftest: Build headers before compiling tests" - ea42cec2ec7ccb66c46cced255f752b8e5b15c2d. - Revert "relayd: Fix build with clang" - 29a21223938fedeb4a12c0f8189a99bb11bbd1bc. - Revert "relayd: Update to latest tip of trunk" - 616991508e15a5d8a4faf020ebeb4062dc46c64b. - Revert "nodejs: Fix ptest result reporting" - cd629b722db82b6ec0e97f6564ba52abfe57d93c. - Revert "fftw: Fix ptest result reporting" - 46d69cd07c32aa67020b297bc26e47cde0a5b57c. - Revert "webkitgtk3: Do not use musttail with clang on arm" - e959a2a96e45eb59e2b5ec1d769a9e4bbf81f323. - Revert "libnfs: Drop -Wno-implicit-function-declaration" - 61663d299051669c7c08c90da2518f0f24fabaaa. - Revert "gnome-remote-desktop: Upgrade 44.2 -> 45.0" - 9dce609306fe9d71f7d89619632d1879745cbc4e. - Revert "overlayfs-tools: Install fsck binary" - c63a101cf99ebf2af265c073509fa45d8d71c525. - Revert "overlayfs-tools: Bump up the version" - ae8faf852988cfed875e8bc73c911b89f3d052ad. - Revert "overlayfs-tools: Drop unneeded dependency" - ba46d91d3958a41e321c649a967e2d1ccd605ed8. - Revert "python3-flask-cors: add initial version of the recipe for 4.0.0" - 6c29bdf1fd5edeea789b891f7bffcd4c07329f39. - Revert "python3-boto3: add recipe for latest version of boto3" - 90558f223aa9cfe771ca47223789e5a63eb8246e. - Revert "python3-botocore: add recipe for latest version of botocore" - aa9a5a0e9702db5ca5e2caf05a30277292f081ff. - Revert "python3-nacl: Add recipe for the latest release of PyNaCl" - 3c292ae4914d2bf946a460ef0e1c6bd5a2eb45ec. - Revert "python3-parse-type: update version 0.5.2 -> 0.6.2" - fbd9f4046fdb0f6cfa5de616406af385ddd1b245. - Revert "python3-google-auth: update version 2.23.0 -> 2.23.1" - 418776ff897432f694f7727a2f2941dcfa5bb364. - Revert "python3-google-api-python-client: update version 2.100.0 -> 2.101.0" - 36a2f3795cbedb1efa5ff6d8866b68ec27452ef1. - Revert "python3-google-api-core: update version 2.12.0" - cfbcaa92efdf21d6a08dd61675a18cc138e9d21d. - Revert "python3-flask: update version 2.3.2 -> 2.3.3" - e10ff8dae562f4d7a3174e6b140abf820348289a. - Revert "vboxguestdrivers: fix kernel v6.5 build" - 030f6708154054787dca7c2de95d074970115187. - Revert "zfs: update to v2.2.0-rc4" - 67e31c930dc637755f7f2422ddcaf96dcbe77910. - Revert "python3-astroid: update version 2.16.6 -> 3.0.0" - 7f470f301b5b88416d37a143fa0af5b48306419e. - Revert "bolt: disable CVE checking for this recipe" - 722c4f16eb388abc6a0bd518ea991a3a6bebe790. - Revert "meta-oe/dynamic-layers: add one more missing Upstream-Status and fix one malformed" - aa851eb8e14eec6a49ef90d2aaa3ed5150916737. - Revert "meta-oe/dynamic-layers: add Upstream-Status where missing" - c51df28a4d2cf23e41965a2fbfb14ab897ffb36d. - Revert "libio-socket-ssl-perl: Change libnet-libidn-perl->libnet-idn-encode rdep for ptests" - 5851ca93a5dd598f2d78d8a3db42167ed4d38a48. - Revert "libnet-idn-encode: Add recipe" - 2a75d18490605cf5cea63d71aa7bc14eb60862fc. - Revert "libnfs: dont install libnfs-config.cmake" - 708b3016e81a2a06883b0bb23bfedc8cb3e3239d. - Revert "jq: Upgrade 1.6+git -> 1.7" - 3f378f792456cf28284e8a342730974957787241. - Revert "nodejs: upgrade 18.17.1 -> 20.5.1" - 13e83bd009200f42741083c5a6f1fbc653205c49. - Revert "python3-tzlocal: Remove dependency on pytz_deprecation_shim removed in release 5.0" - 4985fbfcf3217f8e6df2847341ffb8519a2de26c. - Revert "python3-pytz-deprecation-shim: Remove outdated recipe meant to be a short lived shim" - 6defcd8716d506cc92a88cae39f5949372834bf7. - Revert "mosquitto, etcd-cpp-apiv3: add missing Upstream-Status" - 5488a32d90a02c700b596cf8746e04bd3fb88272. - Revert "mozjs: use PV in MULTILIB_SCRIPTS" - 7d473b7616efc0eaa3f44582d0ed5b69f9905f02. - Revert "gnome-tweaks, networkmanager-fortisslvpn, libesmtp, json-schema-validator, python3-pybluez, python3-pynetlinux, apache2: Fix Malformed Upstream-Status" - a1c3c7f4e81d24a4d43880222ee184de3c3156b2. - Revert "gupnp-tools: fix build with meson-1.2.0" - 8a7c980d92145c02d7dbb1252a930293c301eee7. - Revert "mdns: Upgrade 1790.80.10 -> 2200.0.8" - 8ffef53d6a491e154d9cbc83b766e65825120c80. - Revert "mozjs: fix filename in MULTILIB_SCRIPTS" - 1abd1a419512f9300e98001494eaa67220ee563a. - Revert "minifi-cpp, mozjs-115, redis-7.2.1, pv: add missing Upstream-Status" - 5733ddc8346d9dfd47abe773ea93aafb0f451ffa. - Revert "etcd-cpp-apiv3: fix build when gRPC is cross compiled" - 23d6505d0bf0bbd5887292658ee98e806c7128de. - Revert "mariadb: add missing in rocksdb string_util.h" - 8cb9544e561abfa7c8d875cd554cb473fd26dbe4. - Revert "protobuf-c: bump to next release to support protobuf 4.23.x" - f22a9adb44da3f97cb62c96ae2619a0306af6435. - Revert "protobuf: upgrade 4.22.2 -> 4.23.4" - 39d8b9b7e6648d2c2cf33daac9be597e7d6f9dda. - Revert "devtools: grpc: bump to 1.56.2" - 8b3cc547b729c07eb14d3f88bcfe2b1620a6cc68. - Revert "protobuf-c: add support of protobuf 4.22.x" - 802925894ab264de32e36f5843e9bf1a2aab90e3. - Revert "protobuf: upgrade 3.21.12 -> 4.22.2" - fb34c7e3fae2ac7412dfb5920dfd1c9aca68427f. - Revert "etcd-cpp-apiv3: upgrade 0.14.3 -> 0.15.3" - 09951b1622a736fde8a7b5f8e87a6f224017f1a1. - Revert "mosh: add support of protobuf 4.22.x" - 69d96dc3ac4a413ca530adc70c329f839a91acba. - Revert "mozjs: Upgrade 102.15.0 -> 102.15.1" - 2887c5c0a2eb321f277037e055288f05878db369. - Revert "mozjs-102: Remove the buildpath" - f4dad2f978e3c5614bb164ae9ccb00bb12e9bded. - Revert "python3-prettytable: update version 3.6.0 -> 3.9.0" - c5a5877c2a3c8bbf6bd7ac378c7e4f8828ef1f2a. - Revert "python3-ninja-syntax: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX" - ee9fccf9084a0b8679cda8aaeedf52f9fb97c844. - Revert "python3-idna-ssl: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX" - e594a784351916aa0a798d4007d00fb4d3bee165. - Revert "python3-flask-babel: update version 2.0.0 -> 3.1.0" - 9600507356208eccfc4b874ab072e28935b06b8d. - Revert "python3-cachecontrol: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX" - d8f81f13ba74272c1cf3d98fac319be5132a4da5. - Revert "protobuf: stage protoc binary to sysroot" - a0557fe5433620717eeb00d3b16801711337b1a4. - Revert "python3-pyzmq: update version 25.0.0 -> 25.1.1" - 02914b8b645700a3255b724ef4f60d46b314bd19. - Revert "python3-xxhash: update version 3.2.0 -> 3.3.0" - 2a43654facb0aca57b4f94d05b063fb3fd58d3e1. - Revert "python3-traitlets: update version 5.9.0 -> 5.10.1" - 807dc278bd032bf25258e0526040fedf7c8feb57. - Revert "python3-redis: update version 5.0.0 -> 5.0.1" - 48913b2ff9aae22a789decfdd95bc9798b88ef64. - Revert "python3-pyproject-api: update version 1.5.1 -> 1.6.1" - a9140b705e247807b9e28f7ad4ec079b2b88b9ae. - Revert "python3-pyproj: update version 3.6.0 -> 3.6.1" - 433956f6d3e46b9481e5bbc9aab403ea0491218e. - Revert "python3-pynetlinux: Fix patch upstream-status" - 7c3e425b8d9749857714034d75f0625cd090b24f. - Revert "python3-pybluez: Fix patch upstream-status" - 91ef75cfea923f24a067aa87add49122c35af932. - Revert "Remove python3-isodate" - 41d6c0f7fc59569e3c3e1d501d5f6d735227721f. - Revert "Remove python3-click" - 6f1261a66d49a8f2130ad438579582eb8761da0e. - Revert "Remove python3-booleanpy" - 1beedf1eb71d80f66ff33addee918e79b275c907. - Revert "Remove python3-xmltodict" - 1fba08c2f7a8e37314edc381c958a30452130061. - Revert "Remove python3-license-expression" - df9dc7b8e3476756c0209e108d6ae8f6be340e0b. - Revert "Remove python3-rdflib" - b2c2e9e600fac95fb73609baf8ffb55983378f39. - Revert "python3-pymysql: update verion 1.0.2 -> 1.1.0" - 908729c9ca44e038087f64a745640b91723cbdfb. - Revert "python3-pymysql: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX" - a6e462e3b1bf62a2368d0e1647babe85c2d113c0. - Revert "python-pyiface: Update version from git -> 0.0.11" - f6712591f614cda4a75121593f44620bc173ded8. - Revert "python3-pyasn1-modules: Update version 0.2.8 -> 0.3.0" - 55d0a7396e320bba8d49aa37fabc42f2fd695c54. - Revert "python3-pyhamcrest: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX" - 0c6c1350170ebb6d302b9c242ebded7d015bd9b1. - Revert "python3-pydantic: Update version 1.10.7 -> 2.4.1" - 4570e4aa474e1f1517eb6d298b723bbcc57598e1. - Revert "python3-async-timeout: remove old version of the library" - 8a79a7519c289e9d33c63ce2c4d4c57ff43ff687. - Revert "python3-argh: Update version 0.29.3 -> 0.29.4" - b5ea5fd49716a438744a1a9c5fd9dd3eada0dd07. - Revert "python3-apiflask: Update version 2.0.1 -> 2.0.2" - cb621ee2586448b0c6584bd47ae076cc6b312b49. - Revert "cpp-netlib: Fix buildpaths in generated cmake files" - 9626784f46dfa25462f37742201d6b59a9914580. - Revert "cpp-netlib: Fix build with boost 1.80+" - 0e3c482192f2ff8bfc1c05c5d8542b22e1d67d0d. - Revert "gupnp: fix build with meson-1.2.0" - 15c8096177edbf2e05915d6b8df2139434eef83d. - Revert "python3-pyu2f: add recipe" - ad176afadc7f2ad01f6c04df1f5eef4ead889467. - Revert "webkitgtk3: reduce size of -dbg package" - 6985b3d6a9b77d12bd787fc522533b45e4f501d3. - Revert "mosquitto: upgrade 2.0.17 -> 2.0.18" - 79088766c8b82487a58da79f5ba9114c5ad69eaf. - Revert "mozjs-115: Apply autoconf tuple mismatch fix" - ee100d192dc466eefae420e5e9cf23b74d44562d. - Revert "udisks2: Upgrade 2.9.4 -> 2.10.1" - 5804b39df5866fbb0d6cfbb4203a101388a4c981. - Revert "libblockdev: Upgrade 2.28 -> 3.03" - dc28f172aa70484d71407892918d500150f71670. - Revert "tepl: Upgrade 6.4.0 -> 6.8.0" - 77cc7d45b214d7d7cd9b0a3cc014c83649f0be0c. - Revert "gedit: Upgrade 44.2 -> 46.1" - cddc20f9c653822ca90f2c44039908b3ecc98fa4. Change-Id: I43251352395e7a1de0bf5ecb8087a158ab37fc13 --- meta-openembedded/meta-filesystems/conf/layer.conf | 2 +- .../files/static-passwd-meta-filesystems | 3 - .../images/meta-filesystems-image-all.bb | 3 - .../images/meta-filesystems-image-base.bb | 7 + .../images/meta-filesystems-image.bb | 3 + .../recipes-filesystems/zfs/zfs_2.2.0.bb | 2 +- .../0001-Makefile-proper-location-of-LDFLAGS.patch | 32 ++ .../recipes-utils/overlayfs/overlayfs-progs_git.bb | 32 ++ ...ludes-so-that-it-compiles-on-Ubuntu-20.04.patch | 43 +++ .../0002-makefile-fix-linking-flags.patch | 33 ++ .../recipes-utils/overlayfs/overlayfs-tools_git.bb | 10 +- .../recipes-utils/xfstests/xfstests_2023.03.05.bb | 2 +- .../gnome-remote-desktop_44.2.bb | 38 ++ .../gnome-remote-desktop_45.0.bb | 40 -- .../meta-gnome/files/static-passwd-meta-gnome | 1 - .../meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb | 22 ++ .../meta-gnome/recipes-gnome/gedit/gedit_44.2.bb | 46 +++ .../meta-gnome/recipes-gnome/gedit/gedit_46.1.bb | 53 --- .../recipes-gnome/gedit/libgedit-amtk_5.8.0.bb | 17 - .../gedit/libgedit-gtksourceview_299.0.4.bb | 24 -- .../gnome-control-center_45.0.bb | 2 - ...002-meson-fix-invalid-positional-argument.patch | 2 +- .../meta-gnome/recipes-gnome/tepl/tepl_6.4.0.bb | 31 ++ .../meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb | 31 -- ...uild-failure-for-some-architectures-with-.patch | 34 ++ ...001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch | 6 +- .../klibc/files/armv4-fix-v4bx.patch | 4 +- .../recipes-devtools/klibc/klcc-cross_2.0.10.bb | 32 ++ .../recipes-devtools/klibc/klcc-cross_2.0.13.bb | 32 -- .../klibc/klibc-static-utils_2.0.10.bb | 12 + .../klibc/klibc-static-utils_2.0.13.bb | 12 - .../recipes-devtools/klibc/klibc-utils_2.0.10.bb | 14 + .../recipes-devtools/klibc/klibc-utils_2.0.13.bb | 14 - .../recipes-devtools/klibc/klibc.inc | 3 +- .../recipes-devtools/klibc/klibc_2.0.10.bb | 26 ++ .../recipes-devtools/klibc/klibc_2.0.13.bb | 26 -- .../files/static-group-meta-multimedia | 2 - .../files/static-passwd-meta-multimedia | 2 - .../0001-build-Fix-wrap-file-syntax.patch | 56 --- .../gupnp/gupnp-tools_0.10.2.bb | 4 +- ...ild-properly-spell-provide-in-.wrap-files.patch | 25 -- .../recipes-connectivity/gupnp/gupnp_1.4.1.bb | 1 - .../images/meta-multimedia-image-all.bb | 3 - .../images/meta-multimedia-image-base.bb | 7 + .../images/meta-multimedia-image.bb | 3 + .../images/multimedia-libcamera-image.bb | 2 +- .../libcamera/libcamera_0.1.0.bb | 7 +- .../recipes-multimedia/pipewire/pipewire_0.3.80.bb | 389 +++++++++++++++++++ .../recipes-multimedia/pipewire/pipewire_0.3.81.bb | 389 ------------------- .../files/static-group-meta-networking | 14 - .../files/static-passwd-meta-networking | 19 - .../mosquitto/files/2894.patch | 25 -- .../mosquitto/files/2895.patch | 27 -- .../mosquitto/mosquitto_2.0.17.bb | 90 +++++ .../mosquitto/mosquitto_2.0.18.bb | 92 ----- .../0001-fix-ppp-2.5.0-build.patch | 2 +- .../0002-fix-ppp-2.5.0-build.patch | 2 +- .../0001-rtnl_flush-Error-on-failed-write.patch | 34 ++ .../recipes-connectivity/relayd/relayd_git.bb | 8 +- .../tayga/files/0001-include-sys-uio.patch | 18 - .../recipes-connectivity/tayga/files/tayga.conf | 103 ------ .../recipes-connectivity/tayga/files/tayga.service | 12 - .../recipes-connectivity/tayga/tayga_0.9.2.bb | 21 -- .../images/meta-networking-image-all.bb | 3 - .../images/meta-networking-image-base.bb | 7 + .../recipes-core/images/meta-networking-image.bb | 3 + .../0001-Handle-interface-without-ifa_addr.patch | 38 -- ...red-Drop-MacOS-specific-__block-qualifier.patch | 30 ++ .../0005-mDNSCore-Fix-broken-debug-parameter.patch | 17 +- .../mdns/mdns/0015-Add-missing-limits.h.patch | 23 -- .../recipes-protocols/mdns/mdns_1790.80.10.bb | 133 +++++++ .../recipes-protocols/mdns/mdns_2200.0.8.bb | 134 ------- .../0001-fix-build-do-not-install-git-files.patch | 2 +- .../0001-Add-build-option-for-NTLM-support.patch | 2 +- meta-openembedded/meta-oe/classes/signing.bbclass | 12 +- .../conf/include/ptest-packagelists-meta-oe.inc | 4 +- .../openbox/openbox-xdgmenu/7_6.diff | 2 - .../openbox-xdgmenu/fix-menu-generation.patch | 2 - .../openbox-xdgmenu/port-gnome-menus3.patch | 2 - ...x-build-on-32bit-arches-with-64bit-time_t.patch | 2 - ...-do-not-clobber-PYTHONPATH-from-build-env.patch | 2 - .../lirc/lirc/0001-Unbolt-ubuntu-hack.patch | 2 +- .../lirc/lirc/fix_build_errors.patch | 2 - ...1-don-t-fail-if-GLOB_BRACE-is-not-defined.patch | 2 - .../android-tools/0001-Fixes-for-yocto-build.patch | 2 - ...ls-modifications-to-make-it-build-in-yoct.patch | 2 - ...e-of-usbdevfs_urb-to-match-new-kernel-UAP.patch | 2 - .../0004-adb-Fix-build-on-big-endian-systems.patch | 2 - .../0005-adb-Allow-adbd-to-be-run-as-root.patch | 2 - .../android-tools/debian/Add-riscv64-support.patch | 2 - .../debian/Added-missing-headers.patch | 2 - .../android-tools/debian/Nonnull.patch | 2 - .../android-tools/debian/Vector-cast.patch | 2 - .../android-tools/debian/add-missing-headers.patch | 2 - .../20150704-CVE-2015-3239_dwarf_i.h.patch | 2 - .../libunwind/legacy_built-in_sync_functions.patch | 2 - .../debian/external/libunwind/user_pt_regs.patch | 2 - .../debian/fix-attribute-issue-with-gcc.patch | 2 - .../debian/fix-build-on-non-x86.patch | 2 - .../debian/fix-gettid-exception-declaration.patch | 2 - .../debian/fix-standard-namespace-errors.patch | 2 - .../debian/hard-code-build-number.patch | 2 - .../android-tools/debian/libusb-header-path.patch | 2 - .../debian/move-log-file-to-proper-dir.patch | 2 - .../android-tools/debian/simg_dump-python3.patch | 2 - .../android-tools/debian/stdatomic.patch | 2 - .../android-tools/debian/stub-out-fastdeploy.patch | 2 - .../debian/system/core/Add-riscv64-support.patch | 2 - .../debian/system/core/Added-missing-headers.patch | 2 - .../android-tools/debian/system/core/Nonnull.patch | 2 - .../debian/system/core/Vector-cast.patch | 2 - .../debian/system/core/add-missing-headers.patch | 2 - .../system/core/fix-attribute-issue-with-gcc.patch | 2 - .../debian/system/core/fix-build-on-non-x86.patch | 2 - .../core/fix-gettid-exception-declaration.patch | 2 - .../core/fix-standard-namespace-errors.patch | 2 - .../system/core/hard-code-build-number.patch | 2 - .../debian/system/core/libusb-header-path.patch | 2 - .../system/core/move-log-file-to-proper-dir.patch | 2 - .../debian/system/core/simg_dump-python3.patch | 2 - .../debian/system/core/stdatomic.patch | 2 - .../debian/system/core/stub-out-fastdeploy.patch | 2 - .../core/throw-exception-on-unknown-os.patch | 2 - .../debian/throw-exception-on-unknown-os.patch | 2 - .../meta-oe/files/static-group-meta-oe | 8 - .../meta-oe/files/static-passwd-meta-oe | 11 - .../0001-configure-Add-with-cpu.patch | 37 ++ .../0002-Replace-lfs64-functions-and-defines.patch | 103 ++++++ ...heck-for-pthread_rwlockattr_setkind_np-be.patch | 43 +++ .../stressapptest/libcplusplus-compat.patch | 28 ++ .../stressapptest/read_sysfs_for_cachesize.patch | 72 ++++ .../stressapptest/stressapptest_1.0.11.bb | 23 -- .../stressapptest/stressapptest_1.0.9.bb | 31 ++ .../meta-oe/recipes-bsp/bolt/bolt_0.9.5.bb | 2 - .../meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.5.bb | 30 ++ .../meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.6.bb | 30 -- ...d-int64_t-instead-of-__int64_t-for-mingw-.patch | 33 ++ .../recipes-connectivity/libnet/libnet_1.2.bb | 21 ++ .../recipes-connectivity/libnet/libnet_1.3.bb | 20 - .../recipes-connectivity/libnfs/libnfs_5.0.2.bb | 9 +- ...nfigure.ac-add-support-of-protobuf-4.22.x.patch | 63 ---- .../recipes-connectivity/mosh/mosh_1.4.0.bb | 7 +- .../recipes-core/images/meta-oe-image-all.bb | 5 - .../recipes-core/images/meta-oe-image-base.bb | 7 + .../recipes-core/images/meta-oe-image-ptest-all.bb | 25 -- .../images/meta-oe-image-ptest-fast.bb | 6 - .../recipes-core/images/meta-oe-image-ptest.bb | 41 -- .../meta-oe/recipes-core/images/meta-oe-image.bb | 5 + .../recipes-core/images/meta-oe-ptest-all-image.bb | 25 ++ .../images/meta-oe-ptest-fast-image.bb | 6 + .../recipes-core/images/meta-oe-ptest-image.bb | 42 +++ ...1-Add-missing-includes-cstdint-and-cstdio.patch | 16 +- ...ged-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch | 62 ++++ ...ke-add-separate-export-for-plugin-targets.patch | 93 +++++ .../grpc/grpc/0001-fix-CVE-2023-32732.patch | 81 ++++ .../meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb | 70 ++++ .../meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb | 67 ---- ...ass-_XOPEN_SOURCE-when-checking-for-strpt.patch | 40 ++ ...-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch | 32 ++ .../meta-oe/recipes-devtools/jq/jq_1.7.bb | 46 --- .../meta-oe/recipes-devtools/jq/jq_git.bb | 43 +++ .../0002-Fix-assumed-signed-char.patch | 2 +- .../0003-For-root-value-use-empty-pointer.patch | 2 +- .../nodejs/nodejs-oe-cache-18.17/oe-npm-cache | 77 ++++ .../nodejs/nodejs-oe-cache-20.5/oe-npm-cache | 77 ---- .../nodejs/nodejs-oe-cache-native_18.17.bb | 21 ++ .../nodejs/nodejs-oe-cache-native_20.5.bb | 21 -- .../nodejs/nodejs/0001-Using-native-binaries.patch | 19 +- .../0001-liftoff-Correct-function-signatures.patch | 42 ++- ...mips-Use-32bit-cast-for-operand-on-mips32.patch | 34 ++ .../nodejs/nodejs/big-endian.patch | 18 + .../nodejs/nodejs/mips-less-memory.patch | 37 ++ .../recipes-devtools/nodejs/nodejs/run-ptest | 5 - .../recipes-devtools/nodejs/nodejs_18.17.1.bb | 185 +++++++++ .../recipes-devtools/nodejs/nodejs_20.5.1.bb | 180 --------- ...-do-not-compile-the-code-which-was-genera.patch | 106 ------ .../recipes-devtools/protobuf/protobuf-c_1.4.1.bb | 6 +- .../0001-Fix-linking-error-with-ld-gold.patch | 69 ++++ ...kefile-respect-CXX-LDFLAGS-variables-fix-.patch | 15 +- .../recipes-devtools/protobuf/protobuf_3.21.12.bb | 106 ++++++ .../recipes-devtools/protobuf/protobuf_4.23.4.bb | 115 ------ .../recipes-devtools/pugixml/pugixml_1.13.bb | 24 ++ .../recipes-devtools/pugixml/pugixml_1.14.bb | 24 -- .../recipes-extended/collectd/collectd_5.12.0.bb | 3 +- .../dlt-daemon/dlt-daemon/544.patch | 80 ---- .../dlt-daemon/dlt-daemon_2.18.10.bb | 26 +- .../0001-cmake-fix-when-cross-compiling.patch | 68 ---- .../recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb | 20 + .../recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb | 24 -- ...thondir-for-multilib-when-cross-compiling.patch | 32 -- .../libblockdev/libblockdev_2.28.bb | 43 +++ .../libblockdev/libblockdev_3.03.bb | 39 -- ...ledOSSPUUID.cmake-Pass-CFLAGS-to-compiler.patch | 2 - ...stness-issues-around-autovector-iterator_.patch | 2 - .../recipes-extended/mozjs/mozjs-102_102.15.0.bb | 79 ++++ .../recipes-extended/mozjs/mozjs-102_102.15.1.bb | 82 ---- ...t-use-autoconf-s-config.sub-to-canonicali.patch | 25 +- .../mozjs/mozjs-115/fix-musl-build.patch | 2 - .../recipes-extended/mozjs/mozjs-115_115.2.0.bb | 8 +- .../hiredis-use-default-CC-if-it-is-set.patch | 2 - .../redis/redis-7.2.1/oe-use-libc-malloc.patch | 2 - ...ix-do-not-put-prefix-based-paths-in-compi.patch | 58 --- .../recipes-graphics/graphviz/graphviz_8.1.0.bb | 1 - .../kernel-selftest/kernel-selftest.bb | 40 +- .../kernel-selftest/kernel-selftest/run-ptest | 10 +- .../meta-oe/recipes-kernel/libbpf/libbpf_1.2.0.bb | 2 +- .../recipes-kernel/minicoredumper/files/run-ptest | 4 +- .../recipes-multimedia/webm/libvpx_1.13.0.bb | 53 +++ .../recipes-multimedia/webm/libvpx_1.13.1.bb | 53 --- .../a53f123040998744602f190944464af0e159ea19.patch | 30 -- .../recipes-support/cpp-netlib/cpp-netlib_git.bb | 10 +- .../recipes-support/cpprest/cpprest_2.10.18.bb | 2 +- .../meta-oe/recipes-support/fftw/fftw/run-ptest | 15 +- .../0001-test-handle-POSIX-ioctl-prototype.patch | 68 ---- .../meta-oe/recipes-support/libnvme/libnvme_1.5.bb | 22 ++ .../meta-oe/recipes-support/libnvme/libnvme_1.6.bb | 24 -- .../opencv/fix-build-with-protobuf-v22.patch | 412 --------------------- .../meta-oe/recipes-support/opencv/opencv_4.8.0.bb | 3 +- ...handle-error-of-tcgetpgrp-in-pv_in_foregr.patch | 2 - .../0001-Makefile.am-Dont-include-buildpath.patch | 47 --- .../recipes-support/udisks/udisks2_2.10.1.bb | 63 ---- .../recipes-support/udisks/udisks2_2.9.4.bb | 59 +++ .../0001-vbox_fb-fix-kernel-v6.5-build.patch | 50 --- .../vboxguestdrivers/vboxguestdrivers_7.0.10.bb | 1 - .../webkitgtk/webkitgtk3/no-musttail-arm.patch | 21 -- .../recipes-support/webkitgtk/webkitgtk3_2.42.0.bb | 4 - .../meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb | 2 +- .../meta-perl/files/static-group-meta-perl | 1 - .../meta-perl/files/static-passwd-meta-perl | 1 - .../recipes-core/images/meta-perl-base.bb | 7 + .../recipes-core/images/meta-perl-image-all.bb | 5 - .../images/meta-perl-image-ptest-all.bb | 25 -- .../images/meta-perl-image-ptest-fast.bb | 6 - .../recipes-core/images/meta-perl-image-ptest.bb | 40 -- .../recipes-core/images/meta-perl-image.bb | 5 + .../images/meta-perl-ptest-all-image.bb | 25 ++ .../images/meta-perl-ptest-fast-image.bb | 6 + .../recipes-core/images/meta-perl-ptest-image.bb | 41 ++ .../libio/libio-socket-ssl-perl_2.083.bb | 2 +- .../recipes-perl/libnet/libnet-idn-encode_2.500.bb | 23 -- .../recipes-core/images/meta-python-image-all.bb | 5 - .../recipes-core/images/meta-python-image-base.bb | 7 + .../images/meta-python-image-ptest-all.bb | 25 -- .../images/meta-python-image-ptest-fast.bb | 6 - .../recipes-core/images/meta-python-image-ptest.bb | 40 -- .../recipes-core/images/meta-python-image.bb | 5 + .../images/meta-python-ptest-all-image.bb | 25 ++ .../images/meta-python-ptest-fast-image.bb | 6 + .../recipes-core/images/meta-python-ptest-image.bb | 41 ++ .../packagegroups/packagegroup-meta-python.bb | 1 + .../recipes-devtools/python/python-idna-ssl.inc | 15 + .../python/python3-apiflask_2.0.1.bb | 18 + .../python/python3-apiflask_2.0.2.bb | 18 - .../recipes-devtools/python/python3-argh_0.29.3.bb | 26 ++ .../recipes-devtools/python/python3-argh_0.29.4.bb | 26 -- .../python/python3-astroid_2.15.6.bb | 35 ++ .../python/python3-astroid_3.0.0.bb | 36 -- .../python/python3-async-timeout_4.0.0.bb | 18 + .../python/python3-booleanpy_4.0.bb | 13 + .../python/python3-cachecontrol_0.13.1.bb | 3 - .../python/python3-click/run-ptest | 3 + .../recipes-devtools/python/python3-click_8.1.7.bb | 39 ++ .../python/python3-flask-babel_2.0.0.bb | 16 + .../python/python3-flask-babel_3.1.0.bb | 15 - .../python/python3-flask-cors_4.0.0.bb | 16 - .../recipes-devtools/python/python3-flask_2.3.2.bb | 24 ++ .../recipes-devtools/python/python3-flask_2.3.3.bb | 22 -- .../python/python3-google-api-core_2.11.1.bb | 25 ++ .../python/python3-google-api-core_2.12.0.bb | 25 -- .../python3-google-api-python-client_2.100.0.bb | 20 + .../python3-google-api-python-client_2.101.0.bb | 20 - .../python/python3-google-auth_2.23.0.bb | 26 ++ .../python/python3-google-auth_2.23.1.bb | 26 -- .../python/python3-idna-ssl_1.1.0.bb | 19 +- .../python/python3-isodate_0.6.1.bb | 14 + .../python/python3-license-expression/run-ptest | 3 + .../python/python3-license-expression_30.1.1.bb | 36 ++ .../recipes-devtools/python/python3-lz4/run-ptest | 2 +- .../recipes-devtools/python/python3-lz4_4.3.2.bb | 1 - .../recipes-devtools/python/python3-nacl_1.5.0.bb | 25 -- .../python/python3-ninja-syntax_1.7.2.bb | 2 - .../python/python3-parse-type_0.5.2.bb | 30 ++ .../python/python3-parse-type_0.6.2.bb | 24 -- .../python/python3-prettytable_3.6.0.bb | 46 +++ .../python/python3-prettytable_3.9.0.bb | 43 --- .../python/python3-pyasn1-modules_0.2.8.bb | 29 ++ .../python/python3-pyasn1-modules_0.3.0.bb | 30 -- ...e_t-when-parsing-buffer-length-fix-426-42.patch | 5 +- .../python/python3-pydantic_1.10.7.bb | 21 ++ .../python/python3-pydantic_2.4.1.bb | 23 -- .../python/python3-pyhamcrest_2.0.4.bb | 3 - .../python/python3-pyiface_0.0.11.bb | 18 - .../recipes-devtools/python/python3-pyiface_git.bb | 24 ++ .../0001-pylint-remove-plugin-pickle-test.patch | 53 +++ ...oject.toml-Remove-hard-coded-dependencies.patch | 26 ++ .../python/python3-pylint_2.17.4.bb | 51 +++ .../python/python3-pylint_3.0.0.bb | 50 --- .../python/python3-pymysql_1.0.2.bb | 16 + .../python/python3-pymysql_1.1.0.bb | 19 - .../0002-Fixed-relative-imports.patch | 2 +- .../python/python3-pyproj_3.6.0.bb | 23 ++ .../python/python3-pyproj_3.6.1.bb | 23 -- .../python/python3-pyproject-api_1.5.1.bb | 23 ++ .../python/python3-pyproject-api_1.6.1.bb | 23 -- .../python/python3-pyroute2_0.7.9.bb | 1 - .../python3-pytz-deprecation-shim_0.1.0.post0.bb | 15 + .../recipes-devtools/python/python3-pyu2f_0.1.5.bb | 20 - .../python/python3-pyzmq_25.0.0.bb | 55 +++ .../python/python3-pyzmq_25.1.1.bb | 55 --- .../python/python3-rapidjson/run-ptest | 3 - .../python/python3-rapidjson_1.11.bb | 20 +- .../python/python3-rdflib_7.0.0.bb | 19 + .../recipes-devtools/python/python3-redis_5.0.0.bb | 18 + .../recipes-devtools/python/python3-redis_5.0.1.bb | 18 - .../python/python3-traitlets_5.10.1.bb | 13 - .../python/python3-traitlets_5.9.0.bb | 13 + .../python/python3-tzlocal_5.0.1.bb | 1 + .../python/python3-xmltodict/run-ptest | 3 + .../python/python3-xmltodict_0.13.0.bb | 29 ++ .../python/python3-xxhash_3.2.0.bb | 21 ++ .../python/python3-xxhash_3.3.0.bb | 23 -- .../files/static-passwd-meta-webserver | 2 - .../images/meta-webserver-image-all.bb | 3 - .../images/meta-webserver-image-base.bb | 7 + .../recipes-core/images/meta-webserver-image.bb | 3 + ...pers-config9.m4-Add-server-directory-to-i.patch | 2 +- .../nginx/files/0001-configure-libxslt-conf.patch | 39 -- .../meta-webserver/recipes-httpd/nginx/nginx.inc | 3 - 328 files changed, 4036 insertions(+), 4508 deletions(-) delete mode 100644 meta-openembedded/meta-filesystems/files/static-passwd-meta-filesystems delete mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-all.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-base.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch create mode 100644 meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch create mode 100644 meta-openembedded/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_44.2.bb delete mode 100644 meta-openembedded/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_45.0.bb delete mode 100644 meta-openembedded/meta-gnome/files/static-passwd-meta-gnome create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.4.0.bb delete mode 100644 meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb create mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch create mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.10.bb delete mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.13.bb create mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.10.bb delete mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.13.bb create mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.10.bb delete mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.13.bb create mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.10.bb delete mode 100644 meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.13.bb delete mode 100644 meta-openembedded/meta-multimedia/files/static-group-meta-multimedia delete mode 100644 meta-openembedded/meta-multimedia/files/static-passwd-meta-multimedia delete mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-all.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-base.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.80.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.81.bb delete mode 100644 meta-openembedded/meta-networking/files/static-group-meta-networking delete mode 100644 meta-openembedded/meta-networking/files/static-passwd-meta-networking delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/2894.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/2895.patch create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb create mode 100644 meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/tayga/files/0001-include-sys-uio.patch delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/tayga/files/tayga.conf delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/tayga/files/tayga.service delete mode 100644 meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb delete mode 100644 meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-all.bb create mode 100644 meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-base.bb create mode 100644 meta-openembedded/meta-networking/recipes-core/images/meta-networking-image.bb delete mode 100644 meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch create mode 100644 meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0003-mDNSShared-Drop-MacOS-specific-__block-qualifier.patch delete mode 100644 meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch create mode 100644 meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb delete mode 100644 meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.0.8.bb delete mode 100644 meta-openembedded/meta-oe/files/static-group-meta-oe delete mode 100644 meta-openembedded/meta-oe/files/static-passwd-meta-oe create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0001-configure-Add-with-cpu.patch create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0002-Replace-lfs64-functions-and-defines.patch create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0003-configure-Check-for-pthread_rwlockattr_setkind_np-be.patch create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/libcplusplus-compat.patch create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/read_sysfs_for_cachesize.patch delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.11.bb create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb create mode 100644 meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-.patch create mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh/0001-configure.ac-add-support-of-protobuf-4.22.x.patch delete mode 100644 meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-all.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-base.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-fast.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/images/meta-oe-image.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb create mode 100644 meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-image.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-fix-CVE-2023-32732.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/jq/jq_git.bb create mode 100755 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.17/oe-npm-cache delete mode 100755 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.5/oe-npm-cache create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.17.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/big-endian.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/mips-less-memory.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.17.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_20.5.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch create mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.21.12.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.23.4.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.13.bb delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-pythondir-for-multilib-when-cross-compiling.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.28.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_3.03.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch create mode 100644 meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.13.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.13.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/libnvme/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.5.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.6.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-vbox_fb-fix-kernel-v6.5-build.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch delete mode 100644 meta-openembedded/meta-perl/files/static-group-meta-perl delete mode 100644 meta-openembedded/meta-perl/files/static-passwd-meta-perl create mode 100644 meta-openembedded/meta-perl/recipes-core/images/meta-perl-base.bb delete mode 100644 meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-all.bb delete mode 100644 meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb delete mode 100644 meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-fast.bb delete mode 100644 meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest.bb create mode 100644 meta-openembedded/meta-perl/recipes-core/images/meta-perl-image.bb create mode 100644 meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb create mode 100644 meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb create mode 100644 meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-image.bb delete mode 100644 meta-openembedded/meta-perl/recipes-perl/libnet/libnet-idn-encode_2.500.bb delete mode 100644 meta-openembedded/meta-python/recipes-core/images/meta-python-image-all.bb create mode 100644 meta-openembedded/meta-python/recipes-core/images/meta-python-image-base.bb delete mode 100644 meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-all.bb delete mode 100644 meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-fast.bb delete mode 100644 meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest.bb create mode 100644 meta-openembedded/meta-python/recipes-core/images/meta-python-image.bb create mode 100644 meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-all-image.bb create mode 100644 meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-fast-image.bb create mode 100644 meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-image.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python-idna-ssl.inc create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-apiflask_2.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-apiflask_2.0.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.29.3.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.29.4.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.15.6.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-async-timeout_4.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-booleanpy_4.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-click/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.1.7.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_2.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_3.1.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.3.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.3.3.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.11.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.12.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.100.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.101.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.23.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.23.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-isodate_0.6.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.5.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.6.2.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.6.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.8.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.3.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_1.10.7.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_2.4.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_0.0.11.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_git.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/0001-pylint-remove-plugin-pickle-test.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.17.4.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.0.2.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.1.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.5.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.6.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pytz-deprecation-shim_0.1.0.post0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyu2f_0.1.5.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.1.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-rdflib_7.0.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.1.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.10.1.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.9.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xmltodict/run-ptest create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xmltodict_0.13.0.bb create mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.2.0.bb delete mode 100644 meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.3.0.bb delete mode 100644 meta-openembedded/meta-webserver/files/static-passwd-meta-webserver delete mode 100644 meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-all.bb create mode 100644 meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-base.bb create mode 100644 meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image.bb delete mode 100644 meta-openembedded/meta-webserver/recipes-httpd/nginx/files/0001-configure-libxslt-conf.patch diff --git a/meta-openembedded/meta-filesystems/conf/layer.conf b/meta-openembedded/meta-filesystems/conf/layer.conf index 4f13bd911c..318e992628 100644 --- a/meta-openembedded/meta-filesystems/conf/layer.conf +++ b/meta-openembedded/meta-filesystems/conf/layer.conf @@ -13,6 +13,6 @@ BBFILE_PRIORITY_filesystems-layer = "5" # cause compatibility issues with other layers LAYERVERSION_filesystems-layer = "1" -LAYERDEPENDS_filesystems-layer = "core openembedded-layer networking-layer" +LAYERDEPENDS_filesystems-layer = "core openembedded-layer" LAYERSERIES_COMPAT_filesystems-layer = "nanbield" diff --git a/meta-openembedded/meta-filesystems/files/static-passwd-meta-filesystems b/meta-openembedded/meta-filesystems/files/static-passwd-meta-filesystems deleted file mode 100644 index 157697f3e7..0000000000 --- a/meta-openembedded/meta-filesystems/files/static-passwd-meta-filesystems +++ /dev/null @@ -1,3 +0,0 @@ -fsgqa:x:700:nogroup::/:/bin/nologin -123456-fsgqa:x:701:nogroup::/:/bin/nologin -fsgqa2:x:702:nogroup::/:/bin/nologin \ No newline at end of file diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-all.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-all.bb deleted file mode 100644 index 80fb9f9137..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-all.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-core/images/core-image-base.bb - -IMAGE_INSTALL += "packagegroup-meta-filesystems" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-base.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-base.bb new file mode 100644 index 0000000000..c89b1e1362 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-base.bb @@ -0,0 +1,7 @@ +SUMMARY = "meta-filesystems build test image" + +IMAGE_INSTALL = "packagegroup-core-boot" + +LICENSE = "MIT" + +inherit core-image diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb new file mode 100644 index 0000000000..ca21d2a0ed --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb @@ -0,0 +1,3 @@ +require meta-filesystems-image-base.bb + +IMAGE_INSTALL += "packagegroup-meta-filesystems" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.0.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.0.bb index db6f725b6a..a62a8a39b1 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.0.bb @@ -4,7 +4,7 @@ LICENSE = "CDDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7087caaf1dc8a2856585619f4a787faa" HOMEPAGE ="https://github.com/openzfs/zfs" -SRCREV = "229ca7d738ccbf4c55076977467ee93e20b6f01b" +SRCREV = "009d3288dea524c7ad373b04b65bee8bb6f0bfea" SRC_URI = "git://github.com/openzfs/zfs;protocol=https;branch=zfs-2.2-release \ file://0001-Define-strndupa-if-it-does-not-exist.patch \ file://aaf28a4630af60496c9d33db1d06a7d7d8983422.patch \ diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch new file mode 100644 index 0000000000..2c001834b6 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch @@ -0,0 +1,32 @@ +From 8eeaee82dcfdf47f16ad880e416b722827f41bdb Mon Sep 17 00:00:00 2001 +From: Vyacheslav Yurkov +Date: Mon, 23 May 2022 19:37:32 +0200 +Subject: [PATCH] Makefile: proper location of LDFLAGS + +Signed-off-by: Vyacheslav Yurkov +--- +Upstream-Status: Pending + + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index e3c5207..14b155e 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + CFLAGS = -Wall -g +-LFLAGS = -lm ++LDFLAGS = -lm + CC = gcc + + all: overlay +@@ -7,7 +7,7 @@ all: overlay + objects = fsck.o common.o lib.o check.o mount.o path.o overlayfs.o + + overlay: $(objects) +- $(CC) $(LFLAGS) $(objects) -o fsck.overlay ++ $(CC) $(objects) -o fsck.overlay $(LDFLAGS) + + .c.o: + $(CC) $(CFLAGS) -c $< diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb new file mode 100644 index 0000000000..9d58b9a63f --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb @@ -0,0 +1,32 @@ +SUMMARY = "File system check utility for OverlayFS" +HOMEPAGE = "https://github.com/hisilicon/overlayfs-progs" +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d12946881e13cb3b548d1173851" + +SRC_URI = "\ + git://github.com/hisilicon/overlayfs-progs.git;protocol=https;branch=master \ + file://0001-Makefile-proper-location-of-LDFLAGS.patch \ +" + +PV = "1.0+git${SRCPV}" +SRCREV = "e10ef686570d9c7eff42f52461593a5c15da56bd" + +S = "${WORKDIR}/git" +B = "${S}" + +# Required to have the fts.h header for musl +DEPENDS:append:libc-musl = " fts" +# Fix the missing fts libs when using musl +EXTRA_OEMAKE:append:libc-musl = " LDFLAGS='-lfts'" + +EXTRA_OEMAKE += "'CC=${CC} -O2' " +TARGET_CC_ARCH += "${LDFLAGS}" + +do_compile () { + oe_runmake +} + +do_install () { + install -d ${D}${bindir} + install -m 0755 ${B}/fsck.overlay ${D}${bindir} +} diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch new file mode 100644 index 0000000000..ed84d92c7c --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch @@ -0,0 +1,43 @@ +From 81b4fbb5f52044cb348534c23f10b3884972b09b Mon Sep 17 00:00:00 2001 +From: Beat Schaer +Date: Fri, 19 Mar 2021 08:18:58 +0100 +Subject: [PATCH] Fixed includes so that it compiles on Ubuntu 20.04 + +--- +Upstream-Status: Pending + + logic.c | 3 +-- + main.c | 3 ++- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/logic.c b/logic.c +index 97767f5..47ebfaa 100644 +--- a/logic.c ++++ b/logic.c +@@ -7,8 +7,7 @@ + #include + #include + #include +-#include +-#include ++#include + #include + #include + #include "logic.h" +diff --git a/main.c b/main.c +index aa11239..f462b98 100644 +--- a/main.c ++++ b/main.c +@@ -12,7 +12,8 @@ + #include + #include + #include +-#include ++#include ++#include + #ifndef _SYS_STAT_H + #include + #endif +-- +2.25.1 + diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch new file mode 100644 index 0000000000..8fbb250f04 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch @@ -0,0 +1,33 @@ +From b4ff5886797e72d1c21da43261ca7648412f3186 Mon Sep 17 00:00:00 2001 +From: Vyacheslav Yurkov +Date: Mon, 23 May 2022 19:53:21 +0200 +Subject: [PATCH] makefile: fix linking flags + +LDLIBS should be placed at the end according to +https://www.gnu.org/software/make/manual/html_node/Catalogue-of-Rules.html + +Signed-off-by: Vyacheslav Yurkov +--- +Upstream-Status: Pending + + makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/makefile b/makefile +index fb1bed4..038c7ce 100644 +--- a/makefile ++++ b/makefile +@@ -1,11 +1,11 @@ + CFLAGS = -Wall -std=c99 +-LFLAGS = -lm ++LDLIBS = -lm + CC = gcc + + all: overlay + + overlay: main.o logic.o sh.o +- $(CC) $(LFLAGS) main.o logic.o sh.o -o overlay ++ $(CC) main.o logic.o sh.o -o overlay $(LDLIBS) + + main.o: main.c logic.h + $(CC) $(CFLAGS) -c main.c diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb index ca2ec9cc4f..eb6e4963a5 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb @@ -5,14 +5,17 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f312a7c4d02230e8f2b537295d375c69" SRC_URI = "\ git://github.com/kmxz/overlayfs-tools.git;protocol=https;branch=master \ + file://0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch \ + file://0002-makefile-fix-linking-flags.patch \ " PV = "1.0+git${SRCPV}" -SRCREV = "b5e5a829895ac98ccfe4629fbfbd8b819262bd00" +SRCREV = "291c7f4a3fb548d06c572700650c2e3bccb0cd27" S = "${WORKDIR}/git" B = "${S}" +DEPENDS += "attr" # Required to have the fts.h header for musl DEPENDS:append:libc-musl = " fts" @@ -21,8 +24,11 @@ EXTRA_OEMAKE += "'CC=${CC} -O2'" EXTRA_OEMAKE:append:libc-musl = " LDLIBS=-lfts" TARGET_CC_ARCH += "${LDFLAGS}" +do_compile () { + oe_runmake +} + do_install () { install -d ${D}${bindir} install -m 0755 ${B}/overlay ${D}${bindir} - install -m 0755 ${B}/fsck.overlay ${D}${bindir} } diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb index cfb6e4fd82..fdfe045749 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb @@ -28,7 +28,7 @@ RDEPENDS:${PN} += "\ e2fsprogs-resize2fs \ libaio \ libcap-bin \ - overlayfs-tools \ + overlayfs-progs \ perl \ python3 \ python3-core \ diff --git a/meta-openembedded/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_44.2.bb b/meta-openembedded/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_44.2.bb new file mode 100644 index 0000000000..48e4d9f32f --- /dev/null +++ b/meta-openembedded/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_44.2.bb @@ -0,0 +1,38 @@ +SUMMARY = "Remote desktop daemon for GNOME using pipewire." +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gettext gsettings features_check + +REQUIRED_DISTRO_FEATURES = "opengl" + +SRC_URI[archive.sha256sum] = "7a9ffd341b5fcb636d26675e9f6269650952163fff5295327618cc2d5cc87b8e" + +DEPENDS = " \ + asciidoc-native \ + libdrm \ + libepoxy \ + cairo \ + glib-2.0 \ + pipewire \ + libnotify \ + libsecret \ + nv-codec-headers \ + tpm2-tss \ +" + +PACKAGECONFIG ??= " \ + vnc \ + rdp \ + ${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'fdk_aac', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" + +PACKAGECONFIG[vnc] = "-Dvnc=true,-Dvnc=false,libvncserver" +PACKAGECONFIG[rdp] = "-Drdp=true,-Drdp=false,freerdp fuse3 libxkbcommon" +PACKAGECONFIG[fdk_aac] = "-Dfdk_aac=true,-Dfdk_aac=false,fdk-aac" +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" + +FILES:${PN} += "${systemd_user_unitdir}" diff --git a/meta-openembedded/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_45.0.bb b/meta-openembedded/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_45.0.bb deleted file mode 100644 index d3089648c2..0000000000 --- a/meta-openembedded/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_45.0.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "Remote desktop daemon for GNOME using pipewire." -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gettext gsettings features_check - -REQUIRED_DISTRO_FEATURES = "opengl" - -SRC_URI[archive.sha256sum] = "cb993112d5a3ca21ec217df2d84068e4cad2a4aa6cab52f0e186fa1152f7a381" - -DEPENDS = " \ - asciidoc-native \ - libdrm \ - libei \ - libepoxy \ - cairo \ - glib-2.0 \ - pipewire \ - libnotify \ - libsecret \ - nv-codec-headers \ - tpm2-tss \ -" - -PACKAGECONFIG ??= " \ - vnc \ - rdp \ - ${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'fdk_aac', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ -" - -PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,pipewire-native wireplumber-native dbus-native" -PACKAGECONFIG[vnc] = "-Dvnc=true,-Dvnc=false,libvncserver" -PACKAGECONFIG[rdp] = "-Drdp=true,-Drdp=false,freerdp fuse3 libxkbcommon" -PACKAGECONFIG[fdk_aac] = "-Dfdk_aac=true,-Dfdk_aac=false,fdk-aac" -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" - -FILES:${PN} += "${systemd_user_unitdir}" diff --git a/meta-openembedded/meta-gnome/files/static-passwd-meta-gnome b/meta-openembedded/meta-gnome/files/static-passwd-meta-gnome deleted file mode 100644 index 4502d8bd10..0000000000 --- a/meta-openembedded/meta-gnome/files/static-passwd-meta-gnome +++ /dev/null @@ -1 +0,0 @@ -gdm:x:680:nogroup::/:/bin/nologin \ No newline at end of file diff --git a/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb new file mode 100644 index 0000000000..fbc8f38454 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "Actions, Menus and Toolbars Kit" +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" + +DEPENDS = " \ + glib-2.0-native \ + gtk+3 \ + gtk-doc-native \ + libxslt-native \ + docbook-xsl-stylesheets-native \ + python3-pygments-native \ +" + +GNOMEBASEBUILDCLASS = "meson" + +GIR_MESON_OPTION = "" + +inherit gnomebase gettext features_check gobject-introspection + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI[archive.sha256sum] = "d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb new file mode 100644 index 0000000000..34c782297c --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb @@ -0,0 +1,46 @@ +SUMMARY = "GNOME editor" +SECTION = "x11/gnome" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + gdk-pixbuf-native \ + gtk+3 \ + gsettings-desktop-schemas \ + libpeas \ + libsoup \ + gspell \ + gtksourceview4 \ + tepl \ +" + +inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg python3targetconfig + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "3bbb1b3775d4c277daf54aaab44b0eb83a4eb1f09f0391800041c9e56893ec11" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +GIR_MESON_OPTION = "" + +GTKDOC_MESON_OPTION = "gtk_doc" + +PACKAGES += "${PN}-python" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" + +FILES:${PN}-python += " \ + ${PYTHON_SITEPACKAGES_DIR} \ +" + +RDEPENDS:${PN} += "gsettings-desktop-schemas" +RRECOMMENDS:${PN} += "source-code-pro-fonts" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb deleted file mode 100644 index 01d7a072aa..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "GNOME editor" -SECTION = "x11/gnome" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - appstream-glib-native \ - desktop-file-utils-native \ - libgedit-amtk \ - libgedit-gtksourceview \ - gdk-pixbuf-native \ - gtk+3 \ - gsettings-desktop-schemas \ - libpeas \ - libsoup \ - gspell \ - tepl \ -" - -inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg gtk-icon-cache python3targetconfig - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -SRC_URI[archive.sha256sum] = "a1a6e37f041765dff7227a1f5578b6f49faaf016b1e17e869caf5bfb94c6aa4e" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -do_install:prepend() { - sed -i -e 's|${B}||g' ${B}/plugins/filebrowser/gedit-file-browser-enum-types.c -} - -GIR_MESON_OPTION = "" - -GTKDOC_MESON_OPTION = "gtk_doc" - -PACKAGES += "${PN}-python" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ -" - -FILES:${PN}-python += " \ - ${PYTHON_SITEPACKAGES_DIR} \ -" - -RDEPENDS:${PN} += "gsettings-desktop-schemas" -RRECOMMENDS:${PN} += "source-code-pro-fonts" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb deleted file mode 100644 index 11da836ff4..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "libgedit-amtk - Actions, Menus and Toolbars Kit for GTK applications" -SECTION = "gnome" -LICENSE = "LGPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" - -DEPENDS = "glib-2.0 gtk+3" - -inherit meson pkgconfig gobject-introspection features_check gtk-doc - -SRC_URI = "git://github.com/gedit-technology/libgedit-amtk.git;protocol=https;branch=main" -S = "${WORKDIR}/git" -SRCREV = "f6fbfd1c57de3d97cab2056a5c3088b0da49e8a4" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -GIR_MESON_OPTION = "gobject_introspection" -GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb deleted file mode 100644 index 3a655f6509..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Gedit Technology - Source code editing widget" -SECTION = "gnome" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -DEPENDS = "glib-2.0 gtk+3 libxml2" - -inherit meson pkgconfig gobject-introspection features_check gtk-doc - -SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=main" -S = "${WORKDIR}/git" -SRCREV = "7062264d635f6efe04d88217a893a97ff385b873" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -GIR_MESON_OPTION = "gobject_introspection" -GTKDOC_MESON_OPTION = "gtk_doc" - -do_install:prepend() { - sed -i -e 's|${B}||g' ${B}/gtksourceview/gtksource-enumtypes.c - sed -i -e 's|${B}||g' ${B}/gtksourceview/gtksource-enumtypes.h -} - -FILES:${PN} += "${datadir}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.0.bb index 29c9f3c48c..1122ee5ea0 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.0.bb @@ -48,8 +48,6 @@ PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}" -export XDG_DATA_DIRS = "${STAGING_DATADIR}" - USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch index d921ff3308..bd7e76f208 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch @@ -3,7 +3,7 @@ From: Mae Dartmann Date: Wed, 16 Feb 2022 06:08:41 +0000 Subject: [PATCH] meson: fix invalid positional argument -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8] +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8] --- data/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.4.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.4.0.bb new file mode 100644 index 0000000000..1eecfff4b0 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.4.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "Tepl library eases the development of GtkSourceView-based projects" +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" + +DEPENDS = " \ + gsettings-desktop-schemas \ + glib-2.0 \ + gtk+3 \ + gtksourceview4 \ + amtk \ + libxml2 \ + uchardet \ + gtk-doc-native \ + libxslt-native \ + docbook-xsl-stylesheets-native \ + python3-pygments-native \ +" + +inherit meson gobject-introspection gettext features_check pkgconfig + + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +SRC_URI = "git://gitlab.gnome.org/swilmet/tepl;protocol=https;branch=main" +SRCREV = "d1e9cc2e4a0738f68d9002f13724b7239f075844" +S = "${WORKDIR}/git" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" +GIR_MESON_OPTION = "" + +GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb deleted file mode 100644 index 6c9c36f3ed..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Tepl library eases the development of GtkSourceView-based projects" -LICENSE = "LGPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" - -DEPENDS = " \ - gsettings-desktop-schemas \ - glib-2.0 \ - gtk+3 \ - libgedit-amtk \ - libgedit-gtksourceview \ - libxml2 \ - uchardet \ - gtk-doc-native \ - libxslt-native \ - docbook-xsl-stylesheets-native \ - python3-pygments-native \ -" - -inherit meson gobject-introspection gettext features_check pkgconfig - - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI = "git://gitlab.gnome.org/swilmet/tepl;protocol=https;branch=main" -SRCREV = "16ab2567257a053bd957699f89080fafd0999035" -S = "${WORKDIR}/git" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" -GIR_MESON_OPTION = "" - -GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch new file mode 100644 index 0000000000..4fc4b45fb1 --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch @@ -0,0 +1,34 @@ +From a33c262f828f803fffdad8e1f44d524dc9c75856 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Wed, 3 Aug 2022 01:10:01 +0200 +Subject: [PATCH] fcntl: Fix build failure for some architectures with Linux + 5.19 + +Starting from Linux 5.19, the kernel UAPI headers now only define +__ARCH_FLOCK64_PAD if the architecture actually needs padding in +struct flock64. Wrap its use with #ifdef, + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/libs/klibc/klibc.git/commit/?id=bb2fde5ddbc18a2e7795ca4d24759230c2aae9d0] +Signed-off-by: Ben Hutchings +Signed-off-by: Khem Raj +--- + usr/include/fcntl.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/usr/include/fcntl.h b/usr/include/fcntl.h +index ed703a6..cb2e4e5 100644 +--- a/usr/include/fcntl.h ++++ b/usr/include/fcntl.h +@@ -33,7 +33,9 @@ struct flock { + __kernel_loff_t l_start; + __kernel_loff_t l_len; + __kernel_pid_t l_pid; ++#ifdef __ARCH_FLOCK64_PAD + __ARCH_FLOCK64_PAD ++#endif + }; + + #ifdef F_GETLK64 +-- +2.37.2 + diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch index e4ae3728a4..15b5144e44 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch @@ -14,8 +14,8 @@ Signed-off-by: Khem Raj --- a/usr/klibc/Kbuild +++ b/usr/klibc/Kbuild -@@ -190,7 +190,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash - targets += shared-stub.o +@@ -183,7 +183,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash + targets += interp.o quiet_cmd_interp = BUILD $@ - cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__ \ @@ -23,4 +23,4 @@ Signed-off-by: Khem Raj + -D__ASSEMBLY__ \ -DLIBDIR=\"$(SHLIBDIR)\" \ -DSOHASH=\"$(SOLIBHASH)\" \ - -c -o $@ $< + $(KLIBCSTACKFLAGS) \ diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch index 7b29eaf200..585fb2d439 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch @@ -16,8 +16,8 @@ Upstream-Status: Pending --- a/usr/klibc/arch/arm/MCONFIG +++ b/usr/klibc/arch/arm/MCONFIG -@@ -23,6 +23,7 @@ else - # Extra linkflags when building the shared version of the library +@@ -27,6 +27,7 @@ else + KLIBCSHAREDFLAGS = $(LD_IMAGE_BASE_OPT) 0x01800000 ifeq ($(CONFIG_AEABI),y) KLIBCREQFLAGS += -mabi=aapcs-linux -mno-thumb-interwork +KLIBCLDFLAGS += $(FIX_ARMV4_EABI_BX) diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.10.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.10.bb new file mode 100644 index 0000000000..4011aa231e --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.10.bb @@ -0,0 +1,32 @@ +SUMMARY = "The klcc crosscompiler for klibc" + +require klibc.inc +DEPENDS = "klibc" + +# no packaging for this crossscript +PACKAGES = "" +inherit nopackages + +SRC_URI += "file://use-env-for-perl.patch" + +# disable task already run in klibc recipe +do_configure[noexec] = "1" + +do_compile() { + oe_runmake 'INSTALLDIR=${STAGING_DIR_TARGET}${libdir}/klibc' klcc +} + +do_install() { + install -d ${D}${bindir_crossscripts}/ + install -m 0755 klcc/klcc ${D}${bindir_crossscripts}/${TARGET_PREFIX}klcc + # Turn the horribly encoded paths into something which sstate can transform using its ususal + # magic by removing all the crazy escaping. + sed -i -e "2i \$TARGETSYSROOT = '${STAGING_DIR_TARGET}';" \ + -e "2i \$NATIVESYSROOT = '${STAGING_DIR_NATIVE}';" \ + -e 's#${@d.getVar("STAGING_DIR_NATIVE").replace("/", "\\\\/").replace("-", "\\\\-").replace(".", "\\\\.")}#${NATIVESYSROOT}#g;' \ + -e 's#${@d.getVar("STAGING_DIR_TARGET").replace("/", "\\\\/").replace("-", "\\\\-").replace(".", "\\\\.")}#${TARGETSYSROOT}#g' \ + ${D}${bindir_crossscripts}/${TARGET_PREFIX}klcc +} + +SYSROOT_DIRS += "${bindir_crossscripts}" +SSTATE_SCAN_FILES += "*-klcc" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.13.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.13.bb deleted file mode 100644 index 4011aa231e..0000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.13.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "The klcc crosscompiler for klibc" - -require klibc.inc -DEPENDS = "klibc" - -# no packaging for this crossscript -PACKAGES = "" -inherit nopackages - -SRC_URI += "file://use-env-for-perl.patch" - -# disable task already run in klibc recipe -do_configure[noexec] = "1" - -do_compile() { - oe_runmake 'INSTALLDIR=${STAGING_DIR_TARGET}${libdir}/klibc' klcc -} - -do_install() { - install -d ${D}${bindir_crossscripts}/ - install -m 0755 klcc/klcc ${D}${bindir_crossscripts}/${TARGET_PREFIX}klcc - # Turn the horribly encoded paths into something which sstate can transform using its ususal - # magic by removing all the crazy escaping. - sed -i -e "2i \$TARGETSYSROOT = '${STAGING_DIR_TARGET}';" \ - -e "2i \$NATIVESYSROOT = '${STAGING_DIR_NATIVE}';" \ - -e 's#${@d.getVar("STAGING_DIR_NATIVE").replace("/", "\\\\/").replace("-", "\\\\-").replace(".", "\\\\.")}#${NATIVESYSROOT}#g;' \ - -e 's#${@d.getVar("STAGING_DIR_TARGET").replace("/", "\\\\/").replace("-", "\\\\-").replace(".", "\\\\.")}#${TARGETSYSROOT}#g' \ - ${D}${bindir_crossscripts}/${TARGET_PREFIX}klcc -} - -SYSROOT_DIRS += "${bindir_crossscripts}" -SSTATE_SCAN_FILES += "*-klcc" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.10.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.10.bb new file mode 100644 index 0000000000..0de580781b --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.10.bb @@ -0,0 +1,12 @@ +SUMMARY = "klibc utils for initramfs statically compiled" + +FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" + +PACKAGES = "${PN}" +FILES:${PN} = "" + +KLIBC_UTILS_VARIANT = "static" +KLIBC_UTILS_PKGNAME = "klibc-static-utils" + +require klibc-utils.inc +require klibc.inc diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.13.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.13.bb deleted file mode 100644 index 0de580781b..0000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.13.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "klibc utils for initramfs statically compiled" - -FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" - -PACKAGES = "${PN}" -FILES:${PN} = "" - -KLIBC_UTILS_VARIANT = "static" -KLIBC_UTILS_PKGNAME = "klibc-static-utils" - -require klibc-utils.inc -require klibc.inc diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.10.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.10.bb new file mode 100644 index 0000000000..2f26093cbe --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.10.bb @@ -0,0 +1,14 @@ +SUMMARY = "klibc utils for initramfs" + +FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" + +PACKAGES = "${PN}" +FILES:${PN} = "" + +KLIBC_UTILS_VARIANT = "shared" +KLIBC_UTILS_PKGNAME = "klibc-utils" + +require klibc-utils.inc +require klibc.inc + +DEPENDS = "klibc" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.13.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.13.bb deleted file mode 100644 index 2f26093cbe..0000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.13.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "klibc utils for initramfs" - -FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" - -PACKAGES = "${PN}" -FILES:${PN} = "" - -KLIBC_UTILS_VARIANT = "shared" -KLIBC_UTILS_PKGNAME = "klibc-utils" - -require klibc-utils.inc -require klibc.inc - -DEPENDS = "klibc" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc index 113459b523..5acf679983 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -20,6 +20,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/klibc/2.0/klibc-${PV}.tar.xz \ file://0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch \ file://cross-clang.patch \ file://0001-workaround-for-overlapping-sections-in-binary.patch \ + file://0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch \ " ARMPATCHES ?= "" @@ -27,7 +28,7 @@ ARMPATCHES ?= "" ARMPATCHES:arm = " \ file://armv4-fix-v4bx.patch \ " -SRC_URI[sha256sum] = "d673a294f742d59368222ff5c38462d81098c55063799de6fb8a7ba3d4af0436" +SRC_URI[sha256sum] = "662753da8889e744dfc0db6eb4021c3377ee7ef8ed66d7d57765f8c9e25939cd" S = "${WORKDIR}/klibc-${PV}" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.10.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.10.bb new file mode 100644 index 0000000000..8dda9a8cdc --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.10.bb @@ -0,0 +1,26 @@ +SUMMARY = "klibc, a small C library for use with initramfs" + +do_install() { + oe_runmake install + # the crosscompiler is packaged by klcc-cross + # remove klcc + rm ${D}${bindir}/klcc + # remove now empty dir + rmdir ${D}${bindir} + install -d ${D}${libdir} + install -m 755 usr/klibc/klibc-*.so ${D}${libdir} + (cd ${D}${libdir}; ln -s klibc-*.so klibc.so) + rm -rf ${D}${exec_prefix}/man + rm -rf ${D}${libdir}/klibc/bin +} + +PACKAGES = "libklibc libklibc-staticdev libklibc-dev" + +FILES:libklibc = "${libdir}/klibc-*.so" +FILES:libklibc-staticdev = "${libdir}/klibc/lib/libc.a" +FILES:libklibc-dev = "${libdir}/klibc.so \ + ${libdir}/klibc/lib/* \ + ${libdir}/klibc/include/* \ + " + +require klibc.inc diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.13.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.13.bb deleted file mode 100644 index 8dda9a8cdc..0000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.13.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "klibc, a small C library for use with initramfs" - -do_install() { - oe_runmake install - # the crosscompiler is packaged by klcc-cross - # remove klcc - rm ${D}${bindir}/klcc - # remove now empty dir - rmdir ${D}${bindir} - install -d ${D}${libdir} - install -m 755 usr/klibc/klibc-*.so ${D}${libdir} - (cd ${D}${libdir}; ln -s klibc-*.so klibc.so) - rm -rf ${D}${exec_prefix}/man - rm -rf ${D}${libdir}/klibc/bin -} - -PACKAGES = "libklibc libklibc-staticdev libklibc-dev" - -FILES:libklibc = "${libdir}/klibc-*.so" -FILES:libklibc-staticdev = "${libdir}/klibc/lib/libc.a" -FILES:libklibc-dev = "${libdir}/klibc.so \ - ${libdir}/klibc/lib/* \ - ${libdir}/klibc/include/* \ - " - -require klibc.inc diff --git a/meta-openembedded/meta-multimedia/files/static-group-meta-multimedia b/meta-openembedded/meta-multimedia/files/static-group-meta-multimedia deleted file mode 100644 index c762331719..0000000000 --- a/meta-openembedded/meta-multimedia/files/static-group-meta-multimedia +++ /dev/null @@ -1,2 +0,0 @@ -pipewire:x:660: -mpd:x:665: \ No newline at end of file diff --git a/meta-openembedded/meta-multimedia/files/static-passwd-meta-multimedia b/meta-openembedded/meta-multimedia/files/static-passwd-meta-multimedia deleted file mode 100644 index 94e1310ead..0000000000 --- a/meta-openembedded/meta-multimedia/files/static-passwd-meta-multimedia +++ /dev/null @@ -1,2 +0,0 @@ -pipewire:x:660:660::/:/bin/nologin -mpd:x:665:665::/:/bin/nologin \ No newline at end of file diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch deleted file mode 100644 index 5c13ce0bd5..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 4c86f814fbe17eb5774055d69102408bbfc1cd63 Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Sun, 9 Jul 2023 21:47:48 +0200 -Subject: [PATCH] build: Fix wrap file syntax - -No idea why it worked in the first place - -Fixes #26 - -Signed-off-by: Martin Jansa -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp-tools/-/commit/1372f9ebe45180d58cefb6c0475fafe77de37ef2] ---- - subprojects/gssdp-1.2.wrap | 4 ++-- - subprojects/gupnp-1.2.wrap | 4 ++-- - subprojects/gupnp-av-1.0.wrap | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/subprojects/gssdp-1.2.wrap b/subprojects/gssdp-1.2.wrap -index 34d9b0b..f78d2fa 100644 ---- a/subprojects/gssdp-1.2.wrap -+++ b/subprojects/gssdp-1.2.wrap -@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git - revision = master - depth = 1 - --[provides] --dependency_name = gssdp-1.2 -+[provide] -+dependency_names = gssdp-1.2 - -diff --git a/subprojects/gupnp-1.2.wrap b/subprojects/gupnp-1.2.wrap -index c345910..f92c055 100644 ---- a/subprojects/gupnp-1.2.wrap -+++ b/subprojects/gupnp-1.2.wrap -@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp.git - revision = master - depth = 1 - --[provides] --dependency_name = gupnp-1.2 -+[provide] -+dependency_names = gupnp-1.2 - -diff --git a/subprojects/gupnp-av-1.0.wrap b/subprojects/gupnp-av-1.0.wrap -index 967e6d3..8c3b490 100644 ---- a/subprojects/gupnp-av-1.0.wrap -+++ b/subprojects/gupnp-av-1.0.wrap -@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp-av.git - revision = master - depth = 1 - --[provides] --dependency_name = gupnp-av-1.0 -+[provide] -+dependency_names = gupnp-av-1.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb index 9731ede274..20aced8329 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb @@ -9,9 +9,7 @@ inherit features_check meson pkgconfig gettext gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz \ - file://0001-build-Fix-wrap-file-syntax.patch \ -" +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz" SRC_URI[sha256sum] = "6de49ef4b375b8a164f74b766168b1184e0d28196b6b07a4f5341f08dfd85d6c" RRECOMMENDS:${PN} = "adwaita-icon-theme" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch deleted file mode 100644 index 66f07094c5..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7a4515a356a3d5eb2af1f602c77a42a544e71efa Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Sun, 9 Jul 2023 03:30:47 +0000 -Subject: [PATCH] build: properly spell [provide] in *.wrap files - -meson.build:1:0: ERROR: Unexpected "[provides]" section, did you mean "[provide]"? - -Signed-off-by: Martin Jansa -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp/-/commit/884639bd29323cbb8fbd36bc69d08097a2ae2cd1] ---- - subprojects/gssdp-1.2.wrap | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/subprojects/gssdp-1.2.wrap b/subprojects/gssdp-1.2.wrap -index 469c75d..466b83b 100644 ---- a/subprojects/gssdp-1.2.wrap -+++ b/subprojects/gssdp-1.2.wrap -@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git - revision = gssdp-1.4 - depth = 1 - --[provides] -+[provide] - dependency_name = gssdp-1.2 - diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb index efeb66f28f..c21e7a05bf 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb @@ -9,7 +9,6 @@ inherit meson pkgconfig vala gobject-introspection SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz \ file://0001-all-Drop-xmlRecoverMemory.patch \ - file://0001-build-properly-spell-provide-in-.wrap-files.patch \ " SRC_URI[sha256sum] = "899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-all.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-all.bb deleted file mode 100644 index dc76265a9b..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-all.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-core/images/core-image-base.bb - -IMAGE_INSTALL += "packagegroup-meta-multimedia" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-base.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-base.bb new file mode 100644 index 0000000000..249f989a4b --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-base.bb @@ -0,0 +1,7 @@ +SUMMARY = "meta-multimedia build test image" + +IMAGE_INSTALL = "packagegroup-core-boot" + +LICENSE = "MIT" + +inherit core-image diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb new file mode 100644 index 0000000000..9f2fda9fef --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb @@ -0,0 +1,3 @@ +require meta-multimedia-image-base.bb + +IMAGE_INSTALL += "packagegroup-meta-multimedia" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb index bc2e858b42..bc1c52ad48 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb @@ -4,7 +4,7 @@ DESCRIPTION = "libcamera image" LICENSE = "MIT" -require meta-multimedia-image-all.bb +require meta-multimedia-image.bb IMAGE_INSTALL += " \ kernel-modules \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb index 2a3c6473ee..ece1be6f32 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb @@ -50,11 +50,8 @@ do_install:append() { chrpath -d ${D}${libexecdir}/libcamera/v4l2-compat.so } -do_package:append() { - bb.build.exec_func("do_package_recalculate_ipa_signatures", d) -} - -do_package_recalculate_ipa_signatures() { +addtask do_recalculate_ipa_signatures_package after do_package before do_packagedata +do_recalculate_ipa_signatures_package() { local modules for module in $(find ${PKGD}/usr/lib/libcamera -name "*.so.sign"); do module="${module%.sign}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.80.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.80.bb new file mode 100644 index 0000000000..a134820daa --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.80.bb @@ -0,0 +1,389 @@ +SUMMARY = "Multimedia processing server for Linux" +DESCRIPTION = "Linux server for handling and routing audio and video streams between applications and multimedia I/O devices" +HOMEPAGE = "https://pipewire.org/" +BUGTRACKER = "https://gitlab.freedesktop.org/pipewire/pipewire/issues" +AUTHOR = "Wim Taymans " +SECTION = "multimedia" + +LICENSE = "MIT & LGPL-2.1-or-later & GPL-2.0-only" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=2158739e172e58dc9ab1bdd2d6ec9c72 \ + file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ +" + +DEPENDS = "dbus ncurses" + +SRCREV = "35cca08d2bef14248ac25ff2a1efb0bf274d0a6f" +SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig systemd gettext useradd + +USERADD_PACKAGES = "${PN}" + +GROUPADD_PARAM:${PN} = "--system pipewire" + +USERADD_PARAM:${PN} = "--system --home / --no-create-home \ + --comment 'PipeWire multimedia daemon' \ + --gid pipewire --groups audio,video \ + pipewire" + +SYSTEMD_PACKAGES = "${PN}" + +# For "EVL", look up https://evlproject.org/ . It involves +# a specially prepared kernel, and is currently unavailable +# in Yocto. +# +# +# manpage generation requires xmltoman, which is not available. +# +# The session-managers list specifies which session managers Meson +# shall download (via git clone) and build as subprojects. In OE, +# this is not how a session manager should be built. Instead, they +# should be integrated as separate OE recipes. To prevent PipeWire +# from using this Meson feature, set an empty list. +# This does not disable support or the need for session managers, +# it just prevents this subproject feature. +# +# AptX and LDAC are not available in OE. Currently, neither +# are lv2, ROC, and libmysofa. +# +# The RTKit module is deprecated in favor of the newer RT module. +# It still exists for legacy setups that still include it in +# their PipeWire configuration files. +EXTRA_OEMESON += " \ + -Devl=disabled \ + -Dtests=disabled \ + -Dudevrulesdir=${nonarch_base_libdir}/udev/rules.d/ \ + -Dsystemd-system-unit-dir=${systemd_system_unitdir} \ + -Dsystemd-user-unit-dir=${systemd_user_unitdir} \ + -Dman=disabled \ + -Dsession-managers='[]' \ + -Dlv2=disabled \ + -Droc=disabled \ + -Dbluez5-codec-aptx=disabled \ + -Dbluez5-codec-ldac=disabled \ + -Dlegacy-rtkit=false \ + -Dlibmysofa=disabled \ +" + +# spa alsa plugin code uses typedef redefinition, which is officially a C11 feature. +# Pipewire builds with 'c_std=gnu99' by default. Recent versions of gcc don't issue this warning in gnu99 +# mode but it looks like clang still does +CFLAGS:append = " -Wno-typedef-redefinition" + +# According to wireplumber documentation only one session manager should be installed at a time +# Possible options are media-session, which has fewer dependencies but is very simple, +# or wireplumber, which is more powerful. +PIPEWIRE_SESSION_MANAGER ??= "wireplumber" + +FFMPEG_AVAILABLE = "${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'ffmpeg', '', d)}" +BLUETOOTH_AAC = "${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'bluez-aac', '', d)}" + +PACKAGECONFIG:class-target ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez bluez-opus ${BLUETOOTH_AAC}', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \ + ${PIPEWIRE_SESSION_MANAGER} \ + ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling libcamera readline \ +" + +# "jack" and "pipewire-jack" packageconfigs cannot be both enabled, +# since "jack" imports libjack, and "pipewire-jack" generates +# libjack.so* files, thus colliding with the libpack package. This +# is why these two are marked in their respective packageconfigs +# as being in conflict. +PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev,,pipewire-alsa pipewire-alsa-card-profile" +PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi" +PACKAGECONFIG[bluez] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc" +PACKAGECONFIG[bluez-aac] = "-Dbluez5-codec-aac=enabled,-Dbluez5-codec-aac=disabled,fdk-aac" +PACKAGECONFIG[bluez-opus] = "-Dbluez5-codec-opus=enabled,-Dbluez5-codec-opus=disabled,libopus" +PACKAGECONFIG[bluez-lc3] = "-Dbluez5-codec-lc3=enabled,-Dbluez5-codec-lc3=disabled,liblc3" +# From the pipewire git log: +# "Some Linux phones doesn't use oFono but ModemManager to control the modem." +# This packageconfig enables modemmanager specific code in the BlueZ backend. +PACKAGECONFIG[bluez-backend-native-mm] = "-Dbluez5-backend-native-mm=enabled,-Dbluez5-backend-native-mm=disabled,modemmanager" +PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,doxygen-native graphviz-native" +PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" +PACKAGECONFIG[flatpak] = "-Dflatpak=enabled,-Dflatpak=disabled,glib-2.0" +PACKAGECONFIG[gsettings] = "-Dgsettings=enabled,-Dgsettings=disabled,glib-2.0" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base,,gstreamer1.0-pipewire" +PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack,,,pipewire-jack" +PACKAGECONFIG[libcamera] = "-Dlibcamera=enabled,-Dlibcamera=disabled,libcamera libdrm" +PACKAGECONFIG[libcanberra] = "-Dlibcanberra=enabled,-Dlibcanberra=disabled,libcanberra" +PACKAGECONFIG[libusb] = "-Dlibusb=enabled,-Dlibusb=disabled,libusb" +PACKAGECONFIG[media-session] = ",,,pipewire-media-session,,wireplumber" +PACKAGECONFIG[pulseaudio] = "-Dlibpulse=enabled,-Dlibpulse=disabled,pulseaudio,,pipewire-pulse" +PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=enabled,-Dpipewire-alsa=disabled,alsa-lib" +PACKAGECONFIG[pipewire-jack] = "-Dpipewire-jack=enabled -Dlibjack-path=${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=disabled,jack,,pipewire-jack,jack" +PACKAGECONFIG[pw-cat] = "-Dpw-cat=enabled,-Dpw-cat=disabled" +PACKAGECONFIG[raop] = "-Draop=enabled,-Draop=disabled,openssl" +# Starting with version 0.3.60, readline usage can be turned off in pw-cli. +# If it is disabled, getline() is used as a fallback. +PACKAGECONFIG[readline] = "-Dreadline=enabled,-Dreadline=disabled,readline" +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" +# "systemd-user-service" packageconfig will only install service +# files to rootfs but not enable them as systemd.bbclass +# currently lacks the feature of enabling user services. +PACKAGECONFIG[systemd-user-service] = "-Dsystemd-user-service=enabled,-Dsystemd-user-service=disabled,systemd" +# pw-cat needs sndfile packageconfig to be enabled +PACKAGECONFIG[udev] = "-Dudev=enabled,-Dudev=disabled,udev" +PACKAGECONFIG[v4l2] = "-Dv4l2=enabled,-Dv4l2=disabled,udev" +PACKAGECONFIG[volume] = "-Dvolume=enabled,-Dvolume=disabled" +PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-headers vulkan-loader" +PACKAGECONFIG[webrtc-echo-cancelling] = "-Decho-cancel-webrtc=enabled,-Decho-cancel-webrtc=disabled,webrtc-audio-processing-1" +PACKAGECONFIG[wireplumber] = ",,,wireplumber,,media-session" + +PACKAGESPLITFUNCS:prepend = " split_dynamic_packages " +PACKAGESPLITFUNCS:append = " set_dynamic_metapkg_rdepends " + +SPA_SUBDIR = "spa-0.2" +PW_MODULE_SUBDIR = "pipewire-0.3" + +remove_unused_installed_files() { + # jack.conf is used by pipewire-jack (not the JACK SPA plugin). + # Remove it if pipewire-jack is not built to avoid creating the + # pipewire-jack package. + if ${@bb.utils.contains('PACKAGECONFIG', 'pipewire-jack', 'false', 'true', d)}; then + rm -f "${D}${datadir}/pipewire/jack.conf" + fi + + # minimal.conf is an example of how to minimally configure the + # daemon and is not meant to be used for production. + rm -f "${D}${datadir}/pipewire/minimal.conf" +} + +do_install[postfuncs] += "remove_unused_installed_files" + +python split_dynamic_packages () { + # Create packages for each SPA plugin. These plugins are located + # in individual subdirectories, so a recursive search is needed. + spa_libdir = d.expand('${libdir}/${SPA_SUBDIR}') + do_split_packages(d, spa_libdir, r'^libspa-(.*)\.so$', d.expand('${PN}-spa-plugins-%s'), 'PipeWire SPA plugin for %s', extra_depends='', recursive=True) + + # Create packages for each PipeWire module. + pw_module_libdir = d.expand('${libdir}/${PW_MODULE_SUBDIR}') + do_split_packages(d, pw_module_libdir, r'^libpipewire-module-(.*)\.so$', d.expand('${PN}-modules-%s'), 'PipeWire %s module', extra_depends='', recursive=False) +} + +python set_dynamic_metapkg_rdepends () { + import os + import oe.utils + + if bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('native', d): + return + + # Go through all generated SPA plugin and PipeWire module packages + # (excluding the main package and the -meta package itself) and + # add them to the -meta package as RDEPENDS. + + base_pn = d.getVar('PN') + + spa_pn = base_pn + '-spa-plugins' + spa_metapkg = spa_pn + '-meta' + + pw_module_pn = base_pn + '-modules' + pw_module_metapkg = pw_module_pn + '-meta' + + d.setVar('ALLOW_EMPTY:' + spa_metapkg, "1") + d.setVar('FILES:' + spa_metapkg, "") + + d.setVar('ALLOW_EMPTY:' + pw_module_metapkg, "1") + d.setVar('FILES:' + pw_module_metapkg, "") + + blacklist = [ spa_pn, spa_metapkg, pw_module_pn, pw_module_metapkg ] + spa_metapkg_rdepends = [] + pw_module_metapkg_rdepends = [] + pkgdest = d.getVar('PKGDEST') + + for pkg in oe.utils.packages_filter_out_system(d): + if pkg in blacklist: + continue + + is_spa_pkg = pkg.startswith(spa_pn) + is_pw_module_pkg = pkg.startswith(pw_module_pn) + if not is_spa_pkg and not is_pw_module_pkg: + continue + + if pkg in spa_metapkg_rdepends or pkg in pw_module_metapkg_rdepends: + continue + + # See if the package is empty by looking at the contents of its + # PKGDEST subdirectory. If this subdirectory is empty, then then + # package is empty as well. Empty packages do not get added to + # the meta package's RDEPENDS. + pkgdir = os.path.join(pkgdest, pkg) + if os.path.exists(pkgdir): + dir_contents = os.listdir(pkgdir) or [] + else: + dir_contents = [] + is_empty = len(dir_contents) == 0 + if not is_empty: + if is_spa_pkg: + spa_metapkg_rdepends.append(pkg) + if is_pw_module_pkg: + pw_module_metapkg_rdepends.append(pkg) + + d.setVar('RDEPENDS:' + spa_metapkg, ' '.join(spa_metapkg_rdepends)) + d.setVar('DESCRIPTION:' + spa_metapkg, spa_pn + ' meta package') + + d.setVar('RDEPENDS:' + pw_module_metapkg, ' '.join(pw_module_metapkg_rdepends)) + d.setVar('DESCRIPTION:' + pw_module_metapkg, pw_module_pn + ' meta package') +} + +PACKAGES =+ "\ + libpipewire \ + ${PN}-tools \ + ${PN}-pulse \ + ${PN}-alsa \ + ${PN}-jack \ + ${PN}-spa-plugins \ + ${PN}-spa-plugins-meta \ + ${PN}-spa-tools \ + ${PN}-modules \ + ${PN}-modules-meta \ + ${PN}-alsa-card-profile \ + ${PN}-v4l2 \ + ${PN}-aes67 \ + gstreamer1.0-pipewire \ +" + +PACKAGES_DYNAMIC = "^${PN}-spa-plugins.* ^${PN}-modules.*" +PACKAGES_DYNAMIC:class-native = "" + +SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd-system-service', 'pipewire.service', '', d)}" +CONFFILES:${PN} += "${datadir}/pipewire/pipewire.conf" +FILES:${PN} = " \ + ${datadir}/pipewire \ + ${systemd_system_unitdir}/pipewire* \ + ${systemd_user_unitdir} \ + ${bindir}/pipewire \ + ${bindir}/pipewire-avb \ + ${bindir}/pipewire-vulkan \ +" + +RRECOMMENDS:${PN}:class-target += " \ + pipewire-modules-meta \ + pipewire-spa-plugins-meta \ +" + +FILES:${PN}-dev += " \ + ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so \ +" + +CONFFILES:libpipewire += "${datadir}/pipewire/client.conf" +FILES:libpipewire = " \ + ${datadir}/pipewire/client.conf \ + ${libdir}/libpipewire-*.so.* \ +" +# Add the bare minimum modules and plugins required to be able +# to use libpipewire. Without these, it is essentially unusable. +RDEPENDS:libpipewire += " \ + ${PN}-modules-client-node \ + ${PN}-modules-protocol-native \ + ${PN}-spa-plugins-support \ +" + +FILES:${PN}-tools = " \ + ${bindir}/pw-cat \ + ${bindir}/pw-cli \ + ${bindir}/pw-config \ + ${bindir}/pw-dot \ + ${bindir}/pw-dsdplay \ + ${bindir}/pw-dump \ + ${bindir}/pw-encplay \ + ${bindir}/pw-link \ + ${bindir}/pw-loopback \ + ${bindir}/pw-metadata \ + ${bindir}/pw-mididump \ + ${bindir}/pw-midiplay \ + ${bindir}/pw-midirecord \ + ${bindir}/pw-mon \ + ${bindir}/pw-play \ + ${bindir}/pw-profiler \ + ${bindir}/pw-record \ + ${bindir}/pw-reserve \ + ${bindir}/pw-top \ +" + +# This is a shim daemon that is intended to be used as a +# drop-in PulseAudio replacement, providing a pulseaudio-compatible +# socket that can be used by applications that use libpulse. +CONFFILES:${PN}-pulse += "${datadir}/pipewire/pipewire-pulse.conf" +FILES:${PN}-pulse = " \ + ${datadir}/pipewire/pipewire-pulse.conf \ + ${systemd_system_unitdir}/pipewire-pulse.* \ + ${systemd_user_unitdir}/pipewire-pulse.* \ + ${bindir}/pipewire-pulse \ +" +RDEPENDS:${PN}-pulse += " \ + ${PN}-modules-protocol-pulse \ +" + +# ALSA plugin to redirect audio to pipewire. +FILES:${PN}-alsa = "\ + ${libdir}/alsa-lib/* \ + ${datadir}/alsa/alsa.conf.d/* \ +" + +# JACK drop-in libraries to redirect audio to pipewire. +CONFFILES:${PN}-jack = "${datadir}/pipewire/jack.conf" +FILES:${PN}-jack = "\ + ${bindir}/pw-jack \ + ${datadir}/pipewire/jack.conf \ + ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so.* \ +" + +# Dynamic SPA plugin packages (see set_dynamic_metapkg_rdepends). +FILES:${PN}-spa-plugins = "" +RRECOMMENDS:${PN}-spa-plugins += "${PN}-spa-plugins-meta" + +FILES:${PN}-spa-plugins-bluez5 += " \ + ${datadir}/${SPA_SUBDIR}/bluez5/* \ +" + +FILES:${PN}-spa-tools = " \ + ${bindir}/spa-* \ +" + +# Dynamic PipeWire module packages (see set_dynamic_metapkg_rdepends). +FILES:${PN}-modules = "" +RRECOMMENDS:${PN}-modules += "${PN}-modules-meta" + +CONFFILES:${PN}-modules-rt = "${datadir}/pipewire/client-rt.conf" +FILES:${PN}-modules-rt += " \ + ${datadir}/pipewire/client-rt.conf \ + ${sysconfdir}/security/limits.d/* \ + " + +CONFFILES:${PN}-modules-filter-chain = "${datadir}/pipewire/filter-chain/*" +FILES:${PN}-modules-filter-chain += " \ + ${datadir}/pipewire/filter-chain/* \ +" + +FILES:${PN}-alsa-card-profile = " \ + ${datadir}/alsa-card-profile/* \ + ${nonarch_base_libdir}/udev/rules.d/90-pipewire-alsa.rules \ +" + +# V4L2 interface emulator for sending/receiving data between PipeWire and V4L2 applications. +FILES:${PN}-v4l2 += " \ + ${bindir}/pw-v4l2 \ + ${libdir}/${PW_MODULE_SUBDIR}/v4l2/libpw-v4l2.so \ +" + +# AES67 is a standard for audio over IP, from the Audio Engineering Society (AES). +FILES:${PN}-aes67 += " \ + ${bindir}/pipewire-aes67 \ +" + +FILES:gstreamer1.0-pipewire = " \ + ${libdir}/gstreamer-1.0/* \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.81.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.81.bb deleted file mode 100644 index 2a3699f93e..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.81.bb +++ /dev/null @@ -1,389 +0,0 @@ -SUMMARY = "Multimedia processing server for Linux" -DESCRIPTION = "Linux server for handling and routing audio and video streams between applications and multimedia I/O devices" -HOMEPAGE = "https://pipewire.org/" -BUGTRACKER = "https://gitlab.freedesktop.org/pipewire/pipewire/issues" -AUTHOR = "Wim Taymans " -SECTION = "multimedia" - -LICENSE = "MIT & LGPL-2.1-or-later & GPL-2.0-only" -LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=2158739e172e58dc9ab1bdd2d6ec9c72 \ - file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ -" - -DEPENDS = "dbus ncurses" - -SRCREV = "181fbfee6d3fcc3afd3c93613f126a8346dad586" -SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig systemd gettext useradd - -USERADD_PACKAGES = "${PN}" - -GROUPADD_PARAM:${PN} = "--system pipewire" - -USERADD_PARAM:${PN} = "--system --home / --no-create-home \ - --comment 'PipeWire multimedia daemon' \ - --gid pipewire --groups audio,video \ - pipewire" - -SYSTEMD_PACKAGES = "${PN}" - -# For "EVL", look up https://evlproject.org/ . It involves -# a specially prepared kernel, and is currently unavailable -# in Yocto. -# -# -# manpage generation requires xmltoman, which is not available. -# -# The session-managers list specifies which session managers Meson -# shall download (via git clone) and build as subprojects. In OE, -# this is not how a session manager should be built. Instead, they -# should be integrated as separate OE recipes. To prevent PipeWire -# from using this Meson feature, set an empty list. -# This does not disable support or the need for session managers, -# it just prevents this subproject feature. -# -# AptX and LDAC are not available in OE. Currently, neither -# are lv2, ROC, and libmysofa. -# -# The RTKit module is deprecated in favor of the newer RT module. -# It still exists for legacy setups that still include it in -# their PipeWire configuration files. -EXTRA_OEMESON += " \ - -Devl=disabled \ - -Dtests=disabled \ - -Dudevrulesdir=${nonarch_base_libdir}/udev/rules.d/ \ - -Dsystemd-system-unit-dir=${systemd_system_unitdir} \ - -Dsystemd-user-unit-dir=${systemd_user_unitdir} \ - -Dman=disabled \ - -Dsession-managers='[]' \ - -Dlv2=disabled \ - -Droc=disabled \ - -Dbluez5-codec-aptx=disabled \ - -Dbluez5-codec-ldac=disabled \ - -Dlegacy-rtkit=false \ - -Dlibmysofa=disabled \ -" - -# spa alsa plugin code uses typedef redefinition, which is officially a C11 feature. -# Pipewire builds with 'c_std=gnu99' by default. Recent versions of gcc don't issue this warning in gnu99 -# mode but it looks like clang still does -CFLAGS:append = " -Wno-typedef-redefinition" - -# According to wireplumber documentation only one session manager should be installed at a time -# Possible options are media-session, which has fewer dependencies but is very simple, -# or wireplumber, which is more powerful. -PIPEWIRE_SESSION_MANAGER ??= "wireplumber" - -FFMPEG_AVAILABLE = "${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'ffmpeg', '', d)}" -BLUETOOTH_AAC = "${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'bluez-aac', '', d)}" - -PACKAGECONFIG:class-target ??= " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez bluez-opus ${BLUETOOTH_AAC}', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \ - ${PIPEWIRE_SESSION_MANAGER} \ - ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling libcamera readline \ -" - -# "jack" and "pipewire-jack" packageconfigs cannot be both enabled, -# since "jack" imports libjack, and "pipewire-jack" generates -# libjack.so* files, thus colliding with the libpack package. This -# is why these two are marked in their respective packageconfigs -# as being in conflict. -PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev,,pipewire-alsa pipewire-alsa-card-profile" -PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi" -PACKAGECONFIG[bluez] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc" -PACKAGECONFIG[bluez-aac] = "-Dbluez5-codec-aac=enabled,-Dbluez5-codec-aac=disabled,fdk-aac" -PACKAGECONFIG[bluez-opus] = "-Dbluez5-codec-opus=enabled,-Dbluez5-codec-opus=disabled,libopus" -PACKAGECONFIG[bluez-lc3] = "-Dbluez5-codec-lc3=enabled,-Dbluez5-codec-lc3=disabled,liblc3" -# From the pipewire git log: -# "Some Linux phones doesn't use oFono but ModemManager to control the modem." -# This packageconfig enables modemmanager specific code in the BlueZ backend. -PACKAGECONFIG[bluez-backend-native-mm] = "-Dbluez5-backend-native-mm=enabled,-Dbluez5-backend-native-mm=disabled,modemmanager" -PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,doxygen-native graphviz-native" -PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" -PACKAGECONFIG[flatpak] = "-Dflatpak=enabled,-Dflatpak=disabled,glib-2.0" -PACKAGECONFIG[gsettings] = "-Dgsettings=enabled,-Dgsettings=disabled,glib-2.0" -PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base,,gstreamer1.0-pipewire" -PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack,,,pipewire-jack" -PACKAGECONFIG[libcamera] = "-Dlibcamera=enabled,-Dlibcamera=disabled,libcamera libdrm" -PACKAGECONFIG[libcanberra] = "-Dlibcanberra=enabled,-Dlibcanberra=disabled,libcanberra" -PACKAGECONFIG[libusb] = "-Dlibusb=enabled,-Dlibusb=disabled,libusb" -PACKAGECONFIG[media-session] = ",,,pipewire-media-session,,wireplumber" -PACKAGECONFIG[pulseaudio] = "-Dlibpulse=enabled,-Dlibpulse=disabled,pulseaudio,,pipewire-pulse" -PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=enabled,-Dpipewire-alsa=disabled,alsa-lib" -PACKAGECONFIG[pipewire-jack] = "-Dpipewire-jack=enabled -Dlibjack-path=${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=disabled,jack,,pipewire-jack,jack" -PACKAGECONFIG[pw-cat] = "-Dpw-cat=enabled,-Dpw-cat=disabled" -PACKAGECONFIG[raop] = "-Draop=enabled,-Draop=disabled,openssl" -# Starting with version 0.3.60, readline usage can be turned off in pw-cli. -# If it is disabled, getline() is used as a fallback. -PACKAGECONFIG[readline] = "-Dreadline=enabled,-Dreadline=disabled,readline" -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" -# "systemd-user-service" packageconfig will only install service -# files to rootfs but not enable them as systemd.bbclass -# currently lacks the feature of enabling user services. -PACKAGECONFIG[systemd-user-service] = "-Dsystemd-user-service=enabled,-Dsystemd-user-service=disabled,systemd" -# pw-cat needs sndfile packageconfig to be enabled -PACKAGECONFIG[udev] = "-Dudev=enabled,-Dudev=disabled,udev" -PACKAGECONFIG[v4l2] = "-Dv4l2=enabled,-Dv4l2=disabled,udev" -PACKAGECONFIG[volume] = "-Dvolume=enabled,-Dvolume=disabled" -PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-headers vulkan-loader" -PACKAGECONFIG[webrtc-echo-cancelling] = "-Decho-cancel-webrtc=enabled,-Decho-cancel-webrtc=disabled,webrtc-audio-processing-1" -PACKAGECONFIG[wireplumber] = ",,,wireplumber,,media-session" - -PACKAGESPLITFUNCS:prepend = " split_dynamic_packages " -PACKAGESPLITFUNCS:append = " set_dynamic_metapkg_rdepends " - -SPA_SUBDIR = "spa-0.2" -PW_MODULE_SUBDIR = "pipewire-0.3" - -remove_unused_installed_files() { - # jack.conf is used by pipewire-jack (not the JACK SPA plugin). - # Remove it if pipewire-jack is not built to avoid creating the - # pipewire-jack package. - if ${@bb.utils.contains('PACKAGECONFIG', 'pipewire-jack', 'false', 'true', d)}; then - rm -f "${D}${datadir}/pipewire/jack.conf" - fi - - # minimal.conf is an example of how to minimally configure the - # daemon and is not meant to be used for production. - rm -f "${D}${datadir}/pipewire/minimal.conf" -} - -do_install[postfuncs] += "remove_unused_installed_files" - -python split_dynamic_packages () { - # Create packages for each SPA plugin. These plugins are located - # in individual subdirectories, so a recursive search is needed. - spa_libdir = d.expand('${libdir}/${SPA_SUBDIR}') - do_split_packages(d, spa_libdir, r'^libspa-(.*)\.so$', d.expand('${PN}-spa-plugins-%s'), 'PipeWire SPA plugin for %s', extra_depends='', recursive=True) - - # Create packages for each PipeWire module. - pw_module_libdir = d.expand('${libdir}/${PW_MODULE_SUBDIR}') - do_split_packages(d, pw_module_libdir, r'^libpipewire-module-(.*)\.so$', d.expand('${PN}-modules-%s'), 'PipeWire %s module', extra_depends='', recursive=False) -} - -python set_dynamic_metapkg_rdepends () { - import os - import oe.utils - - if bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('native', d): - return - - # Go through all generated SPA plugin and PipeWire module packages - # (excluding the main package and the -meta package itself) and - # add them to the -meta package as RDEPENDS. - - base_pn = d.getVar('PN') - - spa_pn = base_pn + '-spa-plugins' - spa_metapkg = spa_pn + '-meta' - - pw_module_pn = base_pn + '-modules' - pw_module_metapkg = pw_module_pn + '-meta' - - d.setVar('ALLOW_EMPTY:' + spa_metapkg, "1") - d.setVar('FILES:' + spa_metapkg, "") - - d.setVar('ALLOW_EMPTY:' + pw_module_metapkg, "1") - d.setVar('FILES:' + pw_module_metapkg, "") - - blacklist = [ spa_pn, spa_metapkg, pw_module_pn, pw_module_metapkg ] - spa_metapkg_rdepends = [] - pw_module_metapkg_rdepends = [] - pkgdest = d.getVar('PKGDEST') - - for pkg in oe.utils.packages_filter_out_system(d): - if pkg in blacklist: - continue - - is_spa_pkg = pkg.startswith(spa_pn) - is_pw_module_pkg = pkg.startswith(pw_module_pn) - if not is_spa_pkg and not is_pw_module_pkg: - continue - - if pkg in spa_metapkg_rdepends or pkg in pw_module_metapkg_rdepends: - continue - - # See if the package is empty by looking at the contents of its - # PKGDEST subdirectory. If this subdirectory is empty, then then - # package is empty as well. Empty packages do not get added to - # the meta package's RDEPENDS. - pkgdir = os.path.join(pkgdest, pkg) - if os.path.exists(pkgdir): - dir_contents = os.listdir(pkgdir) or [] - else: - dir_contents = [] - is_empty = len(dir_contents) == 0 - if not is_empty: - if is_spa_pkg: - spa_metapkg_rdepends.append(pkg) - if is_pw_module_pkg: - pw_module_metapkg_rdepends.append(pkg) - - d.setVar('RDEPENDS:' + spa_metapkg, ' '.join(spa_metapkg_rdepends)) - d.setVar('DESCRIPTION:' + spa_metapkg, spa_pn + ' meta package') - - d.setVar('RDEPENDS:' + pw_module_metapkg, ' '.join(pw_module_metapkg_rdepends)) - d.setVar('DESCRIPTION:' + pw_module_metapkg, pw_module_pn + ' meta package') -} - -PACKAGES =+ "\ - libpipewire \ - ${PN}-tools \ - ${PN}-pulse \ - ${PN}-alsa \ - ${PN}-jack \ - ${PN}-spa-plugins \ - ${PN}-spa-plugins-meta \ - ${PN}-spa-tools \ - ${PN}-modules \ - ${PN}-modules-meta \ - ${PN}-alsa-card-profile \ - ${PN}-v4l2 \ - ${PN}-aes67 \ - gstreamer1.0-pipewire \ -" - -PACKAGES_DYNAMIC = "^${PN}-spa-plugins.* ^${PN}-modules.*" -PACKAGES_DYNAMIC:class-native = "" - -SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd-system-service', 'pipewire.service', '', d)}" -CONFFILES:${PN} += "${datadir}/pipewire/pipewire.conf" -FILES:${PN} = " \ - ${datadir}/pipewire \ - ${systemd_system_unitdir}/pipewire* \ - ${systemd_user_unitdir} \ - ${bindir}/pipewire \ - ${bindir}/pipewire-avb \ - ${bindir}/pipewire-vulkan \ -" - -RRECOMMENDS:${PN}:class-target += " \ - pipewire-modules-meta \ - pipewire-spa-plugins-meta \ -" - -FILES:${PN}-dev += " \ - ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so \ -" - -CONFFILES:libpipewire += "${datadir}/pipewire/client.conf" -FILES:libpipewire = " \ - ${datadir}/pipewire/client.conf \ - ${libdir}/libpipewire-*.so.* \ -" -# Add the bare minimum modules and plugins required to be able -# to use libpipewire. Without these, it is essentially unusable. -RDEPENDS:libpipewire += " \ - ${PN}-modules-client-node \ - ${PN}-modules-protocol-native \ - ${PN}-spa-plugins-support \ -" - -FILES:${PN}-tools = " \ - ${bindir}/pw-cat \ - ${bindir}/pw-cli \ - ${bindir}/pw-config \ - ${bindir}/pw-dot \ - ${bindir}/pw-dsdplay \ - ${bindir}/pw-dump \ - ${bindir}/pw-encplay \ - ${bindir}/pw-link \ - ${bindir}/pw-loopback \ - ${bindir}/pw-metadata \ - ${bindir}/pw-mididump \ - ${bindir}/pw-midiplay \ - ${bindir}/pw-midirecord \ - ${bindir}/pw-mon \ - ${bindir}/pw-play \ - ${bindir}/pw-profiler \ - ${bindir}/pw-record \ - ${bindir}/pw-reserve \ - ${bindir}/pw-top \ -" - -# This is a shim daemon that is intended to be used as a -# drop-in PulseAudio replacement, providing a pulseaudio-compatible -# socket that can be used by applications that use libpulse. -CONFFILES:${PN}-pulse += "${datadir}/pipewire/pipewire-pulse.conf" -FILES:${PN}-pulse = " \ - ${datadir}/pipewire/pipewire-pulse.conf \ - ${systemd_system_unitdir}/pipewire-pulse.* \ - ${systemd_user_unitdir}/pipewire-pulse.* \ - ${bindir}/pipewire-pulse \ -" -RDEPENDS:${PN}-pulse += " \ - ${PN}-modules-protocol-pulse \ -" - -# ALSA plugin to redirect audio to pipewire. -FILES:${PN}-alsa = "\ - ${libdir}/alsa-lib/* \ - ${datadir}/alsa/alsa.conf.d/* \ -" - -# JACK drop-in libraries to redirect audio to pipewire. -CONFFILES:${PN}-jack = "${datadir}/pipewire/jack.conf" -FILES:${PN}-jack = "\ - ${bindir}/pw-jack \ - ${datadir}/pipewire/jack.conf \ - ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so.* \ -" - -# Dynamic SPA plugin packages (see set_dynamic_metapkg_rdepends). -FILES:${PN}-spa-plugins = "" -RRECOMMENDS:${PN}-spa-plugins += "${PN}-spa-plugins-meta" - -FILES:${PN}-spa-plugins-bluez5 += " \ - ${datadir}/${SPA_SUBDIR}/bluez5/* \ -" - -FILES:${PN}-spa-tools = " \ - ${bindir}/spa-* \ -" - -# Dynamic PipeWire module packages (see set_dynamic_metapkg_rdepends). -FILES:${PN}-modules = "" -RRECOMMENDS:${PN}-modules += "${PN}-modules-meta" - -CONFFILES:${PN}-modules-rt = "${datadir}/pipewire/client-rt.conf" -FILES:${PN}-modules-rt += " \ - ${datadir}/pipewire/client-rt.conf \ - ${sysconfdir}/security/limits.d/* \ - " - -CONFFILES:${PN}-modules-filter-chain = "${datadir}/pipewire/filter-chain/*" -FILES:${PN}-modules-filter-chain += " \ - ${datadir}/pipewire/filter-chain/* \ -" - -FILES:${PN}-alsa-card-profile = " \ - ${datadir}/alsa-card-profile/* \ - ${nonarch_base_libdir}/udev/rules.d/90-pipewire-alsa.rules \ -" - -# V4L2 interface emulator for sending/receiving data between PipeWire and V4L2 applications. -FILES:${PN}-v4l2 += " \ - ${bindir}/pw-v4l2 \ - ${libdir}/${PW_MODULE_SUBDIR}/v4l2/libpw-v4l2.so \ -" - -# AES67 is a standard for audio over IP, from the Audio Engineering Society (AES). -FILES:${PN}-aes67 += " \ - ${bindir}/pipewire-aes67 \ -" - -FILES:gstreamer1.0-pipewire = " \ - ${libdir}/gstreamer-1.0/* \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-networking/files/static-group-meta-networking b/meta-openembedded/meta-networking/files/static-group-meta-networking deleted file mode 100644 index 0aada6c5ff..0000000000 --- a/meta-openembedded/meta-networking/files/static-group-meta-networking +++ /dev/null @@ -1,14 +0,0 @@ -ftp:x:630: -dovecot:x:631: -dovenull:x:632: -postfix:x:633: -postdrop:x:634: -vmail:x:635: -rasvd:x:636: -frr:x:637: -frrvty:x:638: -nogroup:x:639: -ftp:x:640: -rwhod:x:641: -lldpd:x:642: -opensaf:x:643: \ No newline at end of file diff --git a/meta-openembedded/meta-networking/files/static-passwd-meta-networking b/meta-openembedded/meta-networking/files/static-passwd-meta-networking deleted file mode 100644 index 77c2b36f94..0000000000 --- a/meta-openembedded/meta-networking/files/static-passwd-meta-networking +++ /dev/null @@ -1,19 +0,0 @@ -ftp:x:630:630::/:/bin/nologin -dovecot:x:631:631::/:/bin/nologin -dovenull:x:632:632::/:/bin/nologin -postfix:x:633:633::/:/bin/nologin -vmail:x:635:635::/:/bin/nologin -radvd:x:636:636::/:/bin/nologin -frr:x:637:637::/:/bin/nologin -ftp:x:640:640::/:/bin/nologin -rwhod:x:641:641::/:/bin/nologin -lldpd:x:642:642::/:/bin/nologin -opensaf:x:643:643::/:/bin/nologin -tinyproxy:x:650:nogroup::/:/bin/nologin -radiusd:x:651:nogroup::/:/bin/nologin -nm-openconnect:x:652:nogroup::/:/bin/nologin -ntp:x:653:nogroup::/:/bin/nologin -nm-fortisslvpn:x:654:nogroup::/:/bin/nologin -nm-openvpn:x:655:nogroup::/:/bin/nologin -squid:x:656:nogroup::/:/bin/nologin -mosquitto:x:657:nogroup::/:/bin/nologin \ No newline at end of file diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/2894.patch b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/2894.patch deleted file mode 100644 index 7374cbd26f..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/2894.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Joachim Zobel -Date: Wed, 13 Sep 2023 09:55:34 +0200 -Subject: [PATCH] Link correctly with shared websockets library if needed see: - https://github.com/eclipse/mosquitto/pull/2751 - -Patch contributed by Joachim Zobel and Daniel Engberg ---- -Upstream-Status: Pending - - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9380a04..dce8313 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -200,7 +200,7 @@ if (WITH_WEBSOCKETS) - link_directories(${mosquitto_SOURCE_DIR}) - endif (WIN32) - else (STATIC_WEBSOCKETS) -- set (MOSQ_LIBS ${MOSQ_LIBS} websockets) -+ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared) - endif (STATIC_WEBSOCKETS) - endif (WITH_WEBSOCKETS) - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/2895.patch b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/2895.patch deleted file mode 100644 index 853f881754..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/2895.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Joachim Zobel -Date: Wed, 13 Sep 2023 10:05:43 +0200 -Subject: [PATCH] Mosquitto now waits for network-online when starting - (Closes: #1036450) - -See: https://github.com/eclipse/mosquitto/issues/2878 ---- -Upstream-Status: Pending - - service/systemd/mosquitto.service.simple | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/service/systemd/mosquitto.service.simple b/service/systemd/mosquitto.service.simple -index 15ee0d6..c2a330b 100644 ---- a/service/systemd/mosquitto.service.simple -+++ b/service/systemd/mosquitto.service.simple -@@ -1,8 +1,8 @@ - [Unit] - Description=Mosquitto MQTT Broker - Documentation=man:mosquitto.conf(5) man:mosquitto(8) --After=network.target --Wants=network.target -+After=network-online.target -+Wants=network-online.target - - [Service] - ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb new file mode 100644 index 0000000000..690b6bc126 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb @@ -0,0 +1,90 @@ +SUMMARY = "Open source MQTT implementation" +DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker \ +that implements the MQ Telemetry Transport protocol version 3.1, 3.1.1 and \ +5, providing both an MQTT broker and several command-line clients. MQTT \ +provides a lightweight method of carrying out messaging using a \ +publish/subscribe model. " +HOMEPAGE = "http://mosquitto.org/" +SECTION = "console/network" +LICENSE = "EPL-2.0 | EDL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca9a8f366c6babf593e374d0d7d58749 \ + file://edl-v10;md5=9f6accb1afcb570f8be65039e2fcd49e \ + file://epl-v20;md5=2dd765ca47a05140be15ebafddbeadfe \ + file://NOTICE.md;md5=a7a91b4754c6f7995020d1b49bc829c6 \ +" +DEPENDS = "uthash cjson" + +SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ + file://mosquitto.init \ + file://1571.patch \ +" + +SRC_URI[sha256sum] = "3be7a911236567c1a9fbe25baf3e3167004ba4a0c151a448ef1f7fc077dba52f" + +inherit systemd update-rc.d useradd cmake pkgconfig + +PACKAGECONFIG ??= "ssl websockets \ + ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ + " + +PACKAGECONFIG[manpages] = "-DDOCUMENTATION=ON,-DDOCUMENTATION=OFF,libxslt-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[dns-srv] = "-DWITH_SRV=ON,-DWITH_SRV=OFF,c-ares" +PACKAGECONFIG[ssl] = "-DWITH_TLS=ON -DWITH_TLS_PSK=ON -DWITH_EC=ON,-DWITH_TLS=OFF -DWITH_TLS_PSK=OFF -DWITH_EC=OFF,openssl" +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" +PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF,libwebsockets" +PACKAGECONFIG[dlt] = "-DWITH_DLT=ON,-DWITH_DLT=OFF,dlt-daemon" + +EXTRA_OECMAKE = " \ + -DWITH_BUNDLED_DEPS=OFF \ + -DWITH_ADNS=ON \ +" + +do_install:append() { + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${S}/service/systemd/mosquitto.service.notify ${D}${systemd_unitdir}/system/mosquitto.service + + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto + sed -i -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ + -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${sysconfdir}/init.d/mosquitto +} + +PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients" + +PACKAGE_BEFORE_PN = "${PN}-examples" + +FILES:${PN} = "${sbindir}/mosquitto \ + ${bindir}/mosquitto_passwd \ + ${bindir}/mosquitto_ctrl \ + ${libdir}/mosquitto_dynamic_security.so \ + ${sysconfdir}/mosquitto \ + ${sysconfdir}/init.d \ + ${systemd_unitdir}/system/mosquitto.service \ +" + +CONFFILES:${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" + +FILES:libmosquitto1 = "${libdir}/libmosquitto.so.*" + +FILES:libmosquittopp1 = "${libdir}/libmosquittopp.so.*" + +FILES:${PN}-clients = "${bindir}/mosquitto_pub \ + ${bindir}/mosquitto_sub \ + ${bindir}/mosquitto_rr \ +" + +FILES:${PN}-examples = "${sysconfdir}/mosquitto/*.example" + +SYSTEMD_SERVICE:${PN} = "mosquitto.service" + +INITSCRIPT_NAME = "mosquitto" +INITSCRIPT_PARAMS = "defaults 30" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false \ + --user-group mosquitto" + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb deleted file mode 100644 index 0c9ccc810d..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb +++ /dev/null @@ -1,92 +0,0 @@ -SUMMARY = "Open source MQTT implementation" -DESCRIPTION = "Mosquitto is an open source (Eclipse licensed) message broker \ -that implements the MQ Telemetry Transport protocol version 3.1, 3.1.1 and \ -5, providing both an MQTT broker and several command-line clients. MQTT \ -provides a lightweight method of carrying out messaging using a \ -publish/subscribe model. " -HOMEPAGE = "http://mosquitto.org/" -SECTION = "console/network" -LICENSE = "EPL-2.0 | EDL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca9a8f366c6babf593e374d0d7d58749 \ - file://edl-v10;md5=9f6accb1afcb570f8be65039e2fcd49e \ - file://epl-v20;md5=2dd765ca47a05140be15ebafddbeadfe \ - file://NOTICE.md;md5=a7a91b4754c6f7995020d1b49bc829c6 \ -" -DEPENDS = "uthash cjson" - -SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ - file://mosquitto.init \ - file://1571.patch \ - file://2894.patch \ - file://2895.patch \ -" - -SRC_URI[sha256sum] = "d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a" - -inherit systemd update-rc.d useradd cmake pkgconfig - -PACKAGECONFIG ??= "ssl websockets \ - ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \ - " - -PACKAGECONFIG[manpages] = "-DDOCUMENTATION=ON,-DDOCUMENTATION=OFF,libxslt-native docbook-xsl-stylesheets-native" -PACKAGECONFIG[dns-srv] = "-DWITH_SRV=ON,-DWITH_SRV=OFF,c-ares" -PACKAGECONFIG[ssl] = "-DWITH_TLS=ON -DWITH_TLS_PSK=ON -DWITH_EC=ON,-DWITH_TLS=OFF -DWITH_TLS_PSK=OFF -DWITH_EC=OFF,openssl" -PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd" -PACKAGECONFIG[websockets] = "-DWITH_WEBSOCKETS=ON,-DWITH_WEBSOCKETS=OFF,libwebsockets" -PACKAGECONFIG[dlt] = "-DWITH_DLT=ON,-DWITH_DLT=OFF,dlt-daemon" - -EXTRA_OECMAKE = " \ - -DWITH_BUNDLED_DEPS=OFF \ - -DWITH_ADNS=ON \ -" - -do_install:append() { - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${S}/service/systemd/mosquitto.service.notify ${D}${systemd_unitdir}/system/mosquitto.service - - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto - sed -i -e 's,@SBINDIR@,${sbindir},g' \ - -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ - -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - ${D}${sysconfdir}/init.d/mosquitto -} - -PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients" - -PACKAGE_BEFORE_PN = "${PN}-examples" - -FILES:${PN} = "${sbindir}/mosquitto \ - ${bindir}/mosquitto_passwd \ - ${bindir}/mosquitto_ctrl \ - ${libdir}/mosquitto_dynamic_security.so \ - ${sysconfdir}/mosquitto \ - ${sysconfdir}/init.d \ - ${systemd_unitdir}/system/mosquitto.service \ -" - -CONFFILES:${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" - -FILES:libmosquitto1 = "${libdir}/libmosquitto.so.*" - -FILES:libmosquittopp1 = "${libdir}/libmosquittopp.so.*" - -FILES:${PN}-clients = "${bindir}/mosquitto_pub \ - ${bindir}/mosquitto_sub \ - ${bindir}/mosquitto_rr \ -" - -FILES:${PN}-examples = "${sysconfdir}/mosquitto/*.example" - -SYSTEMD_SERVICE:${PN} = "mosquitto.service" - -INITSCRIPT_NAME = "mosquitto" -INITSCRIPT_PARAMS = "defaults 30" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false \ - --user-group mosquitto" - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch index 2e84a334f0..0a568fa23c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch @@ -7,7 +7,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Backport +Upstream-Status: Accepted Signed-off-by: Eivind Næss --- Makefile.am | 5 +- diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch index 6ac8f2b643..798a57b0da 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch @@ -6,7 +6,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Backport +Upstream-Status: Accepted Signed-off-by: Eivind Næss --- configure.ac | 6 +----- diff --git a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch new file mode 100644 index 0000000000..eaaf30460f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch @@ -0,0 +1,34 @@ +From 2fa326b26dc479942367dc4283e2f87372403988 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 17 Jun 2017 09:32:04 -0700 +Subject: [PATCH] rtnl_flush: Error on failed write() + +Fixes +route.c:45:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] +| write(fd, "-1", 2); +| ^~~~~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + route.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/route.c b/route.c +index c552d1f..fc5c31e 100644 +--- a/route.c ++++ b/route.c +@@ -42,7 +42,8 @@ static void rtnl_flush(void) + if (fd < 0) + return; + +- write(fd, "-1", 2); ++ if (write(fd, "-1", 2) < 0 ) ++ perror("write"); + close(fd); + } + +-- +2.13.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb index 79e1743fdf..1da18d7ca0 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb @@ -5,9 +5,11 @@ LIC_FILES_CHKSUM = "file://main.c;endline=17;md5=86aad799085683e0a2e1c2684a20bab DEPENDS = "libubox" -SRC_URI = "git://git.openwrt.org/project/relayd.git;branch=master" +SRC_URI = "git://git.openwrt.org/project/relayd.git;branch=master \ + file://0001-rtnl_flush-Error-on-failed-write.patch \ +" -SRCREV = "f646ba40489371e69f624f2dee2fc4e19ceec00e" +SRCREV = "f4d759be54ceb37714e9a6ca320d5b50c95e9ce9" PV = "0.0.1+git${SRCPV}" UPSTREAM_CHECK_COMMITS = "1" @@ -15,5 +17,3 @@ UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" inherit cmake - -CFLAGS:append:toolchain-clang = " -Wno-error=gnu-variable-sized-type-not-at-end" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/0001-include-sys-uio.patch b/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/0001-include-sys-uio.patch deleted file mode 100644 index 0c6f1609af..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/0001-include-sys-uio.patch +++ /dev/null @@ -1,18 +0,0 @@ - -This patch addresses the following clang failure: tayga-0.9.2/nat64.c:119:6: -error: call to undeclared function 'writev'; ISO C99 and later do not support -implicit function declarations [-Wimplicit-function-declaration] - -Upstream-Status: Pending -Signed-off-by: Pawel Langowski - ---- tayga.h 2023-09-29 14:38:05.005837695 +0200 -+++ tayga-2.h 2023-09-29 14:37:45.560837257 +0200 -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/tayga.conf b/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/tayga.conf deleted file mode 100644 index c1b6163a45..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/tayga.conf +++ /dev/null @@ -1,103 +0,0 @@ -# -# Sample configuration file for TAYGA 0.9.2 -# -# Modify this to use your own addresses!! -# - -# -# TUN device that TAYGA will use to exchange IPv4 and IPv6 packets with the -# kernel. You may use any name you like, but `nat64' is recommended. -# -# This device may be created before starting the tayga daemon by running -# `tayga --mktun`. This allows routing and firewall rules to be set up prior -# to commencement of packet translation. -# -# Mandatory. -# -tun-device nat64 - -# -# TAYGA's IPv4 address. This is NOT your router's IPv4 address! TAYGA -# requires its own address because it acts as an IPv4 and IPv6 router, and -# needs to be able to send ICMP messages. TAYGA will also respond to ICMP -# echo requests (ping) at this address. -# -# This address can safely be located inside the dynamic-pool prefix. -# -# Mandatory. -# -ipv4-addr 192.168.254.1 - -# -# TAYGA's IPv6 address. This is NOT your router's IPv6 address! TAYGA -# requires its own address because it acts as an IPv4 and IPv6 router, and -# needs to be able to send ICMP messages. TAYGA will also respond to ICMP -# echo requests (ping6) at this address. -# -# You can leave ipv6-addr unspecified and TAYGA will construct its IPv6 -# address using ipv4-addr and the NAT64 prefix. -# -# Optional if the NAT64 prefix is specified, otherwise mandatory. It is also -# mandatory if the NAT64 prefix is 64:ff9b::/96 and ipv4-addr is a private -# (RFC1918) address. -# -#ipv6-addr 2001:db8:1::2 -ipv6-addr fdaa:bb:1::1 - -# -# The NAT64 prefix. The IPv4 address space is mapped into the IPv6 address -# space by prepending this prefix to the IPv4 address. Using a /96 prefix is -# recommended in most situations, but all lengths specified in RFC 6052 are -# supported. -# -# This must be a prefix selected from your organization's IPv6 address space -# or the Well-Known Prefix 64:ff9b::/96. Note that using the Well-Known -# Prefix will prohibit IPv6 hosts from contacting IPv4 hosts that have private -# (RFC1918) addresses, per RFC 6052. -# -# The NAT64 prefix need not be specified if all required address mappings are -# listed in `map' directives. (See below.) -# -# Optional. -# -##prefix 2001:db8:1:ffff::/96 -prefix 64:ff9b::/96 - -# -# Dynamic pool prefix. IPv6 hosts which send traffic through TAYGA (and do -# not correspond to a static map or an IPv4-translatable address in the NAT64 -# prefix) will be assigned an IPv4 address from the dynamic pool. Dynamic -# maps are valid for 124 minutes after the last matching packet is seen. -# -# If no unassigned addresses remain in the dynamic pool (or no dynamic pool is -# configured), packets from unknown IPv6 hosts will be rejected with an ICMP -# unreachable error. -# -# Optional. -# -dynamic-pool 192.168.254.0/24 - -# -# Persistent data storage directory. The dynamic.map file, which saves the -# dynamic maps that are created from dynamic-pool, is stored in this -# directory. Omit if you do not need these maps to be persistent between -# instances of TAYGA. -# -# Optional. -# -data-dir /var/spool/tayga - -# -# Establishes a single-host map. If an IPv6 host should be consistently -# reachable at a specific IPv4 address, the mapping can be specified in a -# `map' directive. (IPv6 hosts numbered with an IPv4-translatable address do -# not need map directives.) -# -# IPv4 addresses specified in the `map' directive can safely be located inside -# the dynamic-pool prefix. -# -# Optional. -# -#map 192.168.5.42 2001:db8:1:4444::1 -#map 192.168.5.43 2001:db8:1:4444::2 -#map 192.168.255.2 2001:db8:1:569::143 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/tayga.service b/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/tayga.service deleted file mode 100644 index 0bffeb92a5..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/tayga.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -SourcePath=/usr/sbin/tayga -Description=LSB: userspace NAT64 - -[Service] -Type=forking -ExecStart=/usr/sbin/tayga -d --config /etc/tayga.conf -RemainAfterExit=yes -TimeoutStopSec=infinity - -[Install] -WantedBy=multi-user.target diff --git a/meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb deleted file mode 100644 index 36d35e6dee..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI = " \ - http://www.litech.org/tayga/tayga-${PV}.tar.bz2 \ - file://tayga.conf \ - file://tayga.service \ - file://0001-include-sys-uio.patch;striplevel=0 \ - " -SRC_URI[sha256sum] = "2b1f7927a9d2dcff9095aff3c271924b052ccfd2faca9588b277431a44f0009c" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "tayga.service" - -do_install:append() { - install -m 0644 ${WORKDIR}/tayga.conf ${D}${sysconfdir}/tayga.conf - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/tayga.service ${D}${systemd_unitdir}/system/ -} - -inherit autotools systemd diff --git a/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-all.bb b/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-all.bb deleted file mode 100644 index 20d3271c94..0000000000 --- a/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-all.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-core/images/core-image-base.bb - -IMAGE_INSTALL += "packagegroup-meta-networking" diff --git a/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-base.bb b/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-base.bb new file mode 100644 index 0000000000..eaf1409537 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-base.bb @@ -0,0 +1,7 @@ +SUMMARY = "meta-networking build test image" + +IMAGE_INSTALL = "packagegroup-core-boot" + +LICENSE = "MIT" + +inherit core-image diff --git a/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image.bb b/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image.bb new file mode 100644 index 0000000000..f4c7401b35 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image.bb @@ -0,0 +1,3 @@ +require meta-networking-image-base.bb + +IMAGE_INSTALL += "packagegroup-meta-networking" diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch deleted file mode 100644 index daee318ae4..0000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1cc54320306e07c1fc0eed98e7fbcbb07a2f3b28 Mon Sep 17 00:00:00 2001 -From: Stefan Agner -Date: Fri, 23 Jun 2023 10:10:00 +0200 -Subject: [PATCH] Handle interface without `ifa_addr` - -It seems that certain interface types may have `ifa_addr` set to null. -Handle this case gracefully. - -Upstream-Status: Submitted [https://github.com/apple-oss-distributions/mDNSResponder/pull/2/commits/11b410d4d683c90e693c40315997bb3e8ec90e9a] - -Signed-off-by: Stefan Agner -Signed-off-by: Alex Kiernan ---- - mDNSPosix/mDNSPosix.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c -index d7f31cc4d5cf..f10301253f58 100644 ---- a/mDNSPosix/mDNSPosix.c -+++ b/mDNSPosix/mDNSPosix.c -@@ -1895,6 +1895,7 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) - continue; - - if ((ifa_loop4 == NULL) && -+ ((*ifi)->ifa_addr != NULL) && - ((*ifi)->ifa_addr->sa_family == AF_INET) && - ((*ifi)->ifa_flags & IFF_UP) && - ((*ifi)->ifa_flags & IFF_LOOPBACK)) -@@ -1903,7 +1904,8 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) - continue; - } - -- if ( (((*ifi)->ifa_addr->sa_family == AF_INET) -+ if ( ((*ifi)->ifa_addr != NULL) && -+ (((*ifi)->ifa_addr->sa_family == AF_INET) - #if HAVE_IPV6 - || ((*ifi)->ifa_addr->sa_family == AF_INET6) - #endif diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0003-mDNSShared-Drop-MacOS-specific-__block-qualifier.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0003-mDNSShared-Drop-MacOS-specific-__block-qualifier.patch new file mode 100644 index 0000000000..0ac0bb6a45 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0003-mDNSShared-Drop-MacOS-specific-__block-qualifier.patch @@ -0,0 +1,30 @@ +From 4c0954f77ba05d77192ee1519929a39fbc978321 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Mon, 5 Dec 2022 15:14:22 +0000 +Subject: [PATCH 3/6] mDNSShared: Drop MacOS specific __block qualifier + +Support for this extension only exists in MacOS/Clang, also it's not +actually used here, so we can just drop it. + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan +--- + mDNSShared/uds_daemon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mDNSShared/uds_daemon.c b/mDNSShared/uds_daemon.c +index 9ae5f78542d6..8c006b71a4ea 100644 +--- a/mDNSShared/uds_daemon.c ++++ b/mDNSShared/uds_daemon.c +@@ -2912,7 +2912,7 @@ exit: + mDNSlocal mStatus add_domain_to_browser(request_state *info, const domainname *d) + { + browser_t *b, *p; +- __block mStatus err; ++ mStatus err; + + for (p = info->u.browser.browsers; p; p = p->next) + { +-- +2.35.1 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch index 4cda71bdb1..39e67cdf48 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch @@ -1,25 +1,28 @@ -From 764b6202402e9e5687ff873330e5ad6be6f69df7 Mon Sep 17 00:00:00 2001 +From 60533a8947af714cc593bae6b20d47f3a4828589 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Mon, 5 Dec 2022 22:49:49 +0000 -Subject: [PATCH] mDNSCore: Fix broken debug parameter +Subject: [PATCH 5/6] mDNSCore: Fix broken debug parameter -Upstream-Status: Pending Signed-off-by: Alex Kiernan - --- +Upstream-Status: Pending + mDNSCore/mDNS.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c -index eecd7daa724e..1e843c081938 100644 +index 66979587ee82..e0a982fa1762 100644 --- a/mDNSCore/mDNS.c +++ b/mDNSCore/mDNS.c -@@ -10210,7 +10210,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage * +@@ -9831,7 +9831,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage * #else const DNSServRef dnsserv = qptr->qDNSServer; #endif -- debugf("mDNSCoreReceiveNoUnicastAnswers making negative cache entry TTL %d for %##s (%s)", negttl, currentQName, DNSTypeName(q.qtype)); +- debugf("mDNSCoreReceiveNoUnicastAnswers making negative cache entry TTL %d for %##s (%s)", negttl, name->c, DNSTypeName(q.qtype)); + debugf("mDNSCoreReceiveNoUnicastAnswers making negative cache entry TTL %d for %##s (%s)", negttl, currentQName->c, DNSTypeName(q.qtype)); // Create a negative record for the current name in the CNAME chain. MakeNegativeCacheRecord(m, &m->rec.r, currentQName, currentQNameHash, q.qtype, q.qclass, negttl, mDNSInterface_Any, dnsserv, response->h.flags); +-- +2.35.1 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch deleted file mode 100644 index 9fe721ff07..0000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9fc45a2cf3b78573a568abf538a6e6f4bd30b2d7 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan -Date: Wed, 27 Sep 2023 11:45:26 +0100 -Subject: [PATCH] Add missing limits.h - -Upstream-Status: Pending -Signed-off-by: Alex Kiernan ---- - mDNSShared/PlatformCommon.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mDNSShared/PlatformCommon.c b/mDNSShared/PlatformCommon.c -index 9ce15468e217..c308af3e8b0e 100644 ---- a/mDNSShared/PlatformCommon.c -+++ b/mDNSShared/PlatformCommon.c -@@ -32,6 +32,7 @@ - #include - #include // Needed for #include (). - #include -+#include - - - #include "mDNSEmbeddedAPI.h" // Defines the interface provided to the client layer above diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb new file mode 100644 index 0000000000..aff7954f50 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb @@ -0,0 +1,133 @@ +SUMMARY = "Publishes & browses available services on a link according to the Zeroconf / Bonjour protocol" +DESCRIPTION = "Bonjour, also known as zero-configuration networking, enables automatic discovery of computers, devices, and services on IP networks." +HOMEPAGE = "http://developer.apple.com/networking/bonjour/" +LICENSE = "Apache-2.0 & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=31c50371921e0fb731003bbc665f29bf" + +DEPENDS:append:libc-musl = " musl-nscd" + +SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https;branch=rel/mDNSResponder-1790 \ + file://0001-dns-sd-Include-missing-headers.patch \ + file://0002-make-Set-libdns_sd.so-soname-correctly.patch \ + file://0003-mDNSShared-Drop-MacOS-specific-__block-qualifier.patch \ + file://0004-make-Separate-TLS-targets-from-libraries.patch \ + file://0005-mDNSCore-Fix-broken-debug-parameter.patch \ + file://0006-make-Add-top-level-Makefile.patch \ + file://0001-Create-subroutine-for-cleaning-recent-interfaces.patch \ + file://0002-Create-subroutine-for-tearing-down-an-interface.patch \ + file://0003-Track-interface-socket-family.patch \ + file://0004-Indicate-loopback-interface-to-mDNS-core.patch \ + file://0005-Use-list-for-changed-interfaces.patch \ + file://0006-Handle-noisy-netlink-sockets.patch \ + file://0007-Mark-deleted-interfaces-as-being-changed.patch \ + file://0008-Handle-errors-from-socket-calls.patch \ + file://0009-remove-unneeded-headers.patch \ + file://mdns.service \ + " +SRCREV = "8769ab51605e465425d33d757f602ce5905ca639" + +# We install a stub Makefile in the top directory so that the various checks +# in base.bbclass pass their tests for a Makefile, this ensures (that amongst +# other things) the sstate checks will clean the build directory when the +# task hashes changes. +# +# We can't use the approach of setting ${S} to mDNSPosix as we need +# DEBUG_PREFIX_MAP to cover files which come from the Clients directory too. +S = "${WORKDIR}/git" + +inherit github-releases manpages systemd update-rc.d + +PACKAGECONFIG ?= "tls \ + ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[debug] = "DEBUG=1,DEBUG=0" +PACKAGECONFIG[ipv6] = "HAVE_IPV6=1,HAVE_IPV6=0" +PACKAGECONFIG[manpages] = "" +PACKAGECONFIG[tls] = ",tls=no,mbedtls" + +CVE_PRODUCT = "apple:mdnsresponder" + +CVE_STATUS[CVE-2007-0613] = "not-applicable-platform: Issue affects Apple products \ +i.e. ichat,mdnsresponder, instant message framework and MacOS. Also, \ +https://www.exploit-db.com/exploits/3230 shows the part of code \ +affected by CVE-2007-0613 which is not preset in upstream source code. \ +Hence, CVE-2007-0613 does not affect other Yocto implementations and \ +is not reported for other distros can be marked whitelisted. \ +Links: https://vulmon.com/vulnerabilitydetails?qid=CVE-2007-0613 \ +https://www.incibe-cert.es/en/early-warning/vulnerabilities/cve-2007-0613 \ +https://security-tracker.debian.org/tracker/CVE-2007-0613 \ +https://vulmon.com/vulnerabilitydetails?qid=CVE-2007-0613" + +PARALLEL_MAKE = "" + +EXTRA_OEMAKE = "os=linux 'CC=${CCLD}' 'LD=${CCLD}' 'LINKOPTS=${LDFLAGS}' STRIP=: ${PACKAGECONFIG_CONFARGS}" + +# MDNS_VERSIONSTR_NODTS disables __DATE__ and __TIME__ in the version string, +# which are fixed anyway for build reproducibility. +TARGET_CPPFLAGS += "-DMDNS_VERSIONSTR_NODTS" + +TARGET_CC_ARCH += "${LDFLAGS}" + +MDNS_BUILDDIR = "build/${@bb.utils.contains('PACKAGECONFIG','debug','debug','prod', d)}" + +do_install () { + cd mDNSPosix + + install -d ${D}${sbindir} + install ${MDNS_BUILDDIR}/mdnsd ${D}${sbindir} + + install -d ${D}${libdir} + install -m 0644 ${MDNS_BUILDDIR}/libdns_sd.so ${D}${libdir}/libdns_sd.so.1 + ln -s libdns_sd.so.1 ${D}${libdir}/libdns_sd.so + + install -d ${D}${includedir} + install -m 0644 ../mDNSShared/dns_sd.h ${D}${includedir} + + install -d ${D}${mandir}/man8 + install -m 0644 ../mDNSShared/mDNSResponder.8 ${D}${mandir}/man8/mdnsd.8 + + install -d ${D}${bindir} + install -m 0755 ../Clients/build/dns-sd ${D}${bindir} + + install -d ${D}${libdir} + oe_libinstall -C ${MDNS_BUILDDIR} -so libnss_mdns-0.2 ${D}${libdir} + ln -s libnss_mdns-0.2.so ${D}${libdir}/libnss_mdns.so.2 + + install -d ${D}${sysconfdir} + install -m 0644 nss_mdns.conf ${D}${sysconfdir} + + install -d ${D}${mandir}/man5 + install -m 0644 nss_mdns.conf.5 ${D}${mandir}/man5 + + install -d ${D}${mandir}/man8 + install -m 0644 libnss_mdns.8 ${D}${mandir}/man8 + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/mdns.service ${D}${systemd_system_unitdir} + + install -d ${D}${INIT_D_DIR} + install mdnsd.sh ${D}${INIT_D_DIR}/mdns +} + +pkg_postinst:${PN} () { + if [ -r $D${sysconfdir}/nsswitch.conf ]; then + sed -e '/^hosts:/s/\s*\//' \ + -e 's/\(^hosts:.*\)\(\\)\(.*\)\(\\)\(.*\)/\1\2 mdns\3\4\5/' \ + -i $D${sysconfdir}/nsswitch.conf + fi +} + +pkg_prerm:${PN} () { + if [ -r $D${sysconfdir}/nsswitch.conf ]; then + sed -e '/^hosts:/s/\s*\//' \ + -e '/^hosts:/s/\s*mdns//' \ + -i $D${sysconfdir}/nsswitch.conf + fi +} + +SYSTEMD_SERVICE:${PN} = "mdns.service" +INITSCRIPT_NAME = "mdns" + +FILES_SOLIBSDEV = "${libdir}/libdns_sd.so" +FILES:${PN} += "${libdir}/libnss_mdns-0.2.so" + +RPROVIDES:${PN} += "libdns_sd.so" diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.0.8.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.0.8.bb deleted file mode 100644 index 8370ed50c0..0000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.0.8.bb +++ /dev/null @@ -1,134 +0,0 @@ -SUMMARY = "Publishes & browses available services on a link according to the Zeroconf / Bonjour protocol" -DESCRIPTION = "Bonjour, also known as zero-configuration networking, enables automatic discovery of computers, devices, and services on IP networks." -HOMEPAGE = "http://developer.apple.com/networking/bonjour/" -LICENSE = "Apache-2.0 & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=31c50371921e0fb731003bbc665f29bf" - -DEPENDS:append:libc-musl = " musl-nscd" - -SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https;branch=main \ - file://0001-dns-sd-Include-missing-headers.patch \ - file://0002-make-Set-libdns_sd.so-soname-correctly.patch \ - file://0004-make-Separate-TLS-targets-from-libraries.patch \ - file://0005-mDNSCore-Fix-broken-debug-parameter.patch \ - file://0006-make-Add-top-level-Makefile.patch \ - file://0001-Create-subroutine-for-cleaning-recent-interfaces.patch \ - file://0002-Create-subroutine-for-tearing-down-an-interface.patch \ - file://0003-Track-interface-socket-family.patch \ - file://0004-Indicate-loopback-interface-to-mDNS-core.patch \ - file://0005-Use-list-for-changed-interfaces.patch \ - file://0006-Handle-noisy-netlink-sockets.patch \ - file://0007-Mark-deleted-interfaces-as-being-changed.patch \ - file://0008-Handle-errors-from-socket-calls.patch \ - file://0009-remove-unneeded-headers.patch \ - file://mdns.service \ - file://0015-Add-missing-limits.h.patch \ - file://0001-Handle-interface-without-ifa_addr.patch \ - " -SRCREV = "d5029b5dff8aa59d1fc07ed796e994106ef58dee" - -# We install a stub Makefile in the top directory so that the various checks -# in base.bbclass pass their tests for a Makefile, this ensures (that amongst -# other things) the sstate checks will clean the build directory when the -# task hashes changes. -# -# We can't use the approach of setting ${S} to mDNSPosix as we need -# DEBUG_PREFIX_MAP to cover files which come from the Clients directory too. -S = "${WORKDIR}/git" - -inherit github-releases manpages systemd update-rc.d - -PACKAGECONFIG ?= "tls \ - ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[debug] = "DEBUG=1,DEBUG=0" -PACKAGECONFIG[ipv6] = "HAVE_IPV6=1,HAVE_IPV6=0" -PACKAGECONFIG[manpages] = "" -PACKAGECONFIG[tls] = ",tls=no,mbedtls" - -CVE_PRODUCT = "apple:mdnsresponder" - -CVE_STATUS[CVE-2007-0613] = "not-applicable-platform: Issue affects Apple products \ -i.e. ichat,mdnsresponder, instant message framework and MacOS. Also, \ -https://www.exploit-db.com/exploits/3230 shows the part of code \ -affected by CVE-2007-0613 which is not preset in upstream source code. \ -Hence, CVE-2007-0613 does not affect other Yocto implementations and \ -is not reported for other distros can be marked whitelisted. \ -Links: https://vulmon.com/vulnerabilitydetails?qid=CVE-2007-0613 \ -https://www.incibe-cert.es/en/early-warning/vulnerabilities/cve-2007-0613 \ -https://security-tracker.debian.org/tracker/CVE-2007-0613 \ -https://vulmon.com/vulnerabilitydetails?qid=CVE-2007-0613" - -PARALLEL_MAKE = "" - -EXTRA_OEMAKE = "os=linux 'CC=${CCLD}' 'LD=${CCLD}' 'LINKOPTS=${LDFLAGS}' STRIP=: ${PACKAGECONFIG_CONFARGS}" - -# MDNS_VERSIONSTR_NODTS disables __DATE__ and __TIME__ in the version string, -# which are fixed anyway for build reproducibility. -TARGET_CPPFLAGS += "-DMDNS_VERSIONSTR_NODTS" - -TARGET_CC_ARCH += "${LDFLAGS}" - -MDNS_BUILDDIR = "build/${@bb.utils.contains('PACKAGECONFIG','debug','debug','prod', d)}" - -do_install () { - cd mDNSPosix - - install -d ${D}${sbindir} - install ${MDNS_BUILDDIR}/mdnsd ${D}${sbindir} - - install -d ${D}${libdir} - install -m 0644 ${MDNS_BUILDDIR}/libdns_sd.so ${D}${libdir}/libdns_sd.so.1 - ln -s libdns_sd.so.1 ${D}${libdir}/libdns_sd.so - - install -d ${D}${includedir} - install -m 0644 ../mDNSShared/dns_sd.h ${D}${includedir} - - install -d ${D}${mandir}/man8 - install -m 0644 ../mDNSShared/mDNSResponder.8 ${D}${mandir}/man8/mdnsd.8 - - install -d ${D}${bindir} - install -m 0755 ../Clients/build/dns-sd ${D}${bindir} - - install -d ${D}${libdir} - oe_libinstall -C ${MDNS_BUILDDIR} -so libnss_mdns-0.2 ${D}${libdir} - ln -s libnss_mdns-0.2.so ${D}${libdir}/libnss_mdns.so.2 - - install -d ${D}${sysconfdir} - install -m 0644 nss_mdns.conf ${D}${sysconfdir} - - install -d ${D}${mandir}/man5 - install -m 0644 nss_mdns.conf.5 ${D}${mandir}/man5 - - install -d ${D}${mandir}/man8 - install -m 0644 libnss_mdns.8 ${D}${mandir}/man8 - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/mdns.service ${D}${systemd_system_unitdir} - - install -d ${D}${INIT_D_DIR} - install mdnsd.sh ${D}${INIT_D_DIR}/mdns -} - -pkg_postinst:${PN} () { - if [ -r $D${sysconfdir}/nsswitch.conf ]; then - sed -e '/^hosts:/s/\s*\//' \ - -e 's/\(^hosts:.*\)\(\\)\(.*\)\(\\)\(.*\)/\1\2 mdns\3\4\5/' \ - -i $D${sysconfdir}/nsswitch.conf - fi -} - -pkg_prerm:${PN} () { - if [ -r $D${sysconfdir}/nsswitch.conf ]; then - sed -e '/^hosts:/s/\s*\//' \ - -e '/^hosts:/s/\s*mdns//' \ - -i $D${sysconfdir}/nsswitch.conf - fi -} - -SYSTEMD_SERVICE:${PN} = "mdns.service" -INITSCRIPT_NAME = "mdns" - -FILES_SOLIBSDEV = "${libdir}/libdns_sd.so" -FILES:${PN} += "${libdir}/libnss_mdns-0.2.so" - -RPROVIDES:${PN} += "libdns_sd.so" diff --git a/meta-openembedded/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch b/meta-openembedded/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch index b93e311054..a84290218d 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix(build): do not install git files Signed-off-by: Vyacheslav Yurkov --- -Upstream-Status: Backport [https://github.com/open62541/open62541/commit/a0328d4cb527f9778a262fc4a6b42bfbdffc38e9] +Upstream-Status: Pending CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch b/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch index dbdd644830..64938a4820 100644 --- a/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch +++ b/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch @@ -11,7 +11,7 @@ disabled by default. Like 1.0.6, it will check openssl MD4 algorithm support as MD4 is insecure and modern systems may drop MD4 support. -Upstream-Status: Backport [https://github.com/libesmtp/libESMTP/commit/1c304e7886a08fb56485e41614ff3f8685afb59d] +Upstream-Status: Accepted [https://github.com/libesmtp/libESMTP/commit/1c304e7886a08fb56485e41614ff3f8685afb59d] Signed-off-by: Jiaqing Zhao --- meson.build | 13 ++++++++++--- diff --git a/meta-openembedded/meta-oe/classes/signing.bbclass b/meta-openembedded/meta-oe/classes/signing.bbclass index 79944e3fe9..5c74a319e4 100644 --- a/meta-openembedded/meta-oe/classes/signing.bbclass +++ b/meta-openembedded/meta-oe/classes/signing.bbclass @@ -224,12 +224,6 @@ signing_import_install() { } signing_prepare() { - export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules" - export OPENSSL_ENGINES="${STAGING_LIBDIR_NATIVE}/engines-3" - export OPENSSL_CONF="${STAGING_LIBDIR_NATIVE}/ssl-3/openssl.cnf" - export SSL_CERT_DIR="${STAGING_LIBDIR_NATIVE}/ssl-3/certs" - export SSL_CERT_FILE="${STAGING_LIBDIR_NATIVE}/ssl-3/cert.pem" - if [ -f ${OPENSSL_CONF} ]; then echo "Using '${OPENSSL_CONF}' for OpenSSL configuration" else @@ -314,3 +308,9 @@ signing_get_module() { python () { signing_class_prepare(d) } + +export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules" +export OPENSSL_ENGINES="${STAGING_LIBDIR_NATIVE}/engines-3" +export OPENSSL_CONF="${STAGING_LIBDIR_NATIVE}/ssl-3/openssl.cnf" +export SSL_CERT_DIR="${STAGING_LIBDIR_NATIVE}/ssl-3/certs" +export SSL_CERT_FILE="${STAGING_LIBDIR_NATIVE}/ssl-3/cert.pem" diff --git a/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index a2b2ce4bc9..81094bf9a5 100644 --- a/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -50,12 +50,10 @@ PTESTS_SLOW_META_OE = "\ rsyslog \ mariadb \ " -PTESTS_SLOW_META_OE:append:x86 = " kernel-selftest" -PTESTS_SLOW_META_OE:append:x86-64 = " kernel-selftest" -PTESTS_SLOW_META_OE:remove:libc-musl = "kernel-selftest" PTESTS_PROBLEMS_META_OE ="\ jemalloc \ + kernel-selftest \ keyutils \ libdbi-perl \ libgpiod \ diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff index cdb29f24dc..8ab5386dc1 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff @@ -1,5 +1,3 @@ -Upstream-Status: Pending - === modified file 'openbox-xdgmenu.c' --- openbox-xdgmenu.c 2011-09-03 20:13:39 +0000 +++ openbox-xdgmenu.c 2013-12-28 17:41:04 +0000 diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/fix-menu-generation.patch b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/fix-menu-generation.patch index 3def090eb1..03b357263f 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/fix-menu-generation.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/fix-menu-generation.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Index: openbox-xdgmenu-0.3/openbox-xdgmenu.c =================================================================== --- openbox-xdgmenu-0.3.orig/openbox-xdgmenu.c diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/port-gnome-menus3.patch b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/port-gnome-menus3.patch index 6d123482e8..3fcc319164 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/port-gnome-menus3.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/port-gnome-menus3.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Index: openbox-xdgmenu-0.3/openbox-xdgmenu.c =================================================================== --- openbox-xdgmenu-0.3.orig/openbox-xdgmenu.c diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch index d4c8a3d7fc..0e38f7d8ec 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -10,8 +10,6 @@ input.h [1] Signed-off-by: Khem Raj --- -Upstream-Status: Pending - plugins/devinput.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Makefile.am-do-not-clobber-PYTHONPATH-from-build-env.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Makefile.am-do-not-clobber-PYTHONPATH-from-build-env.patch index 11f6485b27..089ed23c73 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Makefile.am-do-not-clobber-PYTHONPATH-from-build-env.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Makefile.am-do-not-clobber-PYTHONPATH-from-build-env.patch @@ -8,8 +8,6 @@ and so lirc's variable has to be named something else. Signed-off-by: Alexander Kanavin --- -Upstream-Status: Pending - Makefile.am | 2 +- pylint.mak | 2 +- tools/Makefile.am | 2 +- diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch index 73bacc9139..e58a93b6f6 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch @@ -7,7 +7,7 @@ This bites during cross compiling where the target is different than build host and build host might be ubuntu but that does not matter in cross compilation case. This fails builds when usrmerge feature is used -Upstream-Status: Inappropriate [ Cross-compile specific ] +Upstream-Status: Inappropriates [ Cross-compile specific ] Signed-off-by: Khem Raj --- configure.ac | 2 +- diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/fix_build_errors.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/fix_build_errors.patch index ed840cd098..41353dbbdc 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/fix_build_errors.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/fix_build_errors.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - diff --git a/configure.ac b/configure.ac index 58347d8..8c7fca2 100644 --- a/configure.ac diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch index 0bd7f80c26..8779c251a5 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch @@ -5,8 +5,6 @@ Subject: [PATCH] don't fail if GLOB_BRACE is not defined Signed-off-by: Zang Ruochen --- -Upstream-Status: Pending - src/util.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-Fixes-for-yocto-build.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-Fixes-for-yocto-build.patch index 1d18d47ec3..dcf27d805e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-Fixes-for-yocto-build.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-Fixes-for-yocto-build.patch @@ -8,8 +8,6 @@ Signed-off-by: JJ Robertson Signed-off-by: Etienne Cordonnier --- -Upstream-Status: Pending - system/core/adb/daemon/file_sync_service.cpp | 4 ++-- system/core/adb/daemon/framebuffer_service.h | 2 -- system/core/adb/daemon/main.cpp | 5 +++-- diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch index e749366bb6..2b95ad2b0a 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch @@ -13,8 +13,6 @@ Subject: [PATCH] android-tools: modifications to make it build in yocto Signed-off-by: Etienne Cordonnier --- -Upstream-Status: Pending - debian/external/boringssl/libcrypto.mk | 1 + debian/system/core/append2simg.mk | 2 +- debian/system/core/fastboot.mk | 2 +- diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch index ea934f44d8..7ea040c68a 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch @@ -37,8 +37,6 @@ Signed-off-by: Anatol Pomozov Signed-off-by: Etienne Cordonnier --- -Upstream-Status: Pending - system/core/adb/client/usb_linux.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0004-adb-Fix-build-on-big-endian-systems.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0004-adb-Fix-build-on-big-endian-systems.patch index c82423908f..83fe4475c3 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0004-adb-Fix-build-on-big-endian-systems.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0004-adb-Fix-build-on-big-endian-systems.patch @@ -21,8 +21,6 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Etienne Cordonnier --- -Upstream-Status: Pending - system/core/adb/daemon/usb_ffs.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0005-adb-Allow-adbd-to-be-run-as-root.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0005-adb-Allow-adbd-to-be-run-as-root.patch index dfbdc2af66..3fbdcd4bac 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0005-adb-Allow-adbd-to-be-run-as-root.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0005-adb-Allow-adbd-to-be-run-as-root.patch @@ -6,8 +6,6 @@ Subject: [PATCH] adb: Allow adbd to be run as root Signed-off-by: Etienne Cordonnier --- -Upstream-Status: Pending - system/core/adb/daemon/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Add-riscv64-support.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Add-riscv64-support.patch index 9fd0fa792c..4669f89d07 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Add-riscv64-support.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Add-riscv64-support.patch @@ -24,8 +24,6 @@ Signed-off-by: Lifang Xia Signed-off-by: Mao Han Change-Id: Ib21ddf23cc83f332af202df7bffcaceec16063e0 --- -Upstream-Status: Pending - system/core/libunwindstack/Android.bp | 1 + system/core/libunwindstack/Elf.cpp | 2 + system/core/libunwindstack/Regs.cpp | 10 ++ diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Added-missing-headers.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Added-missing-headers.patch index d827d7d3c2..c07e93660f 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Added-missing-headers.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Added-missing-headers.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Added missing headers causing compile errors Author: Umang Parmar Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Nonnull.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Nonnull.patch index 54bd52c61a..8d1408a48e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Nonnull.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Nonnull.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Bring Clang's _Nonnull keyword to GCC Author: Kai-Chung Yan Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Vector-cast.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Vector-cast.patch index b2881e0213..b32d5f6f54 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Vector-cast.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Vector-cast.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Fix the weird error by GCC7 that fails to match the correct parent method. Author: Kai-Chung Yan Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/add-missing-headers.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/add-missing-headers.patch index 681d2c6553..49d3ecefbb 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/add-missing-headers.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/add-missing-headers.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Forwarded: not-needed --- a/system/core/fs_mgr/liblp/reader.cpp +++ b/system/core/fs_mgr/liblp/reader.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch index e8e216161e..b926eddcdf 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Off-by-one error in the dwarf_to_unw_regnum function in include/dwarf_i.h in libunwind 1.1 allows local users to have unspecified impact via invalid dwarf opcodes. --- a/external/libunwind/include/dwarf_i.h diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/legacy_built-in_sync_functions.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/legacy_built-in_sync_functions.patch index a04a887c68..ce1d4e52eb 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/legacy_built-in_sync_functions.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/legacy_built-in_sync_functions.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Replace the legacy __sync built-in functions with __atomic ones libunwind uses the built-in __sync_* functions which are deprecated by GCC and should be replaced by __atomic_* ones. See the official manuals [1]. diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/user_pt_regs.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/user_pt_regs.patch index 35df944d1c..600471f126 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/user_pt_regs.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/user_pt_regs.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Author: Kai-Chung Yan Last-Update: 2016-08-24 Description: Manual definition of struct user_pt_regs diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-attribute-issue-with-gcc.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-attribute-issue-with-gcc.patch index 441031f536..e0b4275579 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-attribute-issue-with-gcc.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-attribute-issue-with-gcc.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: remove clang-ism Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-build-on-non-x86.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-build-on-non-x86.patch index b1caa60c4a..98a5078244 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-build-on-non-x86.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-build-on-non-x86.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: non-x86 arches do not have PAGE_SIZE Forwarded: not-needed --- a/system/core/base/cmsg.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-gettid-exception-declaration.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-gettid-exception-declaration.patch index 5f24d0b4a0..7fd228bff6 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-gettid-exception-declaration.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-gettid-exception-declaration.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: get libcutils building Forwarded: not-needed --- a/system/core/libcutils/include/cutils/threads.h diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-standard-namespace-errors.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-standard-namespace-errors.patch index 4380308f13..e41a3576ae 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-standard-namespace-errors.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-standard-namespace-errors.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Add missing 'std::' scope identifiers. Forwarded: not-needed --- a/system/core/libunwindstack/include/unwindstack/DwarfMemory.h diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/hard-code-build-number.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/hard-code-build-number.patch index 4d7323bd2f..2a332eb689 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/hard-code-build-number.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/hard-code-build-number.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: just hard code rather than deal with circular deps Forwarded: not-needed --- a/system/core/adb/adb.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/libusb-header-path.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/libusb-header-path.patch index 122bd70e7d..1663aae465 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/libusb-header-path.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/libusb-header-path.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: libusb.h comes from different location Author: Umang Parmar Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/move-log-file-to-proper-dir.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/move-log-file-to-proper-dir.patch index e8494ab433..006564b024 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/move-log-file-to-proper-dir.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/move-log-file-to-proper-dir.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Update log file directory. Author: Umang Parmar Last Updated: 2018-05-17 diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/simg_dump-python3.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/simg_dump-python3.patch index 6664dc2aa5..e6933ef145 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/simg_dump-python3.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/simg_dump-python3.patch @@ -5,8 +5,6 @@ Last-Update: 2019-01-05 Origin: https://bugs.debian.org/945646 --- -Upstream-Status: Pending - Index: android-platform-tools/system/core/libsparse/simg_dump.py =================================================================== --- android-platform-tools.orig/system/core/libsparse/simg_dump.py diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stdatomic.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stdatomic.patch index e11f3cc783..ea3711dfa2 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stdatomic.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stdatomic.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Fix incompatibility between and This 2 headers combined will cause errors for both GCC and Clang. This patch makes sure only one of them is present at any time. diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stub-out-fastdeploy.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stub-out-fastdeploy.patch index d86ef230f7..d2426a781d 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stub-out-fastdeploy.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stub-out-fastdeploy.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Defer packaging fastdeploy with adb for 29.x.x tags. Forwarded: not-needed --- a/system/core/adb/client/commandline.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Add-riscv64-support.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Add-riscv64-support.patch index 9fd0fa792c..4669f89d07 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Add-riscv64-support.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Add-riscv64-support.patch @@ -24,8 +24,6 @@ Signed-off-by: Lifang Xia Signed-off-by: Mao Han Change-Id: Ib21ddf23cc83f332af202df7bffcaceec16063e0 --- -Upstream-Status: Pending - system/core/libunwindstack/Android.bp | 1 + system/core/libunwindstack/Elf.cpp | 2 + system/core/libunwindstack/Regs.cpp | 10 ++ diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Added-missing-headers.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Added-missing-headers.patch index d827d7d3c2..c07e93660f 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Added-missing-headers.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Added-missing-headers.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Added missing headers causing compile errors Author: Umang Parmar Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Nonnull.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Nonnull.patch index 54bd52c61a..8d1408a48e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Nonnull.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Nonnull.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Bring Clang's _Nonnull keyword to GCC Author: Kai-Chung Yan Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Vector-cast.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Vector-cast.patch index b2881e0213..b32d5f6f54 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Vector-cast.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Vector-cast.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Fix the weird error by GCC7 that fails to match the correct parent method. Author: Kai-Chung Yan Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/add-missing-headers.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/add-missing-headers.patch index 681d2c6553..49d3ecefbb 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/add-missing-headers.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/add-missing-headers.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Forwarded: not-needed --- a/system/core/fs_mgr/liblp/reader.cpp +++ b/system/core/fs_mgr/liblp/reader.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-attribute-issue-with-gcc.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-attribute-issue-with-gcc.patch index 441031f536..e0b4275579 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-attribute-issue-with-gcc.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-attribute-issue-with-gcc.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: remove clang-ism Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-build-on-non-x86.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-build-on-non-x86.patch index b1caa60c4a..98a5078244 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-build-on-non-x86.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-build-on-non-x86.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: non-x86 arches do not have PAGE_SIZE Forwarded: not-needed --- a/system/core/base/cmsg.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-gettid-exception-declaration.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-gettid-exception-declaration.patch index 5f24d0b4a0..7fd228bff6 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-gettid-exception-declaration.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-gettid-exception-declaration.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: get libcutils building Forwarded: not-needed --- a/system/core/libcutils/include/cutils/threads.h diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-standard-namespace-errors.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-standard-namespace-errors.patch index 4380308f13..e41a3576ae 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-standard-namespace-errors.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-standard-namespace-errors.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Add missing 'std::' scope identifiers. Forwarded: not-needed --- a/system/core/libunwindstack/include/unwindstack/DwarfMemory.h diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/hard-code-build-number.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/hard-code-build-number.patch index 4d7323bd2f..2a332eb689 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/hard-code-build-number.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/hard-code-build-number.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: just hard code rather than deal with circular deps Forwarded: not-needed --- a/system/core/adb/adb.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/libusb-header-path.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/libusb-header-path.patch index 122bd70e7d..1663aae465 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/libusb-header-path.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/libusb-header-path.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: libusb.h comes from different location Author: Umang Parmar Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/move-log-file-to-proper-dir.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/move-log-file-to-proper-dir.patch index e8494ab433..006564b024 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/move-log-file-to-proper-dir.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/move-log-file-to-proper-dir.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Update log file directory. Author: Umang Parmar Last Updated: 2018-05-17 diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/simg_dump-python3.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/simg_dump-python3.patch index 6664dc2aa5..e6933ef145 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/simg_dump-python3.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/simg_dump-python3.patch @@ -5,8 +5,6 @@ Last-Update: 2019-01-05 Origin: https://bugs.debian.org/945646 --- -Upstream-Status: Pending - Index: android-platform-tools/system/core/libsparse/simg_dump.py =================================================================== --- android-platform-tools.orig/system/core/libsparse/simg_dump.py diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stdatomic.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stdatomic.patch index e11f3cc783..ea3711dfa2 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stdatomic.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stdatomic.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Fix incompatibility between and This 2 headers combined will cause errors for both GCC and Clang. This patch makes sure only one of them is present at any time. diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stub-out-fastdeploy.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stub-out-fastdeploy.patch index d86ef230f7..d2426a781d 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stub-out-fastdeploy.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stub-out-fastdeploy.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Defer packaging fastdeploy with adb for 29.x.x tags. Forwarded: not-needed --- a/system/core/adb/client/commandline.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/throw-exception-on-unknown-os.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/throw-exception-on-unknown-os.patch index 70e732131f..6b07f17bfc 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/throw-exception-on-unknown-os.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/throw-exception-on-unknown-os.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Turn #error into exceptions So the library can be built on non-Linux platforms too, although can't guarauntee its functionality regarding that piece of code. diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/throw-exception-on-unknown-os.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/throw-exception-on-unknown-os.patch index 70e732131f..6b07f17bfc 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/throw-exception-on-unknown-os.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/throw-exception-on-unknown-os.patch @@ -1,5 +1,3 @@ -Upstream-Status: Pending - Description: Turn #error into exceptions So the library can be built on non-Linux platforms too, although can't guarauntee its functionality regarding that piece of code. diff --git a/meta-openembedded/meta-oe/files/static-group-meta-oe b/meta-openembedded/meta-oe/files/static-group-meta-oe deleted file mode 100644 index 79c9bb6e1a..0000000000 --- a/meta-openembedded/meta-oe/files/static-group-meta-oe +++ /dev/null @@ -1,8 +0,0 @@ -redis:x:600: -xrdp:x:601: -sanlock:x:602: -mysql:x:603: -postgres:x:604: -zabbix:x:605: -mail:x:606: -nogroup:x:607: \ No newline at end of file diff --git a/meta-openembedded/meta-oe/files/static-passwd-meta-oe b/meta-openembedded/meta-oe/files/static-passwd-meta-oe deleted file mode 100644 index 4c312b7b1f..0000000000 --- a/meta-openembedded/meta-oe/files/static-passwd-meta-oe +++ /dev/null @@ -1,11 +0,0 @@ -redis:x:600:600::/:/bin/nologin -xrdp:x:601:601::/:/bin/nologin -sanlock:x:602:602::/:/bin/nologin -mysql:x:603:603::/:/bin/nologin -postgres:x:604:604::/:/bin/nologin -zabbix:x:605:605::/:/bin/nologin -cyrus:x:606:nogroup::/:/bin/nologin -pcp:x:620:nogroup::/:/bin/nologin -pcpqa:x:621:nogroup::/:/bin/nologin -influxdb:x:622:nogroup::/:/bin/nologin -mongodb:x:623:nogroup::/:/bin/nologin \ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0001-configure-Add-with-cpu.patch b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0001-configure-Add-with-cpu.patch new file mode 100644 index 0000000000..41fb456c6c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0001-configure-Add-with-cpu.patch @@ -0,0 +1,37 @@ +From 73049e5a9e3698cc6d51471d70ac5e06bed803cc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 17 Dec 2022 10:24:48 -0800 +Subject: [PATCH] configure: Add --with-cpu + +Some cross build systems e.g. yocto may use architectures different from cross compiler target tuple +arm-yoe-gnueabi but build for armv7a, AC_CANONICAL_HOST will fail in +this case even though target will be armv7a it will detect it as arm and +disable armv7a specific optimization paths. This option provides the +needed knob so it can be set explicitly e.g. --with-cpu=armv7a etc. if needed. + +Upstream-Status: Submitted [https://github.com/stressapptest/stressapptest/pull/100] +Signed-off-by: Khem Raj +--- + configure.ac | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c839c87..403728c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,7 +11,14 @@ else + AC_MSG_NOTICE([Compiling with dynamically linked libraries.]) + fi + +-AC_CANONICAL_HOST ++AC_ARG_WITH(cpu, [ --with-cpu define host cpu]) ++ ++if test -z "$with_cpu" ++then ++ AC_CANONICAL_HOST ++else ++ host_cpu=$with_cpu ++fi + # Checking for target cpu and setting custom configuration + # for the different platforms + AS_CASE(["$host_cpu"], diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0002-Replace-lfs64-functions-and-defines.patch b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0002-Replace-lfs64-functions-and-defines.patch new file mode 100644 index 0000000000..48ff3ef93b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0002-Replace-lfs64-functions-and-defines.patch @@ -0,0 +1,103 @@ +From 9ab360fd018d267fe174713d7e14454408b26043 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 17 Dec 2022 10:33:01 -0800 +Subject: [PATCH] Replace lfs64 functions and defines + +AC_SYS_LARGEFILE is already in use in configure.ac which detects +enabling lfs64 functions as needed, it will define _FILE_OFFSET_BITS=64 +which should make lseek same as lseek64 since off_t is 64bit on most of +current 32bit linux platforms + +Upstream-Status: Submitted [https://github.com/stressapptest/stressapptest/pull/100] +Signed-off-by: Khem Raj +--- + src/os.cc | 18 ++++++------------ + src/worker.cc | 6 +++--- + 2 files changed, 9 insertions(+), 15 deletions(-) + +diff --git a/src/os.cc b/src/os.cc +index 1928e0a..faa6068 100644 +--- a/src/os.cc ++++ b/src/os.cc +@@ -142,7 +142,7 @@ int OsLayer::AddressMode() { + uint64 OsLayer::VirtualToPhysical(void *vaddr) { + uint64 frame, paddr, pfnmask, pagemask; + int pagesize = sysconf(_SC_PAGESIZE); +- off64_t off = ((uintptr_t)vaddr) / pagesize * 8; ++ off_t off = ((uintptr_t)vaddr) / pagesize * 8; + int fd = open(kPagemapPath, O_RDONLY); + + /* +@@ -154,7 +154,7 @@ uint64 OsLayer::VirtualToPhysical(void *vaddr) { + if (fd < 0) + return 0; + +- if (lseek64(fd, off, SEEK_SET) != off || read(fd, &frame, 8) != 8) { ++ if (lseek(fd, off, SEEK_SET) != off || read(fd, &frame, 8) != 8) { + int err = errno; + string errtxt = ErrorString(err); + logprintf(0, "Process Error: failed to access %s with errno %d (%s)\n", +@@ -607,9 +607,9 @@ bool OsLayer::AllocateTestMem(int64 length, uint64 paddr_base) { + dynamic_mapped_shmem_ = true; + } else { + // Do a full mapping here otherwise. +- shmaddr = mmap64(NULL, length, PROT_READ | PROT_WRITE, +- MAP_SHARED | MAP_NORESERVE | MAP_LOCKED | MAP_POPULATE, +- shm_object, 0); ++ shmaddr = mmap(NULL, length, PROT_READ | PROT_WRITE, ++ MAP_SHARED | MAP_NORESERVE | MAP_LOCKED | MAP_POPULATE, ++ shm_object, 0); + if (shmaddr == reinterpret_cast(-1)) { + int err = errno; + string errtxt = ErrorString(err); +@@ -704,18 +704,12 @@ void *OsLayer::PrepareTestMem(uint64 offset, uint64 length) { + if (dynamic_mapped_shmem_) { + // TODO(nsanders): Check if we can support MAP_NONBLOCK, + // and evaluate performance hit from not using it. +-#ifdef HAVE_MMAP64 +- void * mapping = mmap64(NULL, length, PROT_READ | PROT_WRITE, +- MAP_SHARED | MAP_NORESERVE | MAP_LOCKED | MAP_POPULATE, +- shmid_, offset); +-#else + void * mapping = mmap(NULL, length, PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_NORESERVE | MAP_LOCKED | MAP_POPULATE, + shmid_, offset); +-#endif + if (mapping == MAP_FAILED) { + string errtxt = ErrorString(errno); +- logprintf(0, "Process Error: PrepareTestMem mmap64(%llx, %llx) failed. " ++ logprintf(0, "Process Error: PrepareTestMem mmap(%llx, %llx) failed. " + "error: %s.\n", + offset, length, errtxt.c_str()); + sat_assert(0); +diff --git a/src/worker.cc b/src/worker.cc +index 745a816..41e93a0 100644 +--- a/src/worker.cc ++++ b/src/worker.cc +@@ -1705,7 +1705,7 @@ bool FileThread::WritePages(int fd) { + int strict = sat_->strict(); + + // Start fresh at beginning of file for each batch of pages. +- lseek64(fd, 0, SEEK_SET); ++ lseek(fd, 0, SEEK_SET); + for (int i = 0; i < sat_->disk_pages(); i++) { + struct page_entry src; + if (!GetValidPage(&src)) +@@ -1943,7 +1943,7 @@ bool FileThread::ReadPages(int fd) { + bool result = true; + + // Read our data back out of the file, into it's new location. +- lseek64(fd, 0, SEEK_SET); ++ lseek(fd, 0, SEEK_SET); + for (int i = 0; i < sat_->disk_pages(); i++) { + struct page_entry dst; + if (!GetEmptyPage(&dst)) +@@ -3153,7 +3153,7 @@ bool DiskThread::ValidateBlockOnDisk(int fd, BlockData *block) { + + // Read block from disk and time the read. If it takes longer than the + // threshold, complain. +- if (lseek64(fd, address * kSectorSize, SEEK_SET) == -1) { ++ if (lseek(fd, address * kSectorSize, SEEK_SET) == -1) { + logprintf(0, "Process Error: Unable to seek to sector %lld in " + "DiskThread::ValidateSectorsOnDisk on disk %s " + "(thread %d).\n", address, device_name_.c_str(), thread_num_); diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0003-configure-Check-for-pthread_rwlockattr_setkind_np-be.patch b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0003-configure-Check-for-pthread_rwlockattr_setkind_np-be.patch new file mode 100644 index 0000000000..b21a534d94 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0003-configure-Check-for-pthread_rwlockattr_setkind_np-be.patch @@ -0,0 +1,43 @@ +From d64a282b57352dde5f5b007947c005e504dc9a6b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 17 Dec 2022 10:46:31 -0800 +Subject: [PATCH] configure: Check for pthread_rwlockattr_setkind_np before use + +musl does not implement this therefore detect this non-posix API before +using it + +Upstream-Status: Submitted [https://github.com/stressapptest/stressapptest/pull/100] +Signed-off-by: Khem Raj +--- + configure.ac | 1 + + src/worker.cc | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 403728c..47968cb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -157,6 +157,7 @@ AC_FUNC_STRERROR_R + AC_FUNC_VPRINTF + AC_CHECK_FUNCS([ftruncate gettimeofday memset munmap select socket strtol strtoull]) + AC_CHECK_FUNCS([mmap64 posix_memalign rand_r sched_getaffinity]) ++AC_CHECK_FUNCS([pthread_rwlockattr_setkind_np]) + + AC_CONFIG_FILES([Makefile src/Makefile]) + AC_OUTPUT +diff --git a/src/worker.cc b/src/worker.cc +index 41e93a0..c4abc87 100644 +--- a/src/worker.cc ++++ b/src/worker.cc +@@ -133,9 +133,11 @@ void WorkerStatus::Initialize() { + + pthread_rwlockattr_t attrs; + sat_assert(0 == pthread_rwlockattr_init(&attrs)); ++#ifdef HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP + // Avoid writer lock starvation. + sat_assert(0 == pthread_rwlockattr_setkind_np( + &attrs, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP)); ++#endif + sat_assert(0 == pthread_rwlock_init(&status_rwlock_, &attrs)); + + #ifdef HAVE_PTHREAD_BARRIERS diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/libcplusplus-compat.patch b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/libcplusplus-compat.patch new file mode 100644 index 0000000000..8754e40697 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/libcplusplus-compat.patch @@ -0,0 +1,28 @@ +Fix compile on sytems using libc++ instead of libstdc++ + +libc++ does not really implement __gnu_cxx namespace and it +compiles fine without this namespace, therefore detect libc++ +and if it is used them exclude this namespace + +See https://github.com/stressapptest/stressapptest/issues/47 + +Fixes + +./sattypes.h:33:17: error: expected namespace name +using namespace __gnu_cxx; //NOLINT + +Upstream-Status: Submitted [https://github.com/stressapptest/stressapptest/pull/100] +Signed-off-by: Khem Raj + +--- stressapptest-1.0.9.orig/src/sattypes.h ++++ stressapptest-1.0.9/src/sattypes.h +@@ -30,7 +30,9 @@ + #include "stressapptest_config_android.h" // NOLINT + #else + #include "stressapptest_config.h" // NOLINT ++#ifndef _LIBCPP_VERSION + using namespace __gnu_cxx; //NOLINT ++#endif // _LIBCPP_VERSION + #endif // __ANDROID__ + using namespace std; + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/read_sysfs_for_cachesize.patch b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/read_sysfs_for_cachesize.patch new file mode 100644 index 0000000000..19261657ac --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/read_sysfs_for_cachesize.patch @@ -0,0 +1,72 @@ +sysconf params like _SC_LEVEL1_DCACHE_LINESIZE are not universally +implemented, therefore check for them being available, if not there +then read the sysfs directly to get the value + +Upstream-Status: Submitted [https://github.com/stressapptest/stressapptest/pull/100] +Signed-off-by: Khem Raj +--- a/src/sat.cc ++++ b/src/sat.cc +@@ -1482,15 +1482,47 @@ int Sat::CpuCount() { + return sysconf(_SC_NPROCESSORS_CONF); + } + ++int Sat::ReadInt(const char *filename, int *value) { ++ char line[64]; ++ int fd = open(filename, O_RDONLY), err = -1; ++ ++ if (fd < 0) ++ return -1; ++ if (read(fd, line, sizeof(line)) > 0) { ++ *value = atoi(line); ++ err = 0; ++ } ++ ++ close(fd); ++ return err; ++} ++ + // Return the worst case (largest) cache line size of the various levels of + // cache actually prsent in the machine. + int Sat::CacheLineSize() { +- int max_linesize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); +- int linesize = sysconf(_SC_LEVEL2_CACHE_LINESIZE); ++ int max_linesize, linesize; ++#ifdef _SC_LEVEL1_DCACHE_LINESIZE ++ max_linesize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); ++#else ++ ReadInt("/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size", &max_linesize); ++#endif ++#ifdef _SC_LEVEL2_DCACHE_LINESIZE ++ linesize = sysconf(_SC_LEVEL2_DCACHE_LINESIZE); ++#else ++ ReadInt("/sys/devices/system/cpu/cpu0/cache/index1/coherency_line_size", &linesize); ++#endif + if (linesize > max_linesize) max_linesize = linesize; +- linesize = sysconf(_SC_LEVEL3_CACHE_LINESIZE); ++#ifdef _SC_LEVEL3_DCACHE_LINESIZE ++ linesize = sysconf(_SC_LEVEL3_DCACHE_LINESIZE); ++#else ++ ReadInt("/sys/devices/system/cpu/cpu0/cache/index2/coherency_line_size", &linesize); ++#endif + if (linesize > max_linesize) max_linesize = linesize; +- linesize = sysconf(_SC_LEVEL4_CACHE_LINESIZE); ++#ifdef _SC_LEVEL4_DCACHE_LINESIZE ++ linesize = sysconf(_SC_LEVEL4_DCACHE_LINESIZE); ++#else ++ ReadInt("/sys/devices/system/cpu/cpu0/cache/index3/coherency_line_size", &linesize); ++#endif + if (linesize > max_linesize) max_linesize = linesize; + return max_linesize; + } +--- a/src/sat.h ++++ b/src/sat.h +@@ -136,7 +136,8 @@ class Sat { + int CpuCount(); + // Return the worst-case (largest) cache line size of the system. + int CacheLineSize(); +- ++ // Read int values from kernel file system e.g. sysfs ++ int ReadInt(const char *filename, int *value); + // Collect error counts from threads. + int64 GetTotalErrorCount(); + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.11.bb b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.11.bb deleted file mode 100644 index ba61ff971e..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.11.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Stressful Application Test" -DESCRIPTION = "Stressful Application Test (or stressapptest, its unix name) \ - is a memory interface test. It tries to maximize randomized traffic to memory \ - from processor and I/O, with the intent of creating a realistic high load \ - situation in order to test the existing hardware devices in a computer. \ -" -HOMEPAGE = "https://github.com/stressapptest/stressapptest" -SECTION = "benchmark" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=55ea9d559f985fb4834317d8ed6b9e58" - -SRCREV = "25e31a2c1fcc66f3a43e91998f0819b016322a70" - -EXTRA_AUTOCONF:append:armv7a = " --with-cpu=armv7a" -EXTRA_AUTOCONF:append:armv7ve = " --with-cpu=armv7a" - -GI_DATA_ENABLED:libc-musl:armv7a = "False" -GI_DATA_ENABLED:libc-musl:armv7ve = "False" -SRC_URI = "git://github.com/stressapptest/stressapptest;branch=master;protocol=https" - -S = "${WORKDIR}/git" - -inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb new file mode 100644 index 0000000000..02144c558a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb @@ -0,0 +1,31 @@ +SUMMARY = "Stressful Application Test" +DESCRIPTION = "Stressful Application Test (or stressapptest, its unix name) \ + is a memory interface test. It tries to maximize randomized traffic to memory \ + from processor and I/O, with the intent of creating a realistic high load \ + situation in order to test the existing hardware devices in a computer. \ +" +HOMEPAGE = "https://github.com/stressapptest/stressapptest" +SECTION = "benchmark" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=55ea9d559f985fb4834317d8ed6b9e58" + +SRCREV = "9146a8bfe3e3daefa95f7a61b75183e5fc64af2c" + +PV .= "+1.0.10git${SRCPV}" + +EXTRA_AUTOCONF:append:armv7a = " --with-cpu=armv7a" +EXTRA_AUTOCONF:append:armv7ve = " --with-cpu=armv7a" + +GI_DATA_ENABLED:libc-musl:armv7a = "False" +GI_DATA_ENABLED:libc-musl:armv7ve = "False" +SRC_URI = "git://github.com/stressapptest/stressapptest;branch=master;protocol=https \ + file://libcplusplus-compat.patch \ + file://read_sysfs_for_cachesize.patch \ + file://0001-configure-Add-with-cpu.patch \ + file://0002-Replace-lfs64-functions-and-defines.patch \ + file://0003-configure-Check-for-pthread_rwlockattr_setkind_np-be.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-bsp/bolt/bolt_0.9.5.bb b/meta-openembedded/meta-oe/recipes-bsp/bolt/bolt_0.9.5.bb index 0cc9d85422..b6ad6337ce 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/bolt/bolt_0.9.5.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/bolt/bolt_0.9.5.bb @@ -12,8 +12,6 @@ SRCREV = "5a8a5866a847561566499847d46a97c612b4e6dd" S = "${WORKDIR}/git" -CVE_PRODUCT = "freedesktop:bolt" - inherit cmake pkgconfig meson features_check FILES:${PN} += "${datadir}/dbus-1/* \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.5.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.5.bb new file mode 100644 index 0000000000..492de65a85 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.5.bb @@ -0,0 +1,30 @@ +SUMMARY = "NVMe management command line interface" +HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" +SECTION = "console/utils" +LICENSE = "GPL-2.0-only & CC0-1.0 & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022 \ + file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ + file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" +DEPENDS = "json-c libnvme" +SRCREV = "d6c07e0de9be777009ebb9ab7475bee1ae3e0e95" + +SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit bash-completion meson pkgconfig systemd + +EXTRA_OEMESON += "-Dsystemddir=${systemd_unitdir}/system" + +pkg_postinst_ontarget:${PN}() { + ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn + ${bindir}/uuidgen > ${sysconfdir}/nvme/hostid +} + +PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" + +FILES:${PN} += "${systemd_system_unitdir}" +FILES:${PN}-dracut = "${nonarch_libdir}/dracut/dracut.conf.d" +FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" + +RDEPENDS:${PN} = "util-linux-uuidgen" diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.6.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.6.bb deleted file mode 100644 index 0d8923f342..0000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.6.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "NVMe management command line interface" -HOMEPAGE = "https://github.com/linux-nvme/nvme-cli" -SECTION = "console/utils" -LICENSE = "GPL-2.0-only & CC0-1.0 & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022 \ - file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ - file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" -DEPENDS = "json-c libnvme" -SRCREV = "bd2f882a49a14b0e21a94c928128b1979e4316fd" - -SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" - -S = "${WORKDIR}/git" - -inherit bash-completion meson pkgconfig systemd - -EXTRA_OEMESON += "-Dsystemddir=${systemd_unitdir}/system" - -pkg_postinst_ontarget:${PN}() { - ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn - ${bindir}/uuidgen > ${sysconfdir}/nvme/hostid -} - -PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" - -FILES:${PN} += "${systemd_system_unitdir}" -FILES:${PN}-dracut = "${nonarch_libdir}/dracut/dracut.conf.d" -FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" - -RDEPENDS:${PN} = "util-linux-uuidgen" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-.patch b/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-.patch new file mode 100644 index 0000000000..a32414bdf6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-.patch @@ -0,0 +1,33 @@ +From a1659e261888bdbed51803132d52d9a6c6803c8a Mon Sep 17 00:00:00 2001 +From: Joachim Nilsson +Date: Sat, 19 Oct 2019 12:26:26 +0200 +Subject: [PATCH] Use standard int64_t instead of __int64_t for mingw cross + build + +Signed-off-by: Joachim Nilsson +--- +Upstream-Status: Pending + + include/libnet/libnet-structures.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/libnet/libnet-structures.h b/include/libnet/libnet-structures.h +index 6084caa..34fffc6 100644 +--- a/include/libnet/libnet-structures.h ++++ b/include/libnet/libnet-structures.h +@@ -49,9 +49,9 @@ struct libnet_port_list_chain + /* libnet statistics structure */ + struct libnet_stats + { +- __int64_t packets_sent; /* packets sent */ +- __int64_t packet_errors; /* packets errors */ +- __int64_t bytes_written; /* bytes written */ ++ int64_t packets_sent; /* packets sent */ ++ int64_t packet_errors; /* packets errors */ ++ int64_t bytes_written; /* bytes written */ + }; + + +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2.bb new file mode 100644 index 0000000000..eaa0a0445d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "A packet dissection and creation library" +HOMEPAGE = "https://github.com/libnet/libnet" + +SECTION = "libs" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=07f291bf6e78efa05cec668cf6a09acc" + +DEPENDS = "libpcap" + +SRC_URI = "git://github.com/libnet/libnet.git;protocol=https;branch=master \ + file://0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-.patch" + +SRC_URI[sha256sum] = "1e9e9054d688b059bcbaf878d8c4fbf69bfc0c9386cd4e7779fbb53339050d2e" +SRCREV = "deeeeaeb84f8bc5d2299913d4ccf53d0d4c26966" + +S = "${WORKDIR}/git" + +inherit autotools binconfig multilib_script +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/libnet-config" + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.3.bb b/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.3.bb deleted file mode 100644 index b4648832f1..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A packet dissection and creation library" -HOMEPAGE = "https://github.com/libnet/libnet" - -SECTION = "libs" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=07f291bf6e78efa05cec668cf6a09acc" - -DEPENDS = "libpcap" - -SRC_URI = "git://github.com/libnet/libnet.git;protocol=https;branch=master" - -SRC_URI[sha256sum] = "1e9e9054d688b059bcbaf878d8c4fbf69bfc0c9386cd4e7779fbb53339050d2e" -SRCREV = "deaebdfe2743e8a6f04d3c307d9272afeeecfade" - -S = "${WORKDIR}/git" - -inherit autotools binconfig multilib_script -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/libnet-config" - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb index afec2753cb..e0df18a50c 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb @@ -3,15 +3,10 @@ HOMEPAGE = "https://github.com/sahlberg/libnfs" LICENSE = "LGPL-2.1-only & BSD-2-Clause & GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=825301ba17efc9d188ee0abd4b924ada" -SRC_URI = " \ - git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \ - file://0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch \ +SRC_URI = "git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \ + file://0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch \ " SRCREV = "40348f45d6beb8a8f50b6b63414a98fc1a061b7d" S = "${WORKDIR}/git" inherit cmake - -do_install:append() { - rm -f ${D}${libdir}/cmake/libnfs/libnfs-config.cmake -} diff --git a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh/0001-configure.ac-add-support-of-protobuf-4.22.x.patch b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh/0001-configure.ac-add-support-of-protobuf-4.22.x.patch deleted file mode 100644 index 088124391c..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh/0001-configure.ac-add-support-of-protobuf-4.22.x.patch +++ /dev/null @@ -1,63 +0,0 @@ -From d9a1a6aac5a3b270449d09ec0d2a556807ab9287 Mon Sep 17 00:00:00 2001 -From: Xiangyu Chen -Date: Wed, 29 Mar 2023 13:53:44 +0800 -Subject: [PATCH] configure.ac: add support of protobuf 4.22.x - -the protobuf 4.22x is using c++14 as default, this caused the mosh cannot compile anymore and report following error: - -.... -/usr/include/google/protobuf/port_def.inc:200:15: error: static assertion failed: Protobuf only supports C++14 and newer. -| 200 | static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and newer."); -| | ^~~~~~~~~~~~~~~~~~~~~~ -.... - -Upstream-Status: Pending [https://github.com/mobile-shell/mosh/pull/1266] - -Signed-off-by: Xiangyu Chen ---- - configure.ac | 8 ++++++++ - src/frontend/Makefile.am | 2 +- - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index ee70c7b..5457009 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -26,6 +26,10 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - AS_IF([pkg-config --atleast-version 3.6.0 protobuf], - [AX_CXX_COMPILE_STDCXX([11])]) - -+# If current protobuf 4.22+ update the requires to C++14. -+AS_IF([pkg-config --atleast-version 4.22.0 protobuf], -+ [AX_CXX_COMPILE_STDCXX([14])]) -+ - WARNING_CXXFLAGS="" - PICKY_CXXFLAGS="" - DISTCHECK_CXXFLAGS="" -@@ -311,6 +315,10 @@ AC_CHECK_FUNCS(m4_normalize([ - pledge - ])) - -+AS_IF([pkg-config --atleast-version 4.22.0 protobuf], -+ [PKG_CHECK_MODULES([ABSL_LOG_INTERNAL_CHECK_OP], [absl_log_internal_check_op],[], -+ [AC_MSG_ERROR([Missing abseil-cpp library.])])]) -+ - # Start by trying to find the needed tinfo parts by pkg-config - PKG_CHECK_MODULES([TINFO], [tinfo], - [AC_DEFINE([HAVE_CURSES_H], [1], [Define to 1 if is present])], -diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am -index 1aa83fd..399ecd6 100644 ---- a/src/frontend/Makefile.am -+++ b/src/frontend/Makefile.am -@@ -1,7 +1,7 @@ - AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(CRYPTO_CFLAGS) - AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS) - AM_LDFLAGS = $(HARDEN_LDFLAGS) $(CODE_COVERAGE_LIBS) --LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS) $(CRYPTO_LIBS) -+LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS) $(CRYPTO_LIBS) $(ABSL_LOG_INTERNAL_CHECK_OP_LIBS) - - mosh_server_LDADD = $(LDADD) - --- -2.34.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb index 0ee050da99..2869e06336 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb @@ -12,12 +12,9 @@ HOMEPAGE = "http://mosh.mit.edu" LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter abseil-cpp" - -SRC_URI = "https://mosh.org/${BP}.tar.gz \ - file://0001-configure.ac-add-support-of-protobuf-4.22.x.patch \ - " +DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter" +SRC_URI = "https://mosh.org/${BP}.tar.gz" SRC_URI[sha256sum] = "872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-all.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-all.bb deleted file mode 100644 index 1338adf29f..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-all.bb +++ /dev/null @@ -1,5 +0,0 @@ -require recipes-core/images/core-image-base.bb - -SUMMARY = "meta-oe build test image" - -IMAGE_INSTALL += "packagegroup-meta-oe" diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-base.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-base.bb new file mode 100644 index 0000000000..df92f16705 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-base.bb @@ -0,0 +1,7 @@ +SUMMARY = "meta-oe build test image" + +IMAGE_INSTALL = "packagegroup-core-boot" + +LICENSE = "MIT" + +inherit core-image diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb deleted file mode 100644 index e8e1750b0e..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Recipe to trigger execution of all meta-oe ptest images." -HOMEPAGE = "https://www.openembedded.org/" - -LICENSE = "MIT" - -inherit features_check nopackages -REQUIRED_DISTRO_FEATURES = "ptest" - -require conf/include/ptest-packagelists-meta-oe.inc - -# Include the full set of ptests -PTESTS_META_OE = "${PTESTS_FAST_META_OE} ${PTESTS_SLOW_META_OE}" - -do_testimage[noexec] = "1" -do_testimage[depends] = "${@' '.join(['meta-oe-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_OE').split()])}" - -do_build[depends] = "${@' '.join(['meta-oe-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_OE').split()])}" - -# normally image.bbclass would do this -EXCLUDE_FROM_WORLD = "1" - -python () { - if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): - bb.build.addtask("do_testimage", "", "", d) -} diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-fast.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-fast.bb deleted file mode 100644 index 46b48d65d6..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-fast.bb +++ /dev/null @@ -1,6 +0,0 @@ -require meta-oe-image-ptest-all.bb - -DESCRIPTION = "Recipe to trigger execution of all fast meta-oe ptest images." - -PTESTS_META_OE = "${PTESTS_FAST_META_OE}" - diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest.bb deleted file mode 100644 index 4cd1f4497c..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest.bb +++ /dev/null @@ -1,41 +0,0 @@ -inherit features_check -REQUIRED_DISTRO_FEATURES = "ptest" - -require recipes-core/images/core-image-minimal.bb -require conf/include/ptest-packagelists-meta-oe.inc - -SUMMARY = "meta-oe ptest test image" - -DESCRIPTION += "Also including the ${MCNAME} ptest package." -HOMEPAGE = "https://www.openembedded.org/" - -PTESTS_META_OE = "${PTESTS_SLOW_META_OE} ${PTESTS_FAST_META_OE}" - -IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" - -BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_OE').split()])}" - -# The image can be sufficiently large (~1.8GB) that we need to be careful that it fits in a live -# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the -# box) and explicitly add up to 1500MB. -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "324288" -# If a particular ptest needs more space, it can be customized: -#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend- = "1024288" -IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-poco = "1024288" - -# ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" -# If a particular ptest needs more memroy, it can be customized: -#QB_MEM:virtclass-mcextend- = "-m 4096" - -TEST_SUITES = "ping ssh parselogs ptest" - -# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places -PTEST_EXPECT_FAILURE = "1" - -python () { - if not d.getVar("MCNAME"): - raise bb.parse.SkipRecipe("No class extension set") -} - diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image.bb new file mode 100644 index 0000000000..1565549059 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image.bb @@ -0,0 +1,5 @@ +require meta-oe-image-base.bb + +SUMMARY = "meta-oe build test image" + +IMAGE_INSTALL += "packagegroup-meta-oe" diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb new file mode 100644 index 0000000000..0ea03dd2e3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Recipe to trigger execution of all meta-oe ptest images." +HOMEPAGE = "https://www.openembedded.org/" + +LICENSE = "MIT" + +inherit features_check nopackages +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-oe.inc + +# Include the full set of ptests +PTESTS_META_OE = "${PTESTS_FAST_META_OE} ${PTESTS_SLOW_META_OE}" + +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['meta-oe-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_OE').split()])}" + +do_build[depends] = "${@' '.join(['meta-oe-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_OE').split()])}" + +# normally image.bbclass would do this +EXCLUDE_FROM_WORLD = "1" + +python () { + if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): + bb.build.addtask("do_testimage", "", "", d) +} diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb new file mode 100644 index 0000000000..f56e841ff1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb @@ -0,0 +1,6 @@ +require meta-oe-ptest-all-image.bb + +DESCRIPTION = "Recipe to trigger execution of all fast meta-oe ptest images." + +PTESTS_META_OE = "${PTESTS_FAST_META_OE}" + diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-image.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-image.bb new file mode 100644 index 0000000000..613da02977 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-image.bb @@ -0,0 +1,42 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-oe.inc + +require meta-oe-image-base.bb + +SUMMARY = "meta-oe ptest test image" + +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.openembedded.org/" + +PTESTS_META_OE = "${PTESTS_SLOW_META_OE} ${PTESTS_FAST_META_OE}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_OE').split()])}" + +# The image can be sufficiently large (~1.8GB) that we need to be careful that it fits in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add up to 1500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +# If a particular ptest needs more space, it can be customized: +#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend- = "1024288" +IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-poco = "1024288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +# If a particular ptest needs more memroy, it can be customized: +#QB_MEM:virtclass-mcextend- = "-m 4096" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} + diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch index f8ccb998be..12fbd75976 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -15,8 +15,7 @@ Signed-off-by: Mingli Yu storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + storage/rocksdb/rocksdb/util/slice.cc | 1 + - storage/rocksdb/rocksdb/util/string_util.h | 1 + - 5 files changed, 5 insertions(+) + 4 files changed, 4 insertions(+) diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h index 963c1d8e..73487edd 100644 @@ -66,19 +65,6 @@ index 6db11cc9..c26b6a21 100644 #include "rocksdb/slice_transform.h" #include "rocksdb/slice.h" #include "util/string_util.h" - -diff --git a/util/string_util.h b/util/string_util.h -index 55d106fff02..11178fd1d7b 100644 ---- a/storage/rocksdb/rocksdb/util/string_util.h -+++ b/storage/rocksdb/rocksdb/util/string_util.h -@@ -6,6 +6,7 @@ - - #pragma once - -+#include - #include - #include - #include -- 2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch new file mode 100644 index 0000000000..b245ad8657 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch @@ -0,0 +1,62 @@ +From dc593958e556dd496b774f35c5992285510d6859 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Tue, 19 Oct 2021 17:09:55 +0200 +Subject: [PATCH] Revert "Changed GRPCPP_ABSEIL_SYNC to GPR_ABSEIL_SYNC + (#25681)" + +This reverts commit 931f91b745cd5b2864a0d1787815871d0bd844ae. + +Fixes sysdig from meta-oe and other recipes (like com.webos.service.tts +libgoogleassistant from meta-webosose) failing with: + +| FAILED: userspace/sysdig/sysdig +| : && /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-sec +urity --sysroot=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -f +debug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/bu +ild/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/OE/build +/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -Wall -ggdb -std=c++0x -O3 -fno-strict-aliasing -DNDEBUG -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security +--sysroot=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-p +refix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe- +core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/OE/build/oe-cor +e/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-cor +e/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2- +64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -Wl,-z,relro,-z,now -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/ +oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/ +core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -Wl,-z,relro,-z,now -rdynamic userspace/sysdig/CMakeFiles/sysdig.dir/fields_info.cpp.o userspace/sysdig/CMakeFiles/sysdig.dir/sysdig.cpp.o -o userspace/sysdig/sysdig userspace/libsinsp/libsinsp.a userspace/libscap/libscap.a + -lelf -lz -lcurl -ljsoncpp -ltbb -lcares -lgrpc++_unsecure -lgrpc_unsecure -lprotobuf -lcares -lgrpc++_unsecure -lgrpc_unsecure -lprotobuf -ljq -lb64 -lrt -lanl -lssl -lcrypto -lluajit-5.1 -ldl -lpthread && : +| /usr/include/grpcpp/impl/codegen/completion_queue.h:121: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()' +| /usr/include/grpcpp/impl/codegen/completion_queue.h:121: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()' +| /usr/include/grpcpp/impl/codegen/completion_queue.h:121: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()' +| /usr/include/grpcpp/impl/codegen/completion_queue.h:259: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()' +| collect2: error: ld returned 1 exit status + +Signed-off-by: Martin Jansa + +--- +Upstream-Status: Pending + + include/grpcpp/impl/codegen/sync.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/grpcpp/impl/codegen/sync.h b/include/grpcpp/impl/codegen/sync.h +index 4cb8133c7c..3d10d9a3a0 100644 +--- a/include/grpcpp/impl/codegen/sync.h ++++ b/include/grpcpp/impl/codegen/sync.h +@@ -47,7 +47,7 @@ + namespace grpc { + namespace internal { + +-#ifdef GPR_ABSEIL_SYNC ++#ifdef GRPCPP_ABSEIL_SYNC + + using Mutex = absl::Mutex; + using MutexLock = absl::MutexLock; +@@ -142,7 +142,7 @@ class CondVar { + gpr_cv cv_; + }; + +-#endif // GPR_ABSEIL_SYNC ++#endif // GRPCPP_ABSEIL_SYNC + + template + GRPC_DEPRECATED("incompatible with thread safety analysis") diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch new file mode 100644 index 0000000000..679bd38829 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch @@ -0,0 +1,93 @@ +From 3150cb043363e05588062dd392b940be25594713 Mon Sep 17 00:00:00 2001 +From: Stefan Herbrechtsmeier +Date: Tue, 18 Feb 2020 14:17:07 +0100 +Subject: [PATCH] cmake: add separate export for plugin targets + +Upstream-Status: Submitted [https://github.com/grpc/grpc/pull/29328] + + +--- + CMakeLists.txt | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index efdaf8936d..6608b1b00c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10935,7 +10935,7 @@ target_link_libraries(grpc_cpp_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -10975,7 +10975,7 @@ target_link_libraries(grpc_csharp_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_csharp_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11015,7 +11015,7 @@ target_link_libraries(grpc_node_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_node_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_node_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11055,7 +11055,7 @@ target_link_libraries(grpc_objective_c_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_objective_c_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11095,7 +11095,7 @@ target_link_libraries(grpc_php_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_php_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_php_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11135,7 +11135,7 @@ target_link_libraries(grpc_python_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_python_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_python_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -11175,7 +11175,7 @@ target_link_libraries(grpc_ruby_plugin + + + if(gRPC_INSTALL) +- install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets ++ install(TARGETS grpc_ruby_plugin EXPORT gRPCPluginTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} +@@ -17349,6 +17349,10 @@ if(gRPC_INSTALL) + DESTINATION ${gRPC_INSTALL_CMAKEDIR} + NAMESPACE gRPC:: + ) ++ install(EXPORT gRPCPluginTargets ++ DESTINATION ${gRPC_INSTALL_CMAKEDIR} ++ NAMESPACE gRPC:: ++ ) + endif() + + include(CMakePackageConfigHelpers) +-- +2.30.2 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-fix-CVE-2023-32732.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-fix-CVE-2023-32732.patch new file mode 100644 index 0000000000..ab46897b12 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-fix-CVE-2023-32732.patch @@ -0,0 +1,81 @@ +From d39489045b5aa73e27713e3cbacb8832c1140ec8 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Wed, 9 Aug 2023 13:33:45 +0800 +Subject: [PATCH] fix CVE-2023-32732 + +CVE: CVE-2023-32732 + +Upstream-Status: Backport [https://github.com/grpc/grpc/pull/32309/commits/6a7850ef4f042ac26559854266dddc79bfbc75b2] +The original patch is adjusted to fit the current 1.50.1 version. + +Signed-off-by: Chen Qi +--- + .../ext/transport/chttp2/transport/hpack_parser.cc | 10 +++++++--- + src/core/ext/transport/chttp2/transport/internal.h | 2 -- + src/core/ext/transport/chttp2/transport/parsing.cc | 6 ++---- + 3 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc +index f2e49022dc3..cd459d15238 100644 +--- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc ++++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc +@@ -1211,12 +1211,16 @@ class HPackParser::Parser { + "). GRPC_ARG_MAX_METADATA_SIZE can be set to increase this limit.", + *frame_length_, metadata_size_limit_); + if (metadata_buffer_ != nullptr) metadata_buffer_->Clear(); ++ // StreamId is used as a signal to skip this stream but keep the connection ++ // alive + return input_->MaybeSetErrorAndReturn( + [] { + return grpc_error_set_int( +- GRPC_ERROR_CREATE_FROM_STATIC_STRING( +- "received initial metadata size exceeds limit"), +- GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED); ++ grpc_error_set_int( ++ GRPC_ERROR_CREATE_FROM_STATIC_STRING( ++ "received initial metadata size exceeds limit"), ++ GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED), ++ GRPC_ERROR_INT_STREAM_ID, 0); + }, + false); + } +diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h +index 4a2f4261d83..f8b544d9583 100644 +--- a/src/core/ext/transport/chttp2/transport/internal.h ++++ b/src/core/ext/transport/chttp2/transport/internal.h +@@ -542,8 +542,6 @@ struct grpc_chttp2_stream { + + grpc_core::Timestamp deadline = grpc_core::Timestamp::InfFuture(); + +- /** saw some stream level error */ +- grpc_error_handle forced_close_error = GRPC_ERROR_NONE; + /** how many header frames have we received? */ + uint8_t header_frames_received = 0; + /** number of bytes received - reset at end of parse thread execution */ +diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc +index 980f13543f6..afe6da190b6 100644 +--- a/src/core/ext/transport/chttp2/transport/parsing.cc ++++ b/src/core/ext/transport/chttp2/transport/parsing.cc +@@ -22,6 +22,7 @@ + #include + + #include ++#include + + #include "absl/base/attributes.h" + #include "absl/status/status.h" +@@ -719,10 +720,7 @@ static grpc_error_handle parse_frame_slice(grpc_chttp2_transport* t, + } + grpc_chttp2_parsing_become_skip_parser(t); + if (s) { +- s->forced_close_error = err; +- grpc_chttp2_add_rst_stream_to_next_write(t, t->incoming_stream_id, +- GRPC_HTTP2_PROTOCOL_ERROR, +- &s->stats.outgoing); ++ grpc_chttp2_cancel_stream(t, s, std::exchange(err, absl::OkStatus())); + } else { + GRPC_ERROR_UNREF(err); + } +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb new file mode 100644 index 0000000000..45bfcb8570 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb @@ -0,0 +1,70 @@ +DESCRIPTION = "A high performance, open source, general-purpose RPC framework. \ +Provides gRPC libraries for multiple languages written on top of shared C core library \ +(C++, Node.js, Python, Ruby, Objective-C, PHP, C#)" +HOMEPAGE = "https://github.com/grpc/grpc" +SECTION = "libs" +LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906" + +DEPENDS = "c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2 abseil-cpp re2" +DEPENDS:append:class-target = " googletest grpc-native " +DEPENDS:append:class-nativesdk = " grpc-native " + +PACKAGE_BEFORE_PN = "${PN}-compiler" + +RDEPENDS:${PN}-compiler = "${PN}" +RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" +# Configuration above allows to cross-compile gRPC applications +# In order to compile applications on the target, use the dependency below +# Both dependencies are mutually exclusive +# RDEPENDS:${PN}-dev += "${PN}-compiler" + +S = "${WORKDIR}/git" +SRCREV_grpc = "90ccf24d22b6fc909a1021ebd89fd8c838467d26" +BRANCH = "v1.50.x" +SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ + file://0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch \ + file://0001-cmake-add-separate-export-for-plugin-targets.patch \ + file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ + file://0001-fix-CVE-2023-32732.patch \ + " +# Fixes build with older compilers 4.8 especially on ubuntu 14.04 +CXXFLAGS:append:class-native = " -Wl,--no-as-needed" + +inherit cmake pkgconfig + +EXTRA_OECMAKE = " \ + -DgRPC_CARES_PROVIDER=package \ + -DgRPC_ZLIB_PROVIDER=package \ + -DgRPC_SSL_PROVIDER=package \ + -DgRPC_PROTOBUF_PROVIDER=package \ + -D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/protoc \ + -DgRPC_ABSL_PROVIDER=package \ + -DgRPC_RE2_PROVIDER=package \ + -DgRPC_INSTALL=ON \ + -DCMAKE_CROSSCOMPILING=ON \ + -DgRPC_INSTALL_LIBDIR=${baselib} \ + -DgRPC_INSTALL_CMAKEDIR=${baselib}/cmake/${BPN} \ + " + +PACKAGECONFIG ??= "cpp shared" +PACKAGECONFIG[cpp] = "-DgRPC_BUILD_GRPC_CPP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF" +PACKAGECONFIG[csharp] = "-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF" +PACKAGECONFIG[node] = "-DgRPC_BUILD_GRPC_NODE_PLUGIN=ON,-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF" +PACKAGECONFIG[objective-c] = "-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=ON,-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF" +PACKAGECONFIG[php] = "-DgRPC_BUILD_GRPC_PHP_PLUGIN=ON,-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF" +PACKAGECONFIG[python] = "-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON,-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF" +PACKAGECONFIG[ruby] = "-DgRPC_BUILD_GRPC_RUBY_PLUGIN=ON,-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF" +PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF,protobuf-lite" +PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," + +do_configure:prepend() { + sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt +} + +BBCLASSEXTEND = "native nativesdk" + +FILES:${PN}-compiler += " \ + ${bindir} \ + ${libdir}/libgrpc_plugin_support${SOLIBS} \ + " diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb deleted file mode 100644 index c4dd6b9857..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb +++ /dev/null @@ -1,67 +0,0 @@ -DESCRIPTION = "A high performance, open source, general-purpose RPC framework. \ -Provides gRPC libraries for multiple languages written on top of shared C core library \ -(C++, Node.js, Python, Ruby, Objective-C, PHP, C#)" -HOMEPAGE = "https://github.com/grpc/grpc" -SECTION = "libs" -LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906" - -DEPENDS = "c-ares protobuf protobuf-native protobuf-c protobuf-c-native openssl libnsl2 abseil-cpp re2" -DEPENDS:append:class-target = " googletest grpc-native " -DEPENDS:append:class-nativesdk = " grpc-native " - -PACKAGE_BEFORE_PN = "${PN}-compiler" - -RDEPENDS:${PN}-compiler = "${PN}" -RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" -# Configuration above allows to cross-compile gRPC applications -# In order to compile applications on the target, use the dependency below -# Both dependencies are mutually exclusive -# RDEPENDS:${PN}-dev += "${PN}-compiler" - -S = "${WORKDIR}/git" -SRCREV_grpc = "c0d1c393d9365664d47df41746e992ae97b651ef" -BRANCH = "v1.56.x" -SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ - file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ - " -# Fixes build with older compilers 4.8 especially on ubuntu 14.04 -CXXFLAGS:append:class-native = " -Wl,--no-as-needed" - -inherit cmake pkgconfig - -EXTRA_OECMAKE = " \ - -DgRPC_CARES_PROVIDER=package \ - -DgRPC_ZLIB_PROVIDER=package \ - -DgRPC_SSL_PROVIDER=package \ - -DgRPC_PROTOBUF_PROVIDER=package \ - -D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/protoc \ - -DgRPC_ABSL_PROVIDER=package \ - -DgRPC_RE2_PROVIDER=package \ - -DgRPC_INSTALL=ON \ - -DCMAKE_CROSSCOMPILING=ON \ - -DgRPC_INSTALL_LIBDIR=${baselib} \ - -DgRPC_INSTALL_CMAKEDIR=${baselib}/cmake/${BPN} \ - " - -PACKAGECONFIG ??= "cpp shared" -PACKAGECONFIG[cpp] = "-DgRPC_BUILD_GRPC_CPP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF" -PACKAGECONFIG[csharp] = "-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=ON,-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF" -PACKAGECONFIG[node] = "-DgRPC_BUILD_GRPC_NODE_PLUGIN=ON,-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF" -PACKAGECONFIG[objective-c] = "-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=ON,-DgRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN=OFF" -PACKAGECONFIG[php] = "-DgRPC_BUILD_GRPC_PHP_PLUGIN=ON,-DgRPC_BUILD_GRPC_PHP_PLUGIN=OFF" -PACKAGECONFIG[python] = "-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=ON,-DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF" -PACKAGECONFIG[ruby] = "-DgRPC_BUILD_GRPC_RUBY_PLUGIN=ON,-DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF" -PACKAGECONFIG[protobuf-lite] = "-DgRPC_USE_PROTO_LITE=ON,-DgRPC_USE_PROTO_LITE=OFF,protobuf-lite" -PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," - -do_configure:prepend() { - sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt -} - -BBCLASSEXTEND = "native nativesdk" - -FILES:${PN}-compiler += " \ - ${bindir} \ - ${libdir}/libgrpc_plugin_support${SOLIBS} \ - " diff --git a/meta-openembedded/meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch b/meta-openembedded/meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch new file mode 100644 index 0000000000..e4d6ebb45b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch @@ -0,0 +1,40 @@ +From 40bbd419ad8d1bd9cbe8b17063c323f8a40ab327 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Sep 2022 09:59:31 -0700 +Subject: [PATCH 1/2] configure: Pass _XOPEN_SOURCE when checking for strptime + +Include sys/time.h for gettimeofday since thats where its in glibc + +Upstream-Status: Submitted [https://github.com/stedolan/jq/pull/2480] +Signed-off-by: Khem Raj +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a2cd99e..95afe06 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -139,7 +139,10 @@ AC_FUNC_ALLOCA + + AC_FIND_FUNC([isatty], [c], [#include ], [0]) + AC_FIND_FUNC([_isatty], [c], [#include ], [0]) ++OLD_CFLAGS=$CFLAGS ++CFLAGS="$CFLAGS -D_XOPEN_SOURCE" + AC_FIND_FUNC([strptime], [c], [#include ], [0, 0, 0]) ++CFLAGS=$OLD_CFLAGS + AC_FIND_FUNC([strftime], [c], [#include ], [0, 0, 0, 0]) + AC_FIND_FUNC([setenv], [c], [#include ], [0, 0, 0]) + AC_FIND_FUNC([timegm], [c], [#include ], [0]) +@@ -147,7 +150,7 @@ AC_FIND_FUNC([gmtime_r], [c], [#include ], [0, 0]) + AC_FIND_FUNC([gmtime], [c], [#include ], [0]) + AC_FIND_FUNC([localtime_r], [c], [#include ], [0, 0]) + AC_FIND_FUNC([localtime], [c], [#include ], [0]) +-AC_FIND_FUNC([gettimeofday], [c], [#include ], [0, 0]) ++AC_FIND_FUNC([gettimeofday], [c], [#include ], [0, 0]) + AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define to 1 if the system has the tm_gmt_off field in struct tm])], + [], [[#include ]]) + AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[Define to 1 if the system has the __tm_gmt_off field in struct tm])], +-- +2.37.3 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch b/meta-openembedded/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch new file mode 100644 index 0000000000..e849436578 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch @@ -0,0 +1,32 @@ +From cda1734bed3b048c01452c798877d05b8c2f4c15 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Sep 2022 10:00:59 -0700 +Subject: [PATCH 2/2] builtin: Replace _BSD_SOURCE with _DEFAULT_SOURCE + +newer glibc has remove _BSD_SOURCE and wants it to be replaced with _DEFAULT_SOURCE + +Fixes +/usr/include/features.h:194:3: warning: "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-W#warnings] +warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" + +Uptream-Status: Submitted [https://github.com/stedolan/jq/pull/2480] +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/builtin.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/builtin.c b/src/builtin.c +index 1c6b08c..2a31496 100644 +--- a/src/builtin.c ++++ b/src/builtin.c +@@ -1,4 +1,4 @@ +-#define _BSD_SOURCE ++#define _DEFAULT_SOURCE + #define _GNU_SOURCE + #ifndef __sun__ + # define _XOPEN_SOURCE +-- +2.37.3 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.7.bb b/meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.7.bb deleted file mode 100644 index 5c2e3aae8f..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.7.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Lightweight and flexible command-line JSON processor" -DESCRIPTION = "jq is like sed for JSON data, you can use it to slice and \ - filter and map and transform structured data with the same \ - ease that sed, awk, grep and friends let you play with text." -HOMEPAGE = "https://jqlang.github.io/jq/" -BUGTRACKER = "https://github.com/jqlang/jq/issues" -SECTION = "utils" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=488f4e0b04c0456337fb70d1ac1758ba" - -GITHUB_BASE_URI = "https://github.com/jqlang/${BPN}/releases/" -SRC_URI = "${GITHUB_BASE_URI}/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ - file://run-ptest \ - " -SRC_URI[sha256sum] = "402a0d6975d946e6f4e484d1a84320414a0ff8eb6cf49d2c11d144d4d344db62" - -inherit autotools github-releases ptest - -UPSTREAM_CHECK_REGEX = "releases/tag/${BPN}-(?P\d+(\.\d+)+)" - -PACKAGECONFIG ?= "oniguruma" - -PACKAGECONFIG[docs] = "--enable-docs,--disable-docs,ruby-native" -PACKAGECONFIG[maintainer-mode] = "--enable-maintainer-mode,--disable-maintainer-mode,flex-native bison-native" -PACKAGECONFIG[oniguruma] = "--with-oniguruma,--without-oniguruma,onig" -# enable if you want ptest running under valgrind -PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind" - -do_configure:append() { - sed -i -e "/^ac_cs_config=/ s:${WORKDIR}::g" ${B}/config.status -} - -do_install_ptest() { - cp -rf ${S}/tests ${D}${PTEST_PATH} - cp -rf ${B}/.libs ${D}${PTEST_PATH} - # libjq.so.* is packaged in the main jq component, so remove it from ptest - rm -f ${D}${PTEST_PATH}/.libs/libjq.so.* - ln -sf ${bindir}/jq ${D}${PTEST_PATH} - if [ "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', 'true', 'false', d)}" = "false" ]; then - sed -i 's:#export NO_VALGRIND=1:export NO_VALGRIND=1:g' ${D}${PTEST_PATH}/run-ptest - fi - # handle multilib - sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest -} - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jq/jq_git.bb b/meta-openembedded/meta-oe/recipes-devtools/jq/jq_git.bb new file mode 100644 index 0000000000..4fa98aa44f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/jq/jq_git.bb @@ -0,0 +1,43 @@ +SUMMARY = "Lightweight and flexible command-line JSON processor" +DESCRIPTION = "jq is like sed for JSON data, you can use it to slice and \ + filter and map and transform structured data with the same \ + ease that sed, awk, grep and friends let you play with text." +HOMEPAGE = "https://stedolan.github.io/jq/" +BUGTRACKER = "https://github.com/stedolan/jq/issues" +SECTION = "utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=2814b59e00e7918c864fa3b6bbe049b4" + +PV = "1.6+git${SRCPV}" +SRC_URI = "git://github.com/stedolan/jq;protocol=https;branch=master \ + file://0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch \ + file://0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch \ + file://run-ptest \ + " +SRCREV = "cff5336ec71b6fee396a95bb0e4bea365e0cd1e8" +S = "${WORKDIR}/git" + +inherit autotools-brokensep ptest + +PACKAGECONFIG ?= "oniguruma" + +PACKAGECONFIG[docs] = "--enable-docs,--disable-docs,ruby-native" +PACKAGECONFIG[maintainer-mode] = "--enable-maintainer-mode,--disable-maintainer-mode,flex-native bison-native" +PACKAGECONFIG[oniguruma] = "--with-oniguruma,--without-oniguruma,onig" +# enable if you want ptest running under valgrind +PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind" + +do_install_ptest() { + cp -rf ${B}/tests ${D}${PTEST_PATH} + cp -rf ${B}/.libs ${D}${PTEST_PATH} + # libjq.so.* is packaged in the main jq component, so remove it from ptest + rm -f ${D}${PTEST_PATH}/.libs/libjq.so.* + ln -sf ${bindir}/jq ${D}${PTEST_PATH} + if [ "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', 'true', 'false', d)}" = "false" ]; then + sed -i 's:#export NO_VALGRIND=1:export NO_VALGRIND=1:g' ${D}${PTEST_PATH}/run-ptest + fi + # handle multilib + sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest +} + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch index 1c4b871bb6..2ee0a39126 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch @@ -11,7 +11,7 @@ GCC treats char as unsigned resulting in compile errors: Fix this by specifying signed char. -Upstream-Status: Backport [https://github.com/pboettch/json-schema-validator/commit/491ac44026e08f31790f5cacffa62e168bb35e32] +Upstream-Status: Accepted [https://github.com/pboettch/json-schema-validator/commit/491ac44026e08f31790f5cacffa62e168bb35e32] Signed-off-by: Parian Golchin --- diff --git a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch index eac997ae58..e0d0cf8ce9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch @@ -3,7 +3,7 @@ From: Sven Fink Date: Fri, 13 Jan 2023 09:15:42 +0100 Subject: [PATCH 3/3] For root value, use empty pointer -Upstream-Status: Backport [https://github.com/pboettch/json-schema-validator/commit/59c9d6200bf3cd54b4fc717ec1660c91eddb4d1a] +Upstream-Status: Accepted [https://github.com/pboettch/json-schema-validator/commit/59c9d6200bf3cd54b4fc717ec1660c91eddb4d1a] Signed-off-by: Parian Golchin --- diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.17/oe-npm-cache b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.17/oe-npm-cache new file mode 100755 index 0000000000..f596207648 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.17/oe-npm-cache @@ -0,0 +1,77 @@ +#!/usr/bin/env node + +/// Usage: oe-npm-cache +/// ... meta - metainformation about package +/// tgz - tarball + +const process = require("node:process"); + +module.paths.unshift("@@libdir@@/node_modules/npm/node_modules"); + +const cacache = require('cacache') +const fs = require('fs') + +// argv[0] is 'node', argv[1] is this script +const cache_dir = process.argv[2] +const type = process.argv[3] +const key = process.argv[4] +const file = process.argv[5] + +const data = fs.readFileSync(file) + +// metadata content is highly nodejs dependent; when cache entries are not +// found, place debug statements in 'make-fetch-happen/lib/cache/policy.js' +// (CachePolicy::satisfies()) +const xlate = { + 'meta': { + 'key_prefix': 'make-fetch-happen:request-cache:', + 'metadata': function() { + return { + time: Date.now(), + url: key, + reqHeaders: { + 'accept': 'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*', + }, + resHeaders: { + "content-type": "application/json", + "status": 200, + }, + options: { + compress: true, + } + }; + }, + }, + + 'tgz': { + 'key_prefix': 'make-fetch-happen:request-cache:', + 'metadata': function() { + return { + time: Date.now(), + url: key, + reqHeaders: { + 'accept': '*/*', + }, + resHeaders: { + "content-type": "application/octet-stream", + "status": 200, + }, + options: { + compress: true, + }, + }; + }, + }, +}; + +const info = xlate[type]; +let opts = {} + +if (info.metadata) { + opts['metadata'] = info.metadata(); +} + +cacache.put(cache_dir, info.key_prefix + key, data, opts) + .then(integrity => { + console.log(`Saved content of ${key} (${file}).`); +}) diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.5/oe-npm-cache b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.5/oe-npm-cache deleted file mode 100755 index f596207648..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.5/oe-npm-cache +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env node - -/// Usage: oe-npm-cache -/// ... meta - metainformation about package -/// tgz - tarball - -const process = require("node:process"); - -module.paths.unshift("@@libdir@@/node_modules/npm/node_modules"); - -const cacache = require('cacache') -const fs = require('fs') - -// argv[0] is 'node', argv[1] is this script -const cache_dir = process.argv[2] -const type = process.argv[3] -const key = process.argv[4] -const file = process.argv[5] - -const data = fs.readFileSync(file) - -// metadata content is highly nodejs dependent; when cache entries are not -// found, place debug statements in 'make-fetch-happen/lib/cache/policy.js' -// (CachePolicy::satisfies()) -const xlate = { - 'meta': { - 'key_prefix': 'make-fetch-happen:request-cache:', - 'metadata': function() { - return { - time: Date.now(), - url: key, - reqHeaders: { - 'accept': 'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*', - }, - resHeaders: { - "content-type": "application/json", - "status": 200, - }, - options: { - compress: true, - } - }; - }, - }, - - 'tgz': { - 'key_prefix': 'make-fetch-happen:request-cache:', - 'metadata': function() { - return { - time: Date.now(), - url: key, - reqHeaders: { - 'accept': '*/*', - }, - resHeaders: { - "content-type": "application/octet-stream", - "status": 200, - }, - options: { - compress: true, - }, - }; - }, - }, -}; - -const info = xlate[type]; -let opts = {} - -if (info.metadata) { - opts['metadata'] = info.metadata(); -} - -cacache.put(cache_dir, info.key_prefix + key, data, opts) - .then(integrity => { - console.log(`Saved content of ${key} (${file}).`); -}) diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.17.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.17.bb new file mode 100644 index 0000000000..a61dd5018f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.17.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "OE helper for manipulating npm cache" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +SRC_URI = "\ + file://oe-npm-cache \ +" + +inherit native + +B = "${WORKDIR}/build" + +do_configure() { + sed -e 's!@@libdir@@!${libdir}!g' < '${WORKDIR}/oe-npm-cache' > '${B}/oe-npm-cache' +} + +do_install() { + install -D -p -m 0755 ${B}/oe-npm-cache ${D}${bindir}/oe-npm-cache +} + +RDEPENDS:${PN} = "nodejs-native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.5.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.5.bb deleted file mode 100644 index a61dd5018f..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.5.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "OE helper for manipulating npm cache" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -SRC_URI = "\ - file://oe-npm-cache \ -" - -inherit native - -B = "${WORKDIR}/build" - -do_configure() { - sed -e 's!@@libdir@@!${libdir}!g' < '${WORKDIR}/oe-npm-cache' > '${B}/oe-npm-cache' -} - -do_install() { - install -D -p -m 0755 ${B}/oe-npm-cache ${D}${bindir}/oe-npm-cache -} - -RDEPENDS:${PN} = "nodejs-native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch index 0178cec777..66e10a0d00 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch @@ -12,7 +12,7 @@ https://git.openembedded.org/meta-openembedded/commit/?id=feeb172d1a8bf010490d22 Signed-off-by: Archana Polampalli --- - node.gyp | 3 + + node.gyp | 1 + tools/v8_gypfiles/v8.gyp | 5 +++++ 2 files changed, 6 insertions(+) @@ -28,23 +28,6 @@ index e8e1d9f9..e60ccc10 100644 '<(node_mksnapshot_exec)', '<(node_snapshot_main)', ], -@@ -935,6 +935,7 @@ - 'action_name': 'node_js2c', - 'process_outputs_as_sources': 1, - 'inputs': [ -+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh', - '<(node_js2c_exec)', - '<@(library_files)', - '<@(deps_files)', -@@ -944,6 +945,7 @@ - '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc', - ], - 'action': [ -+ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh', - '<(node_js2c_exec)', - '<@(_outputs)', - 'lib', - diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index 42e26cd9..bc721991 100644 --- a/tools/v8_gypfiles/v8.gyp diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch index 5af87d866e..c9a522d2e2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch @@ -1,6 +1,6 @@ From dc3652c0abcdf8573fd044907b19d8eda7ca1124 Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Mon, 3 Jul 2023 12:33:16 +0000 +Date: Wed, 20 Oct 2021 12:49:58 -0700 Subject: [PATCH] [liftoff] Correct function signatures Fixes builds on mips where clang reports an error @@ -13,15 +13,16 @@ Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/v8/v8/+/3 Signed-off-by: Archana Polampalli --- deps/v8/src/wasm/baseline/liftoff-assembler.h | 6 +++--- + deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h | 2 +- deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h | 2 +- - deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) + .../src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deps/v8/src/wasm/baseline/liftoff-assembler.h b/deps/v8/src/wasm/baseline/liftoff-assembler.h -index aef63c64..f2a11b01 100644 +index 22c7f73a..db4cb168 100644 --- a/deps/v8/src/wasm/baseline/liftoff-assembler.h +++ b/deps/v8/src/wasm/baseline/liftoff-assembler.h -@@ -717,7 +717,7 @@ class LiftoffAssembler : public MacroAssembler { +@@ -646,7 +646,7 @@ class LiftoffAssembler : public TurboAssembler { void FinishCall(const ValueKindSig*, compiler::CallDescriptor*); // Move {src} into {dst}. {src} and {dst} must be different. @@ -30,7 +31,7 @@ index aef63c64..f2a11b01 100644 // Parallel register move: For a list of tuples , move the // {src} register of kind {kind} into {dst}. If {src} equals {dst}, ignore -@@ -884,8 +884,8 @@ class LiftoffAssembler : public MacroAssembler { +@@ -795,8 +795,8 @@ class LiftoffAssembler : public TurboAssembler { inline void MoveStackValue(uint32_t dst_offset, uint32_t src_offset, ValueKind); @@ -41,11 +42,24 @@ index aef63c64..f2a11b01 100644 inline void Spill(int offset, LiftoffRegister, ValueKind); inline void Spill(int offset, WasmValue); +diff --git a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h +index c76fd2f4..0fffe231 100644 +--- a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h ++++ b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h +@@ -661,7 +661,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, + pinned = pinned | LiftoffRegList{dst_op.rm(), src}; + LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); + // Save original value. +- Move(tmp, src, type.value_type()); ++ Move(tmp, src, type.value_type().kind()); + + src = tmp; + pinned.set(tmp); diff --git a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h -index 96cba24c..53e1842d 100644 +index 36413545..48207337 100644 --- a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h +++ b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h -@@ -592,7 +592,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, +@@ -593,7 +593,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, pinned.set(dst_op.rm()); LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); // Save original value. @@ -54,11 +68,11 @@ index 96cba24c..53e1842d 100644 src = tmp; pinned.set(tmp); -diff --git a/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h b/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h -index 1d6ae09e..397e82b2 100644 ---- a/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h -+++ b/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h -@@ -286,7 +286,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, +diff --git a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h +index 642a7d2a..56ffcc2a 100644 +--- a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h ++++ b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h +@@ -589,7 +589,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, pinned.set(dst_op.rm()); LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); // Save original value. @@ -68,4 +82,4 @@ index 1d6ae09e..397e82b2 100644 src = tmp; pinned.set(tmp); -- -2.40.0 +2.34.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch new file mode 100644 index 0000000000..a0242d8e18 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch @@ -0,0 +1,34 @@ +From e65dde8db17da5acddeef7eb9316199c4e5e0811 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 19 Apr 2022 12:40:25 -0700 +Subject: [PATCH] mips: Use 32bit cast for operand on mips32 + +Fixes +deps/v8/src/compiler/backend/mips/code-generator-mips.cc: In member function 'void v8::internal::compiler::CodeGenerator::AssembleReturn(v8::internal::compiler::InstructionOperand*)': +../deps/v8/src/compiler/backend/mips/code-generator-mips.cc:4233:48: error: call of overloaded 'Operand(int64_t)' is ambiguous + 4233 | Operand(static_cast(0))); + | ^ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + deps/v8/src/compiler/backend/mips/code-generator-mips.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/deps/v8/src/compiler/backend/mips/code-generator-mips.cc b/deps/v8/src/compiler/backend/mips/code-generator-mips.cc +index 2b8197e..b226140 100644 +--- a/deps/v8/src/compiler/backend/mips/code-generator-mips.cc ++++ b/deps/v8/src/compiler/backend/mips/code-generator-mips.cc +@@ -4230,7 +4230,7 @@ void CodeGenerator::AssembleReturn(InstructionOperand* additional_pop_count) { + } else if (FLAG_debug_code) { + __ Assert(eq, AbortReason::kUnexpectedAdditionalPopValue, + g.ToRegister(additional_pop_count), +- Operand(static_cast(0))); ++ Operand(static_cast(0))); + } + } + // Functions with JS linkage have at least one parameter (the receiver). +-- +2.36.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/big-endian.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/big-endian.patch new file mode 100644 index 0000000000..529381842f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/big-endian.patch @@ -0,0 +1,18 @@ + +https://github.com/v8/v8/commit/878ccb33bd3cf0e6dc018ff8d15843f585ac07be + +did some automated cleanups but it missed big-endian code. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/deps/v8/src/runtime/runtime-utils.h ++++ b/deps/v8/src/runtime/runtime-utils.h +@@ -126,7 +126,7 @@ static inline ObjectPair MakePair(Object + #if defined(V8_TARGET_LITTLE_ENDIAN) + return x.ptr() | (static_cast(y.ptr()) << 32); + #elif defined(V8_TARGET_BIG_ENDIAN) +- return y->ptr() | (static_cast(x->ptr()) << 32); ++ return y.ptr() | (static_cast(x.ptr()) << 32); + #else + #error Unknown endianness + #endif diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/mips-less-memory.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/mips-less-memory.patch new file mode 100644 index 0000000000..16776cb762 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/mips-less-memory.patch @@ -0,0 +1,37 @@ +Description: mksnapshot uses too much memory on 32-bit mipsel +Author: Jérémy Lal +Last-Update: 2020-06-03 +Forwarded: https://bugs.chromium.org/p/v8/issues/detail?id=10586 + +This ensures that we reserve 500M instead of 2G range for codegen +ensures that qemu-mips can allocate such large ranges + +Upstream-Status: Inappropriate [embedded specific] + +Imported from debian https://salsa.debian.org/js-team/nodejs/-/blob/master-12.x/debian/patches/mips-less-memory.patch +https://buildd.debian.org/status/fetch.php?pkg=nodejs&arch=mipsel&ver=12.17.0~dfsg-2&stamp=1591050388&raw=0 + +Signed-off-by: Khem Raj + +--- a/deps/v8/src/common/globals.h ++++ b/deps/v8/src/common/globals.h +@@ -224,7 +224,7 @@ constexpr size_t kMinimumCodeRangeSize = + constexpr size_t kMinExpectedOSPageSize = 64 * KB; // OS page on PPC Linux + #elif V8_TARGET_ARCH_MIPS + constexpr bool kPlatformRequiresCodeRange = false; +-constexpr size_t kMaximalCodeRangeSize = 2048LL * MB; ++constexpr size_t kMaximalCodeRangeSize = 512 * MB; + constexpr size_t kMinimumCodeRangeSize = 0 * MB; + constexpr size_t kMinExpectedOSPageSize = 4 * KB; // OS page. + #else +--- a/deps/v8/src/codegen/mips/constants-mips.h ++++ b/deps/v8/src/codegen/mips/constants-mips.h +@@ -140,7 +140,7 @@ const uint32_t kLeastSignificantByteInIn + namespace v8 { + namespace internal { + +-constexpr size_t kMaxPCRelativeCodeRangeInMB = 4096; ++constexpr size_t kMaxPCRelativeCodeRangeInMB = 1024; + + // ----------------------------------------------------------------------------- + // Registers and FPURegisters. diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/run-ptest b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/run-ptest index e82f373626..07a8f2a99c 100755 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/run-ptest +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/run-ptest @@ -1,8 +1,3 @@ #!/bin/sh ./cctest -if [ $? = 0 ]; then - echo "PASS: nodejs" -else - echo "FAIL: nodejs" -fi diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.17.1.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.17.1.bb new file mode 100644 index 0000000000..ee5e848bf8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.17.1.bb @@ -0,0 +1,185 @@ +DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" +HOMEPAGE = "http://nodejs.org" +LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=bc1f9ebe76be76f163e3b675303ad9cd" + +CVE_PRODUCT = "nodejs node.js" + +DEPENDS = "openssl file-replacement-native" +DEPENDS:append:class-target = " qemu-native" +DEPENDS:append:class-native = " c-ares-native" + +inherit pkgconfig python3native qemu ptest + +COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*" +COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*" +COMPATIBLE_MACHINE:mips64 = "(!.*mips64).*" + +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" +COMPATIBLE_HOST:powerpc = "null" + +SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ + file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ + file://0004-v8-don-t-override-ARM-CFLAGS.patch \ + file://big-endian.patch \ + file://mips-less-memory.patch \ + file://system-c-ares.patch \ + file://0001-liftoff-Correct-function-signatures.patch \ + file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \ + file://run-ptest \ + " + +SRC_URI:append:class-target = " \ + file://0001-Using-native-binaries.patch \ + " +SRC_URI:append:toolchain-clang:x86 = " \ + file://libatomic.patch \ + " +SRC_URI:append:toolchain-clang:powerpc64le = " \ + file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ + " +SRC_URI[sha256sum] = "f215cf03d0f00f07ac0b674c6819f804c1542e16f152da04980022aeccf5e65a" + +S = "${WORKDIR}/node-v${PV}" + +# v8 errors out if you have set CCACHE +CCACHE = "" + +def map_nodejs_arch(a, d): + import re + + if re.match('i.86$', a): return 'ia32' + elif re.match('x86_64$', a): return 'x64' + elif re.match('aarch64$', a): return 'arm64' + elif re.match('(powerpc64|powerpc64le|ppc64le)$', a): return 'ppc64' + elif re.match('powerpc$', a): return 'ppc' + return a + +ARCHFLAGS:arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \ + ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \ + bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \ + bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \ + '--with-arm-fpu=vfp', d), d), d)}" +ARCHFLAGS:append:mips = " --v8-lite-mode" +ARCHFLAGS:append:mipsel = " --v8-lite-mode" +ARCHFLAGS ?= "" + +PACKAGECONFIG ??= "ares brotli icu zlib" + +PACKAGECONFIG[ares] = "--shared-cares,,c-ares" +PACKAGECONFIG[brotli] = "--shared-brotli,,brotli" +PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" +PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" +PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" +PACKAGECONFIG[shared] = "--shared" +PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" + +# We don't want to cross-compile during target compile, +# and we need to use the right flags during host compile, +# too. +EXTRA_OEMAKE = "\ + CC.host='${CC} -pie -fPIE' \ + CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \ + CXX.host='${CXX} -pie -fPIE' \ + CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \ + LDFLAGS.host='${LDFLAGS}' \ + AR.host='${AR}' \ + \ + builddir_name=./ \ +" + +EXTRANATIVEPATH += "file-native" + +python prune_sources() { + import shutil + + shutil.rmtree(d.getVar('S') + '/deps/openssl') + if 'ares' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/cares') + if 'brotli' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/brotli') + if 'libuv' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/uv') + if 'nghttp2' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/nghttp2') + if 'zlib' in d.getVar('PACKAGECONFIG'): + shutil.rmtree(d.getVar('S') + '/deps/zlib') +} +do_unpack[postfuncs] += "prune_sources" + +# V8's JIT infrastructure requires binaries such as mksnapshot and +# mkpeephole to be run in the host during the build. However, these +# binaries must have the same bit-width as the target (e.g. a x86_64 +# host targeting ARMv6 needs to produce a 32-bit binary). Instead of +# depending on a third Yocto toolchain, we just build those binaries +# for the target and run them on the host with QEMU. +python do_create_v8_qemu_wrapper () { + """Creates a small wrapper that invokes QEMU to run some target V8 binaries + on the host.""" + qemu_libdirs = [d.expand('${STAGING_DIR_HOST}${libdir}'), + d.expand('${STAGING_DIR_HOST}${base_libdir}')] + qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), + qemu_libdirs) + wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh') + with open(wrapper_path, 'w') as wrapper_file: + wrapper_file.write("""#!/bin/sh + +# This file has been generated automatically. +# It invokes QEMU to run binaries built for the target in the host during the +# build process. + +%s "$@" +""" % qemu_cmd) + os.chmod(wrapper_path, 0o755) +} + +do_create_v8_qemu_wrapper[dirs] = "${B}" +addtask create_v8_qemu_wrapper after do_configure before do_compile + +LDFLAGS:append:x86 = " -latomic" + +CROSS_FLAGS = "--cross-compiling" +CROSS_FLAGS:class-native = "--no-cross-compiling" + +# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi +do_configure () { + GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES + # $TARGET_ARCH settings don't match --dest-cpu settings + python3 configure.py --verbose --prefix=${prefix} \ + --shared-openssl \ + --without-dtrace \ + --without-etw \ + --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ + --dest-os=linux \ + --libdir=${baselib} \ + ${CROSS_FLAGS} \ + ${ARCHFLAGS} \ + ${PACKAGECONFIG_CONFARGS} +} + +do_compile () { + install -D ${RECIPE_SYSROOT_NATIVE}/etc/ssl/openssl.cnf ${B}/deps/openssl/nodejs-openssl.cnf + install -D ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.sh + oe_runmake BUILDTYPE=Release +} + +do_install () { + oe_runmake install DESTDIR=${D} +} + +do_install_ptest () { + cp -r ${B}/out/Release/cctest ${D}${PTEST_PATH}/ + cp -r ${B}/test ${D}${PTEST_PATH} + chown -R root:root ${D}${PTEST_PATH} +} + +PACKAGES =+ "${PN}-npm" +FILES:${PN}-npm = "${nonarch_libdir}/node_modules ${bindir}/npm ${bindir}/npx ${bindir}/corepack" +RDEPENDS:${PN}-npm = "bash python3-core python3-shell python3-datetime \ + python3-misc python3-multiprocessing" + +PACKAGES =+ "${PN}-systemtap" +FILES:${PN}-systemtap = "${datadir}/systemtap" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_20.5.1.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_20.5.1.bb deleted file mode 100644 index 6bb0f7fabd..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_20.5.1.bb +++ /dev/null @@ -1,180 +0,0 @@ -DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" -HOMEPAGE = "http://nodejs.org" -LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=059ecf3a6f87111685e51b611b9563e5" - -CVE_PRODUCT = "nodejs node.js" - -DEPENDS = "openssl file-replacement-native" -DEPENDS:append:class-target = " qemu-native" -DEPENDS:append:class-native = " c-ares-native" - -inherit pkgconfig python3native qemu ptest - -COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*" -COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*" -COMPATIBLE_MACHINE:mips64 = "(!.*mips64).*" - -COMPATIBLE_HOST:riscv64 = "null" -COMPATIBLE_HOST:riscv32 = "null" -COMPATIBLE_HOST:powerpc = "null" - -SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ - file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ - file://0004-v8-don-t-override-ARM-CFLAGS.patch \ - file://system-c-ares.patch \ - file://0001-liftoff-Correct-function-signatures.patch \ - file://run-ptest \ - " - -SRC_URI:append:class-target = " \ - file://0001-Using-native-binaries.patch \ - " -SRC_URI:append:toolchain-clang:x86 = " \ - file://libatomic.patch \ - " -SRC_URI:append:toolchain-clang:powerpc64le = " \ - file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ - " -SRC_URI[sha256sum] = "439c71aa2f38c2861657bfa538e99191a571258066cbfd4548586049c8134190" - -S = "${WORKDIR}/node-v${PV}" - -# v8 errors out if you have set CCACHE -CCACHE = "" - -def map_nodejs_arch(a, d): - import re - - if re.match('i.86$', a): return 'ia32' - elif re.match('x86_64$', a): return 'x64' - elif re.match('aarch64$', a): return 'arm64' - elif re.match('(powerpc64|powerpc64le|ppc64le)$', a): return 'ppc64' - elif re.match('powerpc$', a): return 'ppc' - return a - -ARCHFLAGS:arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \ - ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \ - bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \ - bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \ - '--with-arm-fpu=vfp', d), d), d)}" -ARCHFLAGS:append:mips = " --v8-lite-mode" -ARCHFLAGS:append:mipsel = " --v8-lite-mode" -ARCHFLAGS ?= "" - -PACKAGECONFIG ??= "ares brotli icu zlib" - -PACKAGECONFIG[ares] = "--shared-cares,,c-ares" -PACKAGECONFIG[brotli] = "--shared-brotli,,brotli" -PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" -PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" -PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" -PACKAGECONFIG[shared] = "--shared" -PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" - -# We don't want to cross-compile during target compile, -# and we need to use the right flags during host compile, -# too. -EXTRA_OEMAKE = "\ - CC.host='${CC} -pie -fPIE' \ - CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \ - CXX.host='${CXX} -pie -fPIE' \ - CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \ - LDFLAGS.host='${LDFLAGS}' \ - AR.host='${AR}' \ - \ - builddir_name=./ \ -" - -EXTRANATIVEPATH += "file-native" - -python prune_sources() { - import shutil - - shutil.rmtree(d.getVar('S') + '/deps/openssl') - if 'ares' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/cares') - if 'brotli' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/brotli') - if 'libuv' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/uv') - if 'nghttp2' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/nghttp2') - if 'zlib' in d.getVar('PACKAGECONFIG'): - shutil.rmtree(d.getVar('S') + '/deps/zlib') -} -do_unpack[postfuncs] += "prune_sources" - -# V8's JIT infrastructure requires binaries such as mksnapshot and -# mkpeephole to be run in the host during the build. However, these -# binaries must have the same bit-width as the target (e.g. a x86_64 -# host targeting ARMv6 needs to produce a 32-bit binary). Instead of -# depending on a third Yocto toolchain, we just build those binaries -# for the target and run them on the host with QEMU. -python do_create_v8_qemu_wrapper () { - """Creates a small wrapper that invokes QEMU to run some target V8 binaries - on the host.""" - qemu_libdirs = [d.expand('${STAGING_DIR_HOST}${libdir}'), - d.expand('${STAGING_DIR_HOST}${base_libdir}')] - qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), - qemu_libdirs) - wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh') - with open(wrapper_path, 'w') as wrapper_file: - wrapper_file.write("""#!/bin/sh - -# This file has been generated automatically. -# It invokes QEMU to run binaries built for the target in the host during the -# build process. - -%s "$@" -""" % qemu_cmd) - os.chmod(wrapper_path, 0o755) -} - -do_create_v8_qemu_wrapper[dirs] = "${B}" -addtask create_v8_qemu_wrapper after do_configure before do_compile - -LDFLAGS:append:x86 = " -latomic" - -CROSS_FLAGS = "--cross-compiling" -CROSS_FLAGS:class-native = "--no-cross-compiling" - -# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi -do_configure () { - GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES - # $TARGET_ARCH settings don't match --dest-cpu settings - python3 configure.py --verbose --prefix=${prefix} \ - --shared-openssl \ - --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ - --dest-os=linux \ - --libdir=${baselib} \ - ${CROSS_FLAGS} \ - ${ARCHFLAGS} \ - ${PACKAGECONFIG_CONFARGS} -} - -do_compile () { - install -D ${RECIPE_SYSROOT_NATIVE}/etc/ssl/openssl.cnf ${B}/deps/openssl/nodejs-openssl.cnf - install -D ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.sh - oe_runmake BUILDTYPE=Release -} - -do_install () { - oe_runmake install DESTDIR=${D} -} - -do_install_ptest () { - cp -r ${B}/out/Release/cctest ${D}${PTEST_PATH}/ - cp -r ${B}/test ${D}${PTEST_PATH} - chown -R root:root ${D}${PTEST_PATH} -} - -PACKAGES =+ "${PN}-npm" -FILES:${PN}-npm = "${nonarch_libdir}/node_modules ${bindir}/npm ${bindir}/npx ${bindir}/corepack" -RDEPENDS:${PN}-npm = "bash python3-core python3-shell python3-datetime \ - python3-misc python3-multiprocessing" - -PACKAGES =+ "${PN}-systemtap" -FILES:${PN}-systemtap = "${datadir}/systemtap" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch deleted file mode 100644 index 896a568e19..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 62b2fd0a150133b6439f6537cb1762d35f5790ee Mon Sep 17 00:00:00 2001 -From: Xiangyu Chen -Date: Fri, 31 Mar 2023 16:02:50 +0800 -Subject: [PATCH] Makefile.am: do not compile the code which was generated from - test-full.proto in protobuf-c-native - -Those code was auto generated by protoc command with test-full.proto, those code are not compatible -with protobuf 4.22.x, so temporarily disable compile those code until protobuf-c upstream adapt -the test-full.proto with latest version protobuf. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Xiangyu Chen ---- - Makefile.am | 75 ----------------------------------------------------- - 1 file changed, 75 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ff12664..7412aef 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -136,81 +136,6 @@ else - - LOG_COMPILER = $(VALGRIND) - --check_PROGRAMS += \ -- t/generated-code/test-generated-code \ -- t/generated-code2/test-generated-code2 \ -- t/generated-code3/test-generated-code3 \ -- t/version/version -- --TESTS += \ -- t/generated-code/test-generated-code \ -- t/generated-code2/test-generated-code2 \ -- t/generated-code3/test-generated-code3 \ -- t/version/version -- --t_generated_code_test_generated_code_SOURCES = \ -- t/generated-code/test-generated-code.c \ -- t/test.pb-c.c --t_generated_code_test_generated_code_LDADD = \ -- protobuf-c/libprotobuf-c.la -- --t_generated_code2_test_generated_code2_SOURCES = \ -- t/generated-code2/test-generated-code2.c \ -- t/test-full.pb-c.c \ -- t/test-optimized.pb-c.c --t_generated_code2_test_generated_code2_LDADD = \ -- protobuf-c/libprotobuf-c.la -- --t_generated_code3_test_generated_code3_CPPFLAGS = \ -- -DPROTO3 -- --t_generated_code3_test_generated_code3_SOURCES = \ -- t/generated-code/test-generated-code.c \ -- t/test-proto3.pb-c.c -- --t_generated_code3_test_generated_code3_LDADD = \ -- protobuf-c/libprotobuf-c.la -- --noinst_PROGRAMS += \ -- t/generated-code2/cxx-generate-packed-data -- --t_generated_code2_cxx_generate_packed_data_SOURCES = \ -- t/generated-code2/cxx-generate-packed-data.cc \ -- t/test-full.pb.cc \ -- protobuf-c/protobuf-c.pb.cc --$(t_generated_code2_cxx_generate_packed_data_OBJECTS): t/test-full.pb.h --t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \ -- $(AM_CXXFLAGS) \ -- $(protobuf_CFLAGS) --t_generated_code2_cxx_generate_packed_data_LDADD = \ -- $(protobuf_LIBS) -- --t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto -- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto -- --t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto -- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto -- --t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto -- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto -- --t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto -- $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto -- --t/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.proto -- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto -- --t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT) -- $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc -- --BUILT_SOURCES += \ -- t/test.pb-c.c t/test.pb-c.h \ -- t/test-full.pb-c.c t/test-full.pb-c.h \ -- t/test-optimized.pb-c.c t/test-optimized.pb-c.h \ -- t/test-full.pb.cc t/test-full.pb.h \ -- t/test-proto3.pb-c.c t/test-proto3.pb-c.h \ -- t/generated-code2/test-full-cxx-output.inc -- - t_version_version_SOURCES = \ - t/version/version.c - t_version_version_LDADD = \ --- -2.34.1 - 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 index 1d9ca9daae..d724287d66 100644 --- 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 @@ -12,10 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9f725889e0d77383e26cb42b0b62cea2" DEPENDS = "protobuf-native protobuf" -SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=next;protocol=https" -SRC_URI:append:class-native = " file://0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch" - -SRCREV = "ba4c55f0e686e0252c451f7163ab529e4b36831a" +SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https" +SRCREV = "abc67a11c6db271bedbb9f58be85d6f4e2ea8389" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch new file mode 100644 index 0000000000..2bc44c898b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch @@ -0,0 +1,69 @@ +From a91130bb95528743a3f7253f8fe945b7505047d5 Mon Sep 17 00:00:00 2001 +From: Kyungjik Min +Date: Mon, 28 Dec 2020 15:56:09 +0900 +Subject: [PATCH] Fix linking error with ld-gold + +:Release Notes: + +:Detailed Notes: +https://github.com/protocolbuffers/protobuf/issues/6113 +There's a bug in the CMake build leading it to not use the version +scripts, which hides the problem (because all symbols are now public) +but doesn't solve it properly. + +:Testing Performed: + +:QA Notes: +N/A + +:Issues Addressed: +[PLAT-130467] Fix build error for libgoogleassistant with latest + protobuf-3.11.4 + +--- +Upstream-Status: Pending + + src/libprotobuf-lite.map | 2 ++ + src/libprotobuf.map | 2 ++ + src/libprotoc.map | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/src/libprotobuf-lite.map b/src/libprotobuf-lite.map +index 391554669..a1853ca6c 100644 +--- a/src/libprotobuf-lite.map ++++ b/src/libprotobuf-lite.map +@@ -3,6 +3,8 @@ + extern "C++" { + *google*; + }; ++ scc_info_*; ++ descriptor_table_*; + + local: + *; +diff --git a/src/libprotobuf.map b/src/libprotobuf.map +index 391554669..a1853ca6c 100644 +--- a/src/libprotobuf.map ++++ b/src/libprotobuf.map +@@ -3,6 +3,8 @@ + extern "C++" { + *google*; + }; ++ scc_info_*; ++ descriptor_table_*; + + local: + *; +diff --git a/src/libprotoc.map b/src/libprotoc.map +index 391554669..a1853ca6c 100644 +--- a/src/libprotoc.map ++++ b/src/libprotoc.map +@@ -3,6 +3,8 @@ + extern "C++" { + *google*; + }; ++ scc_info_*; ++ descriptor_table_*; + + local: + *; diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch index 7c4bf260eb..36c3c597ac 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch @@ -30,7 +30,7 @@ Signed-off-by: Leon Anavi 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/Makefile b/examples/Makefile -index ef7a4ef58..7206e14e1 100644 +index 1c7ec8d63..85f591231 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -2,6 +2,8 @@ @@ -42,20 +42,17 @@ index ef7a4ef58..7206e14e1 100644 all: cpp java python cpp: add_person_cpp list_people_cpp -@@ -41,11 +43,11 @@ protoc_middleman_dart: addressbook.proto +@@ -40,11 +42,11 @@ protoc_middleman_dart: addressbook.proto add_person_cpp: add_person.cc protoc_middleman pkg-config --cflags protobuf # fails if protobuf is not installed -- c++ -std=c++14 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf` -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp #$(CXX) -std=c++17 $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp +- c++ -std=c++11 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf` ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp list_people_cpp: list_people.cc protoc_middleman pkg-config --cflags protobuf # fails if protobuf is not installed -- c++ -std=c++14 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf` -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp #$(CXX) -std=c++17 $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp +- c++ -std=c++11 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf` ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp add_person_dart: add_person.dart protoc_middleman_dart --- -2.34.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.21.12.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.21.12.bb new file mode 100644 index 0000000000..d95e1c20f3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.21.12.bb @@ -0,0 +1,106 @@ +SUMMARY = "Protocol Buffers - structured data serialisation mechanism" +DESCRIPTION = "Protocol Buffers are a way of encoding structured data in an \ +efficient yet extensible format. Google uses Protocol Buffers for almost \ +all of its internal RPC protocols and file formats." +HOMEPAGE = "https://github.com/google/protobuf" +SECTION = "console/tools" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" + +DEPENDS = "zlib" +DEPENDS:append:class-target = " protobuf-native" + +SRCREV = "f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c" + +SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=21.x;protocol=https \ + file://run-ptest \ + file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ + file://0001-Fix-linking-error-with-ld-gold.patch \ + " +SRC_URI:append:mips:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " +SRC_URI:append:mipsel:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig ptest + +PACKAGECONFIG ??= "" +PACKAGECONFIG:class-native ?= "compiler" +PACKAGECONFIG:class-nativesdk ?= "compiler" +PACKAGECONFIG[python] = ",," +PACKAGECONFIG[compiler] = "-Dprotobuf_BUILD_PROTOC_BINARIES=ON,-Dprotobuf_BUILD_PROTOC_BINARIES=OFF" + +EXTRA_OECMAKE += "\ + -Dprotobuf_BUILD_SHARED_LIBS=ON \ + -Dprotobuf_BUILD_LIBPROTOC=ON \ + -Dprotobuf_BUILD_TESTS=OFF \ + -Dprotobuf_BUILD_EXAMPLES=OFF \ +" + +TEST_SRC_DIR = "examples" +LANG_SUPPORT = "cpp ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" + +do_compile_ptest() { + mkdir -p "${B}/${TEST_SRC_DIR}" + + # Add the location of the cross-compiled header and library files + # which haven't been installed yet. + cp "${B}/protobuf.pc" "${B}/${TEST_SRC_DIR}/protobuf.pc" + cp ${S}/${TEST_SRC_DIR}/*.cc "${B}/${TEST_SRC_DIR}/" + cp ${S}/${TEST_SRC_DIR}/*.proto "${B}/${TEST_SRC_DIR}/" + cp ${S}/${TEST_SRC_DIR}/*.py "${B}/${TEST_SRC_DIR}/" + cp ${S}/${TEST_SRC_DIR}/Makefile "${B}/${TEST_SRC_DIR}/" + sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Cflags:|Cflags: -I${S}/src|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Libs:|Libs: -L${B}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + # Until out-of-tree build of examples is supported, we have to use this approach + sed -e 's|../src/google/protobuf/.libs/timestamp.pb.o|${B}/CMakeFiles/libprotobuf.dir/src/google/protobuf/timestamp.pb.cc.o|' -i "${B}/${TEST_SRC_DIR}/Makefile" + export PKG_CONFIG_PATH="${B}/${TEST_SRC_DIR}" + + # Save the pkgcfg sysroot variable, and update it to nothing so + # that it doesn't append the sysroot to the beginning of paths. + # The header and library files aren't installed to the target + # system yet. So the absolute paths were specified above. + save_pkg_config_sysroot_dir=$PKG_CONFIG_SYSROOT_DIR + export PKG_CONFIG_SYSROOT_DIR= + + # Compile the tests + for lang in ${LANG_SUPPORT}; do + oe_runmake -C "${B}/${TEST_SRC_DIR}" ${lang} + done + + # Restore the pkgconfig sysroot variable + export PKG_CONFIG_SYSROOT_DIR=$save_pkg_config_sysroot_dir +} + +do_install_ptest() { + local olddir=`pwd` + + cd "${S}/${TEST_SRC_DIR}" + install -d "${D}/${PTEST_PATH}" + for i in add_person* list_people*; do + if [ -x "$i" ]; then + install "$i" "${D}/${PTEST_PATH}" + fi + done + cp "${B}/${TEST_SRC_DIR}/addressbook_pb2.py" "${D}/${PTEST_PATH}" + cd "$olddir" +} + +PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-lite" + +FILES:${PN}-compiler = "${bindir} ${libdir}/libprotoc${SOLIBS}" +FILES:${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}" + +RDEPENDS:${PN}-compiler = "${PN}" +RDEPENDS:${PN}-dev += "${PN}-compiler" +RDEPENDS:${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-protobuf', '', d)}" + +MIPS_INSTRUCTION_SET = "mips" + +BBCLASSEXTEND = "native nativesdk" + +LDFLAGS:append:arm = " -latomic" +LDFLAGS:append:mips = " -latomic" +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:mipsel = " -latomic" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.23.4.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.23.4.bb deleted file mode 100644 index 1edc21cdfc..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.23.4.bb +++ /dev/null @@ -1,115 +0,0 @@ -SUMMARY = "Protocol Buffers - structured data serialisation mechanism" -DESCRIPTION = "Protocol Buffers are a way of encoding structured data in an \ -efficient yet extensible format. Google uses Protocol Buffers for almost \ -all of its internal RPC protocols and file formats." -HOMEPAGE = "https://github.com/google/protobuf" -SECTION = "console/tools" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" - -DEPENDS = "zlib abseil-cpp" -DEPENDS:append:class-target = " protobuf-native" - -SRCREV = "2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a" - -SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=23.x;protocol=https \ - file://run-ptest \ - file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ - " -SRC_URI:append:mips:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " -SRC_URI:append:mipsel:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig ptest - -PACKAGECONFIG ??= "" -PACKAGECONFIG:class-native ?= "compiler" -PACKAGECONFIG:class-nativesdk ?= "compiler" -PACKAGECONFIG[python] = ",," -PACKAGECONFIG[compiler] = "-Dprotobuf_BUILD_PROTOC_BINARIES=ON,-Dprotobuf_BUILD_PROTOC_BINARIES=OFF" - -EXTRA_OECMAKE += "\ - -Dprotobuf_BUILD_SHARED_LIBS=ON \ - -Dprotobuf_BUILD_LIBPROTOC=ON \ - -Dprotobuf_BUILD_TESTS=OFF \ - -Dprotobuf_BUILD_EXAMPLES=OFF \ - -Dprotobuf_ABSL_PROVIDER="package" \ -" - -TEST_SRC_DIR = "examples" -LANG_SUPPORT = "cpp ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" - -do_compile_ptest() { - mkdir -p "${B}/${TEST_SRC_DIR}" - - # Add the location of the cross-compiled header and library files - # which haven't been installed yet. - cp "${B}/protobuf.pc" "${B}/${TEST_SRC_DIR}/protobuf.pc" - cp ${S}/${TEST_SRC_DIR}/*.cc "${B}/${TEST_SRC_DIR}/" - cp ${S}/${TEST_SRC_DIR}/*.proto "${B}/${TEST_SRC_DIR}/" - cp ${S}/${TEST_SRC_DIR}/*.py "${B}/${TEST_SRC_DIR}/" - cp ${S}/${TEST_SRC_DIR}/Makefile "${B}/${TEST_SRC_DIR}/" - # Adapt protobuf.pc - sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|Cflags:|Cflags: -I${S}/src |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|Cflags:|Cflags: -I${WORKDIR}/recipe-sysroot${includedir} |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|Libs:|Libs: -L${B}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|Libs:|Libs: -L${WORKDIR}/recipe-sysroot/usr/lib |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|Libs:|Libs: -labsl_log_internal_check_op |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|Libs:|Libs: -labsl_log_internal_message |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" - # Adapt uf8_range.pc - cp "${B}/third_party/utf8_range/utf8_range.pc" "${B}/${TEST_SRC_DIR}/utf8_range.pc" - sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc" - sed -e 's|Libs:|Libs= -L${B}/third_party/utf8_range |' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc" - # Until out-of-tree build of examples is supported, we have to use this approach - sed -e 's|../src/google/protobuf/.libs/timestamp.pb.o|${B}/CMakeFiles/libprotobuf.dir/src/google/protobuf/timestamp.pb.cc.o|' -i "${B}/${TEST_SRC_DIR}/Makefile" - export PKG_CONFIG_PATH="${B}/${TEST_SRC_DIR}" - - # Save the pkgcfg sysroot variable, and update it to nothing so - # that it doesn't append the sysroot to the beginning of paths. - # The header and library files aren't installed to the target - # system yet. So the absolute paths were specified above. - save_pkg_config_sysroot_dir=$PKG_CONFIG_SYSROOT_DIR - export PKG_CONFIG_SYSROOT_DIR= - - # Compile the tests - for lang in ${LANG_SUPPORT}; do - oe_runmake -C "${B}/${TEST_SRC_DIR}" ${lang} - done - - # Restore the pkgconfig sysroot variable - export PKG_CONFIG_SYSROOT_DIR=$save_pkg_config_sysroot_dir -} - -do_install_ptest() { - local olddir=`pwd` - - cd "${S}/${TEST_SRC_DIR}" - install -d "${D}/${PTEST_PATH}" - for i in add_person* list_people*; do - if [ -x "$i" ]; then - install "$i" "${D}/${PTEST_PATH}" - fi - done - cp "${B}/${TEST_SRC_DIR}/addressbook_pb2.py" "${D}/${PTEST_PATH}" - cd "$olddir" -} - -PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-lite" - -FILES:${PN}-compiler = "${bindir} ${libdir}/libprotoc${SOLIBS}" -FILES:${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}" - -RDEPENDS:${PN}-compiler = "${PN}" -RDEPENDS:${PN}-dev += "${PN}-compiler" -RDEPENDS:${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-protobuf', '', d)}" - -MIPS_INSTRUCTION_SET = "mips" - -BBCLASSEXTEND = "native nativesdk" - -LDFLAGS:append:arm = " -latomic" -LDFLAGS:append:mips = " -latomic" -LDFLAGS:append:powerpc = " -latomic" -LDFLAGS:append:mipsel = " -latomic" diff --git a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.13.bb b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.13.bb new file mode 100644 index 0000000000..7df8fc43b8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.13.bb @@ -0,0 +1,24 @@ +SUMMARY = "Light-weight C++ XML Processing Library" +DESCRIPTION = "pugixml is a C++ XML processing library, which consists of a \ +DOM-like interface with rich traversal/modification capabilities, \ +an extremely fast XML parser which constructs the DOM tree from \ +n XML file/buffer, and an XPath 1.0 implementation for complex \ +data-driven tree queries." +HOMEPAGE = "https://pugixml.org/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=d11b640daff611273752ec136394347c" + +SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI[sha256sum] = "40c0b3914ec131485640fa57e55bf1136446026b41db91c1bef678186a12abbe" + +UPSTREAM_CHECK_URI = "https://github.com/zeux/${BPN}/releases" + +inherit cmake + +EXTRA_OECMAKE += "-DBUILD_PKGCONFIG=ON \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=Release \ + " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb deleted file mode 100644 index 458958edf5..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Light-weight C++ XML Processing Library" -DESCRIPTION = "pugixml is a C++ XML processing library, which consists of a \ -DOM-like interface with rich traversal/modification capabilities, \ -an extremely fast XML parser which constructs the DOM tree from \ -n XML file/buffer, and an XPath 1.0 implementation for complex \ -data-driven tree queries." -HOMEPAGE = "https://pugixml.org/" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=ad370df61d83846cf9e4726244671201" - -SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[sha256sum] = "2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015" - -UPSTREAM_CHECK_URI = "https://github.com/zeux/${BPN}/releases" - -inherit cmake - -EXTRA_OECMAKE += "-DBUILD_PKGCONFIG=ON \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=Release \ - " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb index bd4a5b3e89..479c12d6ae 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb @@ -1,12 +1,11 @@ SUMMARY = "Collects and summarises system performance statistics" DESCRIPTION = "collectd is a daemon which collects system performance statistics periodically and provides mechanisms to store the values in a variety of ways, for example in RRD files." -HOMEPAGE = "https://collectd.org/" LICENSE = "GPL-2.0-only & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=1bd21f19f7f0c61a7be8ecacb0e28854" DEPENDS = "rrdtool curl libpcap libxml2 yajl libgcrypt libtool lvm2" -SRC_URI = "https://collectd.org/files/collectd-${PV}.tar.bz2 \ +SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ file://collectd.init \ file://collectd.service \ file://no-gcrypt-badpath.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch deleted file mode 100644 index 3699b8c83a..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch +++ /dev/null @@ -1,80 +0,0 @@ -Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/544] - -From 8121a979026d5fcb05bd4e5d3a0647f321b56106 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Thu, 28 Sep 2023 12:54:23 +0200 -Subject: [PATCH] Add common dlt_cdh_cpuinfo.c to unblock build on non amd64 - and i386 arcs - ---- - src/core_dump_handler/dlt_cdh.h | 2 ++ - src/core_dump_handler/dlt_cdh_cpuinfo.c | 33 +++++++++++++++++++++++++ - src/core_dump_handler/dlt_cdh_crashid.c | 2 +- - 3 files changed, 36 insertions(+), 1 deletion(-) - create mode 100644 src/core_dump_handler/dlt_cdh_cpuinfo.c - -diff --git a/src/core_dump_handler/dlt_cdh.h b/src/core_dump_handler/dlt_cdh.h -index d572ecf3..8608c6c4 100644 ---- a/src/core_dump_handler/dlt_cdh.h -+++ b/src/core_dump_handler/dlt_cdh.h -@@ -55,6 +55,8 @@ typedef struct - uint64_t pc; - uint64_t ip; - uint64_t lr; -+ uint64_t sp; -+ uint64_t fp; - - } cdh_registers_t; - -diff --git a/src/core_dump_handler/dlt_cdh_cpuinfo.c b/src/core_dump_handler/dlt_cdh_cpuinfo.c -new file mode 100644 -index 00000000..03509fda ---- /dev/null -+++ b/src/core_dump_handler/dlt_cdh_cpuinfo.c -@@ -0,0 +1,33 @@ -+/* -+ * SPDX license identifier: MPL-2.0 -+ * -+ * Copyright (C) 2011-2015, BMW AG -+ * -+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace. -+ * -+ * This Source Code Form is subject to the terms of the -+ * Mozilla Public License (MPL), v. 2.0. -+ * If a copy of the MPL was not distributed with this file, -+ * You can obtain one at http://mozilla.org/MPL/2.0/. -+ * -+ * For further information see http://www.covesa.org/. -+ */ -+ -+/*! -+ * \author Gianfranco Costamagna -+ * -+ * \copyright Copyright © 2011-2015 BMW AG. \n -+ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. -+ * -+ * \file dlt_cdh_cpuinfo.c -+ */ -+ -+#include "dlt_cdh_cpuinfo.h" -+ -+void get_registers(prstatus_t *prstatus, cdh_registers_t *registers) -+{ -+/* struct user_regs_struct *ptr_reg = (struct user_regs_struct *)prstatus->pr_reg; -+ -+ registers->pc = ptr_reg->pc;*/ /* [REG_PROC_COUNTER]; */ -+ -+} -diff --git a/src/core_dump_handler/dlt_cdh_crashid.c b/src/core_dump_handler/dlt_cdh_crashid.c -index bca44e0e..8dd98d70 100644 ---- a/src/core_dump_handler/dlt_cdh_crashid.c -+++ b/src/core_dump_handler/dlt_cdh_crashid.c -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "dlt_cdh.h" diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb index 410fffa24b..33fae06190 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb @@ -17,19 +17,17 @@ DEPENDS = "zlib gzip-native json-c" SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \ file://0002-Don-t-execute-processes-as-a-specific-user.patch \ file://0004-Modify-systemd-config-directory.patch \ - file://544.patch \ " SRCREV = "0f2d4cfffada6f8448a2cb27995b38eb4271044f" S = "${WORKDIR}/git" -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal ', '', d)} \ - dlt-examples dlt-adaptor dlt-adaptor-stdin dlt-adaptor-udp dlt-console \ +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-adaptor-stdin dlt-adaptor-udp dlt-console ', '', d)} \ udp-connection dlt-system dlt-filetransfer " # dlt-dbus # General options -PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF" +PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF,,dlt-daemon-systemd" # Linux options PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF -DWITH_DLT_SYSTEM=OFF,systemd" @@ -40,28 +38,26 @@ 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" -PACKAGECONFIG[dlt-adaptor-stdin] = "-DWITH_DLT_ADAPTOR_STDIN=ON,-DWITH_DLT_ADAPTOR_STDIN=OFF" -PACKAGECONFIG[dlt-adaptor-udp] = "-DWITH_DLT_ADAPTOR_UDP=ON,-DWITH_DLT_ADAPTOR_UDP=OFF" +PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF,,dlt-daemon-systemd" +PACKAGECONFIG[dlt-adaptor-stdin] = "-DWITH_DLT_ADAPTOR_STDIN=ON,-DWITH_DLT_ADAPTOR_STDIN=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" +PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd" inherit autotools gettext cmake pkgconfig systemd -# -DWITH_DLT_COREDUMPHANDLER=ON this feature is too experimental, disable for now -#FILES:${PN} += "${libdir}/sysctl.d" EXTRA_OECMAKE += "-DWITH_DLT_LOGSTORAGE_GZIP=ON -DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}" PACKAGES += "${PN}-systemd" SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" SYSTEMD_SERVICE:${PN} = " ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'dlt.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-system', 'dlt-system.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-dbus', 'dlt-dbus.service', '', d)}" + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-system', 'dlt-system.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'dlt-dbus', 'dlt-dbus.service', '', d)}" SYSTEMD_AUTO_ENABLE:${PN} = "enable" SYSTEMD_SERVICE:${PN}-systemd = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-adaptor-udp', 'dlt-adaptor-udp.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-examples', 'dlt-example-user.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-examples dlt-console', 'dlt-receive.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)} \ " SYSTEMD_AUTO_ENABLE:${PN}-systemd = "disable" diff --git a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch deleted file mode 100644 index ce12d4270a..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch +++ /dev/null @@ -1,68 +0,0 @@ -From cb79329010d73e36ce64830914005f1c17f8f53c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= -Date: Sat, 23 Sep 2023 11:32:18 +0200 -Subject: [PATCH] cmake: fix when cross compiling -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In order to generate protobuf files CMake need to use the protoc -and grpc-cpp-plugin compiled for the host architecture. - -Unfortunately, the protoc and grpc-cpp-plugin in the gRPC CMake -configuration file are the one for the target architecture. - -Fix this by properly finding the correct executable when -CMake is cross compiling. - -Signed-off-by: Clément Péron ---- -Upstream-Status: Pending - - CMakeLists.txt | 28 ++++++++++++++++++++++++++-- - 1 file changed, 26 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5aa1310..80ebad2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -120,10 +120,34 @@ if(Protobuf_PROTOC_EXECUTABLE) - endif() - endif() - -+# When cross compiling we look for the native protoc compiler -+# overwrite protobuf::protoc with the proper protoc -+if(CMAKE_CROSSCOMPILING) -+ find_program(Protobuf_PROTOC_EXECUTABLE REQUIRED NAMES protoc) -+ if(NOT TARGET protobuf::protoc) -+ add_executable(protobuf::protoc IMPORTED) -+ endif() -+ set_target_properties(protobuf::protoc PROPERTIES -+ IMPORTED_LOCATION "${Protobuf_PROTOC_EXECUTABLE}") -+endif() -+ - find_package(gRPC QUIET) --if(gRPC_FOUND AND TARGET gRPC::grpc AND TARGET gRPC::grpc_cpp_plugin) -+if(gRPC_FOUND AND TARGET gRPC::grpc) -+ # When cross compiling we look for the native grpc_cpp_plugin -+ if(CMAKE_CROSSCOMPILING) -+ find_program(GRPC_CPP_PLUGIN REQUIRED NAMES grpc_cpp_plugin) -+ if(NOT TARGET gRPC::grpc_cpp_plugin) -+ add_executable(gRPC::grpc_cpp_plugin IMPORTED) -+ endif() -+ set_target_properties(gRPC::grpc_cpp_plugin PROPERTIES -+ IMPORTED_LOCATION "${GRPC_CPP_PLUGIN}") -+ elseif(TARGET gRPC::grpc_cpp_plugin) -+ get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION) -+ else() -+ message(FATAL_ERROR "Found gRPC but no gRPC CPP plugin defined") -+ endif() -+ - set(GRPC_LIBRARIES gRPC::gpr gRPC::grpc gRPC::grpc++) -- get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION) - get_target_property(GRPC_INCLUDE_DIR gRPC::grpc INTERFACE_INCLUDE_DIRECTORIES) - else() - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGRPC.cmake) --- -2.39.3 (Apple Git-145) - diff --git a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb new file mode 100644 index 0000000000..71744026da --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "C++ API for etcd's v3 client API" +HOMEPAGE = "https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450" + +SRC_URI += "git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https" +SRCREV = "5e2884f36276e44f683fa02fca39807716fdbc16" + +inherit cmake + +DEPENDS += "grpc protobuf cpprest grpc-native protobuf-native" + +S = "${WORKDIR}/git" + +EXTRA_OECONF += "-DCPPREST_EXCLUDE_WEBSOCKETS=ON" + +INSANE_SKIP:${PN}:append = " ldflags" +SOLIBS = ".so" +FILES_SOLIBSDEV = "" diff --git a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb deleted file mode 100644 index e8299bab5f..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "C++ API for etcd's v3 client API" -HOMEPAGE = "https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450" - -SRC_URI = " \ - git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https \ - file://0001-cmake-fix-when-cross-compiling.patch \ -" - -SRCREV = "e31ac4d4caa55fa662e207150ba40f8151b7ad96" - -inherit cmake - -DEPENDS += "grpc protobuf cpprest grpc-native protobuf-native" - -S = "${WORKDIR}/git" - -EXTRA_OECONF += "-DCPPREST_EXCLUDE_WEBSOCKETS=ON" - -INSANE_SKIP:${PN}:append = " ldflags" -SOLIBS = ".so" -FILES_SOLIBSDEV = "" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-pythondir-for-multilib-when-cross-compiling.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-pythondir-for-multilib-when-cross-compiling.patch deleted file mode 100644 index ec3a9fe470..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-pythondir-for-multilib-when-cross-compiling.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 297abed277ce3aa0cf12adbfda3c8581afdba850 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Sun, 8 Oct 2023 19:30:29 -0700 -Subject: [PATCH] fix pythondir for multilib when cross compiling - -In case of cross compiling + multilib, the 'shell python3' line is -not likely to give out correct result. Make use of pythondir instead. - -This patch is related to meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch -in oe-core, so this one is marked as oe specific. - -Upstream-Status: Inappropriate [OE Specific] - -Signed-off-by: Chen Qi ---- - src/python/gi/overrides/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/python/gi/overrides/Makefile.am b/src/python/gi/overrides/Makefile.am -index 5e8e75f7..7c30601c 100644 ---- a/src/python/gi/overrides/Makefile.am -+++ b/src/python/gi/overrides/Makefile.am -@@ -1,5 +1,5 @@ - if WITH_PYTHON3 --py3libdir = $(shell python3 -c "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '${exec_prefix}'}))") -+py3libdir = $(pythondir) - py3overridesdir = $(py3libdir)/gi/overrides - dist_py3overrides_DATA = BlockDev.py - endif --- -2.42.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.28.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.28.bb new file mode 100644 index 0000000000..2e7412e823 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.28.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "libblockdev is a C library supporting GObject introspection for manipulation of \ +block devices. It has a plugin-based architecture where each technology (like \ +LVM, Btrfs, MD RAID, Swap,...) is implemented in a separate plugin, possibly \ +with multiple implementations (e.g. using LVM CLI or the new LVM DBus API)." +HOMEPAGE = "http://rhinstaller.github.io/libblockdev/" +LICENSE = "LGPL-2.0-or-later" +SECTION = "devel/lib" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" + +inherit autotools gobject-introspection pkgconfig lib_package + +DEPENDS = "autoconf-archive-native glib-2.0 kmod udev" + +SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch;protocol=https \ +" +SRCREV = "1412dc51c8f76bf8d9a6008228737db4a9a26d69" +S = "${WORKDIR}/git" + +FILES:${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages" + +PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath nvdimm tools" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" +PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python" +PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2" +PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2" +PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2" +PACKAGECONFIG[dmraid] = "--with-dmraid, --without-dmraid" +PACKAGECONFIG[kmod] = "--with-kbd, --without-kbd,libbytesize" +PACKAGECONFIG[parted] = "--with-part, --without-part, parted" +PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux" +PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" +PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm, ndctl util-linux" +PACKAGECONFIG[vdo] = "--with-vdo, --without-vdo,libbytesize" +PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key" +PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools" +PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup nss volume-key" +PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" +PACKAGECONFIG[kbd] = "--with-kbd,--without-kbd,libbytesize" +PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" +PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper" + +export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_3.03.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_3.03.bb deleted file mode 100644 index 99175e6112..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_3.03.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "libblockdev is a C library supporting GObject introspection for manipulation of \ -block devices. It has a plugin-based architecture where each technology (like \ -LVM, Btrfs, MD RAID, Swap,...) is implemented in a separate plugin, possibly \ -with multiple implementations (e.g. using LVM CLI or the new LVM DBus API)." -HOMEPAGE = "http://rhinstaller.github.io/libblockdev/" -LICENSE = "LGPL-2.0-or-later" -SECTION = "devel/lib" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" - -inherit autotools gobject-introspection pkgconfig lib_package - -DEPENDS = "autoconf-archive-native glib-2.0 kmod udev libnvme" - -SRC_URI = "git://github.com/storaged-project/libblockdev;branch=master;protocol=https \ - file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \ - " -SRCREV = "38378931d285b91333ff2e2a391b1fe91072f9bb" -S = "${WORKDIR}/git" - -FILES:${PN} += "${libdir}/python3.*/site-packages" - -PACKAGECONFIG ??= "python3 lvm lvm-dbus dm parted fs escrow btrfs crypto mdraid mpath nvdimm tools" -PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" -PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2" -PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2" -PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2" -PACKAGECONFIG[parted] = "--with-part, --without-part, parted" -PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux" -PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" -PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm, ndctl util-linux" -PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key" -PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools" -PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup nss volume-key" -PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" -PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" -PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper" - -export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs" diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-BundledOSSPUUID.cmake-Pass-CFLAGS-to-compiler.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-BundledOSSPUUID.cmake-Pass-CFLAGS-to-compiler.patch index ceb8ec34b1..a0265eaa32 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-BundledOSSPUUID.cmake-Pass-CFLAGS-to-compiler.patch +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-BundledOSSPUUID.cmake-Pass-CFLAGS-to-compiler.patch @@ -12,8 +12,6 @@ Upsteam-Status: Pending Signed-off-by: Mingli Yu --- -Upstream-Status: Pending - cmake/BundledOSSPUUID.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch index cd837d8de4..acb96f40d5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch @@ -19,8 +19,6 @@ Pulled By: ltamasi fbshipit-source-id: 04e82d73bc0c67fb0ded018383af8dfc332050cc --- -Upstream-Status: Pending - thirdparty/rocksdb/util/autovector.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb new file mode 100644 index 0000000000..08cfededa7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb @@ -0,0 +1,79 @@ +SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" +HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" + +SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \ + file://0001-Cargo.toml-do-not-abort-on-panic.patch \ + file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \ + file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ + file://0004-use-asm-sgidefs.h.patch \ + file://fix-musl-build.patch \ + file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \ + file://riscv32.patch \ + file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ + file://0001-rewrite-cargo-host-linker-in-python3.patch \ + file://musl-disable-stackwalk.patch \ + file://0001-add-arm-to-list-of-mozinline.patch \ + " +SRC_URI[sha256sum] = "81fa590408f5a3af8f004d839ac47fb4121e05fe717334445cec9ca55d8746af" + +S = "${WORKDIR}/firefox-${PV}" + +inherit pkgconfig perlnative python3native rust + +DEPENDS += "zlib cargo-native python3 icu" +DEPENDS:remove:mipsarch = "icu" +DEPENDS:remove:powerpc:toolchain-clang = "icu" + +B = "${WORKDIR}/build" + +export PYTHONPATH = "${S}/build:${S}/third_party/python/PyYAML/lib3:${S}/testing/mozbase/mozfile:${S}/python/mozboot:${S}/third_party/python/distro:${S}/testing/mozbase/mozinfo:${S}/config:${S}/testing/mozbase/manifestparser:${S}/third_party/python/pytoml:${S}/testing/mozbase/mozprocess:${S}/third_party/python/six:${S}/python/mozbuild:${S}/python/mozbuild/mozbuild:${S}/python/mach:${S}/third_party/python/jsmin:${S}/python/mozversioncontrol" + +export HOST_CC = "${BUILD_CC}" +export HOST_CXX = "${BUILD_CXX}" +export HOST_CFLAGS = "${BUILD_CFLAGS}" +export HOST_CPPFLAGS = "${BUILD_CPPFLAGS}" +export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}" + +export AS = "${CC}" + +export RUSTFLAGS + +JIT ?= "" +JIT:mipsarch = "--disable-jit" +ICU ?= "--with-system-icu" +ICU:mipsarch = "" +ICU:powerpc:toolchain-clang = "" + +do_configure() { + cd ${B} + python3 ${S}/configure.py \ + --enable-project=js \ + --target=${RUST_HOST_SYS} \ + --host=${BUILD_SYS} \ + --prefix=${prefix} \ + --libdir=${libdir} \ + --disable-jemalloc \ + --disable-strip \ + ${JIT} \ + ${ICU} +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +inherit multilib_script multilib_header + +MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js102-config" + +do_install:append() { + oe_multilib_header mozjs-102/js-config.h + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${bindir}/js102-config + rm -f ${D}${libdir}/libjs_static.ajs +} + +PACKAGES =+ "lib${BPN}" +FILES:lib${BPN} += "${libdir}/lib*" diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.1.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.1.bb deleted file mode 100644 index 3a7b51c145..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.1.bb +++ /dev/null @@ -1,82 +0,0 @@ -SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" -HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" - -SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \ - file://0001-Cargo.toml-do-not-abort-on-panic.patch \ - file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \ - file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ - file://0004-use-asm-sgidefs.h.patch \ - file://fix-musl-build.patch \ - file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \ - file://riscv32.patch \ - file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ - file://0001-rewrite-cargo-host-linker-in-python3.patch \ - file://musl-disable-stackwalk.patch \ - file://0001-add-arm-to-list-of-mozinline.patch \ - " -SRC_URI[sha256sum] = "09194fb765953bc6979a35aa8834118c453b9d6060bf1ec4e134551bad740113" - -S = "${WORKDIR}/firefox-${PV}" - -inherit pkgconfig perlnative python3native rust - -DEPENDS += "zlib cargo-native python3 icu" -DEPENDS:remove:mipsarch = "icu" -DEPENDS:remove:powerpc:toolchain-clang = "icu" - -B = "${WORKDIR}/build" - -export PYTHONPATH = "${S}/build:${S}/third_party/python/PyYAML/lib3:${S}/testing/mozbase/mozfile:${S}/python/mozboot:${S}/third_party/python/distro:${S}/testing/mozbase/mozinfo:${S}/config:${S}/testing/mozbase/manifestparser:${S}/third_party/python/pytoml:${S}/testing/mozbase/mozprocess:${S}/third_party/python/six:${S}/python/mozbuild:${S}/python/mozbuild/mozbuild:${S}/python/mach:${S}/third_party/python/jsmin:${S}/python/mozversioncontrol" - -export HOST_CC = "${BUILD_CC}" -export HOST_CXX = "${BUILD_CXX}" -export HOST_CFLAGS = "${BUILD_CFLAGS}" -export HOST_CPPFLAGS = "${BUILD_CPPFLAGS}" -export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}" - -export AS = "${CC}" - -export RUSTFLAGS - -JIT ?= "" -JIT:mipsarch = "--disable-jit" -ICU ?= "--with-system-icu" -ICU:mipsarch = "" -ICU:powerpc:toolchain-clang = "" - -do_configure() { - cd ${B} - python3 ${S}/configure.py \ - --enable-project=js \ - --target=${RUST_HOST_SYS} \ - --host=${BUILD_SYS} \ - --prefix=${prefix} \ - --libdir=${libdir} \ - --disable-jemalloc \ - --disable-strip \ - ${JIT} \ - ${ICU} -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -inherit multilib_script multilib_header - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" -MULTILIB_SCRIPTS += "${PN}-dev:${bindir}/js${MAJ_VER}-config" - -do_install:append() { - oe_multilib_header mozjs-${MAJ_VER}/js-config.h - sed -e 's@${STAGING_DIR_HOST}@@g' \ - -i ${D}${bindir}/js${MAJ_VER}-config - rm -f ${D}${libdir}/libjs_static.ajs - # remove the build path - sed -i -e 's@${WORKDIR}@@g' `find ${B} -name Unified_c*.c*` -} - -PACKAGES =+ "lib${BPN}" -FILES:lib${BPN} += "${libdir}/lib*" diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch index 38496ea56c..fe905fe4dd 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch @@ -14,31 +14,16 @@ Signed-off-by: Alexander Kanavin build/moz.configure/init.configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 81f500a0b7..0b7a2ff60f 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure -@@ -647,24 +647,7 @@ def help_host_target(help, host, target) +@@ -585,7 +585,7 @@ def help_host_target(help, host, target): def config_sub(shell, triplet): config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub") -- # Config.sub doesn't like the *-windows-msvc/*-windows-gnu triplets, so -- # munge those before and after calling config.sub. -- suffix = None -- munging = { -- "-windows-msvc": "-mingw32", -- "-windows-gnu": "-mingw32", -- } -- for check_suffix, replacement in munging.items(): -- if triplet.endswith(check_suffix): -- suffix = check_suffix -- triplet = triplet[: -len(suffix)] + replacement -- break -- result = check_cmd_output(shell, config_sub, triplet).strip() -- if suffix: -- assert result.endswith(replacement) -- result = result[: -len(replacement)] + suffix -- return result -- +- return check_cmd_output(shell, config_sub, triplet).strip() + return triplet + @depends("--host", shell) - @checking("for host system type", lambda h: h.alias) diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch index 22f31e05f8..d2b87e8033 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch @@ -8,8 +8,6 @@ Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: https://github.com/void-linux/void-packages/issues/2598 --- -Upstream-Status: Pending - js/src/old-configure.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb index fcdf64c932..799b8abd90 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb @@ -9,7 +9,6 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ file://0004-use-asm-sgidefs.h.patch \ file://fix-musl-build.patch \ - file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \ file://riscv32.patch \ file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ file://0001-rewrite-cargo-host-linker-in-python3.patch \ @@ -66,13 +65,12 @@ do_install() { inherit multilib_script multilib_header -MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" -MULTILIB_SCRIPTS += "${PN}-dev:${bindir}/js${MAJ_VER}-config" +MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js102-config" do_install:append() { - oe_multilib_header mozjs-${MAJ_VER}/js-config.h + oe_multilib_header mozjs-115/js-config.h sed -e 's@${STAGING_DIR_HOST}@@g' \ - -i ${D}${bindir}/js${MAJ_VER}-config + -i ${D}${bindir}/js115-config rm -f ${D}${libdir}/libjs_static.ajs } diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/hiredis-use-default-CC-if-it-is-set.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/hiredis-use-default-CC-if-it-is-set.patch index 7785acca5c..5b9b71ea69 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/hiredis-use-default-CC-if-it-is-set.patch @@ -18,8 +18,6 @@ Reworked for 6.0.4 Signed-off-by: Andreas Müller --- -Upstream-Status: Pending - deps/hiredis/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/oe-use-libc-malloc.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/oe-use-libc-malloc.patch index 7b601e02a9..be186b57da 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/oe-use-libc-malloc.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/oe-use-libc-malloc.patch @@ -15,8 +15,6 @@ Update to work with 4.0.8 Signed-off-by: Alistair Francis --- -Upstream-Status: Pending - src/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch deleted file mode 100644 index 0d3f412706..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 671e0d091b40ef7deb4a9d43e0dbed2a44edbec8 Mon Sep 17 00:00:00 2001 -From: Matthew Fernandez -Date: Sat, 9 Sep 2023 01:03:04 -0700 -Subject: [PATCH] Autotools: fix: do not put '$prefix' based paths in - compilation flags - -This was causing problems with cross-compilation with a dedicated sysroot, -because compilation would incorrectly use headers and libraries from the -`--prefix` path. The `--prefix` path is meant to indicate a target path to -install to, not a path from which to source dependent libraries. - -Gitlab: fixes #2442 -Reported-by: Daniel Klauer -Suggested-by: Daniel Klauer - -Upstream-Status: Backport [https://gitlab.com/graphviz/graphviz/-/commit/012d250a903e13114bce3ba40995fb957fed7848] -Signed-off-by: Daniel Klauer ---- - CHANGELOG.md | 3 +++ - configure.ac | 8 -------- - 2 files changed, 3 insertions(+), 8 deletions(-) - -diff --git a/CHANGELOG.md b/CHANGELOG.md -index b9b7e8e08..3a15fd256 100644 ---- a/CHANGELOG.md -+++ b/CHANGELOG.md -@@ -39,6 +39,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - longer fails due to missing PHP files. #2388 - - Syntax for a loop in `gvmap.sh` has been corrected. This was a regression in - Graphviz 2.50.0. #2404 -+- The Autotools build system no longer uses headers and libraries from the -+ `--prefix` path given on the command line. This previously caused -+ cross-compilation to incorrectly pick up host headers and libraries. #2442 - - ## [8.0.5] – 2023-04-30 - -diff --git a/configure.ac b/configure.ac -index 573a3ee5d..7d53346de 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -190,14 +190,6 @@ if test "x${prefix}" = "xNONE"; then - AC_SUBST([prefix]) - fi - --# automatically check for other dependencies in $prefix first --if test "x${prefix}" != "x/usr"; then -- CPPFLAGS="$CPPFLAGS -I${prefix}/include" -- LDFLAGS="$LDFLAGS -L${prefix}/lib" -- PKG_CONFIG_PATH="$prefix/lib/pkgconfig$PATHSEPARATOR$PKG_CONFIG_PATH" -- export PKG_CONFIG_PATH --fi -- - dnl ----------------------------------- - # Static/Shared binaries - --- -2.34.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb index 4d40ee4dee..ccc114007c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb @@ -19,7 +19,6 @@ DEPENDS:append:class-nativesdk = " ${BPN}-native" inherit autotools-brokensep pkgconfig gettext qemu SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-releases/${PV}/${BP}.tar.xz \ - file://0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch \ " # Use native mkdefs SRC_URI:append:class-target = "\ diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 291a83aaad..3d97ea0967 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -19,8 +19,6 @@ SRC_URI += "file://run-ptest \ # bpf was added in 4.10 with: https://github.com/torvalds/linux/commit/5aa5bd14c5f8660c64ceedf14a549781be47e53d # if you have older kernel than that you need to remove it from PACKAGECONFIG PACKAGECONFIG ??= "firmware" -# bpf needs working clang compiler anyway -PACKAGECONFIG:append:toolchain-clang:x86-64 = " bpf" PACKAGECONFIG:remove:x86 = "bpf" PACKAGECONFIG:remove:arm = "bpf vm" # host ptrace.h is used to compile BPF target but mips ptrace.h is needed @@ -30,41 +28,34 @@ PACKAGECONFIG:remove:arm = "bpf vm" PACKAGECONFIG:remove:qemumips = "bpf vm" # riscv does not support libhugetlbfs yet -PACKAGECONFIG:remove:riscv64 = "bpf vm" -PACKAGECONFIG:remove:riscv32 = "bpf vm" +PACKAGECONFIG:remove:riscv64 = "vm" +PACKAGECONFIG:remove:riscv32 = "vm" -PACKAGECONFIG[bpf] = ",,elfutils elfutils-native libcap libcap-ng rsync-native python3-docutils-native," +PACKAGECONFIG[bpf] = ",,elfutils libcap libcap-ng rsync-native," PACKAGECONFIG[firmware] = ",,libcap, bash" PACKAGECONFIG[vm] = ",,libcap libhugetlbfs,libgcc bash" do_patch[depends] += "virtual/kernel:do_shared_workdir" -do_compile[depends] += "virtual/kernel:do_install" -inherit linux-kernel-base module-base kernel-arch ptest siteinfo +inherit linux-kernel-base kernel-arch ptest S = "${WORKDIR}/${BP}" -DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" - TEST_LIST = "\ ${@bb.utils.filter('PACKAGECONFIG', 'bpf firmware vm', d)} \ rtc \ " + EXTRA_OEMAKE = '\ CROSS_COMPILE=${TARGET_PREFIX} \ ARCH=${ARCH} \ CC="${CC}" \ + CLANG="clang -fno-stack-protector -target ${TARGET_ARCH} ${TOOLCHAIN_OPTIONS}" \ AR="${AR}" \ LD="${LD}" \ - CLANG="clang -fno-stack-protector -target ${TARGET_ARCH} ${TOOLCHAIN_OPTIONS} -isystem ${S} -D__WORDSIZE=\'64\' -Wno-error=unused-command-line-argument" \ DESTDIR="${D}" \ - V=1 \ + MACHINE="${ARCH}" \ ' -EXTRA_OEMAKE:append:toolchain-clang = "\ - LLVM=1 CONFIG_CC_IS_GCC= CONFIG_CC_IS_CLANG=y CONFIG_CC_IMPLICIT_FALLTHROUGH= \ - HOSTCC="clang -unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++ ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -Wno-error=unused-command-line-argument" \ - HOSTLD="clang ${BUILD_LDFLAGS} -unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++" \ -" KERNEL_SELFTEST_SRC ?= "Makefile \ include \ @@ -75,6 +66,7 @@ KERNEL_SELFTEST_SRC ?= "Makefile \ arch \ LICENSES \ " + do_compile() { if [ ${@bb.utils.contains('PACKAGECONFIG', 'bpf', 'True', 'False', d)} = 'True' ]; then if [ ${@bb.utils.contains('DEPENDS', 'clang-native', 'True', 'False', d)} = 'False' ]; then @@ -82,17 +74,7 @@ do_compile() { either install it and add it to HOSTTOOLS, or add clang-native from meta-clang to dependency" fi fi - mkdir -p ${S}/include/config ${S}/bits - install -Dm 0644 ${STAGING_KERNEL_BUILDDIR}/.config ${S}/include/config/auto.conf - if [ "${SITEINFO_BITS}" != "32" ]; then - for f in long-double endianness floatn struct_rwlock; do - cp ${RECIPE_SYSROOT}${includedir}/bits/$f-64.h ${S}/bits/$f-32.h - done - fi - oe_runmake -C ${S} headers - sed -i -e 's|^all: docs|all:|' ${S}/tools/testing/selftests/bpf/Makefile - sed -i -e '/mrecord-mcount/d' ${S}/Makefile - sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/Makefile + for i in ${TEST_LIST} do oe_runmake -C ${S}/tools/testing/selftests/${i} @@ -151,9 +133,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_PACKAGE_DEBUG_SPLIT="1" FILES:${PN} += "/usr/kernel-selftest" -RDEPENDS:${PN} += "python3 perl perl-module-io-handle" +RDEPENDS:${PN} += "python3 perl" # tools/testing/selftests/vm/Makefile doesn't respect LDFLAGS and tools/testing/selftests/Makefile explicitly overrides to empty -INSANE_SKIP:${PN} += "ldflags libdir" +INSANE_SKIP:${PN} += "ldflags" SECURITY_CFLAGS = "" COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest index 0903d097e1..d40b9576d8 100755 --- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest @@ -1,7 +1,11 @@ #!/bin/sh -/usr/kernel-selftest/run_kselftest.sh -s +export PATH=$PATH:/usr/kernel-selftest/bpf + +# test_align +test_align | grep "12 pass" &> /dev/null if [ $? == 0 ]; then - echo "PASS: kernel-selftest" + echo "[PASS]: test_align" else - echo "[FAIL]: kernel-selftest" + echo "[FAIL]: test_align" fi + diff --git a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_1.2.0.bb b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_1.2.0.bb index a8e1e5c0cb..71ca10e5a0 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_1.2.0.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=master" SRCREV = "fbd60dbff51c870f5e80a17c4f2fd639eb80af90" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux" +COMPATIBLE_HOST = "(x86_64|i.86|aarch64|riscv64|powerpc64).*-linux" S = "${WORKDIR}/git/src" diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/run-ptest b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/run-ptest index 6746132ce6..fbddc0774d 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/run-ptest +++ b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/run-ptest @@ -6,7 +6,7 @@ echo expecting Segmentation fault with core dump ... minicoredumper_demo 6 & sleep 3 && minicoredumper_demo if ls /var/crash/ | grep minicoredumper; then - echo "PASS: minicoredumper" + echo SUCCESS else - echo "FAIL: minicoredumper" + echo FAIL fi diff --git a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.13.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.13.0.bb new file mode 100644 index 0000000000..558b448baf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.13.0.bb @@ -0,0 +1,53 @@ +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 = "d6eb9696aa72473c1a11d34d928d35a3acc0c9a9" +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" +BUILD_LDFLAGS += "-pthread" + +export CC +export LD = "${CC}" + +VPXTARGET:armv5te = "armv5te-linux-gcc" +VPXTARGET:armv6 = "armv6-linux-gcc" +VPXTARGET:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7-linux-gcc","generic-gnu",d)}" +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} +} + +BBCLASSEXTEND += "native" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.13.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.13.1.bb deleted file mode 100644 index eab5546a1b..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.13.1.bb +++ /dev/null @@ -1,53 +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 = "10b9492dcf05b652e2e4b370e205bd605d421972" -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" -BUILD_LDFLAGS += "-pthread" - -export CC -export LD = "${CC}" - -VPXTARGET:armv5te = "armv5te-linux-gcc" -VPXTARGET:armv6 = "armv6-linux-gcc" -VPXTARGET:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7-linux-gcc","generic-gnu",d)}" -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} -} - -BBCLASSEXTEND += "native" diff --git a/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch b/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch deleted file mode 100644 index c93b76619c..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a53f123040998744602f190944464af0e159ea19 Mon Sep 17 00:00:00 2001 -From: jjll -Date: Wed, 6 Sep 2023 20:47:41 +0200 -Subject: [PATCH] Compatibility with boost 1.83 - -Upstream-Status: Backport [https://github.com/cpp-netlib/cpp-netlib/pull/902] -Signed-off-by: Khem Raj ---- - libs/network/src/server_request_parsers_impl.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/boost/network/protocol/http/server/impl/parsers.ipp -+++ b/boost/network/protocol/http/server/impl/parsers.ipp -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #ifdef BOOST_NETWORK_NO_LIB - #ifndef BOOST_NETWORK_INLINE -@@ -32,7 +33,7 @@ typedef std::basic_string u32_ - template <> // - struct assign_to_container_from_value { - static void call(u32_string const& val, std::string& attr) { -- u32_to_u8_iterator begin = val.begin(), -+ boost::u32_to_u8_iterator begin = val.begin(), - end = val.end(); - for (; begin != end; ++begin) attr += *begin; - } diff --git a/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb b/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb index bda5177fc4..3c271ae5d1 100644 --- a/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb @@ -8,13 +8,13 @@ DESCRIPTION = "Modern C++ network programming libraries." SECTION = "libs" LICENSE = "BSL-1.0 & MIT & Python-2.0" LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -PV = "0.13.0" -SRCREV = "31d304cdf52b485f465ada433d8905171b61cbff" SRC_URI = "\ git://github.com/cpp-netlib/cpp-netlib.git;protocol=https;branch=0.13-release \ - file://a53f123040998744602f190944464af0e159ea19.patch \ " +SRC_URI[sha256sum] = "0b9255bb0668d89867a1f367d770f12d7038db4f5b6111774ef032f669cccad4" + +SRCREV = "ca95f04d140acf619892ee02a82e930dd91ff7d4" S = "${WORKDIR}/git" @@ -24,7 +24,3 @@ DEPENDS = "zlib boost openssl" EXTRA_OECMAKE:append = " -DCPP-NETLIB_BUILD_TESTS=OFF -DCPP-NETLIB_BUILD_EXAMPLES=OFF" -do_install:append() { - sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibConfig.cmake - sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibTargets-noconfig.cmake -} diff --git a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb index 36545503ed..1633412cf5 100644 --- a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb +++ b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste file://disable-float-tests.patch \ file://disable-outside-tests.patch " -# tag 2.10.18 +# tag 2.10.17 SRCREV= "122d09549201da5383321d870bed45ecb9e168c5" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/fftw/fftw/run-ptest b/meta-openembedded/meta-oe/recipes-support/fftw/fftw/run-ptest index 4d19057975..6d8dd96f02 100644 --- a/meta-openembedded/meta-oe/recipes-support/fftw/fftw/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/fftw/fftw/run-ptest @@ -10,18 +10,21 @@ cd ../fftwl /usr/bin/perl -w ./check.pl -r -c=30 -v `pwd`/benchl fftwl_result=$? +echo -n "fftw test result:" if [ $fftw_result = "0" ]; then - echo "PASS: fftw" + echo PASSED else - echo "FAIL: fftw" + echo FAILED fi +echo -n "fftwf test result:" if [ $fftwf_result = "0" ]; then - echo "PASS: fftwf" + echo PASSED else - echo "FAIL: fftwf" + echo FAILED fi +echo -n "fftwl test result:" if [ $fftwl_result = "0" ]; then - echo "PASS: fftwl" + echo PASSED else - echo "FAIL: fftwl" + echo FAILED fi diff --git a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch deleted file mode 100644 index ef9cc47d25..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch +++ /dev/null @@ -1,68 +0,0 @@ -From ca47ba3119365eafac0ab25a86cab9d9a1b29bd4 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 30 Sep 2023 06:38:53 +0100 -Subject: [PATCH] test: handle POSIX ioctl prototype - -glibc has the following prototype for ioctl: int ioctl(int fd, unsigned long request, ...) -POSIX (inc. musl) has the following for ioctl: int ioctl(int fd, int request, ...) - -Check which prototype is used in to avoid a conflict and conditionally -define the right one for the system. - -Bug: https://bugs.gentoo.org/914921 -Signed-off-by: Sam James -Upstream-Status: Backport [https://github.com/linux-nvme/libnvme/commit/ca47ba3119365eafac0ab25a86cab9d9a1b29bd4] ---- - meson.build | 10 ++++++++++ - test/ioctl/mock.c | 6 +++++- - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 6fcf1da..2c979cc 100644 ---- a/meson.build -+++ b/meson.build -@@ -230,6 +230,16 @@ conf.set( - ), - description: 'Is network address and service translation available' - ) -+conf.set( -+ 'HAVE_GLIBC_IOCTL', -+ cc.compiles( -+ '''#include -+ int ioctl(int fd, unsigned long request, ...); -+ ''', -+ name: 'ioctl has glibc-style prototype' -+ ), -+ description: 'Is ioctl the glibc interface (rather than POSIX)' -+) - - if cc.has_function_attribute('fallthrough') - conf.set('fallthrough', '__attribute__((__fallthrough__))') -diff --git a/test/ioctl/mock.c b/test/ioctl/mock.c -index e917244..5d2ac94 100644 ---- a/test/ioctl/mock.c -+++ b/test/ioctl/mock.c -@@ -114,7 +114,11 @@ void end_mock_cmds(void) - } \ - }) - -+#ifdef HAVE_GLIBC_IOCTL - int ioctl(int fd, unsigned long request, ...) -+#else -+int ioctl(int fd, int request, ...) -+#endif - { - struct mock_cmds *mock_cmds; - bool result64; -@@ -141,7 +145,7 @@ int ioctl(int fd, unsigned long request, ...) - result64 = true; - break; - default: -- fail("unexpected %s %lu", __func__, request); -+ fail("unexpected %s %lu", __func__, (unsigned long) request); - } - check(mock_cmds->remaining_cmds, - "unexpected %s command", mock_cmds->name); --- -2.40.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.5.bb b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.5.bb new file mode 100644 index 0000000000..4b6f1e30be --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.5.bb @@ -0,0 +1,22 @@ +SUMMARY = "libnvme development C library" +DESCRIPTION = "\ +libnvme provides type definitions for NVMe specification structures, \ +enumerations, and bit fields, helper functions to construct, dispatch, \ +and decode commands and payloads, and utilities to connect, scan, and \ +manage nvme devices on a Linux system." +HOMEPAGE = "https://github.com/linux-nvme/${BPN}" +SECTION = "libs" +LICENSE = "LGPL-2.1-only & CC0-1.0 & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ + file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" +DEPENDS = "json-c" +SRCREV = "4fea83db8328ea788ea8f1001e8ce1cb80ef5fae" + +SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +EXTRA_OEMESON += "-Dkeyutils=disabled -Dopenssl=disabled -Dpython=disabled" diff --git a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.6.bb b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.6.bb deleted file mode 100644 index 802edac508..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.6.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "libnvme development C library" -DESCRIPTION = "\ -libnvme provides type definitions for NVMe specification structures, \ -enumerations, and bit fields, helper functions to construct, dispatch, \ -and decode commands and payloads, and utilities to connect, scan, and \ -manage nvme devices on a Linux system." -HOMEPAGE = "https://github.com/linux-nvme/${BPN}" -SECTION = "libs" -LICENSE = "LGPL-2.1-only & CC0-1.0 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ - file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" -DEPENDS = "json-c" -SRCREV = "37a803cf77e224f66d86b1e1d9e74a15f55ea600" - -SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master \ - file://0001-test-handle-POSIX-ioctl-prototype.patch \ -" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig - -EXTRA_OEMESON += "-Dkeyutils=disabled -Dopenssl=disabled -Dpython=disabled" diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch deleted file mode 100644 index 536060cfd9..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch +++ /dev/null @@ -1,412 +0,0 @@ -From 5e4150826fea6f37276f348c65d94ce4847d1211 Mon Sep 17 00:00:00 2001 -From: Kumataro -Date: Sat, 7 Oct 2023 10:11:25 +0900 -Subject: [PATCH] 3rdparty: supporting protobuf v22 and later - -Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/24372] ---- - cmake/OpenCVFindProtobuf.cmake | 37 ++++++++++++++++++++++++++++++++++ - modules/dnn/CMakeLists.txt | 9 +++++++++ - 2 files changed, 46 insertions(+) - -diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake -index 8835347d1d..9bd5c28db8 100644 ---- a/cmake/OpenCVFindProtobuf.cmake -+++ b/cmake/OpenCVFindProtobuf.cmake -@@ -67,6 +67,38 @@ else() - endif() - endif() - -+# See https://github.com/opencv/opencv/issues/24369 -+# In Protocol Buffers v22.0 and later drops C++11 support and depends abseil-cpp. -+# Details: https://protobuf.dev/news/2022-08-03/ -+# And if std::text_view is in abseil-cpp requests C++17 and later. -+if(HAVE_PROTOBUF) -+ if("${Protobuf_VERSION}" MATCHES [[[0-9]+.([0-9]+).[0-9]+]]) -+ string(COMPARE GREATER_EQUAL "${CMAKE_MATCH_1}" "22" REQUEST_ABSL) -+ -+ if(REQUEST_ABSL) -+ string(COMPARE GREATER_EQUAL "${CMAKE_CXX_STANDARD}" "17" USED_AFTER_CXX17) -+ if(NOT USED_AFTER_CXX17) -+ message("CMAKE_CXX_STANDARD : ${CMAKE_CXX_STANDARD}") -+ message("protobuf : ${Protobuf_VERSION}") -+ message(FATAL_ERROR "protobuf(v22 and later) and abseil-cpp request CMAKE_CXX_STANDARD=17 and later.") -+ endif() -+ -+ ocv_check_modules(ABSL_STRINGS absl_strings) -+ if(NOT ABSL_STRINGS_FOUND) -+ message(FATAL_ERROR "protobuf(v22 and later) requests abseil-cpp(strings), but missing.") -+ endif() -+ -+ ocv_check_modules(ABSL_LOG absl_log) -+ if(NOT ABSL_LOG_FOUND) -+ message(FATAL_ERROR "protobuf(v22 and later) requests abseil-cpp(log), but missing.") -+ endif() -+ -+ endif() -+ else() -+ message(FATAL_ERROR "Protobuf version(${Protobuf_VERSION}) is unexpected to split.") -+ endif() -+endif() -+ - if(HAVE_PROTOBUF AND PROTOBUF_UPDATE_FILES AND NOT COMMAND PROTOBUF_GENERATE_CPP) - message(FATAL_ERROR "Can't configure protobuf dependency (BUILD_PROTOBUF=${BUILD_PROTOBUF} PROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES})") - endif() -@@ -89,3 +121,8 @@ if(HAVE_PROTOBUF) - BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})" - ELSE "${__location} (${Protobuf_VERSION})") - endif() -+ -+if(HAVE_ABSL_STRINGS AND HAVE_ABSL_LOG) -+ list(APPEND CUSTOM_STATUS absl) -+ list(APPEND CUSTOM_STATUS_absl " abseil-cpp:" "YES (${ABSL_STRINGS_VERSION})" ) -+endif() -diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt -index 804b78ead2..d32007b37e 100644 ---- a/modules/dnn/CMakeLists.txt -+++ b/modules/dnn/CMakeLists.txt -@@ -149,6 +149,15 @@ if(NOT BUILD_PROTOBUF) - list(APPEND include_dirs ${Protobuf_INCLUDE_DIRS}) - endif() - -+if(HAVE_ABSL_STRINGS) -+ list(APPEND libs ${ABSL_STRINGS_LIBRARIES}) -+ list(APPEND include_dirs ${ABSL_STRTRINGS_INCLUDE_DIRS}) -+endif() -+if(HAVE_ABSL_LOG) -+ list(APPEND libs ${ABSL_LOG_LIBRARIES}) -+ list(APPEND include_dirs ${ABSL_LOG_INCLUDE_DIRS}) -+endif() -+ - set(sources_options "") - - list(APPEND libs ${LAPACK_LIBRARIES}) -From 06a7669521d205f647d3e718322ccd153cdbbb77 Mon Sep 17 00:00:00 2001 -From: Kumataro -Date: Sun, 8 Oct 2023 09:39:35 +0900 -Subject: [PATCH] dnn: disable some tests for external protobuf - ---- - modules/dnn/CMakeLists.txt | 5 +++++ - modules/dnn/src/caffe/caffe_io.cpp | 24 ++++++++++++++++++++++-- - modules/dnn/test/test_layers.cpp | 16 ++++++++++++++++ - 3 files changed, 43 insertions(+), 2 deletions(-) - -diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt -index d32007b37e..face38465f 100644 ---- a/modules/dnn/CMakeLists.txt -+++ b/modules/dnn/CMakeLists.txt -@@ -254,6 +254,12 @@ ocv_create_module(${libs} ${dnn_runtime_libs}) - ocv_add_samples() - ocv_add_accuracy_tests(${dnn_runtime_libs}) - -+if(NOT BUILD_PROTOBUF) -+ if(TARGET opencv_test_dnn) -+ ocv_target_compile_definitions(opencv_test_dnn PRIVATE "OPENCV_DNN_EXTERNAL_PROTOBUF=1") -+ endif() -+endif() -+ - set(perf_path "${CMAKE_CURRENT_LIST_DIR}/perf") - file(GLOB_RECURSE perf_srcs "${perf_path}/*.cpp") - file(GLOB_RECURSE perf_hdrs "${perf_path}/*.hpp" "${perf_path}/*.h") -@@ -318,3 +322,4 @@ if(OPENCV_TEST_DNN_TFLITE) - ocv_target_compile_definitions(opencv_perf_dnn PRIVATE "OPENCV_TEST_DNN_TFLITE=1") - endif() - endif() -+ -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp -index ebecf95eea..ebceca84cf 100644 ---- a/modules/dnn/src/caffe/caffe_io.cpp -+++ b/modules/dnn/src/caffe/caffe_io.cpp -@@ -1130,7 +1130,17 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) { - parser.AllowUnknownField(true); - parser.SetRecursionLimit(1000); - #endif -- return parser.Parse(&input, proto); -+ const bool ret = parser.Parse(&input, proto); -+ -+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -+ if(!ret) -+ { -+ LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only)."; -+ CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only).")); -+ } -+#endif -+ -+ return ret; - } - - bool ReadProtoFromBinaryFile(const char* filename, Message* proto) { -@@ -1148,7 +1158,17 @@ bool ReadProtoFromTextBuffer(const char* data, size_t len, Message* proto) { - parser.AllowUnknownField(true); - parser.SetRecursionLimit(1000); - #endif -- return parser.Parse(&input, proto); -+ const bool ret = parser.Parse(&input, proto); -+ -+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -+ if(!ret) -+ { -+ LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only)."; -+ CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only).")); -+ } -+#endif -+ -+ return ret; - } - - -diff --git a/modules/dnn/test/test_layers.cpp b/modules/dnn/test/test_layers.cpp -index 763d94b99c..a07d442d76 100644 ---- a/modules/dnn/test/test_layers.cpp -+++ b/modules/dnn/test/test_layers.cpp -@@ -754,7 +754,11 @@ TEST_F(Layer_RNN_Test, get_set_test) - EXPECT_EQ(shape(outputs[1]), shape(nT, nS, nH)); - } - -+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF - TEST_P(Test_Caffe_layers, Accum) -+#else -+TEST_P(Test_Caffe_layers, DISABLED_Accum) // requires patched protobuf (available in OpenCV source tree only) -+#endif - { - if (backend == DNN_BACKEND_OPENCV && target != DNN_TARGET_CPU) - applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL, CV_TEST_TAG_DNN_SKIP_OPENCL_FP16); -@@ -778,7 +782,11 @@ TEST_P(Test_Caffe_layers, ChannelNorm) - testLayerUsingCaffeModels("channel_norm", false, false); - } - -+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF - TEST_P(Test_Caffe_layers, DataAugmentation) -+#else -+TEST_P(Test_Caffe_layers, DISABLED_DataAugmentation) // requires patched protobuf (available in OpenCV source tree only) -+#endif - { - if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16) - applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL_FP16); -@@ -787,7 +795,11 @@ TEST_P(Test_Caffe_layers, DataAugmentation) - testLayerUsingCaffeModels("data_augmentation_8x6", true, false); - } - -+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF - TEST_P(Test_Caffe_layers, Resample) -+#else -+TEST_P(Test_Caffe_layers, DISABLED_Resample) // requires patched protobuf (available in OpenCV source tree only) -+#endif - { - if (backend != DNN_BACKEND_OPENCV) - applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, CV_TEST_TAG_DNN_SKIP_IE_NGRAPH); -@@ -795,7 +807,11 @@ TEST_P(Test_Caffe_layers, Resample) - testLayerUsingCaffeModels("nearest", false, false); - } - -+#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF - TEST_P(Test_Caffe_layers, Correlation) -+#else -+TEST_P(Test_Caffe_layers, DISABLED_Correlation) // requires patched protobuf (available in OpenCV source tree only) -+#endif - { - if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16) - applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NGRAPH, CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, -From 2c33798f41942aefc203183d673ce4846f32dba4 Mon Sep 17 00:00:00 2001 -From: Kumataro -Date: Sun, 8 Oct 2023 13:28:40 +0900 -Subject: [PATCH] use GREATER instead of GREATER_EQUAL and remove new blank - line at EOF - ---- - cmake/OpenCVFindProtobuf.cmake | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake -index 9bd5c28db8..ba147526d6 100644 ---- a/cmake/OpenCVFindProtobuf.cmake -+++ b/cmake/OpenCVFindProtobuf.cmake -@@ -71,12 +71,14 @@ endif() - # In Protocol Buffers v22.0 and later drops C++11 support and depends abseil-cpp. - # Details: https://protobuf.dev/news/2022-08-03/ - # And if std::text_view is in abseil-cpp requests C++17 and later. -+ - if(HAVE_PROTOBUF) - if("${Protobuf_VERSION}" MATCHES [[[0-9]+.([0-9]+).[0-9]+]]) -- string(COMPARE GREATER_EQUAL "${CMAKE_MATCH_1}" "22" REQUEST_ABSL) -+ string(COMPARE GREATER "${CMAKE_MATCH_1}" "21" REQUEST_ABSL) # >=22 - - if(REQUEST_ABSL) -- string(COMPARE GREATER_EQUAL "${CMAKE_CXX_STANDARD}" "17" USED_AFTER_CXX17) -+ string(COMPARE GREATER "${CMAKE_CXX_STANDARD}" "16" USED_AFTER_CXX17) # >=17 -+ - if(NOT USED_AFTER_CXX17) - message("CMAKE_CXX_STANDARD : ${CMAKE_CXX_STANDARD}") - message("protobuf : ${Protobuf_VERSION}") -From cd709eefbeedd116bf3495b42280323b932791ff Mon Sep 17 00:00:00 2001 -From: Kumataro -Date: Mon, 9 Oct 2023 21:51:04 +0900 -Subject: [PATCH] fix for review - ---- - cmake/OpenCVFindProtobuf.cmake | 5 ---- - modules/dnn/src/caffe/caffe_io.cpp | 24 ++---------------- - modules/dnn/test/test_layers.cpp | 40 +++++++++++++++--------------- - 3 files changed, 22 insertions(+), 47 deletions(-) - -diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake -index ba147526d6..2faf1010bf 100644 ---- a/cmake/OpenCVFindProtobuf.cmake -+++ b/cmake/OpenCVFindProtobuf.cmake -@@ -123,8 +123,3 @@ if(HAVE_PROTOBUF) - BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})" - ELSE "${__location} (${Protobuf_VERSION})") - endif() -- --if(HAVE_ABSL_STRINGS AND HAVE_ABSL_LOG) -- list(APPEND CUSTOM_STATUS absl) -- list(APPEND CUSTOM_STATUS_absl " abseil-cpp:" "YES (${ABSL_STRINGS_VERSION})" ) --endif() -diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp -index ebceca84cf..ebecf95eea 100644 ---- a/modules/dnn/src/caffe/caffe_io.cpp -+++ b/modules/dnn/src/caffe/caffe_io.cpp -@@ -1130,17 +1130,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) { - parser.AllowUnknownField(true); - parser.SetRecursionLimit(1000); - #endif -- const bool ret = parser.Parse(&input, proto); -- --#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -- if(!ret) -- { -- LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only)."; -- CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only).")); -- } --#endif -- -- return ret; -+ return parser.Parse(&input, proto); - } - - bool ReadProtoFromBinaryFile(const char* filename, Message* proto) { -@@ -1158,17 +1148,7 @@ bool ReadProtoFromTextBuffer(const char* data, size_t len, Message* proto) { - parser.AllowUnknownField(true); - parser.SetRecursionLimit(1000); - #endif -- const bool ret = parser.Parse(&input, proto); -- --#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -- if(!ret) -- { -- LOG(ERROR) << "Some data requires patched protobuf (available in OpenCV source tree only)."; -- CV_Error_(Error::StsError,("Some data requires patched protobuf (available in OpenCV source tree only).")); -- } --#endif -- -- return ret; -+ return parser.Parse(&input, proto); - } - - -diff --git a/modules/dnn/test/test_layers.cpp b/modules/dnn/test/test_layers.cpp -index a07d442d76..5c6fc541d7 100644 ---- a/modules/dnn/test/test_layers.cpp -+++ b/modules/dnn/test/test_layers.cpp -@@ -754,17 +754,17 @@ TEST_F(Layer_RNN_Test, get_set_test) - EXPECT_EQ(shape(outputs[1]), shape(nT, nS, nH)); - } - --#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF - TEST_P(Test_Caffe_layers, Accum) --#else --TEST_P(Test_Caffe_layers, DISABLED_Accum) // requires patched protobuf (available in OpenCV source tree only) --#endif - { -+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -+ throw SkipTestException("Requires patched protobuf"); -+#else - if (backend == DNN_BACKEND_OPENCV && target != DNN_TARGET_CPU) - applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL, CV_TEST_TAG_DNN_SKIP_OPENCL_FP16); - - testLayerUsingCaffeModels("accum", false, false, 0.0, 0.0, 2); - testLayerUsingCaffeModels("accum_ref", false, false, 0.0, 0.0, 2); -+#endif - } - - TEST_P(Test_Caffe_layers, FlowWarp) -@@ -782,42 +782,42 @@ TEST_P(Test_Caffe_layers, ChannelNorm) - testLayerUsingCaffeModels("channel_norm", false, false); - } - --#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF - TEST_P(Test_Caffe_layers, DataAugmentation) --#else --TEST_P(Test_Caffe_layers, DISABLED_DataAugmentation) // requires patched protobuf (available in OpenCV source tree only) --#endif - { -+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -+ throw SkipTestException("Requires patched protobuf"); -+#else - if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16) - applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL_FP16); - testLayerUsingCaffeModels("data_augmentation", true, false); - testLayerUsingCaffeModels("data_augmentation_2x1", true, false); - testLayerUsingCaffeModels("data_augmentation_8x6", true, false); -+#endif - } - --#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF - TEST_P(Test_Caffe_layers, Resample) --#else --TEST_P(Test_Caffe_layers, DISABLED_Resample) // requires patched protobuf (available in OpenCV source tree only) --#endif - { -+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -+ throw SkipTestException("Requires patched protobuf"); -+#else - if (backend != DNN_BACKEND_OPENCV) - applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, CV_TEST_TAG_DNN_SKIP_IE_NGRAPH); - testLayerUsingCaffeModels("nearest_2inps", false, false, 0.0, 0.0, 2); - testLayerUsingCaffeModels("nearest", false, false); -+#endif - } - --#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF - TEST_P(Test_Caffe_layers, Correlation) --#else --TEST_P(Test_Caffe_layers, DISABLED_Correlation) // requires patched protobuf (available in OpenCV source tree only) --#endif - { -+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -+ throw SkipTestException("Requires patched protobuf"); -+#else - if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16) - applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NGRAPH, CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, - CV_TEST_TAG_DNN_SKIP_OPENCL, CV_TEST_TAG_DNN_SKIP_OPENCL_FP16); - testLayerUsingCaffeModels("correlation", false, false, 0.0, 0.0, 2); - } -+#endif - - TEST_P(Test_Caffe_layers, Convolution2Inputs) - { -@@ -1657,12 +1657,11 @@ private: - int outWidth, outHeight, zoomFactor; - }; - --#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF - TEST_P(Test_Caffe_layers, Interp) --#else --TEST_P(Test_Caffe_layers, DISABLED_Interp) // requires patched protobuf (available in OpenCV source tree only) --#endif - { -+#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF -+ throw SkipTestException("Requires patched protobuf"); -+#else - #if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000) - if (backend == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH && target == DNN_TARGET_MYRIAD) - applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_MYRIAD, CV_TEST_TAG_DNN_SKIP_IE_NGRAPH); // exception -@@ -1686,6 +1685,7 @@ TEST_P(Test_Caffe_layers, DISABLED_Interp) // requires patched protobuf (availa - - // Test an implemented layer. - testLayerUsingCaffeModels("layer_interp", false, false); -+#endif - } - - INSTANTIATE_TEST_CASE_P(/*nothing*/, Test_Caffe_layers, dnnBackendsAndTargets()); diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.8.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.8.0.bb index 85eb230b08..9564bbbe9d 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.8.0.bb @@ -31,7 +31,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=ht file://download.patch \ file://0001-Make-ts-module-external.patch \ file://0008-Do-not-embed-build-directory-in-binaries.patch \ - file://fix-build-with-protobuf-v22.patch \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" @@ -99,7 +98,7 @@ 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 -DCMAKE_CXX_STANDARD=17,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," +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," diff --git a/meta-openembedded/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch b/meta-openembedded/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch index c51fb1cfdb..3c364dcc4e 100644 --- a/meta-openembedded/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch +++ b/meta-openembedded/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch @@ -15,8 +15,6 @@ correctly and pv_in_foreground() returns also true in that case. Signed-off-by: Michael Weiß --- -Upstream-Status: Pending - src/pv/display.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch deleted file mode 100644 index 727c5a32fc..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b1b58f122a3e05b5689358fdd3203ba110cca567 Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Sun, 24 Sep 2023 22:20:42 +0200 -Subject: [PATCH] Reproducibility fix - -This fixes: -WARNING: udisks2-2.10.1-r0 do_package_qa: QA Issue: File /usr/lib/udisks2/modules/libudisks2_btrfs.so in package udisks2 contains reference to TMPDIR -File /usr/lib/udisks2/modules/libudisks2_lvm2.so in package udisks2 contains reference to TMPDIR -File /usr/libexec/udisks2/udisksd in package udisks2 contains reference to TMPDIR [buildpaths] - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Markus Volk ---- - modules/lvm2/Makefile.am | 2 +- - src/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/lvm2/Makefile.am b/modules/lvm2/Makefile.am -index 67b8aa6b3..e4ae462e7 100644 ---- a/modules/lvm2/Makefile.am -+++ b/modules/lvm2/Makefile.am -@@ -16,7 +16,7 @@ CPPFLAGS = \ - -DLVM_HELPER_DIR=\""$(prefix)/lib/udisks2/"\" \ - -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ - -DUDISKS_COMPILATION \ -- -DBUILD_DIR=\"$(abs_top_builddir)/\" \ -+ -DBUILD_DIR=\"/usr/src/\" \ - $(POLKIT_GOBJECT_1_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GIO_CFLAGS) \ -diff --git a/src/Makefile.am b/src/Makefile.am -index 5a174d1ab..0da3a497b 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -20,7 +20,7 @@ CPPFLAGS = \ - -DUDISKS_MODULE_DIR=\"$(libdir)/udisks2/modules\" \ - -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ - -DUDISKS_COMPILATION \ -- -DBUILD_DIR=\"$(abs_top_builddir)/\" \ -+ -DBUILD_DIR=\"/usr/src/\" \ - $(POLKIT_GOBJECT_1_CFLAGS) \ - $(GUDEV_CFLAGS) \ - $(GLIB_CFLAGS) \ --- -2.42.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb deleted file mode 100644 index cb1cbe670d..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY = "udisks provides dbus interfaces for disks and storage devices" -LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" - -DEPENDS = " \ - glib-2.0-native \ - libxslt-native \ - acl \ - libatasmart \ - polkit \ - libgudev \ - glib-2.0 \ - dbus-glib \ - libblockdev \ -" -DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -RDEPENDS:${PN} = "acl" - -SRC_URI = " \ - git://github.com/storaged-project/udisks.git;branch=2.10.x-branch;protocol=https \ - file://0001-Makefile.am-Dont-include-buildpath.patch \ -" -SRCREV = "18c9faf089e306ad6f3f51f5cb887a6b9aa08350" -S = "${WORKDIR}/git" - -CVE_PRODUCT = "udisks" - -inherit autotools-brokensep systemd gtk-doc gobject-introspection gettext features_check - -REQUIRED_DISTRO_FEATURES = "polkit" - -EXTRA_OECONF = "--disable-man --disable-gtk-doc" - -do_configure:prepend() { - # | configure.ac:656: error: required file 'build-aux/config.rpath' not found - mkdir -p ${S}/build-aux - touch ${S}/build-aux/config.rpath -} - -PACKAGECONFIG ?= "" - -PACKAGECONFIG[lvm2] = "--enable-lvm2,--disable-lvm2,lvm2" -PACKAGECONFIG[btrfs] = "--enable-btrfs,--disable-btrfs,,btrfs-tools" -PACKAGECONFIG[lsm] = "--enable-lsm,--disable-lsm,libstoragemgmt" - -FILES:${PN} += " \ - ${datadir}/dbus-1/ \ - ${datadir}/polkit-1 \ - ${datadir}/bash-completion \ - ${datadir}/zsh \ - ${libdir}/polkit-1/extensions/*.so \ - ${nonarch_base_libdir}/udev/* \ - ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ - ${systemd_system_unitdir} \ -" - -PACKAGES =+ "${PN}-libs" -FILES:${PN}-libs = "${libdir}/lib*${SOLIBS}" -FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" - -SYSTEMD_SERVICE:${PN} = "${BPN}.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb new file mode 100644 index 0000000000..2030063712 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb @@ -0,0 +1,59 @@ +SUMMARY = "udisks provides dbus interfaces for disks and storage devices" +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" + +DEPENDS = " \ + glib-2.0-native \ + libxslt-native \ + acl \ + libatasmart \ + polkit \ + libgudev \ + glib-2.0 \ + dbus-glib \ + libblockdev \ +" +DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +RDEPENDS:${PN} = "acl" + +SRC_URI = "git://github.com/storaged-project/udisks.git;branch=2.9.x-branch;protocol=https" +SRCREV = "001c486e6d099ed33e2de4f5c73c03e3ee180f81" +S = "${WORKDIR}/git" + +CVE_PRODUCT = "udisks" + +inherit autotools-brokensep systemd gtk-doc gobject-introspection gettext features_check + +REQUIRED_DISTRO_FEATURES = "polkit" + +EXTRA_OECONF = "--disable-man --disable-gtk-doc" + +do_configure:prepend() { + # | configure.ac:656: error: required file 'build-aux/config.rpath' not found + mkdir -p ${S}/build-aux + touch ${S}/build-aux/config.rpath +} + +PACKAGECONFIG ?= "" + +PACKAGECONFIG[lvm2] = "--enable-lvm2,--disable-lvm2,lvm2" +PACKAGECONFIG[btrfs] = "--enable-btrfs,--disable-btrfs,,btrfs-tools" +PACKAGECONFIG[lsm] = "--enable-lsm,--disable-lsm,libstoragemgmt" + +FILES:${PN} += " \ + ${datadir}/dbus-1/ \ + ${datadir}/polkit-1 \ + ${datadir}/bash-completion \ + ${libdir}/polkit-1/extensions/*.so \ + ${nonarch_base_libdir}/udev/* \ + ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ + ${systemd_system_unitdir} \ +" + +PACKAGES =+ "${PN}-libs" +FILES:${PN}-libs = "${libdir}/lib*${SOLIBS}" +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" + +SYSTEMD_SERVICE:${PN} = "${BPN}.service" +SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-vbox_fb-fix-kernel-v6.5-build.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-vbox_fb-fix-kernel-v6.5-build.patch deleted file mode 100644 index 01969d4a11..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-vbox_fb-fix-kernel-v6.5-build.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4cf34517b0c793405dca154cc70c9b5d1a566a8a Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Fri, 29 Sep 2023 14:52:50 -0400 -Subject: [PATCH] vbox_fb: fix kernel v6.5 build - -When building against the 6.5 kernel (and kernel headers), the following -build error is encountered: - - | vboxguestdrivers/7.0.10/vboxguestdrivers-7.0.10/vboxvideo/vbox_fb.c:194:24: error: 'drm_fb_helper_sys_fillrect' undeclared here (not in a function); did you mean 'drm_fb_helper_lastclose'? - | 194 | .fb_fillrect = drm_fb_helper_sys_fillrect, - | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ - | | drm_fb_helper_lastclose - | vboxguestdrivers/7.0.10/vboxguestdrivers-7.0.10/vboxvideo/vbox_fb.c:195:24: error: 'drm_fb_helper_sys_copyarea' undeclared here (not in a function); did you mean 'drm_fb_helper_set_par'? - | 195 | .fb_copyarea = drm_fb_helper_sys_copyarea, - | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ - | | drm_fb_helper_set_par - | vboxguestdrivers/7.0.10/vboxguestdrivers-7.0.10/vboxvideo/vbox_fb.c:196:25: error: 'drm_fb_helper_sys_imageblit' undeclared here (not in a function) - | 196 | .fb_imageblit = drm_fb_helper_sys_imageblit, - | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ - -We backport a patch from vbox-dev to fix the issue. - -Upstream-Status: Submitted [https://www.mail-archive.com/vbox-dev@virtualbox.org/msg10129.html] - -Signed-off-by: Bruce Ashfield ---- - src/VBox/Additions/linux/drm/vbox_fb.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/VBox/Additions/linux/drm/vbox_fb.c b/src/VBox/Additions/linux/drm/vbox_fb.c -index 2a8c79ab..d453533c 100644 ---- a/src/VBox/Additions/linux/drm/vbox_fb.c -+++ b/src/VBox/Additions/linux/drm/vbox_fb.c -@@ -196,9 +196,13 @@ static struct fb_ops vboxfb_ops = { - .owner = THIS_MODULE, - .fb_check_var = drm_fb_helper_check_var, - .fb_set_par = drm_fb_helper_set_par, -+#if RTLNX_VER_MIN(6, 5, 0) -+ FB_DEFAULT_SYS_OPS, -+#else - .fb_fillrect = drm_fb_helper_sys_fillrect, - .fb_copyarea = drm_fb_helper_sys_copyarea, - .fb_imageblit = drm_fb_helper_sys_imageblit, -+#endif - .fb_pan_display = drm_fb_helper_pan_display, - .fb_blank = drm_fb_helper_blank, - .fb_setcmap = drm_fb_helper_setcmap, --- -2.34.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb index 8e90138244..f193636524 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb @@ -13,7 +13,6 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ - file://0001-vbox_fb-fix-kernel-v6.5-build.patch \ " SRC_URI[sha256sum] = "0b1e6d8b7f87d017c7fae37f80586acff04f799ffc1d51e995954d6415dee371" diff --git a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch deleted file mode 100644 index c660baa1f7..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch +++ /dev/null @@ -1,21 +0,0 @@ -clang/arm: Do not use MUST_TAIL_CALL - -This causes clang-17 to crash see [1] -this code is new in webkit 2.42[2] thats why we do not see the crash in older webkit - -[1] https://github.com/llvm/llvm-project/issues/67767 -[2] https://github.com/WebKit/WebKit/commit/4d816460b765acd8aef90ab474615850b91ecc35 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- a/Source/WTF/wtf/Compiler.h -+++ b/Source/WTF/wtf/Compiler.h -@@ -284,7 +284,7 @@ - /* MUST_TAIL_CALL */ - - #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute) --#if __has_cpp_attribute(clang::musttail) -+#if __has_cpp_attribute(clang::musttail) && !defined(__arm__) - #define MUST_TAIL_CALL [[clang::musttail]] - #endif - #endif diff --git a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.0.bb b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.0.bb index f682cd9f03..5f94d32ee4 100644 --- a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.0.bb @@ -13,7 +13,6 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ file://reproducibility.patch \ file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ - file://no-musttail-arm.patch \ " SRC_URI[sha256sum] = "828f95935861fae583fb8f2ae58cf64c63c178ae2b7c2d6f73070813ad64ed1b" @@ -87,9 +86,6 @@ EXTRA_OECMAKE = " \ ${@bb.utils.contains('GIDOCGEN_ENABLED', 'True', '-DENABLE_DOCUMENTATION=ON', '-DENABLE_DOCUMENTATION=OFF', d)} \ -DENABLE_MINIBROWSER=ON \ " -# Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the -# debug symbols (4.3GB to 700M at time of writing) -DEBUG_FLAGS:append = "${@oe.utils.vartrue('DEBUG_BUILD', '', ' -g1', d)}" # Javascript JIT is not supported on ARC EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " diff --git a/meta-openembedded/meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb b/meta-openembedded/meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb index 1bcfb0a9bf..ed7a3f06af 100644 --- a/meta-openembedded/meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb +++ b/meta-openembedded/meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Linux firmware validation framework" DESCRIPTION = "Cukinia is designed to help Linux-based embedded firmware \ developers run simple system-level validation tests on their firmware." HOMEPAGE = "https://github.com/savoirfairelinux/cukinia" -LICENSE = "GPL-3.0-only | Apache-2.0" +LICENSE = "GPL-3.0-only & Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" diff --git a/meta-openembedded/meta-perl/files/static-group-meta-perl b/meta-openembedded/meta-perl/files/static-group-meta-perl deleted file mode 100644 index 7dd58bbbda..0000000000 --- a/meta-openembedded/meta-perl/files/static-group-meta-perl +++ /dev/null @@ -1 +0,0 @@ -logcheck:x:670: \ No newline at end of file diff --git a/meta-openembedded/meta-perl/files/static-passwd-meta-perl b/meta-openembedded/meta-perl/files/static-passwd-meta-perl deleted file mode 100644 index 7b3591ac50..0000000000 --- a/meta-openembedded/meta-perl/files/static-passwd-meta-perl +++ /dev/null @@ -1 +0,0 @@ -logcheck:x:670:670::/:/bin/nologin \ No newline at end of file diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-base.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-base.bb new file mode 100644 index 0000000000..2af10b218c --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-base.bb @@ -0,0 +1,7 @@ +SUMMARY = "meta-perl build test image" + +IMAGE_INSTALL = "packagegroup-core-boot" + +LICENSE = "MIT" + +inherit core-image diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-all.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-all.bb deleted file mode 100644 index c46cba21cd..0000000000 --- a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-all.bb +++ /dev/null @@ -1,5 +0,0 @@ -require recipes-core/images/core-image-base.bb - -SUMMARY = "meta-perl build test image" - -IMAGE_INSTALL += "packagegroup-meta-perl packagegroup-meta-perl-extended" diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb deleted file mode 100644 index e2cafa98a5..0000000000 --- a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Recipe to trigger execution of all meta-perl ptest images." -HOMEPAGE = "https://www.openembedded.org/" - -LICENSE = "MIT" - -inherit features_check nopackages -REQUIRED_DISTRO_FEATURES = "ptest" - -require conf/include/ptest-packagelists-meta-perl.inc - -# Include the full set of ptests -PTESTS_META_PERL = "${PTESTS_FAST_META_PERL} ${PTESTS_SLOW_META_PERL}" - -do_testimage[noexec] = "1" -do_testimage[depends] = "${@' '.join(['meta-perl-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PERL').split()])}" - -do_build[depends] = "${@' '.join(['meta-perl-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_PERL').split()])}" - -# normally image.bbclass would do this -EXCLUDE_FROM_WORLD = "1" - -python () { - if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): - bb.build.addtask("do_testimage", "", "", d) -} diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-fast.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-fast.bb deleted file mode 100644 index 1ac78f30b7..0000000000 --- a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-fast.bb +++ /dev/null @@ -1,6 +0,0 @@ -require meta-perl-image-ptest-all.bb - -DESCRIPTION = "Recipe to trigger execution of all fast meta-perl ptest images." - -PTESTS_META_PERL = "${PTESTS_FAST_META_PERL}" - diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest.bb deleted file mode 100644 index 7905977828..0000000000 --- a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest.bb +++ /dev/null @@ -1,40 +0,0 @@ -inherit features_check -REQUIRED_DISTRO_FEATURES += "ptest" - -SUMMARY = "meta-perl build ptest image" - -require recipes-core/images/core-image-minimal.bb -require conf/include/ptest-packagelists-meta-perl.inc - -DESCRIPTION += "Also including the ${MCNAME} ptest package." -HOMEPAGE = "https://www.openembedded.org/" - -PTESTS_META_PERL = "${PTESTS_SLOW_META_PERL} ${PTESTS_FAST_META_PERL}" - -IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" - -BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_PERL').split()])}" - -# The image can be sufficiently large (~1.8GB) that we need to be careful that it fits in a live -# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the -# box) and explicitly add up to 1500MB. -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "324288" -# If a particular ptest needs more space, it can be customized: -#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend- = "1024288" - -# ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" -# If a particular ptest needs more memory, it can be customized: -#QB_MEM:virtclass-mcextend- = "-m 4096" - -TEST_SUITES = "ping ssh parselogs ptest" - -# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places -PTEST_EXPECT_FAILURE = "1" - -python () { - if not d.getVar("MCNAME"): - raise bb.parse.SkipRecipe("No class extension set") -} - diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image.bb new file mode 100644 index 0000000000..b8d3a76e6a --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image.bb @@ -0,0 +1,5 @@ +require meta-perl-base.bb + +SUMMARY = "meta-perl build test image" + +IMAGE_INSTALL += "packagegroup-meta-perl packagegroup-meta-perl-extended" diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb new file mode 100644 index 0000000000..236043c22a --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Recipe to trigger execution of all meta-perl ptest images." +HOMEPAGE = "https://www.openembedded.org/" + +LICENSE = "MIT" + +inherit features_check nopackages +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-perl.inc + +# Include the full set of ptests +PTESTS_META_PERL = "${PTESTS_FAST_META_PERL} ${PTESTS_SLOW_META_PERL}" + +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['meta-perl-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PERL').split()])}" + +do_build[depends] = "${@' '.join(['meta-perl-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_PERL').split()])}" + +# normally image.bbclass would do this +EXCLUDE_FROM_WORLD = "1" + +python () { + if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): + bb.build.addtask("do_testimage", "", "", d) +} diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb new file mode 100644 index 0000000000..5d8afa08e7 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb @@ -0,0 +1,6 @@ +require meta-perl-ptest-all-image.bb + +DESCRIPTION = "Recipe to trigger execution of all fast meta-perl ptest images." + +PTESTS_META_PERL = "${PTESTS_FAST_META_PERL}" + diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-image.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-image.bb new file mode 100644 index 0000000000..7cca6402b2 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-image.bb @@ -0,0 +1,41 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES += "ptest" + +require meta-perl-base.bb + +SUMMARY = "meta-perl build ptest image" + +require conf/include/ptest-packagelists-meta-perl.inc + +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.openembedded.org/" + +PTESTS_META_PERL = "${PTESTS_SLOW_META_PERL} ${PTESTS_FAST_META_PERL}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_PERL').split()])}" + +# The image can be sufficiently large (~1.8GB) that we need to be careful that it fits in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add up to 1500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +# If a particular ptest needs more space, it can be customized: +#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend- = "1024288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +# If a particular ptest needs more memory, it can be customized: +#QB_MEM:virtclass-mcextend- = "-m 4096" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} + diff --git a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.083.bb b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.083.bb index 4d793a4e32..8ae5c0e68d 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.083.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.083.bb @@ -38,7 +38,7 @@ do_install:append () { } RDEPENDS:${PN}-ptest += "\ - libnet-idn-encode \ + libnet-libidn-perl \ liburi-perl \ perl-module-file-glob \ perl-module-findbin \ diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-idn-encode_2.500.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-idn-encode_2.500.bb deleted file mode 100644 index ce3b75b774..0000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-idn-encode_2.500.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "IDN Perl module" -DESCRIPTION = "This module provides an easy-to-use interface for encoding \ - and decoding Internationalized Domain Names (IDNs)." - -SECTION = "libs" - -LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8ea5704cf65ca4ec6e9e167fb94f14dd" - -SRC_URI = "${CPAN_MIRROR}/authors/id/C/CF/CFAERBER/Net-IDN-Encode-${PV}.tar.gz" -SRC_URI[sha256sum] = "55453633e3ff24ce325b34bc2c8157b9859962a31ab5cf28bf7ccc1c9b3a3eaa" - -S = "${WORKDIR}/Net-IDN-Encode-${PV}" - -inherit cpan ptest-perl - -do_configure:prepend() { - perl -pi -e 's/auto_install_now.*//g' Makefile.PL -} - -BBCLASSEXTEND = "native" - -RDEPENDS:${PN} += "perl-module-unicode-normalize" diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-all.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-all.bb deleted file mode 100644 index fbe3efc600..0000000000 --- a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-all.bb +++ /dev/null @@ -1,5 +0,0 @@ -require recipes-core/images/core-image-base.bb - -SUMMARY = "meta-python build test image" - -IMAGE_INSTALL += "packagegroup-meta-python3" diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-base.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-base.bb new file mode 100644 index 0000000000..81081e61b2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-base.bb @@ -0,0 +1,7 @@ +SUMMARY = "meta-python build test image" + +IMAGE_INSTALL = "packagegroup-core-boot" + +LICENSE = "MIT" + +inherit core-image diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-all.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-all.bb deleted file mode 100644 index 56c392f036..0000000000 --- a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-all.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Recipe to trigger execution of all meta-python ptest images." -HOMEPAGE = "https://www.openembedded.org/" - -LICENSE = "MIT" - -inherit features_check nopackages -REQUIRED_DISTRO_FEATURES = "ptest" - -require conf/include/ptest-packagelists-meta-python.inc - -# Include the full set of ptests -PTESTS_META_PYTHON = "${PTESTS_FAST_META_PYTHON} ${PTESTS_SLOW_META_PYTHON}" - -do_testimage[noexec] = "1" -do_testimage[depends] = "${@' '.join(['meta-python-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PYTHON').split()])}" - -do_build[depends] = "${@' '.join(['meta-python-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_PYTHON').split()])}" - -# normally image.bbclass would do this -EXCLUDE_FROM_WORLD = "1" - -python () { - if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): - bb.build.addtask("do_testimage", "", "", d) -} diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-fast.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-fast.bb deleted file mode 100644 index bb6e8213fe..0000000000 --- a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-fast.bb +++ /dev/null @@ -1,6 +0,0 @@ -require meta-python-image-ptest-all.bb - -DESCRIPTION = "Recipe to trigger execution of all fast meta-python ptest images." - -PTESTS_META_PYTHON = "${PTESTS_FAST_META_PYTHON}" - diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest.bb deleted file mode 100644 index fed676c42e..0000000000 --- a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest.bb +++ /dev/null @@ -1,40 +0,0 @@ -inherit features_check -REQUIRED_DISTRO_FEATURES = "ptest" - -require recipes-core/images/core-image-minimal.bb -require conf/include/ptest-packagelists-meta-python.inc - -SUMMARY = "meta-python ptest test image" - -DESCRIPTION += "Also including the ${MCNAME} ptest package." -HOMEPAGE = "https://www.openembedded.org/" - -PTESTS_META_PYTHON = "${PTESTS_SLOW_META_PYTHON} ${PTESTS_FAST_META_PYTHON}" - -IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" - -BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_PYTHON').split()])}" - -# The image can be sufficiently large (~1.8GB) that we need to be careful that it fits in a live -# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the -# box) and explicitly add up to 1500MB. -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "324288" -# If a particular ptest needs more space, it can be customized: -#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend- = "1024288" - -# ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" -# If a particular ptest needs more memory, it can be customized: -#QB_MEM:virtclass-mcextend- = "-m 4096" - -TEST_SUITES = "ping ssh parselogs ptest" - -# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places -PTEST_EXPECT_FAILURE = "1" - -python () { - if not d.getVar("MCNAME"): - raise bb.parse.SkipRecipe("No class extension set") -} - diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-image.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-image.bb new file mode 100644 index 0000000000..6353d389b5 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-core/images/meta-python-image.bb @@ -0,0 +1,5 @@ +require meta-python-image-base.bb + +SUMMARY = "meta-python build test image" + +IMAGE_INSTALL += "packagegroup-meta-python3" diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-all-image.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-all-image.bb new file mode 100644 index 0000000000..fd4dc42487 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-all-image.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Recipe to trigger execution of all meta-python ptest images." +HOMEPAGE = "https://www.openembedded.org/" + +LICENSE = "MIT" + +inherit features_check nopackages +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-python.inc + +# Include the full set of ptests +PTESTS_META_PYTHON = "${PTESTS_FAST_META_PYTHON} ${PTESTS_SLOW_META_PYTHON}" + +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['meta-python-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PYTHON').split()])}" + +do_build[depends] = "${@' '.join(['meta-python-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_PYTHON').split()])}" + +# normally image.bbclass would do this +EXCLUDE_FROM_WORLD = "1" + +python () { + if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): + bb.build.addtask("do_testimage", "", "", d) +} diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-fast-image.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-fast-image.bb new file mode 100644 index 0000000000..4f93a15959 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-fast-image.bb @@ -0,0 +1,6 @@ +require meta-python-ptest-all-image.bb + +DESCRIPTION = "Recipe to trigger execution of all fast meta-python ptest images." + +PTESTS_META_PYTHON = "${PTESTS_FAST_META_PYTHON}" + diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-image.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-image.bb new file mode 100644 index 0000000000..a649cbb94c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-image.bb @@ -0,0 +1,41 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-python.inc + +require meta-python-image-base.bb + +SUMMARY = "meta-python ptest test image" + +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.openembedded.org/" + +PTESTS_META_PYTHON = "${PTESTS_SLOW_META_PYTHON} ${PTESTS_FAST_META_PYTHON}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_PYTHON').split()])}" + +# The image can be sufficiently large (~1.8GB) that we need to be careful that it fits in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add up to 1500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +# If a particular ptest needs more space, it can be customized: +#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend- = "1024288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +# If a particular ptest needs more memory, it can be customized: +#QB_MEM:virtclass-mcextend- = "-m 4096" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} + diff --git a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 3b9a0f0481..f75007e13e 100644 --- a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -360,6 +360,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-python-vlc \ python3-pytoml \ python3-pytun \ + python3-pytz-deprecation-shim \ python3-pyudev \ python3-pyusb \ python3-pywbem \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-idna-ssl.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-idna-ssl.inc new file mode 100644 index 0000000000..356a3873ee --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-idna-ssl.inc @@ -0,0 +1,15 @@ +SUMMARY = "Patch ssl.match_hostname for Unicode(idna) domains support" +HOMEPAGE = "https://github.com/aio-libs/idna-ssl" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a61b9c5aec8796b64a6bf15d42605073" + +SRC_URI[md5sum] = "dd44ec53bac36e68446766fd8d3835bd" +SRC_URI[sha256sum] = "a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c" + +PYPI_PACKAGE = "idna-ssl" +inherit pypi + +RDEPENDS:${PN} += " \ + python3-idna \ + python3-io \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-apiflask_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-apiflask_2.0.1.bb new file mode 100644 index 0000000000..ad946470ea --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-apiflask_2.0.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "APIFlask is a lightweight Python web API framework based on Flask and marshmallow-code projects." +HOMEPAGE = "https://github.com/apiflask/apiflask" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5f89d1b0dec37448d4f4163dc3c40e64" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "APIFlask" + +SRC_URI[sha256sum] = "7ffe29e082c6cc76d8ae78ba2445b5fcd69092fac04f4f8cd23b1c887cb291cc" + +RDEPENDS:${PN} += "\ + python3-flask \ + python3-flask-marshmallow \ + python3-webargs \ + python3-flask-httpauth \ + python3-apispec \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-apiflask_2.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-apiflask_2.0.2.bb deleted file mode 100644 index 88afdda717..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-apiflask_2.0.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "APIFlask is a lightweight Python web API framework based on Flask and marshmallow-code projects." -HOMEPAGE = "https://github.com/apiflask/apiflask" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5f89d1b0dec37448d4f4163dc3c40e64" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "APIFlask" - -SRC_URI[sha256sum] = "c1ab81640a1ab252888e2cc7ae556272a169b449c582abae309a8fe295f9337d" - -RDEPENDS:${PN} += "\ - python3-flask \ - python3-flask-marshmallow \ - python3-webargs \ - python3-flask-httpauth \ - python3-apispec \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.29.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.29.3.bb new file mode 100644 index 0000000000..93e0a84eea --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.29.3.bb @@ -0,0 +1,26 @@ +SUMMARY = "An unobtrusive argparse wrapper with natural syntax" +DESCRIPTION = "Building a command-line interface? Found yourself uttering \ +'argh!' while struggling with the API of argparse? Don't like the complexity \ +but need the power? \ +\ +Everything should be made as simple as possible, but no simpler. \ +\ +—Albert Einstein (probably) \ +\ +Argh is a smart wrapper for argparse. Argparse is a very powerful \ +tool; Argh just makes it easy to use." + +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ + file://README.rst;beginline=261;endline=275;md5=a8bf3475df7e0d575a53d04c83d5e090" + +SRC_URI[sha256sum] = "58e438ce9169aaa2e6de147e3ceb34ceacfe26556a2306f50e2d46f52779acb1" + +inherit pypi python_flit_core + +RDEPENDS:${PN} += " \ + python3-argcomplete \ + python3-logging \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.29.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.29.4.bb deleted file mode 100644 index f67ac9d6c6..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.29.4.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "An unobtrusive argparse wrapper with natural syntax" -DESCRIPTION = "Building a command-line interface? Found yourself uttering \ -'argh!' while struggling with the API of argparse? Don't like the complexity \ -but need the power? \ -\ -Everything should be made as simple as possible, but no simpler. \ -\ -—Albert Einstein (probably) \ -\ -Argh is a smart wrapper for argparse. Argparse is a very powerful \ -tool; Argh just makes it easy to use." - -LICENSE = "LGPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ - file://README.rst;beginline=261;endline=275;md5=a8bf3475df7e0d575a53d04c83d5e090" - -SRC_URI[sha256sum] = "695c0ae4534270cae2697841b4a56f434a990694a00264ea10ebbbcdc02c13f7" - -inherit pypi python_flit_core - -RDEPENDS:${PN} += " \ - python3-argcomplete \ - python3-logging \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.15.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.15.6.bb new file mode 100644 index 0000000000..7325eb13f3 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.15.6.bb @@ -0,0 +1,35 @@ +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] = "903f024859b7c7687d7a7f3a3f73b17301f8e42dfd9cc9df9d4418172d3e2dbd" + +inherit pypi python_setuptools_build_meta + +DEPENDS += "\ + ${PYTHON_PN}-pytest-runner-native \ + ${PYTHON_PN}-wheel-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_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.0.0.bb deleted file mode 100644 index 2f80187b2b..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.0.0.bb +++ /dev/null @@ -1,36 +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] = "1defdbca052635dd29657ea674edfc45e4b5be9cd53630c5b084fcfed94344a8" - -inherit pypi python_setuptools_build_meta - -DEPENDS += "\ - ${PYTHON_PN}-pytest-runner-native \ - ${PYTHON_PN}-wheel-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 \ - ${PYTHON_PN}-typing-extensions \ -" - -RDEPENDS:${PN}-tests:class-target += "\ - ${PYTHON_PN}-unittest \ - ${PYTHON_PN}-xml \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-async-timeout_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-async-timeout_4.0.0.bb new file mode 100644 index 0000000000..ca61490fac --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-async-timeout_4.0.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "asyncio-compatible timeout context manager" +DESCRIPTION = "\ +The context manager is useful in cases when you want to apply \ +timeout logic around block of code or in cases when asyncio.wait_for() \ +is not suitable. Also it's much faster than asyncio.wait_for() because \ +timeout doesn't create a new task." +HOMEPAGE = "https://github.com/aio-libs/async-timeout" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4fa41f15bb5f23b6d3560c5845eb8d57" + +SRC_URI[sha256sum] = "7d87a4e8adba8ededb52e579ce6bc8276985888913620c935094c2276fd83382" + +PYPI_PACKAGE = "async-timeout" +inherit pypi setuptools3 + +RDEPENDS:${PN} = "\ + ${PYTHON_PN}-asyncio \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-booleanpy_4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-booleanpy_4.0.bb new file mode 100644 index 0000000000..41fd3d960a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-booleanpy_4.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Define boolean algebras, create and parse boolean expressions and create custom boolean DSL" +HOMEPAGE = "https://github.com/bastikr/boolean.py" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d118b5feceee598ebeca76e13395c2bd" + +SRC_URI[sha256sum] = "17b9a181630e43dde1851d42bef546d616d5d9b4480357514597e78b203d06e4" + +PYPI_PACKAGE = "boolean.py" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachecontrol_0.13.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachecontrol_0.13.1.bb index b4c90bcffd..535bac0e3e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachecontrol_0.13.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachecontrol_0.13.1.bb @@ -7,9 +7,6 @@ SRC_URI[sha256sum] = "f012366b79d2243a6118309ce73151bf52a38d4a5dac8ea57f09bd2908 inherit pypi python_poetry_core -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/CacheControl/" -UPSTREAM_CHECK_REGEX = "/CacheControl/(?P(\d+[\.\-_]*)+)" - RDEPENDS:${PN} += "\ python3-crypt \ python3-datetime \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-click/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-click/run-ptest new file mode 100644 index 0000000000..b63c4de0d9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-click/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.1.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.1.7.bb new file mode 100644 index 0000000000..a4ec6cd1ef --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.1.7.bb @@ -0,0 +1,39 @@ +SUMMARY = "A simple wrapper around optparse for powerful command line utilities." +DESCRIPTION = "\ +Click is a Python package for creating beautiful command line interfaces \ +in a composable way with as little code as necessary. It's the "Command \ +Line Interface Creation Kit". It's highly configurable but comes with \ +sensible defaults out of the box." +HOMEPAGE = "http://click.pocoo.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=1fa98232fd645608937a0fdc82e999b8" + +SRC_URI[sha256sum] = "ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" + +inherit pypi setuptools3 ptest + +SRC_URI += "file://run-ptest" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-terminal \ + ${PYTHON_PN}-unixadmin \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/setup.cfg ${D}${PTEST_PATH}/ + cp -rf ${S}/docs ${D}${PTEST_PATH}/ +} + +UPSTREAM_CHECK_REGEX = "click/(?P\d+(\.\d+)+)/" + +CLEANBROKEN = "1" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-threading \ + " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_2.0.0.bb new file mode 100644 index 0000000000..657c190ec5 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_2.0.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "i18n and l10n support for Flask based on babel and pytz" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=51917f3e8e858f5ae295a7d0e2eb3cc9" + +SRC_URI[md5sum] = "50d5e92d96ef58787bf85b5a1b0a5567" +SRC_URI[sha256sum] = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d" + +PYPI_PACKAGE = "Flask-Babel" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-speaklater \ + ${PYTHON_PN}-babel \ + ${PYTHON_PN}-flask \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_3.1.0.bb deleted file mode 100644 index 610c40f84d..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_3.1.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "i18n and l10n support for Flask based on babel and pytz" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=51917f3e8e858f5ae295a7d0e2eb3cc9" - -SRC_URI[sha256sum] = "be015772c5d7f046f3b99c508dcf618636eb93d21b713b356db79f3e79f69f39" - -PYPI_PACKAGE = "flask_babel" - -inherit pypi python_poetry_core - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-speaklater \ - ${PYTHON_PN}-babel \ - ${PYTHON_PN}-flask \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb deleted file mode 100644 index 1d0d86b4e7..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -HOMEPAGE = "https://pypi.python.org/pypi/Flask-Cors/" -SUMMARY = "A Flask extension adding a decorator for CORS support" -DESCRIPTION = "\ - A Flask extension for handling Cross Origin Resource Sharing (CORS), making cross-origin AJAX possible \ - " -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=118fecaa576ab51c1520f95e98db61ce" - -PYPI_PACKAGE = "Flask-Cors" - -SRC_URI[sha256sum] = "f268522fcb2f73e2ecdde1ef45e2fd5c71cc48fe03cffb4b441c6d1b40684eb0" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += "python3-flask" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.3.2.bb new file mode 100644 index 0000000000..c4c1ff7dec --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.3.2.bb @@ -0,0 +1,24 @@ +SUMMARY = "A microframework based on Werkzeug, Jinja2 and good intentions" +DESCRIPTION = "\ +Flask is a microframework for Python based on Werkzeug, Jinja 2 and good \ +intentions. And before you ask: It’s BSD licensed!" +HOMEPAGE = "https://github.com/mitsuhiko/flask/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" + +SRC_URI[sha256sum] = "8c2f9abd47a9e8df7f0c3f091ce9497d011dc3b31effcf4c85a6e2b50f4114ef" + +PYPI_PACKAGE = "Flask" + +inherit pypi python_setuptools_build_meta + +CLEANBROKEN = "1" + +RDEPENDS:${PN} = " \ + ${PYTHON_PN}-blinker \ + ${PYTHON_PN}-click \ + ${PYTHON_PN}-itsdangerous \ + ${PYTHON_PN}-jinja2 \ + ${PYTHON_PN}-profile \ + ${PYTHON_PN}-werkzeug \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.3.3.bb deleted file mode 100644 index c8c8d870ac..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.3.3.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A microframework based on Werkzeug, Jinja2 and good intentions" -DESCRIPTION = "\ -Flask is a microframework for Python based on Werkzeug, Jinja 2 and good \ -intentions. And before you ask: It’s BSD licensed!" -HOMEPAGE = "https://github.com/mitsuhiko/flask/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" - -SRC_URI[sha256sum] = "09c347a92aa7ff4a8e7f3206795f30d826654baf38b873d0744cd571ca609efc" - -inherit pypi python_setuptools_build_meta - -CLEANBROKEN = "1" - -RDEPENDS:${PN} = " \ - ${PYTHON_PN}-blinker \ - ${PYTHON_PN}-click \ - ${PYTHON_PN}-itsdangerous \ - ${PYTHON_PN}-jinja2 \ - ${PYTHON_PN}-profile \ - ${PYTHON_PN}-werkzeug \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.11.1.bb new file mode 100644 index 0000000000..de2bd3d12d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.11.1.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Google API client core library" +HOMEPAGE = "https://github.com/googleapis/python-api-core" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "25d29e05a0058ed5f19c61c0a78b1b53adea4d9364b464d014fbda941f6d1c9a" + +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.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.12.0.bb deleted file mode 100644 index 28c6a7989c..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.12.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Google API client core library" -HOMEPAGE = "https://github.com/googleapis/python-api-core" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "c22e01b1e3c4dcd90998494879612c38d0a3411d1f7b679eb89e2abe3ce1f553" - -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.100.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.100.0.bb new file mode 100644 index 0000000000..1c6253a83a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.100.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] = "eaed50efc2f8a4027dcca8fd0037f4b1b03b8093efc84ce3cb6c75bfc79a7e31" + +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.101.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.101.0.bb deleted file mode 100644 index 495a37444d..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.101.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] = "e9620a809251174818e1fce16604006f10a9c2ac0d3d94a139cdddcd4dbea2d8" - -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.23.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.23.0.bb new file mode 100644 index 0000000000..f7fb76b3f6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.23.0.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Google Authentication Library" +HOMEPAGE = "https://github.com/googleapis/google-auth-library-python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "753a26312e6f1eaeec20bc6f2644a10926697da93446e1f8e24d6d32d45a922a" + +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.23.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.23.1.bb deleted file mode 100644 index a3228be231..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.23.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Google Authentication Library" -HOMEPAGE = "https://github.com/googleapis/google-auth-library-python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "d38bdf4fa1e7c5a35e574861bce55784fd08afadb4e48f99f284f1e487ce702d" - -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-idna-ssl_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna-ssl_1.1.0.bb index 503b79d667..3643fcfd30 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-idna-ssl_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna-ssl_1.1.0.bb @@ -1,17 +1,2 @@ -SUMMARY = "Patch ssl.match_hostname for Unicode(idna) domains support" -HOMEPAGE = "https://github.com/aio-libs/idna-ssl" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a61b9c5aec8796b64a6bf15d42605073" - -SRC_URI[sha256sum] = "a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c" - -PYPI_PACKAGE = "idna-ssl" -inherit pypi setuptools3 - -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/idna_ssl/" -UPSTREAM_CHECK_REGEX = "/idna_ssl/(?P(\d+[\.\-_]*)+)" - -RDEPENDS:${PN} += " \ - python3-idna \ - python3-io \ -" +inherit setuptools3 +require python-idna-ssl.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isodate_0.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isodate_0.6.1.bb new file mode 100644 index 0000000000..c65083b777 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-isodate_0.6.1.bb @@ -0,0 +1,14 @@ +SUMMARY = "ISO 8601 date/time parser" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" + +SRC_URI[sha256sum] = "48c5881de7e8b0a0d648cb024c8062dc84e7b840ed81e864c7614fd3c127bde9" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-numbers \ + python3-six \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression/run-ptest new file mode 100644 index 0000000000..5cec711696 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.1.1.bb new file mode 100644 index 0000000000..31fb88d6e5 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.1.1.bb @@ -0,0 +1,36 @@ +SUMMARY = "Utility library to parse, compare, simplify and normalize license expressions" +HOMEPAGE = "https://github.com/nexB/license-expression" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://apache-2.0.LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRC_URI[sha256sum] = "42375df653ad85e6f5b4b0385138b2dbea1f5d66360783d8625c3e4f97f11f0c" + +inherit pypi ptest python_setuptools_build_meta + +DEPENDS += "${PYTHON_PN}-setuptools-scm-native" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-booleanpy \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-stringold \ + ${PYTHON_PN}-logging \ +" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -d ${D}${PTEST_PATH}/src + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + cp -rf ${S}/src/* ${D}${PTEST_PATH}/src/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4/run-ptest index 8d2017d39c..1b245bcd8f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest --automake +pytest -v diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_4.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_4.3.2.bb index f0c8684b0d..9d31ab68c2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_4.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_4.3.2.bb @@ -22,7 +22,6 @@ RDEPENDS:${PN}-ptest += "\ python3-pytest-runner \ python3-multiprocessing \ python3-psutil \ - python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb deleted file mode 100644 index 7d5292745b..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Python binding to the Networking and Cryptography (NaCl) library" -HOMEPAGE = "https://github.com/pyca/pynacl" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8cc789b082b3d97e1ccc5261f8594d3f" - -PYPI_PACKAGE = "PyNaCl" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba" - -DEPENDS += "\ - libsodium \ - python3-cffi-native \ - python3-pip-native \ -" - -RDEPENDS:${PN}:class-target += " \ - python3-cffi \ - python3-pycparser \ -" - -export SODIUM_INSTALL = "system" - -BBCLASSEXTEND = "native" \ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb index ec7747307d..9a6326f37d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb @@ -8,5 +8,3 @@ SRC_URI[sha256sum] = "342dc97b9e88a6495bae22953ee6063f91d2f03db6f727b62ba5c3092a inherit pypi setuptools3 PYPI_PACKAGE = "ninja_syntax" -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/ninja_syntax/" -UPSTREAM_CHECK_REGEX = "/ninja_syntax/(?P(\d+[\.\-_]*)+)" \ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.5.2.bb new file mode 100644 index 0000000000..7eebbfb503 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.5.2.bb @@ -0,0 +1,30 @@ +SUMMARY = "Simplifies building parse types based on the parse module" +HOMEPAGE = "https://github.com/jenisys/parse_type" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=16374dbaeaca1890153edb3f41371222" + +SRC_URI[md5sum] = "b954062f14ab723a91fe1e2be15e859d" +SRC_URI[sha256sum] = "7f690b18d35048c15438d6d0571f9045cffbec5907e0b1ccf006f889e3a38c0b" + +PYPI_PACKAGE = "parse_type" +inherit pypi ptest setuptools3 + +RDEPENDS:${PN} += "${PYTHON_PN}-parse ${PYTHON_PN}-six" + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_configure:prepend() { + sed -i -e "/python_version >= 3.0/d" ${S}/setup.py + sed -i -e "/use_2to3/d" ${S}/setup.py +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.6.2.bb deleted file mode 100644 index 99493db322..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.6.2.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Simplifies building parse types based on the parse module" -HOMEPAGE = "https://github.com/jenisys/parse_type" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2e469278ace89c246d52505acc39c3da" - -SRC_URI[sha256sum] = "79b1f2497060d0928bc46016793f1fca1057c4aacdf15ef876aa48d75a73a355" - -PYPI_PACKAGE = "parse_type" -inherit pypi ptest setuptools3 - -RDEPENDS:${PN} += "${PYTHON_PN}-parse" - -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/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.6.0.bb new file mode 100644 index 0000000000..0c0692b144 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.6.0.bb @@ -0,0 +1,46 @@ +SUMMARY = "Python library for displaying tabular data in a ASCII table format" +HOMEPAGE = "http://code.google.com/p/prettytable" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=c9a6829fcd174d9535b46211917c7671" + +SRC_URI[sha256sum] = "2e0026af955b4ea67b22122f310b90eae890738c08cb0458693a49b6221530ac" + +do_install:append() { + perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "*.txt" -o -name "PKG-INFO"` + for f in $perm_files; do + chmod 644 "${f}" + done +} + +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/PrettyTable/" +UPSTREAM_CHECK_REGEX = "/PrettyTable/(?P(\d+[\.\-_]*)+)" + +BBCLASSEXTEND = "native nativesdk" +inherit pypi ptest python_hatchling + +SRC_URI += " \ + file://run-ptest \ +" + +DEPENDS += "\ + ${PYTHON_PN}-hatch-vcs-native \ +" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-math \ + ${PYTHON_PN}-html \ + ${PYTHON_PN}-wcwidth \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-importlib-metadata \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-pytest-lazy-fixture \ + ${PYTHON_PN}-sqlite3 \ +" + +do_install_ptest() { + cp -f ${S}/tests/test_prettytable.py ${D}${PTEST_PATH}/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb deleted file mode 100644 index c1e394d9b3..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Python library for displaying tabular data in a ASCII table format" -HOMEPAGE = "http://code.google.com/p/prettytable" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c9a6829fcd174d9535b46211917c7671" - -SRC_URI[sha256sum] = "f4ed94803c23073a90620b201965e5dc0bccf1760b7a7eaf3158cab8aaffdf34" - -do_install:append() { - perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "*.txt" -o -name "PKG-INFO"` - for f in $perm_files; do - chmod 644 "${f}" - done -} - -BBCLASSEXTEND = "native nativesdk" -inherit pypi ptest python_hatchling - -SRC_URI += " \ - file://run-ptest \ -" - -DEPENDS += "\ - ${PYTHON_PN}-hatch-vcs-native \ -" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-wcwidth \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-importlib-metadata \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytest-lazy-fixture \ - ${PYTHON_PN}-sqlite3 \ -" - -do_install_ptest() { - cp -f ${S}/tests/test_prettytable.py ${D}${PTEST_PATH}/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.8.bb new file mode 100644 index 0000000000..d6a2749c24 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.8.bb @@ -0,0 +1,29 @@ +SUMMARY = "A collection of ASN.1-based protocols modules." +DESCRIPTION = "A collection of ASN.1 modules expressed in form of pyasn1\ + classes. Includes protocols PDUs definition (SNMP, LDAP etc.) and various\ + data structures (X.509, PKCS etc.)." +HOMEPAGE = "https://github.com/etingof/pyasn1-modules" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a14482d15c2249de3b6f0e8a47e021fd" + +SRC_URI[md5sum] = "107e1ece7d0a41d782f69f8a95a4d9bc" +SRC_URI[sha256sum] = "905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e" + +inherit pypi ptest setuptools3 + +RDEPENDS:${PN} = "${PYTHON_PN}-pyasn1" + +BBCLASSEXTEND = "native nativesdk" + +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/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.3.0.bb deleted file mode 100644 index d158876fcd..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.3.0.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "A collection of ASN.1-based protocols modules." -DESCRIPTION = "A collection of ASN.1 modules expressed in form of pyasn1\ - classes. Includes protocols PDUs definition (SNMP, LDAP etc.) and various\ - data structures (X.509, PKCS etc.)." -HOMEPAGE = "https://github.com/etingof/pyasn1-modules" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=190f79253908c986e6cacf380c3a5f6d" - -SRC_URI[sha256sum] = "5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c" - -PYPI_PACKAGE = "pyasn1_modules" - -inherit pypi ptest setuptools3 - -RDEPENDS:${PN} = "${PYTHON_PN}-pyasn1" - -BBCLASSEXTEND = "native nativesdk" - -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/ -} 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 index fea87a2ff0..9126aba8d3 100644 --- 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 @@ -19,10 +19,9 @@ From python 3.8 changes: > values for detail. (Contributed by Inada Naoki in bpo-36381.) Fixes https://github.com/pybluez/pybluez/issues/426 - -Upstream-Status: Backport [https://github.com/pybluez/pybluez/pull/427] -Signed-off-by: Bartosz Golaszewski --- +Upstream-Status: Accepted + bluez/btmodule.c | 23 ++++++++++++++--------- msbt/_msbt.c | 6 ++++-- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_1.10.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_1.10.7.bb new file mode 100644 index 0000000000..9d59cf8598 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_1.10.7.bb @@ -0,0 +1,21 @@ +SUMMARY = "Data validation and settings management using Python type hinting" +HOMEPAGE = "https://github.com/samuelcolvin/pydantic" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2c02ea30650b91528657db64baea1757" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "cfc83c0678b6ba51b0532bea66860617c4cd4251ecf76e9846fa5a9f3454e97e" + +RDEPENDS:${PN} += "\ + python3-core \ + python3-datetime \ + python3-image \ + python3-io \ + python3-json \ + python3-logging \ + python3-netclient \ + python3-numbers \ + python3-profile \ + python3-typing-extensions \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_2.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_2.4.1.bb deleted file mode 100644 index 6d06650eb0..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_2.4.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Data validation and settings management using Python type hinting" -HOMEPAGE = "https://github.com/samuelcolvin/pydantic" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=09280955509d1c4ca14bae02f21d49a6" - -inherit pypi python_hatchling - -SRC_URI[sha256sum] = "b172505886028e4356868d617d2d1a776d7af1625d1313450fd51bdd19d9d61f" - -DEPENDS += "python3-hatch-fancy-pypi-readme-native" - -RDEPENDS:${PN} += "\ - python3-core \ - python3-datetime \ - python3-image \ - python3-io \ - python3-json \ - python3-logging \ - python3-netclient \ - python3-numbers \ - python3-profile \ - python3-typing-extensions \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_2.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_2.0.4.bb index 4ee84531e1..888278af80 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_2.0.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_2.0.4.bb @@ -9,9 +9,6 @@ inherit pypi python_setuptools_build_meta DEPENDS += "${PYTHON_PN}-hatch-vcs-native" -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/PyHamcrest/" -UPSTREAM_CHECK_REGEX = "/PyHamcrest/(?P(\d+[\.\-_]*)+)" - RDEPENDS:${PN} += " \ ${PYTHON_PN}-six \ ${PYTHON_PN}-numbers \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_0.0.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_0.0.11.bb deleted file mode 100644 index b5bd89de76..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_0.0.11.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Pyiface is a package that exposes the network interfaces of the operating system in a easy to use and transparent way" -HOMEPAGE = "https://pypi.python.org/pypi/pyiface/" -SECTION = "devel/python" -LICENSE = "GPL-3.0-or-later" - -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fe869ee987a340198fb0d54c55c47f1" - -DEPENDS += "python3-setuptools-scm-native" - -SRC_URI[sha256sum] = "e231e5735d329c5b2d4fc8854f069fdaa5436d3ef91ed64ee49e41e3f5e8a3f5" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - python3-ctypes \ - python3-fcntl \ - python3-io \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_git.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_git.bb new file mode 100644 index 0000000000..29a0bc86c5 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "Pyiface is a package that exposes the network interfaces of the operating system in a easy to use and transparent way" +SECTION = "devel/python" +HOMEPAGE = "https://pypi.python.org/pypi/pyiface/" +LICENSE = "GPL-3.0-or-later" + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fe869ee987a340198fb0d54c55c47f1" + +DEPENDS += "python3-setuptools-scm-native" + +RDEPENDS:${PN} += " \ + python3-ctypes \ + python3-fcntl \ + python3-io \ +" + +inherit setuptools3 + +SRC_URI = "git://github.com/bat-serjo/PyIface.git;protocol=https;branch=master" +SRCREV = "4557dbda96d2e4b1142c60603d4a27d007a9ffe6" +PV = "0.1.dev33+g4557dbd" + +PIP_INSTALL_PACKAGE = "pyiface" + +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/0001-pylint-remove-plugin-pickle-test.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/0001-pylint-remove-plugin-pickle-test.patch new file mode 100644 index 0000000000..a7637a5ca6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/0001-pylint-remove-plugin-pickle-test.patch @@ -0,0 +1,53 @@ +From 341e19dd69d847f84859e85cabff5846e7da24c4 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin +Date: Mon, 15 May 2023 09:26:04 -0400 +Subject: [PATCH] pylint: remove plugin pickle test + +Upstream-Status: Inappropriate (oe-specific) + +Upstream uses an assertion in the removed test to state that the test +needs changing if the plugin loading succeeds. The same failure wasn't +seen when running the tests on the host with pytest, so disable it by +removing the test from the suite. + +Signed-off-by: Trevor Gamblin +--- + tests/test_check_parallel.py | 22 ---------------------- + 1 file changed, 22 deletions(-) + +diff --git a/tests/test_check_parallel.py b/tests/test_check_parallel.py +index d56502eaf..34fec140f 100644 +--- a/tests/test_check_parallel.py ++++ b/tests/test_check_parallel.py +@@ -257,28 +257,6 @@ class TestCheckParallelFramework: + assert stats.statement == 18 + assert stats.warning == 0 + +- def test_linter_with_unpickleable_plugins_is_pickleable(self) -> None: +- """The linter needs to be pickle-able in order to be passed between workers""" +- linter = PyLinter(reporter=Reporter()) +- # We load an extension that we know is not pickle-safe +- linter.load_plugin_modules(["pylint.extensions.overlapping_exceptions"]) +- try: +- dill.dumps(linter) +- raise AssertionError( +- "Plugins loaded were pickle-safe! This test needs altering" +- ) +- except (KeyError, TypeError, PickleError, NotImplementedError): +- pass +- +- # And expect this call to make it pickle-able +- linter.load_plugin_configuration() +- try: +- dill.dumps(linter) +- except KeyError as exc: +- raise AssertionError( +- "Cannot pickle linter when using non-pickleable plugin" +- ) from exc +- + def test_worker_check_sequential_checker(self) -> None: + """Same as test_worker_check_single_file_no_checkers with SequentialTestChecker.""" + linter = PyLinter(reporter=Reporter()) +-- +2.40.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch new file mode 100644 index 0000000000..7950e72077 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch @@ -0,0 +1,26 @@ +From c5c415a240189ac6730ba95de0bb5883dfb53609 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin +Date: Mon, 1 May 2023 11:32:24 -0400 +Subject: [PATCH] pyproject.toml: Remove hard-coded dependencies + +Signed-off-by: Trevor Gamblin +--- +Upstream-Status: Pending + + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index bd542646b..2c0ed9485 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,5 +1,5 @@ + [build-system] +-requires = ["setuptools~=62.6", "wheel~=0.37.1"] ++requires = ["setuptools", "wheel"] + build-backend = "setuptools.build_meta" + + [project] +-- +2.40.0 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.17.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.17.4.bb new file mode 100644 index 0000000000..96fce2e048 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.17.4.bb @@ -0,0 +1,51 @@ +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 += " \ + git://github.com/pylint-dev/pylint;branch=main;protocol=https \ + file://run-ptest \ + file://0001-pyproject.toml-Remove-hard-coded-dependencies.patch \ + file://0001-pylint-remove-plugin-pickle-test.patch \ + " +SRCREV ?= "fc34a4b6abe56f3ac07ca15d846b1c1955545f85" + +inherit python_setuptools_build_meta ptest + +RDEPENDS:${PN} += "${PYTHON_PN}-astroid \ + ${PYTHON_PN}-dill \ + ${PYTHON_PN}-isort \ + ${PYTHON_PN}-mccabe \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-platformdirs \ + ${PYTHON_PN}-shell \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-pkgutil \ + ${PYTHON_PN}-difflib \ + ${PYTHON_PN}-netserver \ + ${PYTHON_PN}-tomlkit \ + " + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-git \ + ${PYTHON_PN}-py \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-pytest-benchmark \ + ${PYTHON_PN}-pytest-runner \ + ${PYTHON_PN}-pytest-timeout \ + ${PYTHON_PN}-pytest-xdist \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-statistics \ + ${PYTHON_PN}-tomllib \ + ${PYTHON_PN}-typing-extensions \ + " + +S = "${WORKDIR}/git" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + sed -i 's#/usr/bin/python$#/usr/bin/python3#g' ${D}${PTEST_PATH}/tests/data/ascript +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.0.0.bb deleted file mode 100644 index 413e6599db..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.0.0.bb +++ /dev/null @@ -1,50 +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 += " \ - git://github.com/pylint-dev/pylint;branch=main;protocol=https \ - file://run-ptest \ - " -SRCREV ?= "4a7ad5ea9f1c5a98ccf736578a00554be0da6dc7" - -inherit python_setuptools_build_meta ptest - -RDEPENDS:${PN} += "${PYTHON_PN}-astroid \ - ${PYTHON_PN}-dill \ - ${PYTHON_PN}-isort \ - ${PYTHON_PN}-mccabe \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-platformdirs \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-tomlkit \ - " - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-git \ - ${PYTHON_PN}-py \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytest-benchmark \ - ${PYTHON_PN}-pytest-runner \ - ${PYTHON_PN}-pytest-timeout \ - ${PYTHON_PN}-pytest-xdist \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-statistics \ - ${PYTHON_PN}-tomllib \ - ${PYTHON_PN}-typing-extensions \ - " - -S = "${WORKDIR}/git" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - install -Dm 0644 ${S}/tests/.pylint_primer_tests/.gitkeep ${D}${PTEST_PATH}/tests/.pylint_primer_tests/.gitkeep - sed -i 's#/usr/bin/python$#/usr/bin/python3#g' ${D}${PTEST_PATH}/tests/data/ascript -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.0.2.bb new file mode 100644 index 0000000000..1f6fbd3bb1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.0.2.bb @@ -0,0 +1,16 @@ +SUMMARY = "A pure-Python MySQL client library" +DESCRIPTION = " \ + This package contains a pure-Python MySQL client library, based on PEP 249 \ + Most public APIs are compatible with mysqlclient and MySQLdb. \ + " +SECTION = "devel/python" +HOMEPAGE = "https://pymysql.readthedocs.io" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=528175c84163bb800d23ad835c7fa0fc" + +SRC_URI[sha256sum] = "816927a350f38d56072aeca5dfb10221fe1dc653745853d30a216637f5d7ad36" + +PYPI_PACKAGE = "PyMySQL" +inherit pypi setuptools3 + +RDEPENDS:${PN} += "${PYTHON_PN}-cryptography" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.1.0.bb deleted file mode 100644 index f797674e84..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.1.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A pure-Python MySQL client library" -DESCRIPTION = " \ - This package contains a pure-Python MySQL client library, based on PEP 249 \ - Most public APIs are compatible with mysqlclient and MySQLdb. \ - " -SECTION = "devel/python" -HOMEPAGE = "https://pymysql.readthedocs.io" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=528175c84163bb800d23ad835c7fa0fc" - -SRC_URI[sha256sum] = "4f13a7df8bf36a51e81dd9f3605fede45a4878fe02f9236349fd82a3f0612f96" - -PYPI_PACKAGE = "PyMySQL" -inherit pypi python_setuptools_build_meta - -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/pymysql/" -UPSTREAM_CHECK_REGEX = "/pymysql/(?P(\d+[\.\-_]*)+)" - -RDEPENDS:${PN} += "${PYTHON_PN}-cryptography" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch index 65f38814c3..9b5d9d6364 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fixed relative imports Signed-off-by: Bartosz Golaszewski --- -Upstream-Status: Backport [https://github.com/rlisagor/pynetlinux/commit/afb778669efbc658a29e6bdb1c4834fee42931aa] +Upstream-Status: Accepted pynetlinux/__init__.py | 8 ++++---- pynetlinux/brctl.py | 2 +- diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.0.bb new file mode 100644 index 0000000000..d8708f5e72 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "Python interface to PROJ (cartographic projections and coordinate transformations library)" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=873757af01d2d221eedb422c4c1dd163" +DEPENDS = "python3-cython proj" +DEPENDS:append:class-target = " python3-cython-native proj-native" + +PYPI_PACKAGE = "pyproj" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "a5b111865b3f0f8b77b3983f2fbe4dd6248fc09d3730295949977c8dcd988062" + +RDEPENDS:${PN} = " \ + python3-certifi \ + python3-compression \ + python3-json \ + python3-logging \ + python3-profile \ +" + +export PROJ_INCDIR = "${STAGING_INCDIR}" +export PROJ_LIBDIR = "${STAGING_LIBDIR}" +export PROJ_DIR = "${STAGING_BINDIR_NATIVE}/.." diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb deleted file mode 100644 index a4121c3934..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Python interface to PROJ (cartographic projections and coordinate transformations library)" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=873757af01d2d221eedb422c4c1dd163" -DEPENDS = "python3-cython proj" -DEPENDS:append:class-target = " python3-cython-native proj-native" - -PYPI_PACKAGE = "pyproj" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "44aa7c704c2b7d8fb3d483bbf75af6cb2350d30a63b144279a09b75fead501bf" - -RDEPENDS:${PN} = " \ - python3-certifi \ - python3-compression \ - python3-json \ - python3-logging \ - python3-profile \ -" - -export PROJ_INCDIR = "${STAGING_INCDIR}" -export PROJ_LIBDIR = "${STAGING_LIBDIR}" -export PROJ_DIR = "${STAGING_BINDIR_NATIVE}/.." diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.5.1.bb new file mode 100644 index 0000000000..1b458fa2df --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.5.1.bb @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: MIT +# Copyright (C) 2023 iris-GmbH infrared & intelligent sensors + +SUMMARY = "pyproject-api aims to abstract away interaction with pyproject.toml style projects in a flexible way." +HOMEPAGE = "https://pyproject-api.readthedocs.io" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" + +SRC_URI[sha256sum] = "435f46547a9ff22cf4208ee274fca3e2869aeb062a4834adfc99a4dd64af3cf9" + +PYPI_PACKAGE = "pyproject_api" + +BBCLASSEXTEND = "native nativesdk" +inherit pypi python_hatchling + +DEPENDS += "\ + ${PYTHON_PN}-hatch-vcs-native \ +" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-packaging \ + ${PYTHON_PN}-tomli \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.6.1.bb deleted file mode 100644 index 739df2a1ba..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.6.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: MIT -# Copyright (C) 2023 iris-GmbH infrared & intelligent sensors - -SUMMARY = "pyproject-api aims to abstract away interaction with pyproject.toml style projects in a flexible way." -HOMEPAGE = "https://pyproject-api.readthedocs.io" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" - -SRC_URI[sha256sum] = "1817dc018adc0d1ff9ca1ed8c60e1623d5aaca40814b953af14a9cf9a5cae538" - -PYPI_PACKAGE = "pyproject_api" - -BBCLASSEXTEND = "native nativesdk" -inherit pypi python_hatchling - -DEPENDS += "\ - ${PYTHON_PN}-hatch-vcs-native \ -" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-packaging \ - ${PYTHON_PN}-tomli \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb index baf3cf8ede..39fbd1a00e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb @@ -30,7 +30,6 @@ SRC_URI += " \ RDEPENDS:${PN}-ptest += " \ python3-pytest \ python3-fcntl \ - python3-sqlite3 \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz-deprecation-shim_0.1.0.post0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz-deprecation-shim_0.1.0.post0.bb new file mode 100644 index 0000000000..022cf39ac0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz-deprecation-shim_0.1.0.post0.bb @@ -0,0 +1,15 @@ +SUMMARY = "Shims to help you safely remove pytz" +HOMEPAGE = "https://github.com/pganssle/pytz-deprecation-shim" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fca9fd5c15a28eb874ba38577a585d48" + +SRC_URI[sha256sum] = "af097bae1b616dde5c5744441e2ddc69e74dfdcb0c263129610d85b87445a59d" + +PYPI_PACKAGE = "pytz_deprecation_shim" +PYPI_SRC_URI = "https://files.pythonhosted.org/packages/94/f0/909f94fea74759654390a3e1a9e4e185b6cd9aa810e533e3586f39da3097/${PYPI_PACKAGE}-${PV}.tar.gz" + +inherit pypi python_setuptools_build_meta + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-zoneinfo \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyu2f_0.1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyu2f_0.1.5.bb deleted file mode 100644 index c58981a327..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyu2f_0.1.5.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "U2F host library for interacting with a U2F device over USB." -HOMEPAGE = "https://github.com/google/pyu2f/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI[sha256sum] = "a3caa3a11842fc7d5746376f37195e6af5f17c0a15737538bb1cebf656fb306b" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-six \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.0.0.bb new file mode 100644 index 0000000000..39a7614fc5 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.0.0.bb @@ -0,0 +1,55 @@ +SUMMARY = "PyZMQ: Python bindings for ZMQ" +DESCRIPTION = "This package contains Python bindings for ZeroMQ. ZMQ is a lightweight and fast messaging implementation." +HOMEPAGE = "http://zeromq.org/bindings:python" +LICENSE = "BSD-3-Clause & LGPL-3.0-only" +LIC_FILES_CHKSUM = "\ + file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e \ + file://COPYING.LESSER;md5=12c592fa0bcfff3fb0977b066e9cb69e \ +" + +DEPENDS = "python3-packaging-native zeromq" + +SRC_URI:append = " \ + file://club-rpath-out.patch \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "f330a1a2c7f89fd4b0aa4dcb7bf50243bf1c8da9a2f1efc31daf57a2046b31f2" + +inherit pypi pkgconfig python_setuptools_build_meta ptest + +PACKAGES =+ "\ + ${PN}-test \ +" + +FILES:${PN}-test += "\ + ${libdir}/${PYTHON_DIR}/site-packages/*/tests \ +" + +RDEPENDS:${PN} += "\ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-multiprocessing \ +" + +RDEPENDS:${PN}-ptest += "\ + ${PN}-test \ + ${PYTHON_PN}-pytest \ +" + +do_compile:prepend() { + echo [global] > ${S}/setup.cfg + echo zmq_prefix = ${STAGING_DIR_HOST} >> ${S}/setup.cfg + echo have_sys_un_h = True >> ${S}/setup.cfg + echo skip_check_zmq = True >> ${S}/setup.cfg + echo libzmq_extension = False >> ${S}/setup.cfg + echo no_libzmq_extension = True >> ${S}/setup.cfg +} + +do_install:append() { + sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${PYTHON_SITEPACKAGES_DIR}/zmq/utils/config.json + sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${PYTHON_SITEPACKAGES_DIR}/zmq/utils/compiler.json +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/zmq/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.1.1.bb deleted file mode 100644 index 504ef7abc0..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.1.1.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "PyZMQ: Python bindings for ZMQ" -DESCRIPTION = "This package contains Python bindings for ZeroMQ. ZMQ is a lightweight and fast messaging implementation." -HOMEPAGE = "http://zeromq.org/bindings:python" -LICENSE = "BSD-3-Clause & LGPL-3.0-only" -LIC_FILES_CHKSUM = "\ - file://LICENSE.BSD;md5=1787206f198344195a671b60326c59dc \ - file://LICENSE.LESSER;md5=0e99bfbdd8b9d33b0221986fe3be89ed \ -" - -DEPENDS = "python3-packaging-native python3-cython-native python3-setuptools-scm-native zeromq" - -SRC_URI:append = " \ - file://club-rpath-out.patch \ - file://run-ptest \ -" -SRC_URI[sha256sum] = "259c22485b71abacdfa8bf79720cd7bcf4b9d128b30ea554f01ae71fdbfdaa23" - -inherit pypi pkgconfig python_setuptools_build_meta ptest - -PACKAGES =+ "\ - ${PN}-test \ -" - -FILES:${PN}-test += "\ - ${libdir}/${PYTHON_DIR}/site-packages/*/tests \ -" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-multiprocessing \ -" - -RDEPENDS:${PN}-ptest += "\ - ${PN}-test \ - ${PYTHON_PN}-pytest \ -" - -do_compile:prepend() { - echo [global] > ${S}/setup.cfg - echo zmq_prefix = ${STAGING_DIR_HOST} >> ${S}/setup.cfg - echo have_sys_un_h = True >> ${S}/setup.cfg - echo skip_check_zmq = True >> ${S}/setup.cfg - echo libzmq_extension = False >> ${S}/setup.cfg - echo no_libzmq_extension = True >> ${S}/setup.cfg -} - -do_install:append() { - sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${PYTHON_SITEPACKAGES_DIR}/zmq/utils/config.json - sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${PYTHON_SITEPACKAGES_DIR}/zmq/utils/compiler.json -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/zmq/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson/run-ptest deleted file mode 100644 index 8d2017d39c..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.11.bb index 3ea5594887..930ad34340 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.11.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.11.bb @@ -9,32 +9,14 @@ SRCREV = "e1b41f64df1705770b7b70d7221a4812909c1d0f" S = "${WORKDIR}/git" -# Inheriting ptest provides functionality for packaging and installing runtime tests for this recipe -inherit setuptools3 ptest +inherit setuptools3 SETUPTOOLS_BUILD_ARGS += " --rj-include-dir=${RECIPE_SYSROOT}${includedir}" -# run-ptest is a shell script that starts the test suite -SRC_URI += " \ - file://run-ptest \ -" - DEPENDS += " \ rapidjson \ " -# Adding required python package for the ptest (pytest and pytest->automake report translation) -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-unittest-automake-output \ -" - RDEPENDS:${PN} += " \ ${PYTHON_PN}-core \ " - -# Installing the test suite on the target -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rdflib_7.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rdflib_7.0.0.bb new file mode 100644 index 0000000000..952c210116 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rdflib_7.0.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "RDFLib is a pure Python package for working with RDF" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=37d489c0cefe52a17e1d5007e196464a" + +SRC_URI[sha256sum] = "9995eb8569428059b8c1affd26b25eac510d64f5043d9ce8c84e0d0036e995ae" + +inherit pypi python_poetry_core + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-isodate \ + ${PYTHON_PN}-pyparsing \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-xml \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-core \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.0.bb new file mode 100644 index 0000000000..f04e04bbe2 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.0.bb @@ -0,0 +1,18 @@ +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=609ded3add9111c4c6e102f1d421d3f8" + +SRC_URI[sha256sum] = "5cea6c0d335c9a7332a460ed8729ceabb4d0c489c7285b0a86dbbf8a017bd120" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-asyncio \ + python3-compression \ + python3-cryptography \ + python3-datetime \ + python3-json \ + python3-packaging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.1.bb deleted file mode 100644 index 2c473c03ea..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.1.bb +++ /dev/null @@ -1,18 +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=609ded3add9111c4c6e102f1d421d3f8" - -SRC_URI[sha256sum] = "0dab495cd5753069d3bc650a0dde8a8f9edde16fc5691b689a566eda58100d0f" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - python3-asyncio \ - python3-compression \ - python3-cryptography \ - python3-datetime \ - python3-json \ - python3-packaging \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.10.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.10.1.bb deleted file mode 100644 index 7df1d66ccc..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.10.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Traitlets Python config system" -HOMEPAGE = "http://ipython.org" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=13bed0ee6f46a6f6dbf1f9f9572f250a" - -SRC_URI[sha256sum] = "db9c4aa58139c3ba850101913915c042bdba86f7c8a0dda1c6f7f92c5da8e542" - -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.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.9.0.bb new file mode 100644 index 0000000000..fc25271449 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.9.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Traitlets Python config system" +HOMEPAGE = "http://ipython.org" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING.md;md5=f17a3ba4cd59794dd6e005c8e150aef0" + +SRC_URI[sha256sum] = "f6cde21a9c68cf756af02035f72d5a723bf607e862e7be33ece505abf4a3bad9" + +inherit pypi python_hatchling + +RDEPENDS:${PN} = "\ + ${PYTHON_PN}-ipython-genutils \ + ${PYTHON_PN}-decorator \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_5.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_5.0.1.bb index 9673c5d0ea..a59fd93643 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_5.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_5.0.1.bb @@ -10,4 +10,5 @@ inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += " \ python3-datetime \ python3-logging \ + python3-pytz-deprecation-shim \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmltodict/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmltodict/run-ptest new file mode 100644 index 0000000000..3385d68939 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmltodict/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmltodict_0.13.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmltodict_0.13.0.bb new file mode 100644 index 0000000000..a1f3957adc --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmltodict_0.13.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "Makes working with XML feel like you are working with JSON" +HOMEPAGE = "https://github.com/martinblech/xmltodict" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=01441d50dc74476db58a41ac10cb9fa2" + +SRC_URI[sha256sum] = "341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56" + +PYPI_PACKAGE = "xmltodict" + +inherit pypi setuptools3 ptest + +SRC_URI += " \ + file://run-ptest \ +" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-xml \ + ${PYTHON_PN}-io \ +" + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.2.0.bb new file mode 100644 index 0000000000..c4d74306ce --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.2.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "xxhash is a Python binding for the xxHash library by Yann Collet." +SECTION = "devel/python" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3a9dab7f159514231249aa3e108ab26b" + +SRC_URI[sha256sum] = "1afd47af8955c5db730f630ad53ae798cf7fae0acb64cebb3cf94d35c47dd088" + +SRC_URI += " \ + file://run-ptest \ +" + +inherit pypi setuptools3 ptest + +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ +" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.3.0.bb deleted file mode 100644 index e3aec97375..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.3.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "xxhash is a Python binding for the xxHash library by Yann Collet." -SECTION = "devel/python" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3a9dab7f159514231249aa3e108ab26b" - -DEPENDS += "python3-setuptools-scm-native" - -SRC_URI[sha256sum] = "c3f9e322b1ebeebd44e3d9d2d9b124e0c550c1ef41bd552afdcdd719516ee41a" - -SRC_URI += " \ - file://run-ptest \ -" - -inherit pypi python_setuptools_build_meta ptest - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-openembedded/meta-webserver/files/static-passwd-meta-webserver b/meta-openembedded/meta-webserver/files/static-passwd-meta-webserver deleted file mode 100644 index 028cf8d941..0000000000 --- a/meta-openembedded/meta-webserver/files/static-passwd-meta-webserver +++ /dev/null @@ -1,2 +0,0 @@ -www:x:690:nogroup::/:/bin/nologin -netdata:x:691:nogroup::/:/bin/nologin \ No newline at end of file diff --git a/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-all.bb b/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-all.bb deleted file mode 100644 index 9d2badc236..0000000000 --- a/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-all.bb +++ /dev/null @@ -1,3 +0,0 @@ -require recipes-core/images/core-image-base.bb - -IMAGE_INSTALL += "packagegroup-meta-webserver" diff --git a/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-base.bb b/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-base.bb new file mode 100644 index 0000000000..a4ce10f674 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-base.bb @@ -0,0 +1,7 @@ +SUMMARY = "meta-webserver build test image" + +IMAGE_INSTALL = "packagegroup-core-boot" + +LICENSE = "MIT" + +inherit core-image diff --git a/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image.bb b/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image.bb new file mode 100644 index 0000000000..ce4f8a0387 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image.bb @@ -0,0 +1,3 @@ +require meta-webserver-image-base.bb + +IMAGE_INSTALL += "packagegroup-meta-webserver" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch index 9accbf18a1..996eabf586 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch @@ -4,7 +4,7 @@ Date: Tue, 18 Apr 2023 15:38:53 +0200 Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory to include path if mod_rewrite is enabled. -Upstream-Status: Backport [https://svn.apache.org/viewvc?view=revision&revision=1909241] +Upstream-Status: Accepted [https://svn.apache.org/viewvc?view=revision&revision=1909241] --- modules/mappers/config9.m4 | 5 +++++ diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/0001-configure-libxslt-conf.patch b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/0001-configure-libxslt-conf.patch deleted file mode 100644 index 7ba2a1fb85..0000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/0001-configure-libxslt-conf.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0c3c669464a514cf8d0cac08282ecb2b486f440f Mon Sep 17 00:00:00 2001 -From: Joe Slater -Date: Tue, 3 Oct 2023 19:21:17 +0000 -Subject: [PATCH] configure: libxslt conf - -Modify to find libxslt related include files under sysroot. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater ---- - auto/lib/libxslt/conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf -index 3063ac7..eb77886 100644 ---- a/auto/lib/libxslt/conf -+++ b/auto/lib/libxslt/conf -@@ -12,7 +12,7 @@ - #include - #include - #include " -- ngx_feature_path="/usr/include/libxml2" -+ ngx_feature_path="=/usr/include/libxml2" - ngx_feature_libs="-lxml2 -lxslt" - ngx_feature_test="xmlParserCtxtPtr ctxt = NULL; - xsltStylesheetPtr sheet = NULL; -@@ -100,7 +100,7 @@ fi - ngx_feature_name=NGX_HAVE_EXSLT - ngx_feature_run=no - ngx_feature_incs="#include " -- ngx_feature_path="/usr/include/libxml2" -+ ngx_feature_path="=/usr/include/libxml2" - ngx_feature_libs="-lexslt" - ngx_feature_test="exsltRegisterAll();" - . auto/feature --- -2.35.5 - diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc index 8890e0bea1..1ea32f7c94 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -22,7 +22,6 @@ SRC_URI = " \ file://nginx-volatile.conf \ file://nginx.service \ file://nginx-fix-pidfile.patch \ - file://0001-configure-libxslt-conf.patch \ " inherit siteinfo update-rc.d useradd systemd @@ -48,8 +47,6 @@ PACKAGECONFIG[ipv6] = "--with-ipv6,," PACKAGECONFIG[webdav] = "--with-http_dav_module,," PACKAGECONFIG[stream] = "--with-stream,," -PACKAGECONFIG[xslt] = "--with-http_xslt_module,,libxslt" - do_configure () { if [ "${SITEINFO_BITS}" = "64" ]; then PTRSIZE=8 -- cgit v1.2.3