summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-devtools/protobuf
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2023-10-04 18:18:08 +0300
committerAndrew Geissler <geissonator@yahoo.com>2023-10-10 19:23:18 +0300
commit220dafdb7243da3683b8a972c80a3719c2d137ef (patch)
tree48989211d9aee03ff7769a3169aac594816f5ef8 /meta-openembedded/meta-oe/recipes-devtools/protobuf
parent32d5e60788a11425a8b7bb8fc292c72c89ab7f39 (diff)
downloadopenbmc-220dafdb7243da3683b8a972c80a3719c2d137ef.tar.xz
master: subtree updates oct 4 2023
poky: 61531cd395..e444d2bed0: Adrian Freihofer (3): lib/oe/utils: Refactor to make multiprocess_launch callable without d lib/oe/package: Refactor to make strip_execs callable without d oeqa/selftest/devtool: Refactor runqemu pre-requisites Alexander Kanavin (69): cargo-c-native: fix version check igt-gpu-tools: do not write shortened git commit hash into binaries curl: build and run the full set of ptests ptest: report tests that were killed on timeout perl: use 64 bit integers across all targets perl: ensure all failures are caught strace: parallelize ptest strace: remove from time64.inc exception list busybox: enable 64 bit shell arithmetic (via long long type) openssl: parallelize tests openssl: ensure all ptest fails are caught glibc-tests: rename to glibc-y2038-tests sysstat: merge .inc into .bb sysstat: update 12.6.2 -> 12.7.4 glib-2.0: update 2.76.4 -> 2.78.0 ovmf: update edk2-stable202305 -> edk2-stable202308 libdnf: update 0.70.1 -> 0.71.0 liburi-perl: update 5.17 -> 5.21 python3-pygobject: update 3.44.1 -> 3.46.0 go-helloworld: update to latest revision gzip: update 1.12 -> 1.13 procps: update 4.0.3 -> 4.0.4 screen: update 4.9.0 -> 4.9.1 gobject-introspection: update 1.76.1 -> 1.78.0 igt-gpu-tools: update 1.27.1 -> 1.28 libva-utils: update 2.19.0 -> 2.20.0 piglit: update to latest revision groff: add a patch to resolve build races groff: fix another build race via backport systemd: upgrade 254 -> 254.4 util-linux: upgrade 2.39.1 -> 2.39.2 cmake: upgrade 3.27.4 -> 3.27.5 jquery: upgrade 3.7.0 -> 3.7.1 python3-setuptools-rust: upgrade 1.6.0 -> 1.7.0 vulkan: upgrade 1.3.250.0 -> 1.3.261.1 libxcb: upgrade 1.15 -> 1.16 xcb-proto: upgrade 1.15.2 -> 1.16.0 boost: upgrade 1.82.0 -> 1.83.0 btrfs-tools: upgrade 6.3.3 -> 6.5.1 createrepo-c: upgrade 0.21.1 -> 1.0.0 debianutils: upgrade 5.12 -> 5.13 diffoscope: upgrade 244 -> 249 ethtool: upgrade 6.3 -> 6.5 font-util: upgrade 1.4.0 -> 1.4.1 freetype: upgrade 2.13.1 -> 2.13.2 ghostscript: upgrade 10.01.2 -> 10.02.0 iproute2: upgrade 6.4.0 -> 6.5.0 json-c: upgrade 0.16 -> 0.17 kmscube: upgrade to latest revision libarchive: upgrade 3.7.1 -> 3.7.2 libsdl2: upgrade 2.28.0 -> 2.28.3 libsolv: upgrade 0.7.24 -> 0.7.25 man-pages: upgrade 6.04 -> 6.05.01 meson: upgrade 1.1.1 -> 1.2.1 mmc-utils: upgrade to latest revision mtd-utils: upgrade 2.1.5 -> 2.1.6 puzzles: upgrade to latest revision python3-dtschema: upgrade 2023.6.1 -> 2023.7 python3-git: upgrade 3.1.35 -> 3.1.36 python3-libarchive-c: upgrade 4.0 -> 5.0 python3-setuptools: upgrade 68.2.1 -> 68.2.2 python3-sphinx: upgrade 7.2.5 -> 7.2.6 seatd: upgrade 0.7.0 -> 0.8.0 sqlite3: upgrade 3.43.0 -> 3.43.1 tiff: upgrade 4.5.1 -> 4.6.0 vala: upgrade 0.56.8 -> 0.56.13 xf86-input-libinput: upgrade 1.3.0 -> 1.4.0 xwayland: upgrade 23.1.2 -> 23.2.1 python3-setuptools-scm: fix upstream version check Alexandre Belloni (1): python3: fix SoB on patch Antoine Lubineau (1): cve-check: add CVSS vector string to CVE database and reports Bruce Ashfield (9): linux-yocto/6.4: update to v6.4.15 linux-yocto/6.1: update to v6.1.52 linux-yocto/6.4: update to v6.4.16 linux-yocto/6.1: update to v6.1.53 linux-yocto/6.1: update to v6.1.55 linux-yocto-dev: update to v6.6-rcX linux-yocto: introduce 6.5 reference kernel recipes linux-libc-headers: uprev to v6.5 linux-libc-headers: default to 6.5 Charles-Antoine Couret (1): systemd-boot-cfg: add .conf suffix to default entry label Chen Qi (1): python3: add cpython to CVE_PRODUCT Daniel Semkowicz (2): wic: bootimg-partition: Fix file name in debug message uboot-extlinux-config.bbclass: Add missing variable descriptions Deepthi Hemraj (2): binutils: stable 2.41 branch updates. glibc: stable 2.38 branch updates. Denys Dmytriyenko (2): bitbake.conf: add MACHINE to SDK_NAME spdx: use TOOLCHAIN_OUTPUTNAME for SDK filename prefix Derek Straka (1): pypi.bbclass: Update the upstream checks to automatically replace '_' with '-' Eilís 'pidge' Ní Fhlannagáin (2): lib/oe/package_managegment: Add nativesdk-intercept PATH update_mandb: deb fails due to missing man cache Etienne Cordonnier (1): bitbake: bitbake-worker/runqueue: Avoid unnecessary bytes object copies Insu Park (1): bitbake: data: Add missing dependency handling of remove operator Jan Garcia (1): insane.bbclass: Count raw bytes in shebang-size Joshua Watt (6): classes/create-spdx-2.2: Add extra debugging for missing package files nfs-utils: Don't start nfs-statsd.service without exports nfs-utils: Add StateDirectory for systemd services bitbake: utils: Add path_is_descendant() bitbake: fetch2: git: Use path_is_descendant() instead of path for repo check classes/create-spdx-2.2: Show error if document is not found Julien Stephan (1): bitbake: bitbake: cooker: add a new function to retrieve task signatures Kai Kang (2): goarch.bbclass: not compatible with riscv32 adwaita-icon-theme: 43 -> 45.0 Khem Raj (25): perl: Add packageconfig for setlocale functionality differences libc-test: Run as non-root user coreutils: Upgrade to 9.4 coreutils: Add config.h to ptest package gettext: Add missing dependency on gawk autoconf util-linux: Disable failing tests on musl Revert "util-linux: scanf_cv_alloc_modifier changed from 'as' -> 'ms'" util-linux: Fix lscpu on musl qemu: Add PACKAGECONFIG for dax llvm: Upgrade to 17.0.1 oeqa: Use 2.14 release of cpio instead of 2.13 musl: Update to latest bsd-headers: Define __CONCAT and __STRING mesa: Update clang-17 patch to upstream v2 musl-legacy-error: Add recipe elfutils: Depend on musl-legacy-error for musl targets debugedit: Use musl-legacy-error systemd: Drop two upstreamed musl patches systemd: Refresh patches to avoid patch-fuzz glib-2.0: Enable possible locales with musl for ptests glib-2.0: Remove failing ptests on musl llvm: Upgrade to 17.0.2 createrepo-c: Fix function declaration bug found with clang mesa: Simplify llvm-17 patch mesa: Fix native build on hosts with llvm-dev installed Lee Chee Yang (2): bind: update to 9.18.19 cups: fix CVE-2023-4504 Markus Volk (8): mesa: upgrade 23.1.3 -> 23.1.7 libportal: upgrade 0.6 -> 0.7.1 appstream: import recipe from meta-oe libadwaita: upgrade 1.3.4 -> 1.4.0 maintainers.inc: add missing entries for appstream and libxmlb libxmlb: import recipe from meta-oe pulseaudio: dont include consolekit for systemd mesa: Upgrade 23.1.7 -> 23.1.8 Marta Rybczynska (3): python3-ply: add to nativesdk python3-isodate: add homepage python3-rdflib: add homepage Martin Jansa (3): gcc: backport a fix for ICE caused by CVE-2023-4039.patch fontcache.bbclass: avoid native recipes depending on target fontconfig multilib_script.bbclass: expand script name as well Matthias Schnelte (1): bitbake: fetch2: Adds vscode devcontainer support Michael Opdenacker (18): base: add newline before LICENSE_FLAGS_DETAILS dev-manual: new-recipe.rst fix inconsistency with contributor guide contributor-guide: recipe-style-guide: add Upstream-Status dev-manual: licenses: update license manifest location dev-manual: licenses: mention SPDX for license compliance dev-manual: disk-space: improve wording for obsolete sstate cache files sdk-manual: extensible.rst: fix multiple formatting issues alsa-lib: upgrade 1.2.9 -> 1.2.10 alsa-utils: upgrade 1.2.9 -> 1.2.10 shadow: fix patch Upstream-Status libevent: fix patch Upstream-Status alsa-utils: update patch Upstream-Status alsa-lib: fix patch Upstream-Status lib/oe/qa: remove obsolete "Accepted" string for Upstream-Status lib/oe/qa: update guidelines link for Upstream-Status bsp-guide: bsp.rst: replace reference to wiki dev-manual: new-recipe.rst: replace reference to wiki maintainers.inc: add self for flac recipe Mikko Rapeli (9): openssh: update Upstream-Status to Denied in test logging patch openssh: improve banner ptest failure logging testimage.bbclass: detect slirp from TEST_RUNQEMUPARAMS oeqa dnf_runtime.py: fix HTTP server IP address and port oeqa selftest runtime_test.py: append to TEST_RUNQEMUPARAMS selftest runtime_test.py: add testimage.bbclass slirp test openssh: capture logs in run-ptest testimage.bbclass: remove QEMU_USE_SLIRP variable oeqa/selftest/context.py: check git command return values Ninad Palsule (1): kernel-fitImage: Strip path component from dtb Peter Kjellerstedt (7): libsoup-2.4: Only specify --cross-file when building for target libsoup: Only specify --cross-file when building for target bitbake: tinfoil: Do not fail when logging is disabled and full config is used bitbake: bitbake-getvar: Make --quiet work with --recipe bitbake: bitbake-getvar: Make --value imply --quiet bitbake: bitbake-getvar: Add a (suppressable) error for undefined variables bitbake: bitbake-getvar: Treat undefined variables as empty with --value Peter Marko (2): openssl: Upgrade 3.1.2 -> 3.1.3 json-c: define CVE_VERSION Qiu Tingting (1): tar: add ptest support Richard Purdie (34): bitbake.conf: Add IMAGE_BASENAME to SDK_NAME vim: Upgrade 9.0.1664 -> 9.0.1894 defaultsetup: Inherit create-spdx by default oeqa/selftest/runtime_test: No need to use append with TEST_RUNQEMUPARAMS devtool/build_sdk: Drop unused imports bitbake: lib: Drop inotify support and replace with mtime checks bitbake: server/process: Disable the flush() call in server logging recipetool/devtool: Ensure server knows about changed files lttng-tools: Upgrade 2.13.10 -> 2.13.11 oeqa/selftest/wic: Improve assertTrue calls elfutils: Fix reproducibility issue with bunzip2 bitbake: cooker: Drop unneeded flush calls sstate: Fix nativesdk entry in SSTATE_ARCHS multilib: fix SSTATE_ARCHS for multilib usage license/license_image: Fix license file layout to avoid overlapping files oeqa/selftest/bbtests: Improve and update test_non_gplv3 create-spdx/sbom: Ensure files don't overlap between machines sstate: Stop allowing overlapping symlinks from sstate recipes: Drop remaining PR values from recipes bitbake.conf: No longer support PR from filename oeqa/selftest: Fix broken symlink removal handling oeqa/selftest/reproducible: Avoid oe-selftest startup delays oeqa: Streamline oe-selftest startup time oeqa/selftest/oescripts: Avoid variable access at module load bitbake: codeparser: Update debug variable reference contributor-guide/style-guide: Refer to recipes, not packages contributor-guide/style-guide: Add a note about task idempotence lib: Import packagedata oe module by default oeqa/runner: Ensure class setup errors are shown to bitbake logging create-spdx: Ensure it is clear where the message comes from oeqa/utils/gitarchive: Handle broken commit counts in results repo python3-numpy: Fix reproducibility issue scritps/runqemu: Ensure we only have two serial ports glibc: Pull in stable branch fixes Robert Joslyn (2): curl: Update from 8.2.1 to 8.3.0 curl: Skip tests marked flaky Robert Yang (1): libxcrypt-compat: Remove libcrypt.so to fix conflict with libcrypt Roland Hieber (7): template: fix typo in section header ref-manual: point outdated link to the new location contributor-guide: recipe-style-guide: add more patch tagging examples contributor-guide: recipe-style-guide: add section about CVE patches contributor-guide: discourage marking patches as Inappropriate contributor-guide: deprecate "Accepted" patch status contributor-guide: style-guide: discourage using Pending patch status Ross Burton (19): packagegroup-core-x11-xserver: add modesetting driver to default XSERVER machine/qemu*: add modesetting drivers to XSERVER beaglebone-yocto: remove redundant XSERVER assignment gcc: Fix -fstack-protector issue on aarch64 testimage: respect target/server IPs when using slirp manuals: document LICENSE_FLAGS_DETAILS linux-yocto: update CVE ignores libwebp: upgrade to 1.3.2 oeqa/runtime/parselogs: remove unused imports oeqa/runtime/parselogs: don't bother to show target hardware information oeqa/runtime/parselogs: remove obsolete LSB testing support oeqa/runtime/parselogs: inline single-caller functions oeqa/runtime/parselogs: improve find call oeqa/runtime/parselogs: don't pass around members oeqa/runtime/parselogs: move some variables out of global scope oeqa/runtime/parselogs: select the correct machine-specific ignores early oeqa/runtime/parselogs: parse the logs with Python, not grep webkitgtk: reduce size of -dbg package bitbake: bitbake/lib: spawn server/worker using the current Python interpreter Samantha Jalabert (14): python3-isodate: Copy recipe from meta-python python3-booleanpy: Copy recipe from meta-python python3-beartype: add recipe python3-click: Copy recipe from meta-python ptest-packagelists.inc: add python test click python3-license-expression: Copy recipe from meta-python ptest-packagelists.inc: add python test license-expression python3-rdflib: Copy recipe from meta-python python3-uritools: add recipe python3-xmltodict: Copy recipe from meta-python ptest-packagelists.inc: add python test xmltodict python3-spdx-tools: add recipe qa: Add selftest for python3-spdx-tools maintainers.inc: add python3-spdx-tools and dependencies Sean Nyekjaer (1): gcc: depend on zstd Stefan Tauner (1): gdb: fix RDEPENDS for PACKAGECONFIG[tui] Stephan Wurm (1): python3-jsonschema: Update homepage URL Tim Orling (1): python3-cryptography{-vectors}: upgrade to 41.0.4 Trevor Gamblin (6): patchtest: Add tests from patchtest oe repo patchtest/selftest: remove configurable target patchtest: add requirements.txt patchtest: Add README.md for selftests python3-ptest: skip test_input_no_stdout_fileno patchtest/selftest: only split resultlines once Ulrich Ölmann (1): packagegroup-base: clean up setting packagegroup-machine-base's SUMMARY Wang Mingyu (36): alsa-ucm-conf: upgrade 1.2.9 -> 1.2.10 at-spi2-core: upgrade 2.48.3 -> 2.48.4 dbus: upgrade 1.14.8 -> 1.14.10 debianutils: upgrade 5.8 -> 5.12 dnf: upgrade 4.16.1 -> 4.17.0 harfbuzz: upgrade 8.1.1 -> 8.2.0 kexec-tools: upgrade 2.0.26 -> 2.0.27 libinput: upgrade 1.23.0 -> 1.24.0 libnl: upgrade 3.7.0 -> 3.8.0 nghttp2: upgrade 1.55.1 -> 1.56.0 ccache: upgrade 4.8.2 -> 4.8.3 pkgconf: upgrade 2.0.2 -> 2.0.3 python3-git: upgrade 3.1.34 -> 3.1.35 python3-hypothesis: upgrade 6.84.0 -> 6.84.3 python3-pyelftools: upgrade 0.29 -> 0.30 python3-pytest: upgrade 7.4.1 -> 7.4.2 python3-setuptools: upgrade 68.1.2 -> 68.2.1 strace: upgrade 6.4 -> 6.5 stress-ng: upgrade 0.16.04 -> 0.16.05 wayland-utils: upgrade 1.1.0 -> 1.2.0 wireless-regdb: upgrade 2023.05.03 -> 2023.09.01 at-spi2-core: upgrade 2.48.4 -> 2.50.0 enchant2: upgrade 2.5.0 -> 2.6.1 harfbuzz: upgrade 8.2.0 -> 8.2.1 kbd: upgrade 2.6.2 -> 2.6.3 libsecret: upgrade 0.21.0 -> 0.21.1 gobject-introspection: upgrade 1.78.0 -> 1.78.1 python3-numpy: upgrade 1.25.2 -> 1.26.0 python3-hypothesis: upgrade 6.84.3 -> 6.86.2 python3-pycryptodome: upgrade 3.18.0 -> 3.19.0 python3-pycryptodomex: upgrade 3.18.0 -> 3.19.0 python3-smmap: upgrade 5.0.0 -> 6.0.0 python3-trove-classifiers: upgrade 2023.8.7 -> 2023.9.19 python3-typing-extensions: upgrade 4.7.1 -> 4.8.0 python3-urllib3: upgrade 2.0.4 -> 2.0.5 python3-zipp: upgrade 3.16.2 -> 3.17.0 Yash Shinde (1): glibc: fix CVE-2023-4527 Yogita Urade (2): tiff: fix CVE-2023-40745 tiff: fix CVE-2023-41175 meta-openembedded: eff1b182c1..ea42cec2ec: Alex Kiernan (2): mdns: Upgrade 1790.80.10 -> 2200.0.8 jq: Upgrade 1.6+git -> 1.7 Archana Polampalli (2): python3-appdirs: print ptest results in unified format nodejs: upgrade 18.17.1 -> 20.5.1 Armin Kuster (1): openldap: update to 2.5.16. Bruce Ashfield (2): zfs: update to v2.2.0-rc4 vboxguestdrivers: fix kernel v6.5 build Chi Xu (1): mariadb: Add ptest support Clément Péron (6): etcd-cpp-apiv3: upgrade 0.14.3 -> 0.15.3 devtools: grpc: bump to 1.56.2 protobuf: upgrade 4.22.2 -> 4.23.4 protobuf-c: bump to next release to support protobuf 4.23.x mariadb: add missing <cstdint> in rocksdb string_util.h etcd-cpp-apiv3: fix build when gRPC is cross compiled Daniel Semkowicz (2): cockpit: Move packagekit to a separate package cockpit: Move apps to a separate package Derek Straka (54): python3-absl: Update version 1.4.0 -> 2.0.0 python3-brotli: Update version 1.0.9 -> 1.1.0 python3-cachecontrol: Update version 0.13.0 -> 0.13.1 python3-cantools: Update version 38.0.2 -> 39.2.0 python3-cerberus: Update version 1.3.4 -> 1.3.5 python3-configshell-fb: Update version 1.1.29 -> 1.1.30 python3-custom-inherit: Update version 2.3.1 -> 2.4.1 python3-distlib: Update version 0.3.6 -> 0.3.7 python3-fasteners: Update version 0.18 -> 0.19 python3-filelock: Update version 3.12.0 -> 3.12.4 python3-bleak: Update version 0.20.2 -> 0.21.1 python3-dynamic-dispatch: Correct the upstream regex check for version upgrades python3-google-api-python-client: Update version 2.99.0 -> 2.100.0 python3-sqlalchemy: Upgrade 2.0.20 -> 2.0.21 python3-netaddr: Update version 0.8.0 -> 0.9.0 python3-msgpack: Update version 1.0.5 -> 1.0.6 python3-protobuf: Update version 4.24.2 -> 4.24.3 python3-gevent: Update version 23.7.0 -> 23.9.1 python3-langtable: Update version 0.0.63 -> 0.0.64 python3-posix-ipc: Update version 1.0.5 -> 1.1.1 python3-websocket-client: Update version 1.5.3 -> 1.6.3 python3-web3: Update version 6.9.0 -> 6.10.0 python3-apiflask: Update version 2.0.1 -> 2.0.2 python3-argh: Update version 0.29.3 -> 0.29.4 python3-async-timeout: remove old version of the library python3-pydantic: Update version 1.10.7 -> 2.4.1 python3-pyhamcrest: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX python3-pyasn1-modules: Update version 0.2.8 -> 0.3.0 python-pyiface: Update version from git -> 0.0.11 python3-pymysql: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX python3-pymysql: update verion 1.0.2 -> 1.1.0 python3-pyproj: update version 3.6.0 -> 3.6.1 python3-pyproject-api: update version 1.5.1 -> 1.6.1 python3-redis: update version 5.0.0 -> 5.0.1 python3-traitlets: update version 5.9.0 -> 5.10.1 python3-xxhash: update version 3.2.0 -> 3.3.0 python3-pyzmq: update version 25.0.0 -> 25.1.1 python3-cachecontrol: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX python3-flask-babel: update version 2.0.0 -> 3.1.0 python3-idna-ssl: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX python3-ninja-syntax: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX python3-prettytable: update version 3.6.0 -> 3.9.0 python3-pytz-deprecation-shim: Remove outdated recipe meant to be a short lived shim python3-tzlocal: Remove dependency on pytz_deprecation_shim removed in release 5.0 python3-astroid: update version 2.16.6 -> 3.0.0 python3-flask: update version 2.3.2 -> 2.3.3 python3-google-api-core: update version 2.12.0 python3-google-api-python-client: update version 2.100.0 -> 2.101.0 python3-google-auth: update version 2.23.0 -> 2.23.1 python3-parse-type: update version 0.5.2 -> 0.6.2 python3-nacl: Add recipe for the latest release of PyNaCl python3-botocore: add recipe for latest version of botocore python3-boto3: add recipe for latest version of boto3 python3-flask-cors: add initial version of the recipe for 4.0.0 Etienne Cordonnier (1): uutils-coreutils: upgrade 0.0.20 -> 0.0.21 Gianfranco Costamagna (3): mosquitto: do not automatically depend on dlt-daemon, it's a non-mandatory logging system mosquitto: upgrade 2.0.15 -> 2.0.17 mosquitto: upgrade 2.0.17 -> 2.0.18 Jeffrey Pautler (1): bolt: disable CVE checking for this recipe Jonas Gorski (1): frr: upgrade 8.4.4 -> 9.0.1 Julian Haller (1): openct: Fix typo in SUMMARY variable Kai Kang (1): ostree: not compatible with riscv32 when ptest enabled Khem Raj (25): vlc: Fix build with gettext 0.22+ usbguard: Enable seccomp if distro features have it sharutils: Check for intmax_t using configure poco: Add pass/fail ststus into logs mongodb: Add rdep on tzdata-core mongodb: Upgrade to 4.4.24 meta-oe-ptest-image-poco: Increase size tp 1G poco: Fix ptest runtime errors poco: Do not enable MongoDB packageconfig by default plocate: Upgrade to 1.1.19 release xscreensaver: Add osuosl backup MIRROR mozjs-115: Apply autoconf tuple mismatch fix cpp-netlib: Fix build with boost 1.80+ cpp-netlib: Fix buildpaths in generated cmake files python3-pybluez: Fix patch upstream-status python3-pynetlinux: Fix patch upstream-status libnet-idn-encode: Add recipe libio-socket-ssl-perl: Change libnet-libidn-perl->libnet-idn-encode rdep for ptests libnfs: Drop -Wno-implicit-function-declaration webkitgtk3: Do not use musttail with clang on arm fftw: Fix ptest result reporting nodejs: Fix ptest result reporting relayd: Update to latest tip of trunk relayd: Fix build with clang kernel-selftest: Build headers before compiling tests Lee Chee Yang (8): libsdl: fix CVE-2022-34568 keepalived: 2.2.2 -> 2.2.8 irssi: 1.4.2 -> 1.4.4 iniparser: Fix CVE-2023-33461 opensc: fix CVE-2023-2977 x11vnc: Fix CVE-2020-29074 libvncserver: update to 0.9.14 ntpsec: 1.2.2 -> 1.2.2a Markus Volk (48): libei: add recipe libxmlb: update 0.3.10 -> 0.3.14 appstream: update 0.16.2 -> 0.16.3 webrtc-audio-processing: add recipe for 1.x pipewire: upgrade 0.3.79 -> 0.3.80 evolution-data-server: upgrade 3.48.3 -> 3.50.0 appstream: remove workaround for cross-compile libxmlb: fix a reproducibility and runtime issue with ptest tracker-miners: upgrade 3.5.0 -> 3.6.0 mozjs: upgrade 102.9.0 -> 102.15.0 tecla: add recipe polkit: upgrade 122 -> 123 tracker: upgrade 3.5.1 -> 3.6.0 libxmlb: remove recipe appstream: remove recipe gvfs: upgrade 1.51.90 -> 1.52.0 mutter: upgrade 44.3 -> 45.0 xdg-desktop-portal: upgrade 1.16.0 -> 1.18.0 gnome-boxes: upgrade 44.2 -> 45.0 gnome-session: upgrade 44.0 -> 45.0 gnome-text-editor: upgrade 44.0 -> 45.0 gnome-shell: upgrade 44.3 -> 45.0 eog: upgrade 44.3 -> 45.0 gnome-calculator: upgrade 44.0 -> 45.0 xdg-desktop-portal-gnome: upgrade 44.1 -> 45.0 gnome-calendar: upgrade 44.0 -> 45.0 gnome-software: upgrade 44.4 -> 45.0 zenity: upgrade 3.44.0 -> 3.44.2 gnome-system-monitor: upgrade 44.0 -> 45.0 webkitgtk: upgrade 2.40.5 -> 2.42.0 gnome-control-center: upgrade 44.3 -> 45.0 gnome-settings-daemon: upgrade 44.1 -> 45.0 tracker: add missing Upstream-Status gdm: upgrade 44.1 -> 45.0.1 gnome-calendar: fix reproducibility issue exiv2: Upgrade 0.27.6 -> 0.28.0 gexiv: Upgrade 0.14.0 -> 0.14.2 gjs: Upgrade 1.76.1 -> 1.78.0 mozjs: add recipe for v115 evince: Upgrade 44.2 -> 45.0 Nautilus: Upgrade 44.2.1 -> 45.0 gedit: Upgrade 44.2 -> 46.1 tepl: Upgrade 6.4.0 -> 6.8.0 libblockdev: Upgrade 2.28 -> 3.03 udisks2: Upgrade 2.9.4 -> 2.10.1 mozjs: Upgrade 102.15.0 -> 102.15.1 libnfs: dont install libnfs-config.cmake gnome-remote-desktop: Upgrade 44.2 -> 45.0 Martin Jansa (20): webrtc-audio-processing: Fix build with -Werror=return-type freeglut: return x11 to REQUIRED_DISTRO_FEATURES packagegroup-meta-multimedia: restore x11 restriction for projucer btrfsmaintenance: move btrfs-tools dependency from build-time to run-time btrfsmaintenance: drop allarch ttf-google-fira: exclude siggen dependency on fontconfig cukinia: drop allarch mdio-tools: exclude siggen dependency on mdio-netlink ot-br-posix: exclude siggen dependency on ipset mongodb: add and fix Upstream-Status mongodb: Fix build on 32bit gupnp: fix build with meson-1.2.0 minifi-cpp, mozjs-115, redis-7.2.1, pv: add missing Upstream-Status mozjs: fix filename in MULTILIB_SCRIPTS gupnp-tools: fix build with meson-1.2.0 gnome-tweaks, networkmanager-fortisslvpn, libesmtp, json-schema-validator, python3-pybluez, python3-pynetlinux, apache2: Fix Malformed Upstream-Status mozjs: use PV in MULTILIB_SCRIPTS mosquitto, etcd-cpp-apiv3: add missing Upstream-Status meta-oe/dynamic-layers: add Upstream-Status where missing meta-oe/dynamic-layers: add one more missing Upstream-Status and fix one malformed Michał Iwanicki (1): python3-pyu2f: add recipe Mingli Yu (4): minifi-cpp: Remove the buildpath issue hdf5: Upgrade to 1.14.2 vlock: Use EXTRA_CFLAGS mozjs-102: Remove the buildpath Richard Leitner (2): python3-shellingham: add recipe for v1.5.3 python3-autoflake: add recipe for v2.2.1 Ross Burton (1): webkitgtk3: reduce size of -dbg package Sam Van Den Berge (6): python3-flask-jwt-extended: add recipe python3-flask-marshmallow: add recipe python3-apispec: add recipe python3-flask-httpauth: add recipe python3-webargs: add recipe python3-apiflask: add recipe Samantha Jalabert (6): Remove python3-rdflib Remove python3-license-expression Remove python3-xmltodict Remove python3-booleanpy Remove python3-click Remove python3-isodate Samuli Piippo (1): protobuf: stage protoc binary to sysroot Sanjay Chitroda (1): netkit-telnet: Fix CVE-2022-39028 Trevor Gamblin (1): python3-aiofiles: upgrade 23.1.0 -> 23.2.1 Vyacheslav Yurkov (3): overlayfs-tools: Drop unneeded dependency overlayfs-tools: Bump up the version overlayfs-tools: Install fsck binary Wang Mingyu (42): freerdp: upgrade 2.10.0 -> 2.11.0 boost-sml: upgrade 1.1.8 -> 1.1.9 ctags: upgrade 6.0.20230827.0 -> 6.0.20230917.0 dovecot: upgrade 2.3.20 -> 2.3.21 freerdp: upgrade 2.11.0 -> 2.11.1 gensio: upgrade 2.7.5 -> 2.7.6 geoclue: upgrade 2.7.0 -> 2.7.1 hwloc: upgrade 2.9.2 -> 2.9.3 iperf3: upgrade 3.14 -> 3.15 libcloudproviders: upgrade 0.3.2 -> 0.3.4 libdeflate: upgrade 1.18 -> 1.19 libglvnd: upgrade 1.6.0 -> 1.7.0 libtommath: upgrade 1.2.0 -> 1.2.1 libcoap: upgrade 4.3.1 -> 4.3.3 python3-antlr4-runtime: upgrade 4.13.0 -> 4.13.1 python3-lazy: upgrade 1.5 -> 1.6 python3-pyfanotify: upgrade 0.2.0 -> 0.2.1 psqlodbc: upgrade 15.00.0000 -> 16.00.0000 python3-argcomplete: upgrade 3.1.1 -> 3.1.2 python3-bitstring: upgrade 4.1.1 -> 4.1.2 python3-cmake: upgrade 3.27.4.1 -> 3.27.5 python3-coverage: upgrade 7.3.0 -> 7.3.1 python3-engineio: upgrade 4.7.0 -> 4.7.1 python3-eth-utils: upgrade 2.2.0 -> 2.2.1 python3-flask-migrate: upgrade 4.0.4 -> 4.0.5 python3-flask-socketio: upgrade 5.3.5 -> 5.3.6 python3-google-api-python-client: upgrade 2.97.0 -> 2.99.0 python3-google-auth: upgrade 2.22.0 -> 2.23.0 python3-pillow: upgrade 10.0.0 -> 10.0.1 python3-pymisp: upgrade 2.4.175 -> 2.4.176 python3-pymodbus: upgrade 3.5.0 -> 3.5.2 python3-rapidjson: upgrade 1.10 -> 1.11 python3-rich: upgrade 13.5.2 -> 13.5.3 python3-term: upgrade 2.4 -> 2.5 python3-tox: upgrade 4.11.1 -> 4.11.3 python3-typeguard: upgrade 4.1.3 -> 4.1.5 python3-types-setuptools: upgrade 68.1.0.1 -> 68.2.0.0 python3-virtualenv: upgrade 20.24.4 -> 20.24.5 python3-xlsxwriter: upgrade 3.1.2 -> 3.1.3 python3-zeroconf: upgrade 0.97.0 -> 0.112.0 redis: upgrade 7.2.0 -> 7.2.1 remmina: upgrade 1.4.31 -> 1.4.32 Xiangyu Chen (3): mosh: add support of protobuf 4.22.x protobuf: upgrade 3.21.12 -> 4.22.2 protobuf-c: add support of protobuf 4.22.x Yi Zhao (1): audit: upgrade 3.1.1 -> 3.1.2 meta-arm: bd0953cc60..95789365f7: Abdellatif El Khlifi (2): arm-bsp/trusted-firmware-a: corstone1000: enable ERRATA_A35_855472 arm-bsp/u-boot: corstone1000: purge U-Boot specific DT nodes before Linux Adam Johnston (1): arm-bsp/trusted-firmware-a: Fix BL32 path if usrmerge enabled Divin Raj (1): ci,doc,kas,arm-bsp,arm: Remove support for fvp-baser-aemv8r64 machine Emekcan Aras (6): arm-bsp/optee-os: corstone1000: Handling logging syscall correctly CI: Add meta-secure-core CI: Include meta-secure-core in corstone1000 kas: corstone1000: add meta-secure-core arm-bsp/u-boot: corstone1000: introduce authenticated capsule update arm-bsp/trusted-firmware-m: Enable authenticated capsule update Javier Tia (2): optee-client: start tee-supplicant.service when teeprivX dev is detected libts: tee-udev.rules: Change ownership to tee group Jon Mason (5): arm/edk2: update to edk2-stable202308 arm/trusted-firmware-m: update to 1.8.1 arm/opencsd: update to v1.4.1 arm/scp-firmware: update to v2.13.0 README: remove reference to meta-arm-autonomy Khem Raj (1): layer.conf: update LAYERSERIES_COMPAT for nanbield Mariam Elshakfy (2): arm-bsp/optee-os: N1SDP upgrade optee-os to 3.22 arm-bsp/optee-os: N1SDP upgrade tadevkit and optee-test to 3.22 Peter Hoyes (2): CI: Allow a GitHub container registry mirror to be specified CI: Make update-repos more resilient to network issues Ross Burton (15): arm/generic-arm64: move SERIAL_CONSOLES to generic-arm64 arm/qemu-generic-arm64: force off KVM in qemu arm/generic-arm64: set XSERVER to install the modesetting driver CI: remove redundant variables in testimage.yml arm-bsp: change port mapping for SSH to port 2222 arm/apply_local_src_patches: allow use in multiple directories arm/trusted-services: pass through CMake generator arm/trusted-services: add missing pkgconfig inherit arm/trusted-services/ts-remote-test: move binary to $bindir arm/trusted-services/ts-sp-env-test: add missing DEPENDS arm/trusted-services/ts-sp-env-test: remove arm/trusted-services: use apply_local_src_patches arm/trusted-services: upgrade nanopb and fix build races CI: use a venv for sphinx CI: upgrade to Kas 4 container Xueliang Zhong (2): arm-bsp/n1sdp: update to linux yocto kernel 6.4 arm-bsp/corstone1000: bump kernel version to v6.4 meta-security: 1856a7cf43..aca6d4a9e7: Armin Kuster (10): suricata: fix build issue. suricata: Update to 7.0.0 sssd: Update to 2.9.2 openscap: update to 1.3.9 python3-privacyidea: update to 3.8.1 lkrg-module: update to 0.9.7 libhtp: update to 0.5.45 swtpm: update 0.8.1 lynis: Update to 3.0.9 scap-security-guide: Drop Poky patch and update to tip John Broadbent (1): libhoth: Update meta-raspberrypi: 6501ec892c..482d864b8f: Joshua Watt (1): rpi-base: Fix wic image kernel dependency Khem Raj (5): userland: Update to trunk from 20230419 linux-raspberrypi: Upgrade 6.1 release to latest point release 6.1.54 linux-firmware-rpidistro: Update to 20230210-5_bpo11+1 bluez-firmware-rpidistro: Update to 1.2-4+rpt10 raspberrypi-firmware: Update to 20230509~buster Martin Jansa (1): layer.conf: update LAYERSERIES_COMPAT for nanbield Change-Id: Id75112a3b0be4bd150dc5d9a28c01982ed48200e Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/protobuf')
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch106
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb6
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch69
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch15
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.23.4.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.21.12.bb)22
5 files changed, 136 insertions, 82 deletions
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
new file mode 100644
index 0000000000..896a568e19
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch
@@ -0,0 +1,106 @@
+From 62b2fd0a150133b6439f6537cb1762d35f5790ee Mon Sep 17 00:00:00 2001
+From: Xiangyu Chen <xiangyu.chen@windriver.com>
+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 <xiangyu.chen@windriver.com>
+---
+ 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 d724287d66..1d9ca9daae 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,8 +12,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9f725889e0d77383e26cb42b0b62cea2"
DEPENDS = "protobuf-native protobuf"
-SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https"
-SRCREV = "abc67a11c6db271bedbb9f58be85d6f4e2ea8389"
+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"
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
deleted file mode 100644
index 2bc44c898b..0000000000
--- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From a91130bb95528743a3f7253f8fe945b7505047d5 Mon Sep 17 00:00:00 2001
-From: Kyungjik Min <dp.min@lge.com>
-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 36c3c597ac..7c4bf260eb 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 <leon.anavi@konsulko.com>
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/examples/Makefile b/examples/Makefile
-index 1c7ec8d63..85f591231 100644
+index ef7a4ef58..7206e14e1 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -2,6 +2,8 @@
@@ -42,17 +42,20 @@ index 1c7ec8d63..85f591231 100644
all: cpp java python
cpp: add_person_cpp list_people_cpp
-@@ -40,11 +42,11 @@ protoc_middleman_dart: addressbook.proto
+@@ -41,11 +43,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++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
+- 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
list_people_cpp: list_people.cc protoc_middleman
pkg-config --cflags protobuf # fails if protobuf is not installed
-- 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
+- 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
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_4.23.4.bb
index d95e1c20f3..06d73d648f 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.21.12.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.23.4.bb
@@ -7,15 +7,14 @@ SECTION = "console/tools"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b"
-DEPENDS = "zlib"
+DEPENDS = "zlib abseil-cpp"
DEPENDS:append:class-target = " protobuf-native"
-SRCREV = "f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c"
+SRCREV = "2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a"
-SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=21.x;protocol=https \
+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 \
- 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 "
@@ -35,6 +34,7 @@ EXTRA_OECMAKE += "\
-Dprotobuf_BUILD_LIBPROTOC=ON \
-Dprotobuf_BUILD_TESTS=OFF \
-Dprotobuf_BUILD_EXAMPLES=OFF \
+ -Dprotobuf_ABSL_PROVIDER="package" \
"
TEST_SRC_DIR = "examples"
@@ -50,9 +50,18 @@ do_compile_ptest() {
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${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}"
@@ -92,6 +101,9 @@ PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-lite"
FILES:${PN}-compiler = "${bindir} ${libdir}/libprotoc${SOLIBS}"
FILES:${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}"
+# CMake requires binaries to exist in sysroot, even if they have wrong architecture.
+SYSROOT_DIRS += "${bindir}"
+
RDEPENDS:${PN}-compiler = "${PN}"
RDEPENDS:${PN}-dev += "${PN}-compiler"
RDEPENDS:${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-protobuf', '', d)}"