diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2023-09-11 15:41:39 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2023-09-18 14:19:32 +0300 |
commit | 5082cc7fedfff6c28a1406c79606b09012b134bc (patch) | |
tree | bc994073c7289536f801a16ca7e20d21c05ad7b6 /meta-openembedded/meta-oe | |
parent | 2edf0648b7c401072e7183c7f9e0e7c437e5f3f0 (diff) | |
download | openbmc-5082cc7fedfff6c28a1406c79606b09012b134bc.tar.xz |
subtree updates openembedded poky
meta-openembedded: 491b7592f4..eff1b182c1:
Alejandro Hernandez Samaniego (1):
emacs: update to 29.1
Archana Polampalli (2):
python3-pyroute2: fix ptest failure
nodejs: upgrade 18.17.0 -> 18.17.1
Bartosz Golaszewski (1):
libgpiod: update to v2.0.2
Beniamin Sandu (3):
unbound: upgrade 1.17.1 -> 1.18.0
mbedtls: upgrade 3.4.0 -> 3.4.1
mbedtls: upgrade 2.28.3 -> 2.28.4
Benjamin Bara (3):
libvpx: fix VPXTARGET for non-neon armv7a
ne10: set incompatible for armv7 without neon
openh264: make neon optional and disable if not supported
Chaitanya Vadrevu (1):
bolt: Add recipe
Chen Qi (2):
spice-protocol: fix populate_sdk error when spice is installed
python3-blivetgui: switch from master to main
Christophe Vu-Brugier (1):
sg3-utils: upgrade 1.47 -> 1.48
Danik (2):
python3-gspread: interface for google spreadsheet
python3-piccata: piccata - a simple CoAP toolkit added
Denys Zagorui (1):
bpftool: add native and nativesdk support
Emil Kronborg Andersen (3):
lcms: add CVE_PRODUCT
snappy: add CVE_PRODUCT
libopus: add CVE_PRODUCT
Enrico Jorns (1):
microcom: add new recipe
Ewa Kujawska (1):
python3-oauth2client_4.1.2.bb: recipe added
Frieder Schrempf (1):
python3-can: Add missing runtime dependencies
Gianfranco Costamagna (1):
dlt-daemon: upgrade 2.18.9 -> 2.18.10 (commit: 0f2d4cfffada6f8448a2cb27995b38eb4271044f)
Joe Slater (1):
python3-inotify: fix tests
Justin Bronder (5):
python3-mypy-extensions: upgrade 0.4.3 -> 1.0.0
python3-types-setuptools: add 68.0.0.3
python3-typed-ast: remove EOL package
python3-types-psutil: add 5.9.5.16
python3-mypy: upgrade 0.971 -> 1.5.0
Kai Kang (1):
libmcrypt: fix multilib conflict
Khem Raj (31):
qad: Fix build with clang
python3-dominate: Fix get_thread_context ptest on musl
perfetto: Add SRCREV_FORMAT
gosu: Define SRCREV_FORMAT
libsdl2-ttf: Define SRCREV_FORMAT
gosu: Define SRCREV_FORMAT
sysdig: Add SRCREV_FORMAT
cockpit: Upgrade to 298 release
librelp: Fix function prototypes in tests
jemalloc: Unbolt clang workaroud
python3-protobuf: Fix build errors seen with clang
mariadb: Fix build with libfmt 10.1+
librelp: Add packageconfigs for TLS implementations
librelp: Fix ptests builds on musl
librelp: Fix ptest installs to work with dash
librelp: Add to meta-oe ptest image
liburing: Upgrade to 2.4 release
rsyslog: Enable openssl transport by default
libio-socket-ssl-perl: Upgrade to 2.083
libfaketime: Fix build with clang
libfaketime: Eanable LFS64 on musl
python3-lz4: Drop using PYTHON_PN
python3-lz4: Add missing rdeps needed for ptests
rsyslog: Skip failing omfile-outchannel test on musl
python3-m2crypto: Append architecture to SWIG_FEATURES instead of overriding
networkmanager: Fix build on musl
network-manager-applet: Fix build with musl/lld linker
networkmanager-openvpn: Fix build with lld on musl
openconnect: Upgrade to 9.12
openconnect: Fix build with GnuTLS v3.8.1
fontforge: Fix build with gettext 0.22
Kirk Hays (1):
jack: Drop dependency on readline
Leon Anavi (2):
aml: add new recipe
neatvnc: add new recipe
Marek Vasut (2):
libiio: Use tagged v0.25
libiio: Rename to versioned recipe filename
Marine Vovard (1):
python3-kivy: Require X11 or Wayland in DISTRO_FEATURES
Mark Hatle (1):
kconfig-frontends: Avoid using hard coded /usr/include paths
Markus Volk (28):
gvfs: update 1.51.1 -> 1.51.90
gnome-themes-extra: fix datadir path
libnice: add graphviz-native dependency
libcanberra: fix api-documentation build
libgweather4: fix api-documentation build
appstream: disable docs
gtksourceview5: fix api-documentation build
libpeas: fix api-documentation build
nautilus: fix api-documentation build
evince: fix api-documentation build
usbids: add recipe
libcacard: add recipe
usbredir: upgrade 0.9.0 -> 0.13.0
spice: upgrade 0.14.2 -> 0.15.2
gnome-remote-desktop: add recipe
libosinfo: add recipe
gnome-boxes: add recipe
pipewire: upgrade 0.3.77 -> 0.3.78
spice-gtk: fix api-documentation build
flatpak: fix api-documentation build
phodav: add recipe
libdecor: update to latest commit
spice-guest-vdagent: add recipe
pipewire: upgrade 0.3.78 -> 0.3.79
spice: add missing dependency on orc
spice-guest-vdagent: add missing dependencies
libosinfo: build vapi only if gobject-introspection is enabled
gnome-boxes: remove dependency on ovmf
Martin Jansa (12):
openh264: fix installed-vs-shared QA issue with multilib
libfaketime: simplify packaging
json-schema-validator: restore 0004-cmake-Use-GNUInstallDirs.patch
phodav: make sure systemd files are packaged correctly
sysbench: avoid -L/usr/lib32 and configure-unsafe QA issue
mongodb: enable hardware crc32 only with crc in TUNE_FEATURES
khronos-cts.inc: respect MLPREFIX when appending DEPENDS with anonymous python
libcyusbserial: fix installed-vs-shipped QA issue with multilib
tcpreplay: fix pcap detection with /usr/lib32 multilib
libiio: use main branch instead of master
webkitgtk: explicitly disable JIT for armv7* with softfp
layer.conf: update LAYERSERIES_COMPAT for nanbield
Ming Liu (1):
libusbgx: usbgx.service: use Type=oneshot
Mingli Yu (4):
mariadb: Upgrade to 10.11.5
dialog: Update the SRC_URI
gnulib: Update SRC_URI
thrift: Remove buildpaths
Nicolas Marguet (1):
librelp: add ptest
Parian Golchin (1):
json-schema-validator: Updrade to 2.2.0
Pawel Langowski (1):
qcbor: add recipe
Petr Chernikov (1):
Fix empty 0.0.0-0-g0 jemalloc version by adding --with-version
Petr Gotthard (1):
python3-sdbus: add recipe
Robert Yang (1):
frr: Fix CVE-2023-41358 and CVE-2023-41360
Roger Knecht (1):
python3-schedule: add recipe
Roland Hieber (1):
fbida: update Upstream-Status for submitted patches
Ross Burton (1):
Revert "protobuf: stage protoc binary to sysroot"
Soumya (1):
yasm: fix CVE-2023-37732
Soumya Sambu (1):
krb5: Upgrade 1.20.1 -> 1.20.2
Sourav Kumar Pramanik (1):
meta-oe-components: Avoid usage of nobranch=1
Sourav Pramanik (2):
rapidjson: Avoid usage of nobranch=1
nlohmann-json: Avoid usage of nobranch=1
Stanislav Angelovic (1):
feat: bump sdbus-c++ up to v1.3.0
Sudip Mukherjee (1):
qad: Add initial recipe
Trevor Gamblin (1):
python3-kivy: fix filename
Tymoteusz Burak (2):
ttf-google-fira: add recipe
libfaketime: add recipe
Vincent Davis Jr (1):
cglm: upgrade v0.8.9 -> v0.9.1
Wang Mingyu (108):
libcloudproviders: upgrade 0.3.1 -> 0.3.2
chrony: upgrade 4.3 -> 4.4
networkmanager: upgrade 1.42.8 -> 1.44.0
weechat: upgrade 4.0.2 -> 4.0.3
ctags: upgrade 6.0.20230730.0 -> 6.0.20230813.0
fmt: upgrade 10.0.0 -> 10.1.0
gensio: upgrade 2.6.7 -> 2.7.2
googletest: upgrade 1.13.0 -> 1.14.0
lvgl: upgrade 8.3.8 -> 8.3.9
postgresql: upgrade 15.3 -> 15.4
smartmontools: upgrade 7.3 -> 7.4
xdg-dbus-proxy: upgrade 0.1.4 -> 0.1.5
yaml-cpp: upgrade 0.7.0 -> 0.8.0
libtest-harness-perl: upgrade 3.44 -> 3.47
python3-alembic: upgrade 1.11.1 -> 1.11.2
python3-async-timeout: upgrade 4.0.2 -> 4.0.3
python3-bitarray: upgrade 2.8.0 -> 2.8.1
python3-cmake: upgrade 3.27.0 -> 3.27.2
python3-coverage: upgrade 7.2.7 -> 7.3.0
python3-dnspython: upgrade 2.4.1 -> 2.4.2
python3-google-api-python-client: upgrade 2.95.0 -> 2.96.0
python3-googleapis-common-protos: upgrade 1.59.1 -> 1.60.0
python3-joblib: upgrade 1.3.1 -> 1.3.2
python3-luma-oled: upgrade 3.12.0 -> 3.13.0
python3-platformdirs: upgrade 3.9.1 -> 3.10.0
python3-pycodestyle: upgrade 2.10.0 -> 2.11.0
python3-pyflakes: upgrade 3.0.1 -> 3.1.0
python3-pymisp: upgrade 2.4.173 -> 2.4.174
python3-rdflib: upgrade 6.3.2 -> 7.0.0
python3-regex: upgrade 2023.6.3 -> 2023.8.8
python3-rich: upgrade 13.4.2 -> 13.5.2
python3-sh: upgrade 2.0.4 -> 2.0.6
python3-tox: upgrade 4.6.4 -> 4.8.0
python3-tqdm: upgrade 4.65.0 -> 4.66.1
python3-uefi-firmware: upgrade 1.10 -> 1.11
python3-virtualenv: upgrade 20.24.2 -> 20.24.3
python3-web3: upgrade 6.7.0 -> 6.8.0
python3-yamlloader: upgrade 1.2.2 -> 1.3.2
python3-zeroconf: upgrade 0.71.4 -> 0.76.0
python3-protobuf: upgrade 4.23.4 -> 4.24.0
ctags: upgrade 6.0.20230813.0 -> 6.0.20230820.0
debootstrap: upgrade 1.0.128 -> 1.0.131
gensio: upgrade 2.7.2 -> 2.7.4
gnome-bluetooth: upgrade 42.5 -> 42.6
nginx: upgrade 1.25.1 -> 1.25.2
geary: update 44.0 -> 44.1
php: upgrade 8.2.8 -> 8.2.9
python3-redis: upgrade 4.6.0 -> 5.0.0
python3-alembic: upgrade 1.11.2 -> 1.11.3
python3-awesomeversion: upgrade 23.5.0 -> 23.8.0
python3-bitstring: upgrade 4.0.2 -> 4.1.0
python3-click: upgrade 8.1.6 -> 8.1.7
python3-engineio: upgrade 4.5.1 -> 4.6.0
python3-google-api-python-client: upgrade 2.96.0 -> 2.97.0
python3-humanize: upgrade 4.7.0 -> 4.8.0
python3-mypy: upgrade 1.5.0 -> 1.5.1
python3-oauth2client: upgrade 4.1.2 -> 4.1.3
python3-protobuf: upgrade 4.24.0 -> 4.24.1
python3-pycocotools: upgrade 2.0.6 -> 2.0.7
python3-pymetno: upgrade 0.10.0 -> 0.11.0
python3-pymongo: upgrade 4.4.1 -> 4.5.0
python3-pywbem: upgrade 1.6.1 -> 1.6.2
python3-sqlalchemy: upgrade 2.0.19 -> 2.0.20
python3-tox: upgrade 4.8.0 -> 4.10.0
python3-typeguard: upgrade 4.1.0 -> 4.1.2
python3-types-setuptools: upgrade 68.0.0.3 -> 68.1.0.0
python3-zeroconf: upgrade 0.76.0 -> 0.82.1
redis: upgrade 7.0.12 -> 7.2.0
weechat: upgrade 4.0.3 -> 4.0.4
traceroute: upgrade 2.1.2 -> 2.1.3
wireshark: upgrade 4.0.7 -> 4.0.8
adw-gtk3: upgrade 4.8 -> 4.9
ctags: upgrade 6.0.20230820.0 -> 6.0.20230827.0
debootstrap: upgrade 1.0.131 -> 1.0.132
dialog: upgrade 1.3-20210509 -> 1.3-20230209
fmt: upgrade 10.1.0 -> 10.1.1
gensio: upgrade 2.7.4 -> 2.7.5
iwd: upgrade 2.7 -> 2.8
libgphoto2: upgrade 2.5.30 -> 2.5.31
libzip: upgrade 1.10.0 -> 1.10.1
logwatch: upgrade 7.8 -> 7.9
thrift: upgrade 0.18.1 -> 0.19.0
libnet-dns-perl: upgrade 1.39 -> 1.40
python3-alembic: upgrade 1.11.3 -> 1.12.0
python3-argh: upgrade 0.28.1 -> 0.29.3
python3-asttokens: upgrade 2.2.1 -> 2.4.0
python3-bitstring: upgrade 4.1.0 -> 4.1.1
python3-cmake: upgrade 3.27.2 -> 3.27.4.1
python3-diskcache: upgrade 5.6.1 -> 5.6.3
python3-engineio: upgrade 4.6.0 -> 4.7.0
python3-imageio: upgrade 2.31.1 -> 2.31.3
python3-ipython: upgrade 8.14.0 -> 8.15.0
python3-kiwisolver: upgrade 1.4.4 -> 1.4.5
python3-langtable: upgrade 0.0.62 -> 0.0.63
python3-luma-core: upgrade 2.4.0 -> 2.4.1
python3-protobuf: upgrade 4.24.1 -> 4.24.2
python3-pymisp: upgrade 2.4.174 -> 2.4.175
python3-pymodbus: upgrade 3.4.1 -> 3.5.0
python3-smbus2: upgrade 0.4.2 -> 0.4.3
python3-snagboot: upgrade 1.1 -> 1.2
python3-socketio: upgrade 5.8.0 -> 5.9.0
python3-soupsieve: upgrade 2.4.1 -> 2.5
python3-tox: upgrade 4.10.0 -> 4.11.1
python3-typeguard: upgrade 4.1.2 -> 4.1.3
python3-types-setuptools: upgrade 68.1.0.0 -> 68.1.0.1
python3-virtualenv: upgrade 20.24.3 -> 20.24.4
python3-web3: upgrade 6.8.0 -> 6.9.0
python3-zeroconf: upgrade 0.82.1 -> 0.97.0
Willy Tu (1):
abseil-cpp: upgrade 20230125.3 -> 20230802.0
Yi Zhao (7):
nftables: upgrade 1.0.7 -> 1.0.8
libssh: upgrade 0.10.4 -> 0.10.5
samba: upgrade 4.18.5 -> 4.18.6
libyang: upgrade 2.1.55 -> 2.1.111
frr: Security fix CVE-2023-3748
vsomeip: add recipe
ntp: add missing runtime dependencies
Yogita Urade (2):
poppler: fix CVE-2023-34872
hwloc: fix CVE-2022-47022
Βούλγαρη Αικατερίνη (1):
collectd: build with rrdcached plugin
poky: 71282bbc53..61531cd395:
Adrian Freihofer (2):
cmake.bbclass: cleanup spaces and tabs
cmake.bbclass: refactor cmake args
Alberto Planas (1):
bitbake.conf: add bunzip2 in HOSTTOOLS
Alexander Kanavin (18):
lib/oe/recipeutils.py: accommodate SRCPV being optional and deprecated in version check regex
python3-sphinx: correct version check
systemd-bootchart: musl fixes have been rejected upstream
openssl: build and install manpages only if they are enabled
gettext: upgrade 0.21.1 -> 0.22
connman: update 1.41 -> 1.42
libcgroup: update 3.0.0 -> 3.1.0
perlcross: update 1.4.1 -> 1.5
perl: update 5.36.1 -> 5.38.0
groff: update 1.22.4 -> 1.23.0
libglu: update 9.0.2 -> 9.0.3
libpthread-stubs: update 0.4 -> 0.5
gpgme: upgrade 1.20.0 -> 1.22.0
libgudev: upgrade 237 -> 238
gnupg: upgrade 2.4.2 -> 2.4.3
gnutls: update 3.8.0 -> 3.8.1
runqemu: check permissions of available render nodes as well as their presence
build-sysroots: target or native sysroot population need to be selected explicitly
Alexis Lothoré (7):
oeqa/utils/gitarchive: fix tag computation when creating archive
oeqa/selftest: introduce gitarchive tests
oeqa/utils/gitarchive: fix tag computation when creating archive
oeqa/selftest/gitarchive: add tests about tags lisiting when no remote is configured
oeqa/utils/gitarchive: allow to pass a logger to get_tags
oeqa/utils/gitarchive: fall back to local tags when listing existing tags
oeqa/utils/gitarchive: replace warning with info when reading local tags
Angelo Ribeiro (1):
ccache.bbclass: Add allowed list for native recipes
Anuj Mittal (3):
gstreamer1.0: upgrade 1.22.4 -> 1.22.5
harfbuzz: upgrade 8.0.1 -> 8.1.1
stress-ng: upgrade 0.15.08 -> 0.16.04
Archana Polampalli (1):
vim: upgrade 9.0.1592 -> 9.0.1664
Benjamin Bara (6):
rust-target-config: fix target_features for vfpv3d16
README: fix mail address in git example command
pixman: avoid neon on unsupported machines
nettle: avoid neon on unsupported machines
ffmpeg: avoid neon on unsupported machines
ghostscript: avoid neon on unsupported machines
Bruce Ashfield (19):
conf/machine: set preferred kernel to be 6.4
poky/poky-tiny: set preferred linux-yocto version to 6.4
linux-yocto/6.1: update to v6.1.44
linux-yocto/6.4: update to v6.4.10
linux-yocto/6.1: update to v6.1.45
kern-tools: include utility to post process config diffs
linux-yocto/6.1: fix uninitialized read in nohz_full/isolcpus setup
linux-yocto/6.4: fix uninitialized read in nohz_full/isolcpus setup
linux-yocto/6.4: update to v6.4.11
linux-yocto/6.1: update to v6.1.46
linux-yocto/6.1: fix IRQ-80 warnings
linux-yocto/6.4: fix IRQ-80 warnings
linux-yocto/6.4: fix CONFIG_F2FS_IO_TRACE configuration warning
linux-yocto/6.1: fix CONFIG_F2FS_IO_TRACE configuration warning
linux-yocto/6.4: update to v6.4.12
linux-yocto/6.1: update to v6.1.50
linux-yocto/6.4: update to v6.4.13
linux-yocto/6.4: update to v6.4.14
linux-yocto/6.1: update to v6.1.51
Changqing Li (1):
sqlite3: set CVE_STATUS for CVE-2023-36191
Chen Qi (6):
bitbake: runqueue.py: fix PSI check logic
cmake: drop OE specific environment variable support
cmake.bbclass: fix allarch override syntax
uninative.bbclass: sync to use UNINATIVE_STAGING_DIR
stress-ng: disable DEBUG_BUILD
oe-depends-dot: improve '-w' behavior
Daniel Semkowicz (1):
dev-manual: wic.rst: Update native tools build command
David Reyna (3):
bitbake: toaster: Update to Django 4.2
bitbake: toaster: import only used layers
bitbake: toaster: accommodate missing 'Image Name' value in buildinfohelper
Dmitry Baryshkov (4):
mdadm: disable strace on rv32 arch
linux-firmware: upgrade 20230625 -> 20230804
linux-firmware: package audio topology for Lenovo X13s
linux-firmware: package Dragonboard 845c sensors DSP firmware
Eilís 'pidge' Ní Fhlannagáin (1):
nativesdk-intercept: Fix bad intercept chgrp/chown logic
Emil Ekmečić (2):
bitbake: fetch2: add Google Cloud Platform (GCP) fetcher
Add GCP fetcher to list of supported protocols
Emil Kronborg Andersen (2):
dbus: add additional entries to CVE_PRODUCT
libxkbcommon: add CVE_PRODUCT
Etienne Cordonnier (2):
vim: update obsolete comment
migration-guides: system-conf -> systemd-conf
Frederic Martinsons (5):
rust: add cargo-c native recipe
classes-recipe: add cargo_c.bbclass
rust: provide examples for C library generation in rust
oeqa/runtime/rust: correct rust test
ref-manual: classes.rst: suppress rust-hello-world reference, add ptest-cargo class
Jaeyoon Jung (1):
cml1: Fix KCONFIG_CONFIG_COMMAND not conveyed fully in do_menuconfig
Jasper Orschulko (1):
cve_check: Fix cpe_id generation
Joe Slater (1):
file: fix call to localtime_r()
Jon Mason (1):
linux-yocto-dev: correct qemuarmv5 device tree location
Jose Quaresma (3):
systemd: fix efi dependency
systemd-boot: remove old gummiboot TUNE_CCARGS
pybootchartgui: also match do_compile and do_configure subtasks
Joshua Watt (9):
bitbake: bblayers/query: Add multiconfig support to `show-appends`
bitbake: cooker: Fix error message
bitbake: lib/bb: Add xattr and acl libraries
buildtools-tarball: Add libacl
classes/image_types: Add vfat image type
bitbake: fetch2: git: Check if clone directory is a git repo
wic: Add gpt-hybrid partition layout
bitbake: fetch2: git: Remove useless try..else clause
Add libacl to required packages
Julien Stephan (4):
less: upgrade 633 -> 643
less: add ptest support
patch.py: use --absolute-git-dir instead of --show-toplevel to retrieve gitdir
vulkan-samples: convert debugfix.patch to git format patch
Kai Kang (1):
webkitgtk: fix build failure with DEBUG_BUILD enabled
Khem Raj (22):
gnu-efi: Fix build on musl
systemd-boot: Fix build on musl
glibc: Upgrade to 2.38 release
glibc: Enable fortify sources by defaults
glibc: Drop --enable-tunables
glibc: Fix SVE detection on aarch64
glibc-tests: Add missing libgcc runtime dependency
kernel.bbclass: Use KERNEL_STRIP instead of STRIP
build-sysroots: Add SUMMARY field
tunes: Add support for sve instructions on armv8/armv9
arch-armv8,arch-armv9: Add sve based tune options
python3: Increase default thread stack size on musl
inetutils: Fix CVE-2023-40303
inetutils: Apply devtool formatting suggestions
qemu: Fix CVE-2023-40360
core-image-ptest: Define a fallback for SUMMARY field
dos2unix: upgrade 7.5.0 -> 7.5.1
python3: Fix ptests on musl
tcl: Add a way to skip ptests
rust-target-config: Map rust target to OE target
libc-test: Depend on musl-staticdev
apr: Fix ptests on musl
Lee Chee Yang (2):
migration-guides: add release notes for 4.2.3
migration-guides: add release notes for 4.0.12
Lei Maohui (1):
glibc-package: Fix conflict error when enable multilib.
Luan Rafael Carneiro (2):
weston: Upgrade version 12.0.1 -> 12.0.2
weston: Add sysconfdir to FILES:${PN}
Luca Ceresoli (1):
Revert "oeqa/runtime/parselogs: Exclude preempt-rt error for now"
Markus Niebel (2):
wic: fix wrong attempt to create file system in upartitioned regions
oeqa: wic: Add test for --no-table option
Markus Volk (8):
gtk4: upgrade 4.10.4 -> 4.10.5
libadwaita: upgrade 1.3.3 -> 1.3.4
gtk4: upgrade 4.10.5 -> 4.12.0
qemu: fix libudev packageconfig for systemd images
qemu: build pulseaudio support depending on distro_feature
qemu: add packageconfigs for fuse and dbus-display
gtk4: upgrade 4.12.0 -> 4.12.1
mesa: add intel raytracing support to opencl build
Martin Jansa (6):
tcl: prevent installing another copy of tzdata
cross-localedef-native: fix build on hosts with older glibc
bitbake: runqueue: show more pressure data
Makefile: remove from top-level directory
bitbake: runqueue: show number of currently running bitbake threads when pressure changes
webkitgtk: explicitly disable JIT for armv7* with softfp
Michael Halstead (2):
yocto-uninative: Update to 4.2 for glibc 2.38
yocto-uninative: Update to 4.3
Michael Opdenacker (26):
scripts/create-pull-request: update URLs to git repositories
manuals: create a dedicated "Contributor Guide" document
ref-manual: classes.rst: fix location of _ref-classes-ccache
ref-manual: update supported distro versions
contributor-guide: add missing links to mailing lists
contributor-guide: add section about why we use mailing lists
contributor-guide: add recipe style guide
ref-manual: remove AUTHOR variable
contributor guide: call section "Reporting a defect"
contributor-guide: remove obsolete pkg-config guidelines
contributor guide: remove unnecessary information about mailing lists
contributor-guide: clarification about patchtest
contributor guide: update instructions for making and sharing changes
dev-manual: disk-space: mention faster "find" command to trim sstate cache
contributor-guide: move to 2nd place in top menu
contributor-guide: submit-changes: simplify note
contributor-guide: identify component: provide link to repositories
contributor-guide: submit-changes: detail commit and patch creation
contributor-guide: submit-changes: develop sending patches section
manuals: README: update list of manuals
contributor-guide: submit-changes: reorganize and develop sections
contributor-guide: submit-changes: improvements to mailing lists section
contributor-guide: submit-changes: commit guidelines for recipes
contributor-guide: submit-changes: how to request push access to repositories
README: update/fix contribution guidelines
bitbake: doc: bitbake-user-manual: remove reference to SSTATE_MIRRORS variable
Mikko Rapeli (4):
openssh: capture ptest regression test failure logs
oeqa selftest context.py: whitespace fix
oeqa selftest context.py: remove warning from missing meta-selftest
oeqa selftest context.py: fix git commands and set branch name
Mingli Yu (2):
qemu: Add qemu-common package
webkitgtk: Add opengl to REQUIRED_DISTRO_FEATURES
Narpat Mali (1):
ffmpeg: add CVE_STATUS for CVE-2023-39018
Otavio Salvador (2):
weston-init: remove misleading comment about udev rule
weston-init: fix init code indentation
Ovidiu Panait (1):
mdadm: skip running 04update-uuid and 07revert-inplace testcases
Paulo Neves (1):
bitbake: siggen.py: Improve taskhash reproducibility
Peter Kjellerstedt (3):
bin_package.bbclass: Inhibit the default dependencies
insane.bbclass: Remove an unused variable
poky.conf: Switch to post release name/version
Peter Marko (2):
openssl: Upgrade 3.1.1 -> 3.1.2
gcc-runtime: remove bashism
Poonam Jadhav (1):
pixman: Remove duplication of license MIT
Randolph Sapp (1):
bitbake: gitsm: tolerate git-lfs in submodules
Richard Purdie (39):
bitbake: siggen: Fix indentation
bitbake: siggen: Update debug
resulttool/report: Avoid divide by zero
gcc-testsuite: Fix qemu binary filtering code logic error
gcc-testsuite: Set qemu options for mips correctly
mips/tune-mips64r2: Set qemu cpu option correctly
binutils-cross-testsuite: Pass TUNE_LDARGS to tests
arch-mips: Ensure TUNE_LDARGS is set correctly
gcc: Add patch to improve testsuite failures, particularly mips
oeqa/runtime/parselogs: Exclude preempt-rt error for now
qemu: Upgrade 8.0.3 -> 8.0.4
lib/package_manager: Improve repo artefact filtering
Revert "oeqa/utils/gitarchive: fix tag computation when creating archive"
lttng-modules: Upgrade 2.13.9 -> 2.13.10
lttng-tools: Upgrade 2.13.9 -> 2.13.10
pseudo: Fix to work with glibc 2.38
binutils: Add missing DEPENDS on pod2man
build-sysroots: Ensure dependency chains are minimal
bitbake: fetch2: Add new srcrev fetcher API
base/package: Move source revision information from PV to PKGV
recipes/classes/scripts: Drop SRCPV usage in OE-Core
glibc: Add glibc 2.38 stable updates
README: Update to point to new contributor guide
bitbake: README: Update to point to new contributor guide
bitbake: command: Avoid time intensive distractions for ping
README: Clarify/standardise contributions process
python3-numpy: Attempt to fix reproducibility issue
bitbake: doc: Document challenges of tags with git fetcher
bitbake: server/process: Add more timing debug
qemu: Upgrade 8.0.4 -> 8.1.0
qemu: Add patches to resolve x86 and then mips boot issues
mdadm: Disable further tests due to intermittent failures
Revert "oeqa selftest context.py: fix git commands and set branch name"
classes: Drop ';' delimiter from ROOTFS/IMAGE*COMMAND variables
build-appliance-image: Update to master head revision
layer.conf: Update to nanbield release series
bitbake: bitbake: Update to 2.6.0 release series/version
layer.conf: Update to nanbield release series
build-appliance-image: Update to master head revision
Ross Burton (47):
connman-conf: don't take over any ethernet devices, not just eth0
meson.bbclass: add MESON_TARGET
meson.bbclass:: update do_write_config vardeps
systemd-boot: use MESON_TARGET
systemd-boot: improve cross file generation
p11-kit: fix build without qemu-usermode
gi-docgen: depend on qemu-usermode MACHINE_FEATURES
python3-pygobject: add explicit check for qemu-usermode MACHINE_FEATURE
graphene: fix runtime detection of IEEE754 behaviour
python3: ignore disputed CVE-2023-36632
procps: backport fix for CVE-2023-4016
linux/generate-cve-exclusions.py: fix comparison
linux/cve-exclusions: update CVE_STATUS exclusions
perf: enable verbose feature detection
perf: add more PACKAGECONFIGs
perf: fix perl binding support
perf: split scripting PACKAGECONFIG into perl and python
perf: disable perl support
libtraceevent: build with Meson
linux/generate-cve-exclusions: add version check warning
linux-yocto: update CVE exclusions files
site: remove at-spi2-core values
inetutils: don't guess target paths
inetutils: remove obsolete patches
inetutils: remove obsolete cruft from do_configure
glib-networking: enable build with GnuTLS if PKCS#11 was disabled
glib-networking: use gnutls backend for TLS sockets
cve-extra-exclusions: remove historic kernel CVEs which are handled now
cve-extra-exclusions: remove BlueZ issues
linux-yocto: update kernel CVE status
linux: review some historic CVE_STATUS
glib-2.0: explicitly enable strlcpy()
scripts/oe-find-native-sysroot: use bitbake-getvar
qemu-system-native: enable PNG support
python3-build: upgrade to 1.0.0
glib-2.0: libelf has a configure option now, specify it
harfbuzz: update PACKAGECONFIG
pango: explictly enable/disable libthai
libsoup-2.4: update PACKAGECONFIG
libsoup: update PACKAGECONFIG
wayland-utils: add libdrm PACKAGECONFIG
cve-exclusion: review the last of the historical kernel CVEs
busybox: remove coreutils dependency in busybox-ptest
libgudev: explicitly disable tests and vapi
linux: update CVE exclusions
python3-build: upgrade to 1.0.3
avahi: handle invalid service types gracefully
Ryan Eatmon (1):
kernel.bbclass: Add force flag to rm calls
Samantha Jalabert (1):
bitbake: Fix disk space monitoring on cephfs
Stéphane Veyret (1):
nfs-utils: Add needed library to client
Sudip Mukherjee (4):
kea: upgrade to v2.4.0
cmake: upgrade to v3.27.4
dpkg: upgrade to v1.22.0
openssh: upgrade to v9.4p1
Tom Hochstein (1):
linux-firmware: add firmware files for NXP BT chipsets
Trevor Gamblin (16):
python3-hypothesis: upgrade 6.82.0 -> 6.82.5
python3-more-itertools: upgrade 10.0.0 -> 10.1.0
python3-pygments: upgrade 2.15.1 -> 2.16.1
python3-wheel: upgrade 0.41.0 -> 0.41.1
maintainers.inc: Add self for unmaintained Python recipes
oe-buildenv-internal: update required Python version
python3-dbusmock: upgrade 0.29.0 -> 0.29.1
python3-numpy: upgrade 1.25.1 -> 1.25.2
python3-trove-classfiers: upgrade 2023.7.6 -> 2023.8.7
python3-setuptools: upgrade 68.0.0 -> 68.1.0
python3-dtc: upgrade 1.6.1 -> 1.7.0
python3-poetry: upgrade 1.6.1 -> 1.7.0
python3-git: upgrade 3.1.32 -> 3.1.34
python3-hypothesis: upgrade 6.82.7 -> 6.84.0
python3-pytest: upgrade 7.4.0 -> 7.4.1
python3-sphinx: upgrade 7.1.1 -> 7.2.5
Ulrich Ölmann (1):
weston: fix comment
Wang Mingyu (47):
btrfs-tools: upgrade 6.3.1 -> 6.3.3
curl: upgrade 8.2.0 -> 8.2.1
file: upgrade 5.44 -> 5.45
gmp: upgrade 6.2.1 -> 6.3.0
xxhash: upgrade 0.8.1 -> 0.8.2
python3-editables: upgrade 0.4 -> 0.5
python3-markdown: upgrade 3.4.3 -> 3.4.4
python3-pathspec: upgrade 0.11.1 -> 0.11.2
python3-pip: upgrade 23.2 -> 23.2.1
python3-pyparsing: upgrade 3.1.0 -> 3.1.1
re2c: upgrade 3.0 -> 3.1
shaderc: upgrade 2023.4 -> 2023.5
sudo: upgrade 1.9.14p2 -> 1.9.14p3
libarchive: upgrade 3.6.2 -> 3.7.1
tar: upgrade 1.34 -> 1.35
bind: upgrade 9.18.17 -> 9.18.18
bluez5: upgrade 5.68 -> 5.69
ell: upgrade 0.57 -> 0.58
git: upgrade 2.41.0 -> 2.42.0
kbd: upgrade 2.6.1 -> 2.6.2
libconvert-asn1-perl: upgrade 0.33 -> 0.34
libdrm: upgrade 2.4.115 -> 2.4.116
libedit: upgrade 20221030-3.1 -> 20230828-3.1
libgit2: upgrade 1.7.0 -> 1.7.1
librepo: upgrade 1.15.1 -> 1.15.2
libsecret: upgrade 0.20.5 -> 0.21.0
libsndfile1: upgrade 1.2.0 -> 1.2.2
libxml2: upgrade 2.11.4 -> 2.11.5
mc: upgrade 4.8.29 -> 4.8.30
mpfr: upgrade 4.2.0 -> 4.2.1
neard: upgrade 0.18 -> 0.19
python3: upgrade 3.11.4 -> 3.11.5
pango: upgrade 1.50.14 -> 1.51.0
pigz: upgrade 2.7 -> 2.8
pkgconf: upgrade 1.9.5 -> 2.0.2
python3-setuptools: upgrade 68.1.0 -> 68.1.2
repo: upgrade 2.35 -> 2.36.1
shaderc: upgrade 2023.5 -> 2023.6
sqlite3: upgrade 3.42.0 -> 3.43.0
sysklogd: upgrade 2.5.0 -> 2.5.2
xz: upgrade 5.4.3 -> 5.4.4
zlib: upgrade 1.2.13 -> 1.3
python3-hypothesis: upgrade 6.82.5 -> 6.82.7
python3-pluggy: upgrade 1.2.0 -> 1.3.0
python3-sphinx-rtd-theme: upgrade 1.2.2 -> 1.3.0
python3-wheel: upgrade 0.41.1 -> 0.41.2
librepo: upgrade 1.15.2 -> 1.16.0
Yang Xu (1):
meson: don't fail if no .pyc exists
Yi Zhao (2):
dhcpcd: upgrade 10.0.1 -> 10.0.2
dhcpcd: fix buffer overflow
Yoann Congal (1):
dev-manual: remove unsupported :term: markup inside markup
Yogita Urade (1):
dropbear: fix CVE-2023-36328
Yuta Hayama (3):
linux/generate-cve-exclusions: print the generated time in UTC
linux/generate-cve-exclusions: fix mishandling of boundary values
linux-yocto: correct the wording in CVE_STATUS
Zang Ruochen (6):
tcf-agent: Disable non-building features on loongarch64
gcc-sanitizers: Add loongarch as a compatible architecture.
goarch.bbclass: Add loongarch64 to go_map_arch
qemuloongarch.inc:Change to use virtio-serial-pci
kernel-devsrc: Fixed missing loongarch64 kernel source code when test_kernelmodules
gcc: Fresh 0003-64-bit-multilib-hack.patch to add loongarch64 support
Change-Id: I4d4752539711b34471002dd1817bb7c14a590675
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe')
150 files changed, 2049 insertions, 830 deletions
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 77dace08a0..06f3e16054 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 @@ -20,6 +20,7 @@ PTESTS_FAST_META_OE = "\ libee \ libio-pty-perl \ libmanette \ + librelp \ libssh \ libtinyxml2 \ libxml++-5.0 \ diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index 923b722b3c..e5970cf251 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -44,7 +44,7 @@ LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" -LAYERSERIES_COMPAT_openembedded-layer = "mickledore" +LAYERSERIES_COMPAT_openembedded-layer = "nanbield" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index 0ce58b13c4..21c3b10148 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -91,6 +91,7 @@ EXTRA_OESCONS = "PREFIX=${prefix} \ --use-system-zlib \ --nostrip \ --endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ + --use-hardware-crc32=${@bb.utils.contains('TUNE_FEATURES', 'crc', 'on', 'off', d)} \ --wiredtiger='${WIREDTIGER}' \ --separate-debug \ ${PACKAGECONFIG_CONFARGS}" diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb index caf55ed6d8..fbad5e1368 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb @@ -12,7 +12,7 @@ DEPENDS = "libbsd libpcre zlib libcap libusb squashfs-tools p7zip libselinux goo SRCREV_core = "abfd66fafcbb691d7860df059f1df1c9b1ef29da" SRC_URI = " \ - git://salsa.debian.org/android-tools-team/android-platform-tools;name=core;protocol=https;nobranch=1 \ + git://salsa.debian.org/android-tools-team/android-platform-tools;name=core;protocol=https;branch=master \ " # Patches copied from android-platform-tools/debian/patches diff --git a/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb b/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb index 945e2c3274..11e33fec55 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb @@ -4,7 +4,7 @@ SECTION = "console/tests" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "libtool libaio luajit concurrencykit" +DEPENDS = "libtool luajit concurrencykit" inherit autotools-brokensep pkgconfig @@ -17,7 +17,7 @@ S = "${WORKDIR}/git" COMPATIBLE_HOST = "(arm|aarch64|i.86|x86_64).*-linux*" -EXTRA_OECONF += "--enable-largefile --with-system-luajit --with-system-ck --without-gcc-arch" +EXTRA_OECONF += "--enable-largefile --with-system-luajit --with-system-ck --without-gcc-arch --with-lib-prefix=no" PACKAGECONFIG ??= "" PACKAGECONFIG[aio] = "--enable-aio,--disable-aio,libaio," PACKAGECONFIG[mysql] = "--with-mysql \ 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 new file mode 100644 index 0000000000..b6ad6337ce --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/bolt/bolt_0.9.5.bb @@ -0,0 +1,19 @@ +SUMMARY = "Thunderbolt user-space management tool" +DESCRIPTION = "Userspace system daemon to enable security levels for Thunderbolt on GNU/Linux" +HOMEPAGE = "https://gitlab.freedesktop.org/bolt/bolt" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "udev polkit dbus" +REQUIRED_DISTRO_FEATURES = "polkit" + +SRC_URI = "git://gitlab.freedesktop.org/bolt/bolt.git;protocol=https;branch=master" +SRCREV = "5a8a5866a847561566499847d46a97c612b4e6dd" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig meson features_check + +FILES:${PN} += "${datadir}/dbus-1/* \ + ${datadir}/polkit-1/* \ + " diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.6.7.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.7.5.bb index c3ba96ff60..00053c8ee2 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.6.7.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.7.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " -SRCREV = "266277aeb39dc2db33e577335236f89ed7ca5918" +SRCREV = "ecfc538d516cee1d2c7904a645cb74bba48b6514" SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.7.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.8.bb index f4e70890a9..ee310d295b 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.7.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.8.bb @@ -8,7 +8,7 @@ DEPENDS = "ell" SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ " -SRC_URI[sha256sum] = "289ff47a76fb854e7789c45c5e3e0f15de4adc5fd2e82e47ab08e3564d8961d9" +SRC_URI[sha256sum] = "a90e621f45b9c2f9021beea0fa6477ee0334fcd2ee34beaab42e31ea0fd3be29" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch deleted file mode 100644 index 9d0b066b10..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0aa127afa52fd265a4f1bbded1623201390ae96a Mon Sep 17 00:00:00 2001 -From: Julien Rische <jrische@redhat.com> -Date: Thu, 17 Nov 2022 15:01:24 +0100 -Subject: [PATCH] Fix aclocal.m4 syntax error for autoconf 2.72 - -An incorrect closure inside KRB5_AC_INET6 is innocuous with autoconf -versions up to 2.71, but will cause an error at configure time with -the forthcoming autoconf 2.72. - -[ghudson@mit.edu: added more context to commit message] - -ticket: 9077 (new) -tags: pullup -target_version: 1.20-next -target_version: 1.19-next - -Upstream-Status: Backport [https://github.com/krb5/krb5/commit/d864d740d019fdf2c640460f2aa2760c7fa4d5e9] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/aclocal.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/aclocal.m4 b/src/aclocal.m4 -index 9920476..3d66a87 100644 ---- a/src/aclocal.m4 -+++ b/src/aclocal.m4 -@@ -409,8 +409,8 @@ else - [[struct sockaddr_in6 in; - AF_INET6; - IN6_IS_ADDR_LINKLOCAL(&in.sin6_addr);]])], -- [krb5_cv_inet6=yes], [krb5_cv_inet6=no])]) --fi -+ [krb5_cv_inet6=yes], [krb5_cv_inet6=no]) -+fi]) - AC_MSG_RESULT($krb5_cv_inet6) - if test "$krb5_cv_inet6" = no && test "$ac_cv_func_inet_ntop" = yes; then - AC_MSG_CHECKING(for IPv6 compile-time support with -DINET6) --- -2.40.0 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.20.2.bb index 10fff11c25..54e6b778b0 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.20.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.20.2.bb @@ -14,7 +14,7 @@ DESCRIPTION = "Kerberos is a system for authenticating users and services on a n HOMEPAGE = "http://web.mit.edu/Kerberos/" SECTION = "console/network" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=1d31018dba5a0ef195eb426a1e61f02e" +LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=3c7414a99de5452b8f809ae2753b0855" inherit autotools-brokensep binconfig perlnative systemd update-rc.d pkgconfig @@ -22,7 +22,6 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ file://debian-suppress-usr-lib-in-krb5-config.patch;striplevel=2 \ file://crosscompile_nm.patch \ - file://0001-Fix-aclocal.m4-syntax-error-for-autoconf-2.72.patch;striplevel=2 \ file://etc/init.d/krb5-kdc \ file://etc/init.d/krb5-admin-server \ file://etc/default/krb5-kdc \ @@ -30,8 +29,8 @@ SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ file://krb5-kdc.service \ file://krb5-admin-server.service \ " -SRC_URI[md5sum] = "73f5780e7b587ccd8b8cfc10c965a686" -SRC_URI[sha256sum] = "704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851" +SRC_URI[md5sum] = "7ac456e97c4959ebe5c836dc2f5aab2c" +SRC_URI[sha256sum] = "7d8d687d42aed350c2525cb69a4fc3aa791694da6761dccc1c42c2ee7796b5dd" CVE_PRODUCT = "kerberos" CVE_VERSION = "5-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.18.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.19.0.bb index ea5a3972dc..70c9a7a087 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.18.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.19.0.bb @@ -10,7 +10,7 @@ DEPENDS = "thrift-native boost flex-native bison-native openssl zlib" SRC_URI = "https://downloads.apache.org/${BPN}/${PV}/${BP}.tar.gz \ file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch" -SRC_URI[sha256sum] = "04c6f10e5d788ca78e13ee2ef0d2152c7b070c0af55483d6b942e29cff296726" +SRC_URI[sha256sum] = "d49c896c2724a78701e05cfccf6cf70b5db312d82a17efe951b441d300ccf275" BBCLASSEXTEND = "native nativesdk" @@ -35,6 +35,8 @@ EXTRA_OECMAKE = " \ -DWITH_OPENSSL=ON \ -DWITH_QT5=OFF \ -DWITH_ZLIB=ON \ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ " PACKAGECONFIG ??= "glib libevent" @@ -46,6 +48,10 @@ PACKAGECONFIG[python] = "-DWITH_PYTHON=ON,-DWITH_PYTHON=OFF,python" do_install:append () { ln -sf thrift ${D}/${bindir}/thrift-compiler + # remove absolute paths + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/thrift/thriftnbTargets.cmake + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/thrift/thrift_c_glibTargets.cmake + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/thrift/thrift_c_glib_zlibTargets.cmake } LEAD_SONAME = "libthrift.so.${PV}" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 0a88f37acf..c58047977c 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -925,8 +925,8 @@ RDEPENDS:packagegroup-meta-oe-support ="\ libmicrohttpd \ yaml-cpp \ " -RDEPENDS:packagegroup-meta-oe-support:append:armv7a = " ne10" -RDEPENDS:packagegroup-meta-oe-support:append:armv7ve = " ne10" +RDEPENDS:packagegroup-meta-oe-support:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}" +RDEPENDS:packagegroup-meta-oe-support:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}" RDEPENDS:packagegroup-meta-oe-support:append:aarch64 = " ne10" RDEPENDS:packagegroup-meta-oe-support:append:x86 = " mcelog mce-inject mce-test vboxguestdrivers" RDEPENDS:packagegroup-meta-oe-support:append:x86-64 = " mcelog mce-inject mce-test vboxguestdrivers" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.2.0/run-ptest b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.3.0/run-ptest index f6ade0c7e4..f6ade0c7e4 100755 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.2.0/run-ptest +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-1.3.0/run-ptest diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_1.2.0.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_1.3.0.bb index 27b965ac11..a7e147877b 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-tools_1.3.0.bb @@ -8,7 +8,7 @@ inherit cmake DEPENDS += "expat" -SRCREV = "751c1addc4fd2f949a466f488c1b7de2ca3b76dc" +SRCREV = "0eda85574546d19d9f06d6d5418bc192b3846f96" SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;subpath=tools" S = "${WORKDIR}/tools" diff --git a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.2.0.bb b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.3.0.bb index 2fb975ced6..2ef4d5a4b7 100644 --- a/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++_1.3.0.bb @@ -16,7 +16,7 @@ PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DTESTS_INSTALL_PATH=${libdir}/${B DEPENDS += "expat" -SRCREV = "751c1addc4fd2f949a466f488c1b7de2ca3b76dc" +SRCREV = "0eda85574546d19d9f06d6d5418bc192b3846f96" SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master" SRC_URI += "file://run-ptest" diff --git a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.20.bb b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.20.bb index 0614416690..1121e9a4c9 100644 --- a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.20.bb +++ b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.20.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=41f7469eaacac62c67d5664fff2c062d" inherit cargo cargo-update-recipe-crates -SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;nobranch=1" +SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;branch=main" # musl not supported because the libc crate does not support functions like "endutxent" at the moment, # so src/uucore/src/lib/features.rs disables utmpx when targetting musl. diff --git a/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb b/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb index a3d09c7cbd..cfa056d71d 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb @@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "e4eb6c074bbab168ac47b947c195ff8cef9d51a211cdd18ca9c9ef34d2 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mcrypt/files/Libmcrypt/" UPSTREAM_CHECK_REGEX = "Libmcrypt/(?P<pver>\d+(\.\d+)+)/" -inherit autotools-brokensep gettext binconfig +inherit autotools-brokensep gettext binconfig multilib_script CFLAGS += "-Wno-error=implicit-int" @@ -28,3 +28,5 @@ do_configure() { } CLEANBROKEN = "1" + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/libmcrypt-config" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.5.bb index 578357b480..578357b480 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.4.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.5.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 2fb0bd7be5..d64d5b0e42 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -23,9 +23,10 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ file://lfs64.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ + file://libfmt_make_fmt.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "ce8dac125568cc5f40da74c17212767c92d8faed81066580b526a485a591127d" +SRC_URI[sha256sum] = "4c9484048d4d0c71dd076ab33fc2a9ce8510bdf762886de0d63fe52496f3dbbb" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -67,7 +68,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} lz4 openssl" EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" PACKAGECONFIG:class-native = "" -PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" +PACKAGECONFIG[pam] = "-DPLUGIN_AUTH_PAM=YES,-DPLUGIN_AUTH_PAM=NO,libpam" PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind" PACKAGECONFIG[krb5] = ", ,krb5" PACKAGECONFIG[lz4] = ", ,lz4" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/libfmt_make_fmt.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/libfmt_make_fmt.patch new file mode 100644 index 0000000000..4d5f4a611b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/libfmt_make_fmt.patch @@ -0,0 +1,68 @@ +Make make_arg work with libfmt 10.1+ + +This ensures that compiler can find the correct template to use +Fixes + +mariadb-10.11.5/sql/item_strfunc.cc:1429:22: error: no matching functi +on for call to 'make_arg' +| 1429 | vargs[carg-1]= fmt::detail::make_arg<ctx>(args[carg]->val_int()); +| | ^~~~~~~~~~~~~~~~~~~~~~~~~~ +| /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/mariadb/10.11.5/recipe-sysroot/usr/include/fmt/core.h:1588:20: note: candidate functio +n [with Context = fmt::basic_format_context<fmt::appender, char>, T = long long] not viable: expects an lvalue for 1st argument +| 1588 | FMT_CONSTEXPR auto make_arg(T& val) -> basic_format_arg<Context> { +| | ^ ~~~~~~ +| /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/mariadb/10.11.5/recipe-sysroot/usr/include/fmt/core.h:1559:31: note: candidate templat +e ignored: invalid explicitly-specified argument for template parameter 'PACKED' +| 1559 | FMT_CONSTEXPR FMT_INLINE auto make_arg(T& [ 46%] Building C object mysys/CMakeFiles/mysys.dir/my_likely.c.o +| val) -> value<Context> { +| | ^ +| /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/mariadb/10.11.5/recipe-sysroot/usr/include/fmt/core.h:1596:27: note: candidate templat +e ignored: invalid explicitly-specified argument for template parameter 'PACKED' +| 1596 | FMT_CONSTEXPR inline auto make_arg(T& val) -> basic_format_arg<Context> { +| | ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/cmake/libfmt.cmake ++++ b/cmake/libfmt.cmake +@@ -33,8 +33,9 @@ MACRO (CHECK_LIBFMT) + #include <fmt/format-inl.h> + #include <iostream> + int main() { ++ int val = 42; + fmt::format_args::format_arg arg= +- fmt::detail::make_arg<fmt::format_context>(42); ++ fmt::detail::make_arg<fmt::format_context>(val); + std::cout << fmt::vformat(\"The answer is {}.\", + fmt::format_args(&arg, 1)); + }" HAVE_SYSTEM_LIBFMT) +--- a/sql/item_strfunc.cc ++++ b/sql/item_strfunc.cc +@@ -1426,14 +1426,22 @@ String *Item_func_sformat::val_str(Strin + switch (args[carg]->result_type()) + { + case INT_RESULT: +- vargs[carg-1]= fmt::detail::make_arg<ctx>(args[carg]->val_int()); ++ int intval; ++ intval = args[carg]->val_int(); ++ vargs[carg-1]= fmt::detail::make_arg<ctx>(intval); + break; + case DECIMAL_RESULT: // TODO + case REAL_RESULT: ++ float fval; ++ int val; + if (args[carg]->field_type() == MYSQL_TYPE_FLOAT) +- vargs[carg-1]= fmt::detail::make_arg<ctx>((float)args[carg]->val_real()); +- else +- vargs[carg-1]= fmt::detail::make_arg<ctx>(args[carg]->val_real()); ++ { ++ fval = (float)args[carg]->val_real(); ++ vargs[carg-1]= fmt::detail::make_arg<ctx>(fval); ++ } else { ++ val = args[carg]->val_real(); ++ vargs[carg-1]= fmt::detail::make_arg<ctx>(val); ++ } + break; + case STRING_RESULT: + if (!(parg= args[carg]->val_str(&val_arg[carg-1]))) diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.5.bb index 87faabfa27..87faabfa27 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.4.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.5.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch index 3c8187d1a2..fb70b22720 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch @@ -8,18 +8,17 @@ for upgrade to autoconf 2.71 Upstream-Status: Inappropriate [disable feature] Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> - --- configure.ac | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 998ff31..912e490 100644 +index 524fdf1..3bea642 100644 --- a/configure.ac +++ b/configure.ac @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [15.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [15.4], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not @@ -28,3 +27,6 @@ index 998ff31..912e490 100644 AC_COPYRIGHT([Copyright (c) 1996-2022, PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_15.3.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_15.4.bb index e1d49895f0..3aa2662891 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_15.3.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_15.4.bb @@ -11,6 +11,6 @@ SRC_URI += "\ file://0001-postgresql-fix-ptest-failure-of-sysviews.patch \ " -SRC_URI[sha256sum] = "ffc7d4891f00ffbf5c3f4eab7fbbced8460b8c0ee63c5a5167133b9e6599d932" +SRC_URI[sha256sum] = "baec5a4bdc4437336653b6cb5d9ed89be5bd5c0c58b94e0becee0a999e63c8f9" CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Ddoesn't apply to out configuration of postgresql so we can safely ignore it." diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-direct_mmap-Use-off_t-on-linux.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-direct_mmap-Use-off_t-on-linux.patch deleted file mode 100644 index 49df528d7e..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-direct_mmap-Use-off_t-on-linux.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 45fdade6c0415ec5af3f9312e6311a4ccc682a7b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 28 Dec 2022 18:24:21 -0800 -Subject: [PATCH] direct_mmap: Use off_t on linux - -off64_t is not provided without defining _LARGEFILE64_SOURCE on musl -this define is not defined automatically like glibc where it gets -defined when _GNU_SOURCE is defined. Using off_t makes it portable -across musl/glibc and for using 64bit off_t on glibc 32bit systems --D_FILE_OFFSET_BITS=64 can be defined during build via CXXFLAGS - -Upstream-Status: Submitted [https://github.com/abseil/abseil-cpp/pull/1349] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - absl/base/internal/direct_mmap.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h -index 815b8d23..fdf88f0b 100644 ---- a/absl/base/internal/direct_mmap.h -+++ b/absl/base/internal/direct_mmap.h -@@ -72,7 +72,7 @@ namespace base_internal { - // Platform specific logic extracted from - // https://chromium.googlesource.com/linux-syscall-support/+/master/linux_syscall_support.h - inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd, -- off64_t offset) noexcept { -+ off_t offset) noexcept { - #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ - defined(__m68k__) || defined(__sh__) || \ - (defined(__hppa__) && !defined(__LP64__)) || \ -@@ -102,7 +102,7 @@ inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd, - #else - return reinterpret_cast<void*>( - syscall(SYS_mmap2, start, length, prot, flags, fd, -- static_cast<off_t>(offset / pagesize))); -+ offset / pagesize)); - #endif - #elif defined(__s390x__) - // On s390x, mmap() arguments are passed in memory. --- -2.39.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb index dd7ce4aee4..f847ebf156 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -7,15 +7,14 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" -PV = "20230125.3" -SRCREV = "c2435f8342c2d0ed8101cb43adfd605fdc52dca2" -BRANCH = "lts_2023_01_25" +PV = "20230802.0" +SRCREV = "29bf8085f3bf17b84d30e34b3d7ff8248fda404e" +BRANCH = "lts_2023_08_02" SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ file://0001-absl-always-use-asm-sgidefs.h.patch \ file://0002-Remove-maes-option-from-cross-compilation.patch \ file://abseil-ppc-fixes.patch \ file://0003-Remove-neon-option-from-cross-compilation.patch \ - file://0001-direct_mmap-Use-off_t-on-linux.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230730.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230827.0.bb index fc7d82de3c..7d25e2e870 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230730.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230827.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "06036801ba3c5cc927c4dfd7be9ae08c8086eede" +SRCREV = "713c557bd30e729be54af12edafd90dc041ce534" SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.128.bb b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb index 592d997aad..c28a51749c 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.128.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb @@ -11,7 +11,7 @@ SRC_URI = "\ file://0001-do-not-hardcode-the-full-path-of-dpkg.patch \ " -SRC_URI[sha256sum] = "09e7f8795fee894b77994213ee3a588e9d8f96ddf5f93afdec91e9a137aa7866" +SRC_URI[sha256sum] = "d963a465314ac0e8fd5392573def042e6663e8edf3d08ace4bbd0d27ee8431f7" S = "${WORKDIR}/debootstrap" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jemalloc/files/0001-test-Disable-optimization-with-clang-for-aligned_all.patch b/meta-openembedded/meta-oe/recipes-devtools/jemalloc/files/0001-test-Disable-optimization-with-clang-for-aligned_all.patch deleted file mode 100644 index 570202e800..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/jemalloc/files/0001-test-Disable-optimization-with-clang-for-aligned_all.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3fe67deb9fcf0ae3c2ff31a9eccb6a0a9af33b9c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 14 Jan 2022 09:47:03 -0800 -Subject: [PATCH] test: Disable optimization with clang for aligned_alloc.c - -Clang crashes when using glibc 2.35, it works ok with older glibc or -musl, so its very specific problem. Its reported here - -https://github.com/llvm/llvm-project/issues/52765 - -Until it is fixed, workaround the build failure - -Upstream-Status: Inappropriate [Workaround] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - test/integration/aligned_alloc.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/test/integration/aligned_alloc.c b/test/integration/aligned_alloc.c -index 4375b172..6513bdd9 100644 ---- a/test/integration/aligned_alloc.c -+++ b/test/integration/aligned_alloc.c -@@ -1,5 +1,7 @@ - #include "test/jemalloc_test.h" - -+#pragma clang optimize off -+ - #define MAXALIGN (((size_t)1) << 23) - - /* --- -2.34.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb b/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb index 9ad83261ef..df499fbe50 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb @@ -16,10 +16,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ea061f8731d5e6a5761dfad951ef5f5f" SRC_URI = "git://github.com/jemalloc/jemalloc.git;branch=master;protocol=https \ file://run-ptest \ " - -# Workaround for https://github.com/llvm/llvm-project/issues/52765 -SRC_URI:append:libc-glibc:toolchain-clang = " file://0001-test-Disable-optimization-with-clang-for-aligned_all.patch " - SRCREV = "54eaed1d8b56b1aa528be3bdd1877e59c56fa90c" S = "${WORKDIR}/git" @@ -29,6 +25,9 @@ inherit autotools ptest EXTRA_AUTORECONF += "--exclude=autoheader" EXTRA_OECONF:append:libc-musl = " --with-jemalloc-prefix=je_" +# For some reason VERSION file populated only in tarball distribution. +# Adding jemalloc version since this recipe is using source code from git tag +EXTRA_OECONF:append = " --with-version=${PV}-0-g${SRCREV}" do_install:append() { sed -i -e 's@${STAGING_DIR_HOST}@@g' \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-Set-Json_validator-Install-off-if-it-finds-it-via-li.patch b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-Set-Json_validator-Install-off-if-it-finds-it-via-li.patch new file mode 100644 index 0000000000..6e6a4b93e8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-Set-Json_validator-Install-off-if-it-finds-it-via-li.patch @@ -0,0 +1,29 @@ +From 35939115142db6cd366ab11b29692a0179338ddf Mon Sep 17 00:00:00 2001 +From: Parian Golchin <Parian.Golchin@iris-sensing.com> +Date: Fri, 18 Aug 2023 15:54:25 +0200 +Subject: [PATCH 1/3] Set Json_validator Install off if it finds it via linking + +Upstream-Status: Inappropriate [newer version of cmake in main branch] + +Signed-off-by: Parian Golchin <Parian.Golchin@iris-sensing.com> +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f636734..9e4587f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,6 +55,9 @@ option(JSON_VALIDATOR_BUILD_EXAMPLES "Build examples" ${JSON_VALIDATOR_IS_TOP_LE + + if(NOT TARGET nlohmann_json::nlohmann_json) + find_package(nlohmann_json REQUIRED) ++else() ++ message(STATUS "Found nlohmann_json::nlohmann_json-target - linking with it") ++ set(JSON_VALIDATOR_INSTALL OFF) + endif() + + target_link_libraries( +-- +2.25.1 + 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 new file mode 100644 index 0000000000..2ee0a39126 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch @@ -0,0 +1,71 @@ +From 2065015da40cf79dd8ec9e3f186538e17c3b592f Mon Sep 17 00:00:00 2001 +From: Robert Joslyn <robert.joslyn@redrectangle.org> +Date: Wed, 30 Nov 2022 13:07:29 -0800 +Subject: [PATCH 2/3] Fix assumed signed char + +The code assumes that char is signed, but whether char is signed or +unsigned is implementation defined. On some architectures like PowerPC, +GCC treats char as unsigned resulting in compile errors: + + smtp-address-validator.cpp:213:1: error: narrowing conversion of '-32' from 'int' to 'char' [-Wnarrowing] + +Fix this by specifying signed char. + +Upstream-Status: Accepted [https://github.com/pboettch/json-schema-validator/commit/491ac44026e08f31790f5cacffa62e168bb35e32] + +Signed-off-by: Parian Golchin <Parian.Golchin@iris-sensing.com> +--- + src/smtp-address-validator.cpp | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/smtp-address-validator.cpp b/src/smtp-address-validator.cpp +index a63ead0..3903b51 100644 +--- a/src/smtp-address-validator.cpp ++++ b/src/smtp-address-validator.cpp +@@ -63,7 +63,7 @@ static const short _address_key_offsets[] = { + 1363, 1365, 1367, 1368, 1370, 1388, 0 + }; + +-static const char _address_trans_keys[] = { ++static const signed char _address_trans_keys[] = { + -32, -19, -16, -12, 34, 45, 61, 63, + -62, -33, -31, -17, -15, -13, 33, 39, + 42, 43, 47, 57, 65, 90, 94, 126, +@@ -711,7 +711,7 @@ bool is_address(const char* p, const char* pe) + { + int _klen; + unsigned int _trans = 0; +- const char * _keys; ++ const signed char * _keys; + const signed char * _acts; + unsigned int _nacts; + _resume: {} +@@ -728,9 +728,9 @@ bool is_address(const char* p, const char* pe) + + _klen = (int)_address_single_lengths[cs]; + if ( _klen > 0 ) { +- const char *_lower = _keys; +- const char *_upper = _keys + _klen - 1; +- const char *_mid; ++ const signed char *_lower = _keys; ++ const signed char *_upper = _keys + _klen - 1; ++ const signed char *_mid; + while ( 1 ) { + if ( _upper < _lower ) { + _keys += _klen; +@@ -752,9 +752,9 @@ bool is_address(const char* p, const char* pe) + + _klen = (int)_address_range_lengths[cs]; + if ( _klen > 0 ) { +- const char *_lower = _keys; +- const char *_upper = _keys + (_klen<<1) - 2; +- const char *_mid; ++ const signed char *_lower = _keys; ++ const signed char *_upper = _keys + (_klen<<1) - 2; ++ const signed char *_mid; + while ( 1 ) { + if ( _upper < _lower ) { + _trans += (unsigned int)_klen; +-- +2.25.1 + 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 new file mode 100644 index 0000000000..e0d0cf8ce9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch @@ -0,0 +1,41 @@ +From fa49c29942763285c51b7d2dea417d9f51e4961f Mon Sep 17 00:00:00 2001 +From: Sven Fink <sven.fink@wipotec.com> +Date: Fri, 13 Jan 2023 09:15:42 +0100 +Subject: [PATCH 3/3] For root value, use empty pointer + +Upstream-Status: Accepted [https://github.com/pboettch/json-schema-validator/commit/59c9d6200bf3cd54b4fc717ec1660c91eddb4d1a] + +Signed-off-by: Parian Golchin <Parian.Golchin@iris-sensing.com> +--- + src/json-validator.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/json-validator.cpp b/src/json-validator.cpp +index 7f34553..3c73d98 100644 +--- a/src/json-validator.cpp ++++ b/src/json-validator.cpp +@@ -553,6 +553,9 @@ class type_schema : public schema + else_->validate(ptr, instance, patch, e); + } + } ++ if (instance.is_null()) { ++ patch.add(nlohmann::json::json_pointer{}, default_value_); ++ } + } + + protected: +@@ -1134,6 +1137,11 @@ public: + propertyNames_ = schema::make(attr.value(), root, {"propertyNames"}, uris); + sch.erase(attr); + } ++ ++ attr = sch.find("default"); ++ if (attr != sch.end()) { ++ set_default_value(*attr); ++ } + } + }; + +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-cmake-Use-GNUInstallDirs.patch b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0004-cmake-Use-GNUInstallDirs.patch index 4b1184a394..8199e4f8d4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0001-cmake-Use-GNUInstallDirs.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0004-cmake-Use-GNUInstallDirs.patch @@ -1,4 +1,4 @@ -From e0b1ad02c678513412aba95a1b2fb4005c3c0452 Mon Sep 17 00:00:00 2001 +From a42d374aa260caec5f683c75d0db322811e51ab9 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 19 Mar 2022 22:40:49 -0700 Subject: [PATCH] cmake: Use GNUInstallDirs @@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index c4cc218..594dc5f 100644 +index 9e4587f..3eff234 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -122,11 +122,13 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +@@ -93,11 +93,13 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") endif() endif() @@ -32,15 +32,12 @@ index c4cc218..594dc5f 100644 RUNTIME DESTINATION bin) install(FILES src/nlohmann/json-schema.hpp -@@ -155,7 +157,7 @@ if(JSON_VALIDATOR_INSTALL) - # Set Up the Project Targets and Config Files for CMake +@@ -129,7 +131,7 @@ endif() - # Set the install path to the cmake config files -- set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_PREFIX}/lib/cmake/${PROJECT_NAME}) -+ set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) + if(JSON_VALIDATOR_INSTALL) + # Set the install path to the cmake config files (Relative, so install works correctly under Hunter as well) +- set(INSTALL_CMAKE_DIR "lib/cmake/${PROJECT_NAME}") ++ set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) + set(INSTALL_CMAKEDIR_ROOT share/cmake) - # Create the ConfigVersion file - include(CMakePackageConfigHelpers) # write_basic_package_version_file --- -2.35.1 - + # Install Targets diff --git a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb deleted file mode 100644 index 00d26d7b34..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.1.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "JSON schema validator for JSON for Modern C++" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c441d022da1b1663c70181a32225d006" - -SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=master;protocol=https \ - file://0001-cmake-Use-GNUInstallDirs.patch \ - " -SRCREV = "27fc1d094503623dfe39365ba82581507524545c" - -S = "${WORKDIR}/git" - -DEPENDS += "nlohmann-json" - -inherit cmake -EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF" - diff --git a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb new file mode 100644 index 0000000000..02dcdb2696 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator_2.2.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "JSON schema validator for JSON for Modern C++" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c441d022da1b1663c70181a32225d006" + +SRC_URI = "git://github.com/pboettch/json-schema-validator;branch=main;protocol=https \ + file://0001-Set-Json_validator-Install-off-if-it-finds-it-via-li.patch \ + file://0002-Fix-assumed-signed-char.patch \ + file://0003-For-root-value-use-empty-pointer.patch \ + file://0004-cmake-Use-GNUInstallDirs.patch \ + " + +SRCREV = "6b17782d6a5d1dee5d2c4fc5d25ffb1123913431" + +S = "${WORKDIR}/git" + +DEPENDS += "nlohmann-json" + +inherit cmake +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DJSON_VALIDATOR_BUILD_TESTS=OFF -DJSON_VALIDATOR_BUILD_EXAMPLES=OFF" diff --git a/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Avoid-using-hard-coded-usr-include-paths.patch b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Avoid-using-hard-coded-usr-include-paths.patch new file mode 100644 index 0000000000..ac20e9b88e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Avoid-using-hard-coded-usr-include-paths.patch @@ -0,0 +1,33 @@ +From 2bd01e844096ab4ecaaab8eccfbfdc721a136d01 Mon Sep 17 00:00:00 2001 +From: Mark Hatle <mark.hatle@amd.com> +Date: Tue, 22 Aug 2023 12:28:01 -0600 +Subject: [PATCH] Avoid using hard coded /usr/include paths + +The system could end up using an include path that points to the host +system instead of the sysroot. Force the system to use the sysroot. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mark Hatle <mark.hatle@amd.com> +--- + configure.ac | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 150bc50..4dc684f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -344,10 +344,6 @@ AS_IF( + [test "$need_panel_menu" = "yes" -o "$need_panel_menu" = "auto"], + [AC_SUBST([ncurses_nconf_CPPFLAGS]) + AC_SUBST([ncurses_panel_menu_LIBS]) +- AS_CASE( +- [$CURSES_LOC], +- [ncursesw/*],[ncurses_nconf_CPPFLAGS="-I/usr/include/ncursesw"], +- [ncurses/*],[ncurses_nconf_CPPFLAGS="-I/usr/include/ncurses"]) + LIBS_old="$LIBS" + LIBS= + AC_SEARCH_LIBS( +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb index 169500f6b4..b894f0ba03 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb @@ -15,7 +15,8 @@ DEPENDS += "ncurses flex-native gperf-native bison-native" RDEPENDS:${PN} += "python3 bash" SRC_URI = "git://gitlab.com/ymorin/kconfig-frontends.git;protocol=https;branch=4.11.x \ file://0001-Makefile-ensure-frontends-exits-before-writing-into-.patch \ - file://0001-Switch-utils-kconfig-diff-to-use-Python-3.patch" + file://0001-Switch-utils-kconfig-diff-to-use-Python-3.patch \ + file://0001-Avoid-using-hard-coded-usr-include-paths.patch" SRCREV = "f22fce3a308be1c7790ebefc6bbedb33c5f7c86a" diff --git a/meta-openembedded/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb b/meta-openembedded/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb new file mode 100644 index 0000000000..4bb3e62d9f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "Minimalistic terminal program for communicating with devices over a serial connection" +HOMEPAGE = "https://github.com/pengutronix/microcom" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=c9f7c009791eaa4b9ca90dc4c9538d24" + +SRC_URI = "https://github.com/pengutronix/microcom/releases/download/v${PV}/microcom-${PV}.tar.xz" +SRC_URI[sha256sum] = "ef42184bb35c9762b3e9c70748696f7478efacad8412a88aaf2d9a6a500231a1" + +DEPENDS = "readline" + +inherit autotools update-alternatives + +PACKAGECONFIG ??= "" +PACKAGECONFIG[can] = "--enable-can,--disable-can" + +EXTRA_OECONF = "--enable-largefile" + +# higher priority than busybox' microcom +ALTERNATIVE:${PN} = "microcom" +ALTERNATIVE_PRIORITY[microcom] = "100" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb index 6cf27755e8..74e40942a5 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-json/nlohmann-json_3.11.2.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=f969127d7b7ed0a8a63c2bbeae002588" CVE_PRODUCT = "json-for-modern-cpp" -SRC_URI = "git://github.com/nlohmann/json.git;nobranch=1;protocol=https \ +SRC_URI = "git://github.com/nlohmann/json.git;branch=develop;protocol=https \ " SRCREV = "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.17.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.17.1.bb index 1d49218e65..ee5e848bf8 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.17.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.17.1.bb @@ -39,7 +39,7 @@ SRC_URI:append:toolchain-clang:x86 = " \ SRC_URI:append:toolchain-clang:powerpc64le = " \ file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ " -SRC_URI[sha256sum] = "80c0faadf5ea39c213ccb9aa5c2432977a0f1b5a0b766852abd0de06f2770406" +SRC_URI[sha256sum] = "f215cf03d0f00f07ac0b674c6819f804c1542e16f152da04980022aeccf5e65a" S = "${WORKDIR}/node-v${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.bb b/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.bb index 4ab7a93714..7e9408b0b2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.bb @@ -39,6 +39,9 @@ SRCREV_libcxx = "f8571eaba606bde2eb8cd34b30104ca33e7c207e" SRCREV_libcxxabi = "8dd405113a4f3694e910b79785dd7fb7535a888a" SRCREV_libunwind = "aabcd8753678f1536e15eb6385a948470debdae4" SRCREV_zlib = "5c85a2da4c13eda07f69d81a1579a5afddd35f59" + +SRCREV_FORMAT .="_bionic_core_lzma_libprocinfo_logging_unwinding_protobuf_libbase_libcxx_libcxxabi_libunwind_zlib" + SRC_URI[gn.sha256sum] = "f706aaa0676e3e22f5fc9ca482295d7caee8535d1869f99efa2358177b64f5cd" require perfetto.inc diff --git a/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.inc b/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.inc index de871d4f3d..4b06c5bf04 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.inc @@ -4,6 +4,7 @@ HOMEPAGE = "https://github.com/google/perfetto" SRC_URI = "git://github.com/google/perfetto.git;protocol=https;name=perfetto;nobranch=1" SRCREV_perfetto = "b8da07095979310818f0efde2ef3c69ea70d62c5" +SRCREV_FORMAT = "perfetto" PV = "31.0" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.8.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.9.bb index 407b1a7bcb..27d3be1b00 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.8.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.9.bb @@ -34,7 +34,7 @@ SRC_URI:append:class-target = " \ " S = "${WORKDIR}/php-${PV}" -SRC_URI[sha256sum] = "995ed4009c7917c962d31837a1a3658f36d4af4f357b673c97ffdbe6403f8517" +SRC_URI[sha256sum] = "48460b994ae7eb5096a310f44d13e865de1771104d4a550d53072be58a6f176c" CVE_STATUS_GROUPS += "CVE_STATUS_PHP" CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored." 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 index 343933033b..d95e1c20f3 100644 --- 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 @@ -92,8 +92,6 @@ PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-lite" FILES:${PN}-compiler = "${bindir} ${libdir}/libprotoc${SOLIBS}" FILES:${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}" -SYSROOT_DIRS += "${bindir}" - RDEPENDS:${PN}-compiler = "${PN}" RDEPENDS:${PN}-dev += "${PN}-compiler" RDEPENDS:${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-protobuf', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb index b6ff62b91c..65294fafad 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125" -SRC_URI = "git://github.com/miloyip/rapidjson.git;nobranch=1;protocol=https" +SRC_URI = "git://github.com/miloyip/rapidjson.git;branch=master;protocol=https" SRCREV = "0ccdbf364c577803e2a751f5aededce935314313" diff --git a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-37732.patch b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-37732.patch new file mode 100644 index 0000000000..1ca33f0a92 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/CVE-2023-37732.patch @@ -0,0 +1,41 @@ +From 2cd3bb50e256f5ed5f611ac611d25fe673f2cec3 Mon Sep 17 00:00:00 2001 +From: Peter Johnson <johnson.peter@gmail.com> +Date: Fri, 11 Aug 2023 10:49:51 +0000 +Subject: [PATCH] elf.c: Fix NULL deref on bad xsize expression (#234) + +CVE: CVE-2023-37732 + +Upstream-Status: Backport [https://github.com/yasm/yasm/commit/2cd3bb50e256f5ed5f611ac611d25fe673f2cec3] + +Signed-off-by: Soumya <soumya.sambu@windriver.com> +--- + modules/objfmts/elf/elf.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/modules/objfmts/elf/elf.c b/modules/objfmts/elf/elf.c +index 2486bba8..bab4c9ca 100644 +--- a/modules/objfmts/elf/elf.c ++++ b/modules/objfmts/elf/elf.c +@@ -482,15 +482,15 @@ elf_symtab_write_to_file(FILE *f, elf_symtab_head *symtab, + + /* get size (if specified); expr overrides stored integer */ + if (entry->xsize) { +- size_intn = yasm_intnum_copy( +- yasm_expr_get_intnum(&entry->xsize, 1)); +- if (!size_intn) { ++ yasm_intnum *intn = yasm_expr_get_intnum(&entry->xsize, 1); ++ if (!intn) { + yasm_error_set(YASM_ERROR_VALUE, + N_("size specifier not an integer expression")); + yasm_errwarn_propagate(errwarns, entry->xsize->line); +- } ++ } else ++ size_intn = yasm_intnum_copy(intn); + } +- else ++ if (!size_intn) + size_intn = yasm_intnum_create_uint(entry->size); + + /* get EQU value for constants */ +-- +2.40.0 diff --git a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb index 19686ff275..26540b4295 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb @@ -13,6 +13,7 @@ SRCREV = "ba463d3c26c0ece2e797b8d6381b161633b5971a" SRC_URI = "git://github.com/yasm/yasm.git;branch=master;protocol=https \ file://0001-Do-not-use-AC_HEADER_STDC.patch \ file://CVE-2023-31975.patch \ + file://CVE-2023-37732.patch \ " S = "${WORKDIR}/git" 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 5dc64588d2..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 @@ -50,7 +50,7 @@ PACKAGECONFIG[libmnl] = "--with-libmnl,--without-libmnl,libmnl" PACKAGECONFIG[libatasmart] = "--with-libatasmart,--without-libatasmart,libatasmart" PACKAGECONFIG[ldap] = "--enable-openldap --with-libldap,--disable-openldap --without-libldap, openldap" PACKAGECONFIG[rrdtool] = "--enable-rrdtool,--disable-rrdtool,rrdtool" -PACKAGECONFIG[rrdcached] = "--enable-rrdcached,--disable-rrdcached,rrdcached" +PACKAGECONFIG[rrdcached] = "--enable-rrdcached,--disable-rrdcached,rrdtool" PACKAGECONFIG[python] = "--enable-python,--disable-python" EXTRA_OECONF = " \ diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20210509.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20230209.bb index 0b1e7e6088..444b97c4e6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20210509.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20230209.bb @@ -8,8 +8,8 @@ DEPENDS = "ncurses" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" -SRC_URI = "ftp://ftp.invisible-island.net/${BPN}/${BP}.tgz" -SRC_URI[sha256sum] = "ae478fe7d5fca82bcf4b51684641e07d2ee68489d319710fe1e81f41a197bd66" +SRC_URI = "https://invisible-mirror.net/archives/${BPN}/${BP}.tgz" +SRC_URI[sha256sum] = "0c26282305264be2217f335f3798f48b1dce3cf12c5a076bf231cadf77a6d6a8" # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch index 181be25c7f..cfb820cec7 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0002-Don-t-execute-processes-as-a-specific-user.patch @@ -18,7 +18,7 @@ diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.ser index 8dac1f2..ecf9f9e 100644 --- a/systemd/dlt-adaptor-udp.service.cmake +++ b/systemd/dlt-adaptor-udp.service.cmake -@@ -21,9 +21,8 @@ Wants=dlt.service +@@ -19,9 +19,8 @@ Wants=dlt.service [Service] Type=simple @@ -51,7 +51,7 @@ index b665742..35009b0 100644 [Service] Type=simple -User=@DLT_USER@ - ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application" + ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from COVESA DLT example user application" -LimitCORE=infinity \ No newline at end of file +LimitCORE=infinity @@ -59,7 +59,7 @@ diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cma index c07d447..8f88f00 100644 --- a/systemd/dlt-receive.service.cmake +++ b/systemd/dlt-receive.service.cmake -@@ -22,6 +22,5 @@ Wants=dlt.service +@@ -20,6 +20,5 @@ Wants=dlt.service [Service] Type=simple @@ -72,7 +72,7 @@ diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake index 0e91f42..1a5b913 100755 --- a/systemd/dlt-system.service.cmake +++ b/systemd/dlt-system.service.cmake -@@ -22,7 +22,6 @@ Wants=dlt.service +@@ -20,7 +20,6 @@ Wants=dlt.service [Service] Type=simple @@ -84,7 +84,7 @@ diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake index 0b3ee2c..e4753a2 100755 --- a/systemd/dlt.service.cmake +++ b/systemd/dlt.service.cmake -@@ -21,7 +21,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5) +@@ -19,7 +19,6 @@ Documentation=man:dlt-daemon(1) man:dlt.conf(5) [Service] Type=simple diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch deleted file mode 100644 index 52d9de2fd7..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/481.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 95476de802585629c6d89707a9247bbb0c70f6c9 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Date: Fri, 28 Apr 2023 22:39:57 +0200 -Subject: [PATCH] Update gtest_dlt_daemon_multiple_files_logging.cpp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix build error due to dlt_vlog not having the correct format string with security build flags enabled - -[ 88%] Building CXX object tests/CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o -cd dlt-daemon-2.18.9/obj-x86_64-linux-gnu/tests && /usr/bin/c++ -DCONFIGURATION_FILES_DIR=\"/etc\" -DDLT_DAEMON_USE_FIFO_IPC -DDLT_LIB_USE_FIFO_IPC -DDLT_NETWORK_TRACE_ENABLE -DDLT_SYSTEMD_ENABLE -DDLT_SYSTEMD_JOURNAL_ENABLE -DDLT_UNIT_TESTS -DDLT_USER_IPC_PATH=\"/tmp\" -DDLT_USE_IPv6 -DEXTENDED_FILTERING -D_GNU_SOURCE -Idlt-daemon-2.18.9 -Idlt-daemon-2.18.9/obj-x86_64-linux-gnu/include/dlt -Idlt-daemon-2.18.9/include/dlt -Idlt-daemon-2.18.9/src/shared -Idlt-daemon-2.18.9/src/core_dump_handler -Idlt-daemon-2.18.9/src/offlinelogstorage -Idlt-daemon-2.18.9/src/lib -Idlt-daemon-2.18.9/src/daemon -Idlt-daemon-2.18.9/src/console -Idlt-daemon-2.18.9/src/gateway -Idlt-daemon-2.18.9/systemd/3rdparty -g -O2 -ffile-prefix-map=dlt-daemon-2.18.9=. -flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -isystem /include -std=gnu++0x -std=gnu++11 -Wall -Wextra -Wno-variadic-macros -Wno-strict-aliasing -DGTEST_HAS_PTHREAD=1 -MD -MT tests/CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o -MF CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o.d -o CMakeFiles/gtest_dlt_daemon_multiple_files_logging.dir/gtest_dlt_daemon_multiple_files_logging.cpp.o -c dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp -dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp: In member function ‘virtual void t_dlt_logging_multiple_files_append_reinit_normal_Test::TestBody()’: -dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp:106:13: error: format not a string literal and no format arguments [-Werror=format-security] - 106 | dlt_vlog(LOG_INFO, log1); - | ~~~~~~~~^~~~~~~~~~~~~~~~ -dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp:110:13: error: format not a string literal and no format arguments [-Werror=format-security] - 110 | dlt_vlog(LOG_INFO, log2); - | ~~~~~~~~^~~~~~~~~~~~~~~~ -In file included from /usr/include/string.h:535, - from /usr/include/gtest/internal/gtest-port.h:264, - from /usr/include/gtest/internal/gtest-internal.h:40, - from /usr/include/gtest/gtest.h:62, - from dlt-daemon-2.18.9/tests/gtest_dlt_daemon_multiple_files_logging.cpp:27: -In function ‘strncpy’, ---- -Upstream-Status: Pending - - tests/gtest_dlt_daemon_multiple_files_logging.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/gtest_dlt_daemon_multiple_files_logging.cpp b/tests/gtest_dlt_daemon_multiple_files_logging.cpp -index 2da512e1..05b58f2c 100644 ---- a/tests/gtest_dlt_daemon_multiple_files_logging.cpp -+++ b/tests/gtest_dlt_daemon_multiple_files_logging.cpp -@@ -103,11 +103,11 @@ TEST(t_dlt_logging_multiple_files_append_reinit, normal) - const char* log2 = "TWO\n"; - - configure(path, file_name, true, file_size, max_file_size); -- dlt_vlog(LOG_INFO, log1); -+ dlt_vlog(LOG_INFO, "%s", log1); - EXPECT_NO_THROW(dlt_log_free()); - - configure(path, file_name, true, file_size, max_file_size); -- dlt_vlog(LOG_INFO, log2); -+ dlt_vlog(LOG_INFO, "%s", log2); - EXPECT_NO_THROW(dlt_log_free()); - verify_in_one_file(path, file_name, log1, log2); - } diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/482.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/482.patch deleted file mode 100644 index 7c9e222b35..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/482.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b38761831670e980a58acb33d611f65255d678ac Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Date: Fri, 28 Apr 2023 22:46:36 +0200 -Subject: [PATCH] Update CMakeLists.txt - -Link systemd libraries, to avoid underlinking of tests with --DWITH_SYSTEMD_SOCKET_ACTIVATION=ON - -[ 82%] Linking CXX executable gtest_dlt_daemon_gateway -cd dlt-daemon-2.18.9/obj-x86_64-linux-gnu/tests && /usr/bin/cmake -E cmake_link_script CMakeFiles/gtest_dlt_daemon_gateway.dir/link.txt --verbose=1 -/usr/bin/c++ -g -O2 -ffile-prefix-map=dlt-daemon-2.18.9=. -flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -isystem /include -std=gnu++0x -Wl,-Bsymbolic-functions -flto=auto -ffat-lto-objects -flto=auto -Wl,-z,relro -rdynamic CMakeFiles/gtest_dlt_daemon_gateway.dir/gtest_dlt_daemon_gateway.cpp.o CMakeFiles/gtest_dlt_daemon_gateway.dir/__/systemd/3rdparty/sd-daemon.c.o -o gtest_dlt_daemon_gateway -Wl,-rpath,dlt-daemon-2.18.9/obj-x86_64-linux-gnu/src/daemon ../src/daemon/libdlt_daemon.so /usr/lib/x86_64-linux-gnu/libgtest.a /usr/lib/x86_64-linux-gnu/libgtest_main.a -lrt /usr/lib/x86_64-linux-gnu/libgtest.a -/usr/bin/ld: ../src/daemon/libdlt_daemon.so: undefined reference to `sd_listen_fds_with_names' ---- -Upstream-Status: Pending - - tests/CMakeLists.txt | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 579d7308..3155ca9a 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -21,8 +21,16 @@ else() - set(LIBRARIES socket) - endif() - -+if(WITH_SYSTEMD_JOURNAL) -+ if(SYSTEMD_VERSION LESS 209) -+ set(SYSTEMD_LIBS systemd-journal systemd-id128) -+ else(SYSTEMD_VERSION LESS 209) -+ set(SYSTEMD_LIBS systemd) -+ endif(SYSTEMD_VERSION LESS 209) -+endif(WITH_SYSTEMD_JOURNAL) -+ - set(DLT_LIBRARIES dlt ${GTEST_LIBS} ${LIBRARIES}) --set(DLT_DAEMON_LIBRARIES dlt_daemon ${GTEST_LIBS} ${LIBRARIES}) -+set(DLT_DAEMON_LIBRARIES dlt_daemon ${GTEST_LIBS} ${LIBRARIES} ${SYSTEMD_LIBS}) - set(DLT_CONTROL_LIBRARIES dlt dlt_control_common_lib ${GTEST_LIBS}) - - #Receiver used for QTs. add_test() is not required diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch deleted file mode 100644 index 3290d1108c..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/504.patch +++ /dev/null @@ -1,34 +0,0 @@ -Bug: https://bugs.debian.org/1041124 -From 3f8bc3343983697531d52918fb6cdba19593f3a8 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> -Date: Sat, 15 Jul 2023 11:31:55 +0200 -Subject: [PATCH] Update CMakeLists.txt: set required std version to gnu++14 - -New googletest 1.13.0 defaults to gnu++14, so makes this package FTBFS when building testsuite with this error: - -In file included from /usr/include/gtest/gtest-message.h:57, - from /usr/include/gtest/gtest-assertion-result.h:46, - from /usr/include/gtest/gtest.h:64, - from /build/1st/dlt-daemon-2.18.9/tests/gtest_dlt_user.cpp:27: -/usr/include/gtest/internal/gtest-port.h:270:2: error: #error C++ versions less than C++14 are not supported. - 270 | #error C++ versions less than C++14 are not supported. - | ^~~~~ - -Thanks Adrian Bunk <bunk@debian.org> for the report and the fix! ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 014fc3bb..b2e056db 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -213,7 +213,7 @@ endif() - - add_compile_options( - $<$<COMPILE_LANGUAGE:C>:-std=gnu99> -- $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++11> -+ $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++14> - -Wall - -Wextra - # -pedantic diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb index 2d6d1879a7..33fae06190 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb @@ -17,11 +17,8 @@ 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://481.patch \ - file://482.patch \ - file://504.patch \ " -SRCREV = "9a2312d3512a27620d41b9a325338b6e7b3d42de" +SRCREV = "0f2d4cfffada6f8448a2cb27995b38eb4271044f" S = "${WORKDIR}/git" @@ -49,7 +46,7 @@ PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt- inherit autotools gettext cmake pkgconfig systemd -EXTRA_OECMAKE += "-DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}" +EXTRA_OECMAKE += "-DWITH_DLT_LOGSTORAGE_GZIP=ON -DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}" PACKAGES += "${PN}-systemd" SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" diff --git a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb index 163d732a86..ca0f0e82c0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb @@ -4,7 +4,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = " \ - gitsm://github.com/flatpak/flatpak;protocol=https;nobranch=1 \ + gitsm://github.com/flatpak/flatpak;protocol=https;branch=main \ file://0001-flatpak-pc-add-pc_sysrootdir.patch \ " @@ -12,7 +12,7 @@ SRCREV = "e936e3100d406c50ba49f3ad6a0ecae455345ec0" S = "${WORKDIR}/git" -inherit meson pkgconfig gettext systemd gobject-introspection python3native useradd mime features_check +inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native useradd mime features_check REQUIRED_DISTRO_FEATURES = "polkit" @@ -48,6 +48,9 @@ RDEPENDS:${PN} = " \ EXTRA_OEMESON += "-Dsystem_dbus_proxy=${bindir}/xdg-dbus-proxy -Dsystem_bubblewrap=${bindir}/bwrap" GIR_MESON_OPTION = "" +GTKDOC_MESON_OPTION = 'gtkdoc' +GTKDOC_MESON_ENABLE_FLAG = 'enabled' +GTKDOC_MESON_DISABLE_FLAG = 'disabled' PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native" PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth" diff --git a/meta-openembedded/meta-oe/recipes-extended/hwloc/files/CVE-2022-47022.patch b/meta-openembedded/meta-oe/recipes-extended/hwloc/files/CVE-2022-47022.patch new file mode 100644 index 0000000000..c981b68b70 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/hwloc/files/CVE-2022-47022.patch @@ -0,0 +1,77 @@ +From ac1f8db9a0790d2bf153711ff4cbf6101f89aace Mon Sep 17 00:00:00 2001 +From: Brice Goglin <Brice.Goglin@inria.fr> +Date: Thu, 31 Aug 2023 09:28:34 +0000 +Subject: [PATCH] linux: handle glibc cpuset allocation failures + +Closes #544 +CVE-2022-47022 + +Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr> + +CVE: CVE-2022-47022 + +Upstream-Status: Backport[https://github.com/open-mpi/hwloc/commit/ac1f8db9a0790d2bf153711ff4cbf6101f89aace] + +Signed-off-by: Yogita Urade <yogita.urade@windriver.com> +--- + hwloc/topology-linux.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/hwloc/topology-linux.c b/hwloc/topology-linux.c +index c7b63d2..fd6745e 100644 +--- a/hwloc/topology-linux.c ++++ b/hwloc/topology-linux.c +@@ -870,6 +870,8 @@ hwloc_linux_set_tid_cpubind(hwloc_topology_t topology __hwloc_attribute_unused, + + setsize = CPU_ALLOC_SIZE(last+1); + plinux_set = CPU_ALLOC(last+1); ++ if (!plinux_set) ++ return -1; + + CPU_ZERO_S(setsize, plinux_set); + hwloc_bitmap_foreach_begin(cpu, hwloc_set) +@@ -950,7 +952,10 @@ hwloc_linux_find_kernel_nr_cpus(hwloc_topology_t topology) + while (1) { + cpu_set_t *set = CPU_ALLOC(nr_cpus); + size_t setsize = CPU_ALLOC_SIZE(nr_cpus); +- int err = sched_getaffinity(0, setsize, set); /* always works, unless setsize is too small */ ++ int err; ++ if (!set) ++ return -1; /* caller will return an error, and we'll try again later */ ++ err = sched_getaffinity(0, setsize, set); /* always works, unless setsize is too small */ + CPU_FREE(set); + nr_cpus = setsize * 8; /* that's the value that was actually tested */ + if (!err) +@@ -978,8 +983,12 @@ hwloc_linux_get_tid_cpubind(hwloc_topology_t topology __hwloc_attribute_unused, + + /* find the kernel nr_cpus so as to use a large enough cpu_set size */ + kernel_nr_cpus = hwloc_linux_find_kernel_nr_cpus(topology); ++ if (kernel_nr_cpus < 0) ++ return -1; + setsize = CPU_ALLOC_SIZE(kernel_nr_cpus); + plinux_set = CPU_ALLOC(kernel_nr_cpus); ++ if (!plinux_set) ++ return -1; + + err = sched_getaffinity(tid, setsize, plinux_set); + +@@ -1333,6 +1342,8 @@ hwloc_linux_set_thread_cpubind(hwloc_topology_t topology, pthread_t tid, hwloc_c + + setsize = CPU_ALLOC_SIZE(last+1); + plinux_set = CPU_ALLOC(last+1); ++ if (!plinux_set) ++ return -1; + + CPU_ZERO_S(setsize, plinux_set); + hwloc_bitmap_foreach_begin(cpu, hwloc_set) +@@ -1424,6 +1435,8 @@ hwloc_linux_get_thread_cpubind(hwloc_topology_t topology, pthread_t tid, hwloc_b + + setsize = CPU_ALLOC_SIZE(last+1); + plinux_set = CPU_ALLOC(last+1); ++ if (!plinux_set) ++ return -1; + + err = pthread_getaffinity_np(tid, setsize, plinux_set); + if (err) { +-- +2.35.5 diff --git a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_2.9.2.bb b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_2.9.2.bb index 487b7da130..bcb615f73a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_2.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_2.9.2.bb @@ -7,7 +7,9 @@ SECTION = "base" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=79179bb373cd55cbd834463a514fb714" -SRC_URI = "https://www.open-mpi.org/software/${BPN}/v2.9/downloads/${BP}.tar.bz2" +SRC_URI = "https://www.open-mpi.org/software/${BPN}/v2.9/downloads/${BP}.tar.bz2 \ + file://CVE-2022-47022.patch \ + " SRC_URI[sha256sum] = "0a87fdf677f8b00b567d229b6320bf6b25c693edaa43e0b85268d999d6b060cf" UPSTREAM_CHECK_URI = "https://www.open-mpi.org/software/hwloc/v2.9/" diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.55.bb b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.111.bb index bddf30bf6a..e59235690a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.55.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.111.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" -SRCREV = "9a4e5b2ce30b9696116d6e654ee55caab5aafed8" +SRCREV = "8b0b910a2dcb7360cb5b0aaefbd1338271d50946" SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \ file://0001-test_context-skip-test-case-test_searchdirs.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.10.0.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.10.1.bb index b500f26e25..a314efc126 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.10.1.bb @@ -21,6 +21,6 @@ inherit cmake SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" -SRC_URI[sha256sum] = "cd2a7ac9f1fb5bfa6218272d9929955dc7237515bba6e14b5ad0e1d1e2212b43" +SRC_URI[sha256sum] = "dc3c8d5b4c8bbd09626864f6bcf93de701540f761d76b85d7c7d710f4bd90318" BBCLASSEXTEND += "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.8.bb b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.9.bb index 187e794b3d..00dc2fb1d0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.9.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ba882fa9b4b6b217a51780be3f4db9c8" RDEPENDS:${PN} = "perl" SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BP}/${BP}.tar.gz" -SRC_URI[sha256sum] = "b1df31779306c2c87d595816305c89c19c382edf9ebbfce03143f567e580be42" +SRC_URI[sha256sum] = "49d2f1e99c9770f56fc3e82a46880e8900b874dfba593e45f599c89fd255738e" do_install() { install -m 0755 -d ${D}${sysconfdir}/logwatch/scripts diff --git a/meta-openembedded/meta-oe/recipes-extended/minio/minio_git.bb b/meta-openembedded/meta-oe/recipes-extended/minio/minio_git.bb index bfd313ddfe..f278a728fd 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minio/minio_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/minio/minio_git.bb @@ -6,7 +6,7 @@ DESCRIPTION = "MinIO Client (mc) provides a modern alternative to \ cloud storage service (AWS Signature v2 and v4). \ " -SRC_URI = "git://github.com/minio/mc;nobranch=1;name=mc;protocol=https \ +SRC_URI = "git://github.com/minio/mc;branch=master;name=mc;protocol=https \ file://modules.txt \ " @@ -14,6 +14,8 @@ include src_uri.inc SRCREV_mc = "01b87ecc02ffad47dfe13c2154ac31db3e3115df" +SRCREV_FORMAT .= "_mc" + GO_IMPORT = "import" LICENSE = "AGPL-3.0-only" diff --git a/meta-openembedded/meta-oe/recipes-extended/qad/qad/0001-Fix-warnings-found-by-clang-compiler.patch b/meta-openembedded/meta-oe/recipes-extended/qad/qad/0001-Fix-warnings-found-by-clang-compiler.patch new file mode 100644 index 0000000000..7a9937d685 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/qad/qad/0001-Fix-warnings-found-by-clang-compiler.patch @@ -0,0 +1,53 @@ +From 2e871d6d6d13955ff363ff756adfdd257e72e9e8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 10 Aug 2023 23:58:43 -0700 +Subject: [PATCH] Fix warnings found by clang compiler + +Fix diagnostics found with -Wdeprecated-non-prototype using clang +compiler + +e.g. +| ../git/src/server.c:108:35: error: passing arguments to a function without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype] | 108 | if (backend->input_backend->move(x, y, event) < 0) { | | ^ + +Upstream-Status: Submitted [https://gitlab.com/CodethinkLabs/qad/qad/-/merge_requests/33] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/backend.h | 8 ++++---- + src/backends/input/input_common.h | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/include/backend.h b/include/backend.h +index 8f4c7c1..4bfe510 100644 +--- a/include/backend.h ++++ b/include/backend.h +@@ -41,10 +41,10 @@ typedef struct qad_screen_buffer_s { + } qad_screen_buffer_t; + + typedef struct qad_backend_input_s { +- int (*move)(); +- int (*button)(); +- int (*touch)(); +- int (*swipe)(); ++ int (*move)(int, int, int); ++ int (*button)(int, int); ++ int (*touch)(int, int, int, int); ++ int (*swipe)(int, int, int, int, int, int); + void *data; + } qad_backend_input_t; + +diff --git a/src/backends/input/input_common.h b/src/backends/input/input_common.h +index 8e099a5..f2ea73f 100644 +--- a/src/backends/input/input_common.h ++++ b/src/backends/input/input_common.h +@@ -28,7 +28,7 @@ + #define BTN_DOWN 1 + #define BTN_UP 0 + +-qad_backend_input_t *create_input_backend(); ++qad_backend_input_t *create_input_backend(char input_type[]); + + // int move(int x, int y, int event); + +-- +2.41.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/qad/qad_git.bb b/meta-openembedded/meta-oe/recipes-extended/qad/qad_git.bb new file mode 100644 index 0000000000..056f28a0a4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/qad/qad_git.bb @@ -0,0 +1,28 @@ +SUMMARY = "Simple, REST-API compliant daemon for automated testing" +DESCRIPTION = " This is a simple, REST-API compliant daemon which makes \ +automated testing on hardware possible by removing the need for physical \ +intervention as Q.A.D allows inputs to be injected via http/https requests. \ +This both eliminates the need to physically interact with the rig and allows \ +for tasks to be carried out entirely automatically." + +LICENSE = "MIT & GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=402cce7fbcb6ea9ab5a0378dd7f40806 \ + file://openqa/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + " +SRC_URI = "git://gitlab.com/CodethinkLabs/qad/qad;branch=main;protocol=https \ + file://0001-Fix-warnings-found-by-clang-compiler.patch" + +SRCREV = "ae0c099c1fdc0ca6f5d631cea6b302937122b362" + +S = "${WORKDIR}/git" +PV = "0.0+git${SRCPV}" + +DEPENDS = "cjson libmicrohttpd libdrm libpng" + +FILES:${PN} += "qad" +inherit meson pkgconfig + +do_install () { + install -d ${D}${bindir} + install -p -m 755 qad ${D}${bindir}/ +} diff --git a/meta-openembedded/meta-oe/recipes-extended/qcbor/qcbor_git.bb b/meta-openembedded/meta-oe/recipes-extended/qcbor/qcbor_git.bb new file mode 100644 index 0000000000..9c562d5a66 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/qcbor/qcbor_git.bb @@ -0,0 +1,32 @@ +DESCRIPTION = " \ + QCBOR is a powerful, commercial-quality CBOR encoder/decoder that \ + implements these RFCs: RFC8949, RFC7049, RFC8742, RFC8943 \ +" + +HOMEPAGE = "https://github.com/laurencelundblade/QCBOR" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://README.md;beginline=442;endline=463;md5=b55643261d6d221dac2b7a395105af62" + +SRC_URI = "git://github.com/laurencelundblade/QCBOR;protocol=https;branch=master" + +SRCREV = "44754f738c6534a4304a83d4c6e97b3d3193d887" + +PV = "1.2+git${SRCPV}" + +S = "${WORKDIR}/git" + +inherit pkgconfig + +CFLAGS += " \ + -DUSEFULBUF_DISABLE_ALL_FLOAT \ +" + +do_install(){ + install -d ${D}${libdir} + install -m 755 ${S}/libqcbor.a ${D}${libdir}/ + install -d ${D}${includedir}/qcbor + install -m 644 ${S}/inc/*.h ${D}${includedir} + install -m 644 ${S}/inc/qcbor/*.h ${D}${includedir}/qcbor +} + diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/0001-src-Do-not-reset-FINAL_LIBS.patch index e8d8b1d53f..e8d8b1d53f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/0001-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/0001-src-Do-not-reset-FINAL_LIBS.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/0006-Define-correct-gregs-for-RISCV32.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/0006-Define-correct-gregs-for-RISCV32.patch index 385b0aeed0..385b0aeed0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/0006-Define-correct-gregs-for-RISCV32.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/0006-Define-correct-gregs-for-RISCV32.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/GNU_SOURCE-7.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/GNU_SOURCE-7.patch index 6e07c25c6a..6e07c25c6a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/GNU_SOURCE-7.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/GNU_SOURCE-7.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/hiredis-use-default-CC-if-it-is-set.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/hiredis-use-default-CC-if-it-is-set.patch index 250fdd0ff4..5b9b71ea69 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/hiredis-use-default-CC-if-it-is-set.patch @@ -1,4 +1,4 @@ -From 9da2d12c9fabfff4b4460accf887658db89687e4 Mon Sep 17 00:00:00 2001 +From 41efa2f0cf08c91ff935bbb2d16ab233df7f5811 Mon Sep 17 00:00:00 2001 From: Venture Research <tech@ventureresearch.com> Date: Fri, 8 Feb 2013 17:39:52 -0600 Subject: [PATCH] hiredis: use default CC if it is set @@ -18,21 +18,19 @@ Reworked for 6.0.4 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- -Upstream-Status: Pending - deps/hiredis/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile -index 7e41c97..54717e3 100644 +index bd2106b..9ce768d 100644 --- a/deps/hiredis/Makefile +++ b/deps/hiredis/Makefile -@@ -42,8 +42,6 @@ endef +@@ -36,8 +36,6 @@ endef export REDIS_TEST_CONFIG # Fallback to gcc when $CC is not in $PATH. -CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') -CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') OPTIMIZATION?=-O3 - WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers + WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers DEBUG_FLAGS?= -g -ggdb diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/init-redis-server b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/init-redis-server index c5f335f57d..c5f335f57d 100755 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/init-redis-server +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/init-redis-server diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/lua-update-Makefile-to-use-environment-build-setting.patch index bff07535de..bff07535de 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/lua-update-Makefile-to-use-environment-build-setting.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/oe-use-libc-malloc.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/oe-use-libc-malloc.patch index bf05fc4c50..be186b57da 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/oe-use-libc-malloc.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/oe-use-libc-malloc.patch @@ -1,4 +1,4 @@ -From 88da6b19ecd00747769663e913aba5e9569c489d Mon Sep 17 00:00:00 2001 +From 38a5f403b033d03cdac3ff814687d83f61527d8e Mon Sep 17 00:00:00 2001 From: Venture Research <tech@ventureresearch.com> Date: Wed, 6 Feb 2013 20:51:02 -0600 Subject: [PATCH] hack to force use of libc malloc @@ -15,13 +15,11 @@ Update to work with 4.0.8 Signed-off-by: Alistair Francis <alistair.francis@wdc.com> --- -Upstream-Status: Pending - src/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index 2a0d74d..ddabd44 100644 +index ecbd275..39decee 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,7 +13,8 @@ @@ -32,5 +30,5 @@ index 2a0d74d..ddabd44 100644 +# use fake uname option to force use of generic libc +uname_S := "USE_LIBC_MALLOC" uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') - OPTIMIZATION?=-O2 - DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram + CLANG := $(findstring clang,$(shell sh -c '$(CC) --version | head -1')) + OPTIMIZATION?=-O3 diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/redis.conf b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/redis.conf index 75037d6dc8..75037d6dc8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/redis.conf +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/redis.conf diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/redis.service b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/redis.service index a52204cc70..a52204cc70 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.0.12/redis.service +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.0/redis.service diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.12.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.2.0.bb index 321b90dadf..4f1c97b7e4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.0.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.2.0.bb @@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE-7.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ " -SRC_URI[sha256sum] = "9dd83d5b278bb2bf0e39bfeb75c3e8170024edbaf11ba13b7037b2945cf48ab7" +SRC_URI[sha256sum] = "8b12e242647635b419a0e1833eda02b65bf64e39eb9e509d9db4888fb3124943" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/files/0001-Fix-function-inline-errors-in-debug-optimization-Og.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-Fix-function-inline-errors-in-debug-optimization-Og.patch index 10e2b564cc..10e2b564cc 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/files/0001-Fix-function-inline-errors-in-debug-optimization-Og.patch +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-Fix-function-inline-errors-in-debug-optimization-Og.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-tcp-fix-some-compiler-warnings-with-enable-tls-opens.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-tcp-fix-some-compiler-warnings-with-enable-tls-opens.patch new file mode 100644 index 0000000000..3ce5926333 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-tcp-fix-some-compiler-warnings-with-enable-tls-opens.patch @@ -0,0 +1,88 @@ +From 6e9b27f04132287463c89d3be0ce4f506944920d Mon Sep 17 00:00:00 2001 +From: Patrick Williams <patrick@stwcx.xyz> +Date: Fri, 3 Feb 2023 16:11:29 -0600 +Subject: [PATCH] tcp: fix some compiler warnings with enable-tls-openssl + +When --enable-tls=no and --enable-tls-openssl=yes, the following +compiler errors are reported: + +``` +| ../../git/src/tcp.c:3765:1: error: no previous declaration for 'relpTcpGetRtryDirection_gtls' [-Werror=missing-declarations] +| 3765 | relpTcpGetRtryDirection_gtls(LIBRELP_ATTR_UNUSED relpTcp_t *const pThis) +| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| ../../git/src/tcp.c:3583:1: error: 'relpTcpChkPeerName' defined but not used [-Werror=unused-function] +| 3583 | relpTcpChkPeerName(NOTLS_UNUSED relpTcp_t *const pThis, NOTLS_UNUSED void* cert) +| | ^~~~~~~~~~~~~~~~~~ +``` + +Fix these by: + 1. Add static on the openssl path for relpTcpGetRtryDirection_gtls. + 2. Move the relpTcpChkPeerName forward declaration to another ifdef + leg. + 3. Wrap relpTcpChkPeerName in gnutls-based ifdef. + 4. Remove relpTcpChkPeerName_gtls from openssl path. + +Upstream-Status: Backport [https://github.com/rsyslog/librelp/pull/255] +Signed-off-by: Patrick Williams <patrick@stwcx.xyz> +--- + src/tcp.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/src/tcp.c b/src/tcp.c +index 7a75cc4..18cffda 100644 +--- a/src/tcp.c ++++ b/src/tcp.c +@@ -132,12 +132,12 @@ callOnErr(const relpTcp_t *__restrict__ const pThis, + static int LIBRELP_ATTR_NONNULL() relpTcpGetCN(char *const namebuf, const size_t lenNamebuf, const char *const szDN); + #ifdef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION + static int relpTcpVerifyCertificateCallback(gnutls_session_t session); ++static int relpTcpChkPeerName(relpTcp_t *const pThis, void* cert); + #endif /* #ifdef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION */ + #if defined(HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION) || defined(ENABLE_TLS_OPENSSL) + static void relpTcpChkOnePeerName(relpTcp_t *const pThis, char *peername, int *pbFoundPositiveMatch); + static int relpTcpAddToCertNamesBuffer(relpTcp_t *const pThis, char *const buf, + const size_t buflen, int *p_currIdx, const char *const certName); +-static int relpTcpChkPeerName(relpTcp_t *const pThis, void* cert); + #endif /* defined(HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION) || defined(ENABLE_TLS_OPENSSL) */ + + +@@ -2820,11 +2820,6 @@ relpTcpLstnInitTLS_gtls(LIBRELP_ATTR_UNUSED relpTcp_t *const pThis) + { + return RELP_RET_ERR_INTERNAL; + } +-static int +-relpTcpChkPeerName_gtls(LIBRELP_ATTR_UNUSED relpTcp_t *const pThis, LIBRELP_ATTR_UNUSED void *vcert) +-{ +- return RELP_RET_ERR_INTERNAL; +-} + #endif /* defined(ENABLE_TLS)*/ + + +@@ -3579,6 +3574,7 @@ finalize_it: + + } + ++#ifdef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION + static int + relpTcpChkPeerName(NOTLS_UNUSED relpTcp_t *const pThis, NOTLS_UNUSED void* cert) + { +@@ -3592,6 +3588,7 @@ relpTcpChkPeerName(NOTLS_UNUSED relpTcp_t *const pThis, NOTLS_UNUSED void* cert) + #endif /* #ifdef WITH_TLS*/ + LEAVE_RELPFUNC; + } ++#endif + + static relpRetVal LIBRELP_ATTR_NONNULL() + relpTcpAcceptConnReqInitTLS(NOTLS_UNUSED relpTcp_t *const pThis, NOTLS_UNUSED relpSrv_t *const pSrv) +@@ -3761,7 +3758,7 @@ relpTcpGetRtryDirection_gtls(relpTcp_t *const pThis) + return gnutls_record_get_direction(pThis->session); + } + #else /* #ifdef ENABLE_TLS */ +-relpRetVal LIBRELP_ATTR_NONNULL() ++static relpRetVal LIBRELP_ATTR_NONNULL() + relpTcpGetRtryDirection_gtls(LIBRELP_ATTR_UNUSED relpTcp_t *const pThis) + { + return RELP_RET_ERR_INTERNAL; +-- +2.41.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-tests-Fix-callback-prototype.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-tests-Fix-callback-prototype.patch new file mode 100644 index 0000000000..ba081926e1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-tests-Fix-callback-prototype.patch @@ -0,0 +1,49 @@ +From 2a7e26510cf9276b7e640ca8282cc1c5e46075d0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Aug 2023 11:59:40 -0700 +Subject: [PATCH] tests: Fix callback prototype + +clang errors about it + +| ../../git/tests/receive.c:71:34: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] +| 71 | hdlr_enable(int sig, void (*hdlr)()) +| | ^ +| | void +| 1 error generated. + +Upstream-Status: Submitted [https://github.com/rsyslog/librelp/pull/260] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/receive.c | 2 +- + tests/send.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/receive.c b/tests/receive.c +index f376cb4..c12e911 100644 +--- a/tests/receive.c ++++ b/tests/receive.c +@@ -68,7 +68,7 @@ doSleep(int iSeconds, const int iuSeconds) + } + + static void +-hdlr_enable(int sig, void (*hdlr)()) ++hdlr_enable(int sig, void (*hdlr)(const int)) + { + struct sigaction sigAct; + memset(&sigAct, 0, sizeof (sigAct)); +diff --git a/tests/send.c b/tests/send.c +index d7e90f0..1b1df4f 100644 +--- a/tests/send.c ++++ b/tests/send.c +@@ -57,7 +57,7 @@ struct usrdata { /* used for testing user pointer pass-back */ + struct usrdata *userdata = NULL; + + static void +-hdlr_enable(int sig, void (*hdlr)()) ++hdlr_enable(int sig, void (*hdlr)(const int)) + { + struct sigaction sigAct; + memset(&sigAct, 0, sizeof (sigAct)); +-- +2.41.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-tests-Include-missing-sys-time.h.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-tests-Include-missing-sys-time.h.patch new file mode 100644 index 0000000000..6fed23c1d1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/0001-tests-Include-missing-sys-time.h.patch @@ -0,0 +1,41 @@ +From 5c32487a9c127f37141488d416cdb5d5bec6aca1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 19 Aug 2023 10:24:40 -0700 +Subject: [PATCH] tests: Include missing sys/time.h + +This is found when building for musl C library systems where sys/time.h +is not included indirectly and select() and timeval structs are used + +Fixes + +../../git/tests/receive.c:64:17: error: variable has incomplete type 'struct timeval' + 64 | struct timeval tvSelectTimeout; + | ^ +../../git/tests/receive.c:64:9: note: forward declaration of 'struct timeval' + 64 | struct timeval tvSelectTimeout; + | ^ +../../git/tests/receive.c:67:2: error: call to undeclared function 'select'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + 67 | select(0, NULL, NULL, NULL, &tvSelectTimeout); + | ^ + +Upstream-Status: Submitted [https://github.com/rsyslog/librelp/pull/261] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/receive.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/receive.c b/tests/receive.c +index f376cb4..e20861e 100644 +--- a/tests/receive.c ++++ b/tests/receive.c +@@ -33,6 +33,7 @@ + #include <limits.h> + #include <errno.h> + #include <signal.h> ++#include <sys/time.h> + #include "librelp.h" + + #define TRY(f) { const int TRY_r = f; if(TRY_r != RELP_RET_OK) { \ +-- +2.41.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/run-ptest b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/run-ptest new file mode 100644 index 0000000000..a649a5716f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh +# +set -e +set -o pipefail + +SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" +cd ${SCRIPTPATH} +useradd tester || echo "user already exists" +su tester -c "make -C tests -k check-TESTS" +userdel tester diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb index bac5abb052..9d949c6303 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb @@ -4,14 +4,83 @@ HOMEPAGE = "https://github.com/rsyslog/librelp" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1fb9c10ed9fd6826757615455ca893a9" -DEPENDS = "gmp nettle libidn zlib gnutls openssl" +DEPENDS = "gmp libidn zlib" SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https;branch=stable \ file://0001-Fix-function-inline-errors-in-debug-optimization-Og.patch \ + file://0001-tests-Fix-callback-prototype.patch \ + file://0001-tcp-fix-some-compiler-warnings-with-enable-tls-opens.patch \ + file://0001-tests-Include-missing-sys-time.h.patch \ + file://run-ptest \ " SRCREV = "b421f56d9ee31a966058d23bd23c966221c91396" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest + +PACKAGECONFIG ?= "tls-openssl valgrind" +# Valgrind is not available for RISCV yet +PACKAGECONFIG:remove:riscv64 = "valgrind" +PACKAGECONFIG:remove:riscv32 = "valgrind" + +PACKAGECONFIG[tls] = "--enable-tls,--disable-tls,gnutls nettle" +PACKAGECONFIG[tls-openssl] = "--enable-tls-openssl,--disable-tls-openssl,openssl" +PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind," + +# For ptests, copy source tests/*.sh scripts, Makefile and +# executables and run them with make on target. +TESTDIR = "tests" +do_compile_ptest() { + echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${TESTDIR}/Makefile + oe_runmake -C ${TESTDIR} buildtest-TESTS +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/${TESTDIR} + + # copy source tests/*.sh and python scripts + cp -f ${S}/${TESTDIR}/*.sh ${S}/${TESTDIR}/*.py ${D}${PTEST_PATH}/${TESTDIR} + # install data files needed by the test scripts on the target + cp -f ${S}/${TESTDIR}/*.supp ${D}${PTEST_PATH}/${TESTDIR} + cp -rf ${S}/${TESTDIR}/tls-certs ${D}${PTEST_PATH}/${TESTDIR} + + # copy executables + find ${B}/${TESTDIR} -type f -executable -exec cp {} ${D}${PTEST_PATH}/${TESTDIR} \; + cp -rf ${B}/${TESTDIR}/.libs ${D}${PTEST_PATH}/${TESTDIR} + # copy Makefile + # run-ptest will run make which runs the executables + cp -f ${B}/${TESTDIR}/Makefile ${D}${PTEST_PATH}/${TESTDIR} + cp -f ${B}/${TESTDIR}/set-envvars ${D}${PTEST_PATH}/${TESTDIR} + + # give permissions to all users + # some tests need to write to this directory + chmod 777 -R ${D}${PTEST_PATH}/${TESTDIR} + + # do NOT need to rebuild Makefile or $(check_PROGRAMS) + sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + + # fix the srcdir, top_srcdir, abs_top_builddir + sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + + # install test-driver + install -m 644 ${S}/test-driver ${D}${PTEST_PATH} + + # fix the python3 path for tests/set-envar + sed -i -e s:${HOSTTOOLS_DIR}:${bindir}:g ${D}${PTEST_PATH}/${TESTDIR}/set-envvars + + # these 2 scripts need help finding their /usr/lib/librelp/ptest/tests/.libs libraries + sed -i 's:${B}/src:${PTEST_PATH}/${TESTDIR}:' ${D}${PTEST_PATH}/${TESTDIR}/send + sed -i 's:${B}/src:${PTEST_PATH}/${TESTDIR}:' ${D}${PTEST_PATH}/${TESTDIR}/receive +} + +RDEPENDS:${PN}-ptest += "\ + make bash coreutils libgcc util-linux gawk grep \ + python3-core python3-io \ +" +RRECOMMENDS:${PN}-ptest += "${@bb.utils.filter('PACKAGECONFIG', 'valgrind', d)}" + diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/disable-omfile-outchannel.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/disable-omfile-outchannel.patch new file mode 100644 index 0000000000..a8bbe2b51e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/disable-omfile-outchannel.patch @@ -0,0 +1,23 @@ +tests: Skip omfile-outchannel test as it fails on musl + +scanf error in index i=5559 +sequence error detected in rstb_168227_f19f3b245QVE.out.log +number of lines in file: 5559 rstb_168227_f19f3b245QVE.out.log + +Patch is also applied in void linux + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/tests/omfile-outchannel.sh 2021-03-09 05:51:07.000000000 -0600 ++++ b/tests/omfile-outchannel.sh 2022-05-26 15:55:23.358520256 -0500 +@@ -1,5 +1,9 @@ + #!/bin/bash + # addd 2018-08-02 by RGerhards, released under ASL 2.0 ++ ++# This test fails for x86_64-musl, under GitHub's CI/CD. Disable for now. ++exit 77 ++ + . ${srcdir:=.}/diag.sh init + export NUMMESSAGES=10000 + echo "ls -l $RSYSLOG_DYNNAME* diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb index c639e81473..c3948a40ec 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb @@ -29,6 +29,7 @@ SRC_URI = "https://www.rsyslog.com/files/download/rsyslog/${BPN}-${PV}.tar.gz \ SRC_URI:append:libc-musl = " \ file://0001-Include-sys-time-h.patch \ + file://disable-omfile-outchannel.patch \ " SRC_URI[sha256sum] = "f6283efaadc609540a56e6bec88a362c966e77f29fe48e6b734bd6c1123e0be5" @@ -47,7 +48,7 @@ EXTRA_OECONF:remove:riscv32 = "ap_cv_atomic_builtins=yes" # first line is default yes in configure PACKAGECONFIG ??= " \ rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ - fmhttp imdiag gnutls imfile \ + fmhttp imdiag openssl imfile \ ${@bb.utils.filter('DISTRO_FEATURES', 'snmp systemd', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench relp ${VALGRIND}', '', d)} \ " @@ -70,6 +71,7 @@ PACKAGECONFIG[imdiag] = "--enable-imdiag,--disable-imdiag,," PACKAGECONFIG[imfile] = "--enable-imfile,--disable-imfile,," PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl," PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," PACKAGECONFIG[imjournal] = "--enable-imjournal,--disable-imjournal," PACKAGECONFIG[mmjsonparse] = "--enable-mmjsonparse,--disable-mmjsonparse," diff --git a/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.3.bb b/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.4.bb index 1bf55bfcfd..f387147412 100644 --- a/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_7.4.bb @@ -23,7 +23,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'libcap-ng selinux', d) PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng" PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" -SRC_URI[sha256sum] = "a544f8808d0c58cfb0e7424ca1841cb858a974922b035d505d4e4c248be3a22b" +SRC_URI[sha256sum] = "e9a61f641ff96ca95319edfb17948cd297d0cd3342736b2c49c99d4716fb993d" inherit autotools update-rc.d systemd diff --git a/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb b/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb index 0d58345d7a..9e0e43ce8f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb @@ -24,3 +24,5 @@ PACKAGECONFIG[lzo] = "-DHAVE_LIBLZO2=1,-DHAVE_LIBLZO2=0,lzo," TARGET_CFLAGS += "-fPIC" EXTRA_OECMAKE += '-DBUILD_SHARED_LIBS="ON" -DSNAPPY_BUILD_TESTS="OFF" -DSNAPPY_BUILD_BENCHMARKS="OFF"' + +CVE_PRODUCT = "google:snappy" diff --git a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb index 92897cd3fc..e814120ee6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb @@ -30,6 +30,8 @@ SRC_URI = "git://github.com/draios/sysdig.git;branch=dev;protocol=https;name=sys SRCREV_sysdig = "4fb6288275f567f63515df0ff0a6518043ecfa9b" SRCREV_falco= "caa0e4d0044fdaaebab086592a97f0c7f32aeaa9" +SRCREV_FORMAT = "sysdig_falco" + S = "${WORKDIR}/git" EXTRA_OECMAKE = "\ diff --git a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_4.8.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_4.9.bb index 2a3f772f8f..d7b7eef977 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_4.8.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_4.9.bb @@ -11,6 +11,6 @@ inherit meson SRC_URI = "git://github.com/lassekongo83/adw-gtk3.git;protocol=https;branch=main" S = "${WORKDIR}/git" -SRCREV = "7ee024ed79f68875e5dea3616be24a703cf72cc5" +SRCREV = "08d3dfbde51d4cb0a3bb8e58a81aa61064857d89" FILES:${PN} = "${datadir}/themes" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb index d7e422cc97..227422d90c 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb @@ -21,8 +21,8 @@ EXTRA_OECONF = "--disable-gtk3-engine" do_install:append() { # Only building Adwaita, remove highcontrast files - rm -rf ${D}${prefix}/share/themes/HighContrast \ - ${D}${prefix}/share/icons + rm -rf ${D}${datadir}/themes/HighContrast \ + ${D}${datadir}/icons # The libtool archive file is unneeded with shared libs on modern Linux rm -rf ${D}${libdir}/gtk-2.0/2.10.0/engines/libadwaita.la @@ -34,10 +34,10 @@ PACKAGES += "gnome-theme-adwaita \ gnome-theme-adwaita-dark \ " -FILES:gnome-theme-adwaita = "${prefix}/share/themes/Adwaita \ +FILES:gnome-theme-adwaita = "${datadir}/themes/Adwaita \ ${libdir}/gtk-2.0/2.10.0/engines/libadwaita.so" -FILES:gnome-theme-adwaita-dark = "${prefix}/share/themes/Adwaita-dark" +FILES:gnome-theme-adwaita-dark = "${datadir}/themes/Adwaita-dark" RDEPENDS:gnome-theme-adwaita-dark = "gnome-theme-adwaita" # gnome-themes-standard is empty and doesn't exist diff --git a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb index a32ea9b550..9920603428 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb @@ -8,7 +8,7 @@ DEPENDS = "gtk+3" GNOMEBASEBUILDCLASS = "meson" GTKDOC_MESON_OPTION = "gtk_doc" -inherit gnomebase gobject-introspection gtk-doc gtk-icon-cache features_check +inherit gnomebase gobject-introspection gi-docgen gtk-icon-cache features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" # FIXME: When upgrading to libpeas 2, g-i is no longer needed. diff --git a/meta-openembedded/meta-oe/recipes-graphics/aml/aml_git.bb b/meta-openembedded/meta-oe/recipes-graphics/aml/aml_git.bb new file mode 100644 index 0000000000..eed62adae0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/aml/aml_git.bb @@ -0,0 +1,35 @@ +SUMMARY = "Andri's Main Loop" +DESCRIPTION = "Andri's Main Loop" +HOMEPAGE = "https://github.com/any1/aml" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6f3cfaa39204b96e14b68b9d50d3e4e" + +SRC_URI = "git://github.com/any1/aml;branch=master;protocol=https" + +SRCREV = "b83f3576ce4187d9285f06e9066ef43a691464d4" + +PV = "0.3.0+git${SRCPV}" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false" + +PACKAGE_BEFORE_PN += "${PN}-examples" +ALLOW_EMPTY:${PN}-examples = "1" +FILES:${PN}-examples = "${bindir}" + +inherit meson pkgconfig + +AML_EXAMPLES = "ticker nested-ticker reader" + +do_install:append () { + if ${@bb.utils.contains('PACKAGECONFIG', 'examples', 'true', 'false', d)}; then + install -d ${D}${bindir} + for bin in ${AML_EXAMPLES}; do + install -m 0755 ${B}/examples/$bin ${D}${bindir} + done + fi +} + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/cglm/cglm_0.8.9.bb b/meta-openembedded/meta-oe/recipes-graphics/cglm/cglm_0.9.1.bb index fbd267b16f..603ebe48d1 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/cglm/cglm_0.8.9.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/cglm/cglm_0.9.1.bb @@ -9,8 +9,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=8dc95c4110ba741c43832734b51b7de7" SRC_URI = "git://github.com/recp/cglm;branch=master;protocol=https" -# Tag v0.8.5 -SRCREV = "c51040cd4139b628fba2a0e6751ad4aecbc0c81a" +# Tag v0.9.1 +SRCREV = "cdd4d0e83e9ee79f73aeb0a4fb60b4abd8ecf947" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch index d686def3d2..4d081258be 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch @@ -3,7 +3,7 @@ From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> Date: Fri, 9 Sep 2022 09:32:22 +0200 Subject: [PATCH] meson.build: install fbgs shell script -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4] Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> --- meson.build | 3 +++ diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch index 304c6600ca..b872e213aa 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch @@ -3,7 +3,7 @@ From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> Date: Fri, 16 Sep 2022 18:45:58 +0200 Subject: [PATCH] meson.build: make fbpdf build optional -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4] Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> --- meson.build | 22 ++++++++++++---------- diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch index fe36fcb7cb..4f54fbfba7 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch @@ -3,7 +3,7 @@ From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> Date: Fri, 16 Sep 2022 16:25:38 +0200 Subject: [PATCH] meson.build: add features options for png, gif, tiff, webp, and motif -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4] Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> --- meson.build | 41 +++++++++++++++++++++++++++-------------- diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-Fix-Translations-containing-invalid-directives-hs.patch b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-Fix-Translations-containing-invalid-directives-hs.patch new file mode 100644 index 0000000000..6d133254ed --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge/0001-Fix-Translations-containing-invalid-directives-hs.patch @@ -0,0 +1,385 @@ +From e6ccc8a8cf1391010a8220836a732da9fab19c69 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 7 Sep 2023 12:35:12 -0700 +Subject: [PATCH] Fix Translations containing invalid directives %hs + +Found with gettext 0.22 +Older versions of msgfmt were more sloppy, thus allowing such mistakes to cause bugs at runtime. + +https://bugs.gentoo.org/908868 +https://savannah.gnu.org/bugs/index.php?64333 +https://github.com/fontforge/fontforge/issues/5251 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + fontforgeexe/searchview.c | 2 +- + po/ca.po | 4 ++-- + po/de.po | 4 ++-- + po/en_GB.po | 4 ++-- + po/fr.po | 40 +++++++++++++++++++-------------------- + po/hr.po | 4 ++-- + po/it.po | 8 ++++---- + po/ja.po | 4 ++-- + po/ko.po | 4 ++-- + po/pl.po | 4 ++-- + po/uk.po | 4 ++-- + po/vi.po | 4 ++-- + 12 files changed, 43 insertions(+), 43 deletions(-) + +diff --git a/fontforgeexe/searchview.c b/fontforgeexe/searchview.c +index 1cb39a221..7e1c109cb 100644 +--- a/fontforgeexe/searchview.c ++++ b/fontforgeexe/searchview.c +@@ -516,7 +516,7 @@ return( true ); + if ( ask_if_difficult==2 && !searcher->isvisible ) + return( false ); + if ( gwwv_ask(_("Bad Reference"),(const char **) buttons,1,1, +- _("The %1$s in the search dialog contains a reference to %2$.20hs which does not exist in the new font.\nShould I remove the reference?"), ++ _("The %1$s in the search dialog contains a reference to %2$.20s which does not exist in the new font.\nShould I remove the reference?"), + i==0?_("Search Pattern"):_("Replace Pattern"), + r->sc->name)==1 ) + return( false ); +diff --git a/po/ca.po b/po/ca.po +index e2349b6ef..6c920b7c0 100644 +--- a/po/ca.po ++++ b/po/ca.po +@@ -12347,11 +12347,11 @@ msgstr "Tai" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"Al diàleg de cerca, %1$s conté una referència a %2$.20hs\n" ++"Al diàleg de cerca, %1$s conté una referència a %2$.20s\n" + "que no existeix en el nou tipus.\n" + "Voleu eliminar la referència?" + +diff --git a/po/de.po b/po/de.po +index 41430ffae..8a31aeaa2 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -15765,11 +15765,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"%1$s im Suchdialog enthält eine Referenz auf %2$.20hs, die in der neuen " ++"%1$s im Suchdialog enthält eine Referenz auf %2$.20s, die in der neuen " + "Schrift nicht existiert.\n" + "Soll der Referenz entfernt werden?" + +diff --git a/po/en_GB.po b/po/en_GB.po +index 9bd2d62bb..fce64c97d 100644 +--- a/po/en_GB.po ++++ b/po/en_GB.po +@@ -728,11 +728,11 @@ msgstr "Template Colour" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"The %1$s in the search dialogue contains a reference to %2$.20hs which does " ++"The %1$s in the search dialogue contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + +diff --git a/po/fr.po b/po/fr.po +index 26e446b38..d130f89bc 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -291,7 +291,7 @@ msgstr "chaîne %1$.30s pour %2$.30s" + #. GT: $4 is the changed flag ('*' for the changed items) + #, c-format + msgid "%1$.80s at %2$d from %3$.90s%4$s" +-msgstr "%1$.80s à %2$d de %3$.90hs%4$s" ++msgstr "%1$.80s à %2$d de %3$.90s%4$s" + + #. GT: This is the title for a window showing a bitmap character + #. GT: It will look something like: +@@ -302,7 +302,7 @@ msgstr "%1$.80s à %2$d de %3$.90hs%4$s" + #. GT: $4 is the font name + #, c-format + msgid "%1$.80s at %2$d size %3$d from %4$.80s" +-msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs" ++msgstr "%1$.80s (%2$d) taille %3$d de %4$.80s" + + #, c-format + msgid "%1$s from lookup subtable %2$.50s" +@@ -7433,7 +7433,7 @@ msgid "" + "Reverting the file will lose those changes.\n" + "Is that what you want?" + msgstr "" +-"La fonte %1$.40s dans le fichier %2$.40hs a été modifiée.\n" ++"La fonte %1$.40s dans le fichier %2$.40s a été modifiée.\n" + "Revenir vous fera perdre toutes les modifications.\n" + "Voulez vous vraiment revenir ?" + +@@ -19077,11 +19077,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"Dans %1$s du dialogue de recherche il y a une référence vers %2$.20hs qui " ++"Dans %1$s du dialogue de recherche il y a une référence vers %2$.20s qui " + "n'existe pas dans la nouvelle fonte.\n" + "Faut-il supprimer la référence ?" + +@@ -19925,7 +19925,7 @@ msgid "" + "The fonts %1$.30s and %2$.30s have a different number of glyphs or different " + "encodings" + msgstr "" +-"Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des " ++"Les fontes %1$.30s et %2$.30s n'ont pas le même nombre de glyphes ou des " + "codages différents" + + #, c-format +@@ -19933,7 +19933,7 @@ msgid "" + "The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, " + "one cubic)" + msgstr "" +-"Les fontes %1$.30s et %2$.30hs utilisent des courbes de Bézier d'ordres " ++"Les fontes %1$.30s et %2$.30s utilisent des courbes de Bézier d'ordres " + "différents (quadratique et cubique)" + + msgid "The generated font won't work with ATM" +@@ -19968,8 +19968,8 @@ msgid "" + "The glyph %1$.30s in font %2$.30s has a different hint mask on its contours " + "than in %3$.30s" + msgstr "" +-"Le glyphe %1$.30s dans la police %2$.30hs a un masque de hints différent que " +-"dans %3$.30hs" ++"Le glyphe %1$.30s dans la police %2$.30s a un masque de hints différent que " ++"dans %3$.30s" + + #, c-format + msgid "" +@@ -19984,8 +19984,8 @@ msgid "" + "The glyph %1$.30s in font %2$.30s has a different number of references than " + "in %3$.30s" + msgstr "" +-"Le glyphe %1$.30s de la fonte %2$.30hs a un nombre de références différent " +-"dans %3$.30hs" ++"Le glyphe %1$.30s de la fonte %2$.30s a un nombre de références différent " ++"dans %3$.30s" + + #, c-format + msgid "" +@@ -20457,7 +20457,7 @@ msgstr "" + #, c-format + msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s" + msgstr "" +-"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs" ++"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60s" + + msgid "The paths that make up this glyph intersect one another" + msgstr "Les chemins qui composent ce glyphe se coupent les uns les autres" +@@ -21042,7 +21042,7 @@ msgstr "Il y a déjà une sous-table avec ce nom, changez de nom SVP" + + #, c-format + msgid "There is already an anchor point named %1$.40s in %2$.40s." +-msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs." ++msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40s." + + msgid "There is another glyph in the font with this name" + msgstr "Il y a un autre glyphe dans la fonte avec ce nom" +@@ -21441,8 +21441,8 @@ msgid "" + "been able to find is %1$.20s-%2$.20s-%4$d.\n" + "Shall I use that or let you search?" + msgstr "" +-"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20hs-%3$d, mais " +-"ce que j'ai trouvé de mieux c'est %1$.20hs-%2$.20hs-%4$d.\n" ++"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20s-%3$d, mais " ++"ce que j'ai trouvé de mieux c'est %1$.20s-%2$.20s-%4$d.\n" + "Devrais-je utiliser cette valeur ou préférez vous chercher ?" + + msgid "" +@@ -21770,7 +21770,7 @@ msgid "" + "with a 0 offset for this combination. Would you like to alter this kerning " + "class entry (or create a kerning pair for just these two glyphs)?" + msgstr "" +-"Cette paire de crénage (%.20s et %.20hs) est dans une classe de crénage\n" ++"Cette paire de crénage (%.20s et %.20s) est dans une classe de crénage\n" + "avec un déplacement de 0 pour cette combinaison. Voulez-vous modifier cette " + "partie\n" + "de la classe de crénage (ou créer une nouvelle paire rien que pour ces 2 " +@@ -24551,8 +24551,8 @@ msgid "" + "referred to.\n" + "It will not be copied." + msgstr "" +-"Vous essayer de coller une référence vers %1$s dans %2$hs.\n" +-"Mais %1$hs n'existe pas dans cette fonte, et FontForge ne trouve pas le " ++"Vous essayer de coller une référence vers %1$s dans %2$s.\n" ++"Mais %1$s n'existe pas dans cette fonte, et FontForge ne trouve pas le " + "glyphe auquel il se référait.\n" + "Le glyphe ne sera pas copié." + +@@ -24562,8 +24562,8 @@ msgid "" + "But %1$s does not exist in this font.\n" + "Would you like to copy the original splines (or delete the reference)?" + msgstr "" +-"Vous essayer de coller une référence vers %1$s dans %2$hs.\n" +-"Mais %1$hs n'existe pas dans cette fonte.\n" ++"Vous essayer de coller une référence vers %1$s dans %2$s.\n" ++"Mais %1$s n'existe pas dans cette fonte.\n" + "Voulez vous copier le contour d'origine (ou supprimer la référence)?" + + msgid "" +diff --git a/po/hr.po b/po/hr.po +index d261d4ca7..ac41b9250 100644 +--- a/po/hr.po ++++ b/po/hr.po +@@ -20156,11 +20156,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"%1$s u dijaloškom okviru traženja sadrži referencu na %2$.20hs koja ne " ++"%1$s u dijaloškom okviru traženja sadrži referencu na %2$.20s koja ne " + "postoji u fontu.\n" + "Želiš li dozvoliti uklanjanje reference?" + +diff --git a/po/it.po b/po/it.po +index e13711485..d0c3ea987 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -2303,7 +2303,7 @@ msgid "" + "Reverting the file will lose those changes.\n" + "Is that what you want?" + msgstr "" +-"Il font %1$.40s nel file %2$.40hs è stato modificato.\n" ++"Il font %1$.40s nel file %2$.40s è stato modificato.\n" + "Ripristinando il file perderai tutte le modifiche.\n" + "È quello che vuoi fare?" + +@@ -5835,7 +5835,7 @@ msgid "" + "The glyph %1$.30s has a different number of contours in font %2$.30s than in " + "%3$.30s" + msgstr "" +-"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30hs rispetto " ++"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30s rispetto " + "a %3$.30s" + + #, c-format +@@ -6235,8 +6235,8 @@ msgid "" + "been able to find is %1$.20s-%2$.20s-%4$d.\n" + "Shall I use that or let you search?" + msgstr "" +-"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20hs-%3$d, ma " +-"il migliore che io abbia trovato è %1$.20hs-%2$.20hs-%4$d.\n" ++"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20s-%3$d, ma " ++"il migliore che io abbia trovato è %1$.20s-%2$.20s-%4$d.\n" + "Devo usare questo valore o preferisci cercare tu stesso?" + + msgid "" +diff --git a/po/ja.po b/po/ja.po +index ed9f5a645..206ae82d1 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -11458,11 +11458,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"%1$s には, 新しいフォントには含まれないグリフ %2$.20hs への参照が含まれていま" ++"%1$s には, 新しいフォントには含まれないグリフ %2$.20s への参照が含まれていま" + "す.\n" + "参照を削除しますか?" + +diff --git a/po/ko.po b/po/ko.po +index 971b4db03..4d5c8d40d 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -20920,11 +20920,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"검색 대화 상자의 %1$s에는 새 글꼴에 없는 %2$.20hs에 대한 참조가 포함되어 있" ++"검색 대화 상자의 %1$s에는 새 글꼴에 없는 %2$.20s에 대한 참조가 포함되어 있" + "다.\n" + "참조를 제거해야 하는가?" + +diff --git a/po/pl.po b/po/pl.po +index 2bbbf00be..c1fd5a454 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -19552,11 +19552,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"%1$s w okienku wyszukiwania zawiera odwołanie do %2$.20hs, który nie " ++"%1$s w okienku wyszukiwania zawiera odwołanie do %2$.20s, który nie " + "istnieje w nowym foncie.\n" + "Czy usunąć to odwołanie?" + +diff --git a/po/uk.po b/po/uk.po +index e3768acc3..3302a1005 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -19860,11 +19860,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"%1$s у діалоговому вікні пошуку містить посилання на %2$.20hs, якого не " ++"%1$s у діалоговому вікні пошуку містить посилання на %2$.20s, якого не " + "існує у новому шрифті.\n" + "Вилучити це посилання?" + +diff --git a/po/vi.po b/po/vi.po +index 6aee8bb3f..f5eb739e6 100644 +--- a/po/vi.po ++++ b/po/vi.po +@@ -17109,11 +17109,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"Trong hộp thoại tìm kiếm, %1$s chứa một tham chiếu đến %2$.20hs mà không tồn " ++"Trong hộp thoại tìm kiếm, %1$s chứa một tham chiếu đến %2$.20s mà không tồn " + "tại trong phông mới.\n" + "Bạn có muốn gỡ bỏ tham chiếu này không?" + +-- +2.42.0 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb index 2b425c583d..404e86b86a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb @@ -19,6 +19,7 @@ SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \ file://0001-include-sys-select-on-non-glibc-platforms.patch \ file://0001-fontforgeexe-Use-env-to-find-fontforge.patch \ file://0001-cmake-Use-alternate-way-to-detect-libm.patch \ + file://0001-Fix-Translations-containing-invalid-directives-hs.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.30.bb b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb index b1fb7579ee..cc42b6a9c6 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.30.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb @@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ file://0001-configure-Filter-out-buildpaths-from-CC.patch \ " -SRC_URI[libgphoto2.sha256sum] = "ee61a1dac6ad5cf711d114e06b90a6d431961a6e7ec59f4b757a7cd77b1c0fb4" +SRC_URI[libgphoto2.sha256sum] = "4f81c34c0b812bee67afd5f144940fbcbe01a2055586a6a1fa2d0626024a545b" inherit autotools pkgconfig gettext lib_package diff --git a/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor/0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch b/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor/0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch deleted file mode 100644 index 9ecbdf3b37..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor/0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fb6eb15b34b5b07a431bb4c3585341411a3e088f Mon Sep 17 00:00:00 2001 -From: Markus Volk <f_l_k@t-online.de> -Date: Tue, 28 Feb 2023 13:42:18 +0100 -Subject: [PATCH] libdecor-gtk.c: dont skip for conflicting_symbols - -This is a hack that should be removed, once the underlying bug in glibc was fixed and -libdecor was updated to use dlmopen() instead of dlopen() - -https://gitlab.freedesktop.org/libdecor/libdecor/-/issues/47 -https://gitlab.freedesktop.org/libdecor/libdecor/-/issues/44 - ---- -Upstream-Status: Pending - - src/plugins/gtk/libdecor-gtk.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/gtk/libdecor-gtk.c b/src/plugins/gtk/libdecor-gtk.c -index 228161e..fd91afb 100644 ---- a/src/plugins/gtk/libdecor-gtk.c -+++ b/src/plugins/gtk/libdecor-gtk.c -@@ -2606,7 +2606,7 @@ libdecor_plugin_description = { - .priorities = priorities, - .constructor = libdecor_plugin_new, - .conflicting_symbols = { -- "png_free", -+ //"png_free", - NULL, - }, - }; --- -2.34.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb b/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb index ed0b05f41f..078058e8ba 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb @@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7ae2be7fb1637141840314b51970a9f7" SRC_URI = " \ git://gitlab.freedesktop.org/libdecor/libdecor.git;protocol=https;branch=master \ - file://0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch \ " DEPENDS = " \ @@ -16,7 +15,7 @@ DEPENDS = " \ " S = "${WORKDIR}/git" -SRCREV = "a254d0c2ff0cbfcf0bbf14cc67cc403640880c01" +SRCREV = "0d63d125f899dbb1b932468f2f3b911f9c121e58" PACKAGECONFIG ?= "dbus ${@bb.utils.filter('DISTRO_FEATURES', 'gtk+3', d)}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb index 7d352f4218..6cd4a48aa8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb @@ -15,6 +15,8 @@ SRCREV = "89d1692fd8fe91a679bb943d377bfbd709b52c23" SRCREV_freetype = "6fc77cee03e078e97afcee0c0e06a2d3274b9a29" SRCREV_harfbuzz = "43931e3e596c04044861770b831c8f9452e2d3b0" +SRCREV_FORMAT .= "_freetype_harfbuzz" + S = "${WORKDIR}/git" inherit autotools pkgconfig features_check diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb index 22b4826403..0049bbe237 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb @@ -8,7 +8,7 @@ DESCRIPTION = "Allow the use of PNG images in LVGL. This implementation uses lod LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" -SRC_URI = "git://github.com/lvgl/lv_lib_png;;protocol=https;nobranch=1" +SRC_URI = "git://github.com/lvgl/lv_lib_png;;protocol=https;branch=master" SRCREV = "bf1531afe07c9f861107559e29ab8a2d83e4715a" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.3.8.bb b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.3.9.bb index 6103a02948..dc681c249b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.3.8.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.3.9.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" SRC_URI = "git://github.com/lvgl/lvgl;protocol=https;branch=release/v8.3" -SRCREV = "e6d7be00bfa5e1df450c7b713003a9effa03c614" +SRCREV = "9ec3b8706b098f60940cee6ac211d3cb3141aedf" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-graphics/neatvnc/neatvnc_git.bb b/meta-openembedded/meta-oe/recipes-graphics/neatvnc/neatvnc_git.bb new file mode 100644 index 0000000000..8344015204 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/neatvnc/neatvnc_git.bb @@ -0,0 +1,40 @@ +SUMMARY = "A liberally licensed VNC server library" +DESCRIPTION = "This is a liberally licensed VNC server library that's intended to be fast and neat." +HOMEPAGE = "https://github.com/any1/neatvnc" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=94fc374e7174f41e3afe0f027ee59ff7" + +SRC_URI = "git://github.com/any1/neatvnc;branch=master;protocol=https" + +SRCREV = "8b3dc1ae6099dcfa73aec3ae11df2fdc58540d14" + +PV = "0.6.0+git${SRCPV}" + +S = "${WORKDIR}/git" + +DEPENDS = "libdrm pixman aml zlib" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[tls] = "-Dtls=enabled,-Dtls=disabled,gnutls" +PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,libjpeg-turbo" +PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false,libpng" +PACKAGECONFIG[benchmarks] = "-Dbenchmarks=true,-Dbenchmarks=false,libpng" + +PACKAGE_BEFORE_PN += "${PN}-examples" +ALLOW_EMPTY:${PN}-examples = "1" +FILES:${PN}-examples = "${bindir}" + +NEATVNC_EXAMPLES = "draw png-server" + +inherit meson pkgconfig + +do_install:append () { + if ${@bb.utils.contains('PACKAGECONFIG', 'examples', 'true', 'false', d)}; then + install -d ${D}${bindir} + for bin in ${NEATVNC_EXAMPLES}; do + install -m 0755 ${B}/examples/$bin ${D}${bindir} + done + fi +} + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb new file mode 100644 index 0000000000..d618607496 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb @@ -0,0 +1,61 @@ +SUMMARY = "Google Fira Fonts- TTF Edition" +HOMEPAGE = "https://fonts.google.com/?query=fira" +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = " \ + file://${S}/firamono/OFL.txt;md5=0373cf792d4b95c61399b94c02702892 \ + file://${S}/firacode/OFL.txt;md5=c75ca55aa0a5809a854d87db2a8ebf23 \ + file://${S}/firasans/OFL.txt;md5=de28deb2f8c1f23fd4d6918113ac3ddd \ + file://${S}/firasanscondensed/OFL.txt;md5=de28deb2f8c1f23fd4d6918113ac3ddd \ + file://${S}/firasansextracondensed/OFL.txt;md5=de28deb2f8c1f23fd4d6918113ac3ddd \ +" + +SRCREV_FORMAT = "firamono_firacode_firasans_firasanscondensed_firasansextracondensed" + +SRCREV_firamono = "701bd391b1a4b3238de193a8523009ecef1be42c" +SRCREV_firacode = "701bd391b1a4b3238de193a8523009ecef1be42c" +SRCREV_firasans = "701bd391b1a4b3238de193a8523009ecef1be42c" +SRCREV_firasanscondensed = "701bd391b1a4b3238de193a8523009ecef1be42c" +SRCREV_firasansextracondensed = "701bd391b1a4b3238de193a8523009ecef1be42c" + +SRC_URI = "git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firamono;name=firamono \ + git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firacode;name=firacode \ + git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasans;name=firasans \ + git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasanscondensed;name=firasanscondensed \ + git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasansextracondensed;name=firasansextracondensed" + +S = "${WORKDIR}" + +do_install:append() { + install -d ${D}${datadir}/fonts/truetype/ + find ${S} -path 'fira*/*.tt[cf]' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/{} \; + install -D -m 0644 ${S}/firamono/OFL.txt ${D}${datadir}/licenses/${PN}mono/OFL.txt + install -D -m 0644 ${S}/firacode/OFL.txt ${D}${datadir}/licenses/${PN}code/OFL.txt + install -D -m 0644 ${S}/firasans/OFL.txt ${D}${datadir}/licenses/${PN}sans/OFL.txt + install -D -m 0644 ${S}/firasanscondensed/OFL.txt ${D}${datadir}/licenses/${PN}sanscondensed/OFL.txt + install -D -m 0644 ${S}/firasansextracondensed/OFL.txt ${D}${datadir}/licenses/${PN}sansextracondensed/OFL.txt +} + +PACKAGES =+ "${PN}-mono ${PN}-code ${PN}-sans ${PN}-sanscondensed ${PN}-sansextracondensed" + +FILES:${PN}-mono += " \ + ${datadir}/fonts/truetype/FiraMono* \ + ${datadir}/licenses/${PN}mono/OFL.txt \ + " +FILES:${PN}-code += " \ + ${datadir}/fonts/truetype/FiraCode* \ + ${datadir}/licenses/${PN}code/OFL.txt \ + " +FILES:${PN}-sans += " \ + ${datadir}/fonts/truetype/FiraSans-* \ + ${datadir}/licenses/${PN}sans/OFL.txt \ + " +FILES:${PN}-sanscondensed += " \ + ${datadir}/fonts/truetype/FiraSansCondensed-* \ + ${datadir}/licenses/${PN}sanscondensed/OFL.txt \ + " +FILES:${PN}-sansextracondensed += " \ + ${datadir}/fonts/truetype/FiraSansExtraCondensed-* \ + ${datadir}/licenses/${PN}sansextracondensed/OFL.txt \ + " + +require ttf.inc diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 097acc1a0b..72005636ea 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -74,9 +74,9 @@ python __anonymous() { distrofeatures = (d.getVar("DISTRO_FEATURES") or "") if not bb.utils.contains_any("PACKAGECONFIG", ["surfaceless", "wayland", "x11_egl", "x11_glx", "x11_egl_glx"], True, False, d): if "wayland" in distrofeatures: - d.appendVar("DEPENDS", " wayland-native wayland wayland-protocols") + d.appendVar("DEPENDS", " wayland-native ${MLPREFIX}wayland ${MLPREFIX}wayland-protocols") if "x11" in distrofeatures: - d.appendVar("DEPENDS", " virtual/libx11 virtual/egl ") + d.appendVar("DEPENDS", " virtual/${MLPREFIX}libx11 virtual/${MLPREFIX}egl ") } CTSDIR = "/usr/lib/${BPN}" diff --git a/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb b/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb index bbfab47aae..317ec19266 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb @@ -18,6 +18,7 @@ EXTRA_OEMAKE = "\ LD="${LD}" \ AR=${AR} \ ARCH=${ARCH} \ + bash_compdir=${prefix}/share/bash-completion \ " SECURITY_CFLAGS = "" @@ -42,3 +43,7 @@ python do_package:prepend() { } B = "${WORKDIR}/${BPN}-${PV}" + +FILES:${PN} += "${exec_prefix}/sbin/*" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb index b85b7993d0..104b946c68 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.22.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \ file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \ " -DEPENDS = "libsamplerate0 libsndfile1 readline" +DEPENDS = "libsamplerate0 libsndfile1" SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https" SRCREV = "4f58969432339a250ce87fe855fb962c67d00ddb" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.4.bb b/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.4.bb index 2002117746..127c8be18d 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.4.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.4.bb @@ -29,8 +29,8 @@ EXTRA_OECONF = " \ # ne10 is available only for armv7a, armv7ve and aarch64 DEPENDS:append:aarch64 = " ne10" -DEPENDS:append:armv7a = " ne10" -DEPENDS:append:armv7ve = " ne10" +DEPENDS:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}" +DEPENDS:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}" python () { if d.getVar('TARGET_FPU') in [ 'soft' ]: @@ -52,3 +52,5 @@ python () { ARM_INSTRUCTION_SET:armv5 = "arm" BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT += "opus-codec:opus" 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 index 79b330c315..558b448baf 100644 --- 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 @@ -26,7 +26,7 @@ export LD = "${CC}" VPXTARGET:armv5te = "armv5te-linux-gcc" VPXTARGET:armv6 = "armv6-linux-gcc" -VPXTARGET:armv7a = "armv7-linux-gcc" +VPXTARGET:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7-linux-gcc","generic-gnu",d)}" VPXTARGET ?= "generic-gnu" CONFIGUREOPTS = " \ diff --git a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb index 6784b099aa..822e3043eb 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb @@ -13,7 +13,7 @@ DEPENDS = "glib-2.0 dbus json-glib libsoup-3.0 intltool-native" inherit meson pkgconfig gtk-doc gobject-introspection vala useradd SRCREV = "bbfb6289dedb88cb8155d9f6868787d5432e1f90" -SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;nobranch=1 \ +SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;branch=master \ file://0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/appstream/appstream_0.16.2.bb b/meta-openembedded/meta-oe/recipes-support/appstream/appstream_0.16.2.bb index 1ba4521834..240e63a1bd 100644 --- a/meta-openembedded/meta-oe/recipes-support/appstream/appstream_0.16.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/appstream/appstream_0.16.2.bb @@ -36,6 +36,7 @@ PACKAGECONFIG[stemming] = "-Dstemming=true,-Dstemming=false,libstemmer" FILES:${PN} += "${datadir}" +EXTRA_OEMESON:append = " -Ddocs=false" EXTRA_OEMESON:class-target += "--cross-file=${WORKDIR}/meson-${PN}.cross" do_write_config:append:class-target() { diff --git a/meta-openembedded/meta-oe/recipes-support/emacs/emacs_28.2.bb b/meta-openembedded/meta-oe/recipes-support/emacs/emacs_29.1.bb index d44026536d..ae35367ac4 100644 --- a/meta-openembedded/meta-oe/recipes-support/emacs/emacs_28.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/emacs/emacs_29.1.bb @@ -5,11 +5,13 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRC_URI = "https://ftp.gnu.org/pub/gnu/emacs/emacs-${PV}.tar.xz \ - file://0001-largefile.m4-Update-from-latest-gnulib.patch \ " -SRC_URI:append:class-target = " file://usemake-docfile-native.patch" +SRC_URI:append:class-target = " \ + file://use-emacs-native-tools-for-cross-compiling.patch \ + file://avoid-running-host-binaries-for-sanity.patch \ +" -SRC_URI[sha256sum] = "ee21182233ef3232dc97b486af2d86e14042dbb65bbc535df562c3a858232488" +SRC_URI[sha256sum] = "d2f881a5cc231e2f5a03e86f4584b0438f83edd7598a09d24a21bd8d003e2e01" CVE_STATUS[CVE-2007-6109] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." @@ -32,24 +34,42 @@ DEPENDS:append:class-target = " emacs-native" inherit autotools mime-xdg pkgconfig -# Remove build host references to avoid target pollution -do_compile:prepend () { - sed -i -e 's|${TMPDIR}||g' ${B}/src/config.h - sed -i -e 's|${B}||g' ${B}/src/epaths.h -} +# Create the required native tools for the target build do_compile:class-native (){ cd ${B}/lib-src oe_runmake make-docfile oe_runmake make-fingerprint + cd ${B}/src + oe_runmake bootstrap-emacs } + do_install:class-native(){ install -d ${D}${bindir} install -m 755 ${B}/lib-src/make-docfile ${D}/${bindir}/ install -m 755 ${B}/lib-src/make-fingerprint ${D}/${bindir}/ + install -m 755 ${B}/src/bootstrap-emacs ${D}/${bindir}/ +} + +do_compile:prepend:class-target () { + # export EMACS env variables for the native tools to use to allow calling bootstrap-emacs + export EMACSLOADPATH=${S}/lisp + export EMACSDATA=${S}/etc } +do_install:prepend:class-target(){ + # export EMACS env variables for the native tools to use to allow calling bootstrap-emacs + export EMACSLOADPATH=${S}/lisp + export EMACSDATA=${S}/etc +} + +# Remove build host references to avoid target pollution +do_compile:prepend () { + sed -i -e 's|${TMPDIR}||g' ${B}/src/config.h + sed -i -e 's|${B}||g' ${B}/src/epaths.h +} + do_install:append(){ # Delete systemd stuff, extend using DISTRO_FEATURES? rm -rf ${D}/${libdir} @@ -96,18 +116,28 @@ FILES:${PN}-minimal = " \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/bytecomp.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cconv.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-generic.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-lib.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-macs.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-preloaded.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-seq.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/debug-early.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/easy-mmode.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/easymenu.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eldoc.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/float-sup.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/gv.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/inline.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/lisp-mode.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/lisp.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/macroexp.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/map-ynp.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/map.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/nadvice.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/oclosure.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/pcase.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/regexp-opt.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/rmc.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/rx.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/seq.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/shorthands.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/subr-x.elc \ @@ -141,6 +171,8 @@ FILES:${PN}-minimal = " \ ${datadir}/${BPN}/${PV}/lisp/isearch.elc \ ${datadir}/${BPN}/${PV}/lisp/jit-lock.elc \ ${datadir}/${BPN}/${PV}/lisp/jka-cmpr-hook.elc \ + ${datadir}/${BPN}/${PV}/lisp/jka-compr.elc \ + ${datadir}/${BPN}/${PV}/lisp/keymap.elc \ ${datadir}/${BPN}/${PV}/lisp/language/burmese.elc \ ${datadir}/${BPN}/${PV}/lisp/language/cham.elc \ ${datadir}/${BPN}/${PV}/lisp/language/chinese.elc \ @@ -153,11 +185,13 @@ FILES:${PN}-minimal = " \ ${datadir}/${BPN}/${PV}/lisp/language/greek.elc \ ${datadir}/${BPN}/${PV}/lisp/language/hebrew.elc \ ${datadir}/${BPN}/${PV}/lisp/language/indian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/indonesian.elc \ ${datadir}/${BPN}/${PV}/lisp/language/japanese.elc \ ${datadir}/${BPN}/${PV}/lisp/language/khmer.elc \ ${datadir}/${BPN}/${PV}/lisp/language/korean.elc \ ${datadir}/${BPN}/${PV}/lisp/language/lao.elc \ ${datadir}/${BPN}/${PV}/lisp/language/misc-lang.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/philippine.elc \ ${datadir}/${BPN}/${PV}/lisp/language/romanian.elc \ ${datadir}/${BPN}/${PV}/lisp/language/sinhala.elc \ ${datadir}/${BPN}/${PV}/lisp/language/slovak.elc \ @@ -182,7 +216,6 @@ FILES:${PN}-minimal = " \ ${datadir}/${BPN}/${PV}/lisp/rfn-eshadow.elc \ ${datadir}/${BPN}/${PV}/lisp/select.elc \ ${datadir}/${BPN}/${PV}/lisp/simple.elc \ - ${datadir}/${BPN}/${PV}/lisp/simple.elc \ ${datadir}/${BPN}/${PV}/lisp/startup.elc \ ${datadir}/${BPN}/${PV}/lisp/subr.elc \ ${datadir}/${BPN}/${PV}/lisp/tab-bar.elc \ @@ -192,6 +225,7 @@ FILES:${PN}-minimal = " \ ${datadir}/${BPN}/${PV}/lisp/textmodes/page.elc \ ${datadir}/${BPN}/${PV}/lisp/textmodes/paragraphs.elc \ ${datadir}/${BPN}/${PV}/lisp/textmodes/text-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/thingatpt.elc \ ${datadir}/${BPN}/${PV}/lisp/tooltip.elc \ ${datadir}/${BPN}/${PV}/lisp/uniquify.elc \ ${datadir}/${BPN}/${PV}/lisp/vc/ediff-hook.elc \ diff --git a/meta-openembedded/meta-oe/recipes-support/emacs/files/avoid-running-host-binaries-for-sanity.patch b/meta-openembedded/meta-oe/recipes-support/emacs/files/avoid-running-host-binaries-for-sanity.patch new file mode 100644 index 0000000000..719ee4bce9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/emacs/files/avoid-running-host-binaries-for-sanity.patch @@ -0,0 +1,38 @@ +Upstream-Status: Inappropriate [OE-Specific] + +Emacs introduced a sanity-check for the build artifacts, where it +runs the newly built emacs to perform some checks. + +This is not going to work for us since we are cross-compiling, +we need to avoid running target binaries on the host + +Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org> + +Index: emacs-29.1/Makefile.in +=================================================================== +--- emacs-29.1.orig/Makefile.in ++++ emacs-29.1/Makefile.in +@@ -416,19 +416,10 @@ advice-on-failure: + @exit ${exit-status} + + sanity-check: +- @[ -f .no-advice-on-failure ] && exit 0; true +- @v=$$(src/emacs${EXEEXT} --batch --eval \ +- '(progn (defun f (n) (if (= 0 n) 1 (* n (f (- n 1))))) (princ (f 10)))' \ +- 2> /dev/null); \ +- [ "X$$v" = "X3628800" ] && exit 0; \ +- echo >&2 '***'; \ +- echo >&2 '*** '"\"make ${make-target}\" succeeded, but Emacs is not functional."; \ +- echo >&2 '***'; \ +- cat Makefile | \ +- sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q;};' | \ +- sed 's/^# /*** /' | grep -v '^\*\*\* ADVICE-ON-FAILURE-' >&2; \ +- echo >&2 '***'; \ +- exit 1 ++# The Makefile will try to call the newly built emacs to perform some checks ++# this is not going to work since it was (probably) built for a different architecture. ++# Avoid calling target binaries from the host and simply assume our build artifacts work. ++ exit 0 + + .PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 epaths-force-ns-self-contained etc-emacsver + diff --git a/meta-openembedded/meta-oe/recipes-support/emacs/files/use-emacs-native-tools-for-cross-compiling.patch b/meta-openembedded/meta-oe/recipes-support/emacs/files/use-emacs-native-tools-for-cross-compiling.patch new file mode 100644 index 0000000000..df5e4bd258 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/emacs/files/use-emacs-native-tools-for-cross-compiling.patch @@ -0,0 +1,106 @@ +Upstream-Status: Inappropriate [OE-Specific] + +When building emacs, it builds some tools for the HOST +that are then used to build for target, such as +make-fingerprint and make-docfile and bootstrap-emacs, +this needs to be adapted to be used by bitbake, otherwise +the compiled executables arent compatible with the HOST. + +We also need to be able to use emacs env variables to +control how bootstrap-emacs is used when cross-compiling. + +Use the above mentioned tools provided by the native +version of the recipe instead. + +Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> + +Index: emacs-29.1/src/Makefile.in +=================================================================== +--- emacs-29.1.orig/src/Makefile.in ++++ emacs-29.1/src/Makefile.in +@@ -1,3 +1,4 @@ ++ + ### @configure_input@ + + # Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2023 Free Software +@@ -508,7 +509,7 @@ ifeq ($(CHECK_STRUCTS),true) + pdumper.o: dmpstruct.h + endif + dmpstruct.h: $(srcdir)/dmpstruct.awk +-dmpstruct.h: $(libsrc)/make-fingerprint$(EXEEXT) $(dmpstruct_headers) ++dmpstruct.h: $(dmpstruct_headers) + $(AM_V_GEN)POSIXLY_CORRECT=1 awk -f $(srcdir)/dmpstruct.awk \ + $(dmpstruct_headers) > $@ + +@@ -610,8 +611,7 @@ SYSTEM_TYPE = @SYSTEM_TYPE@ + ## Strictly speaking, emacs does not depend directly on all of $lisp, + ## since not all pieces are used on all platforms. But DOC depends + ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. +-emacs$(EXEEXT): temacs$(EXEEXT) \ +- lisp.mk $(etc)/DOC $(lisp) \ ++emacs$(EXEEXT): lisp.mk $(etc)/DOC $(lisp) \ + $(lispsource)/international/charprop.el ${charsets} + ifeq ($(SYSTEM_TYPE),cygwin) + find ${top_builddir} -name '*.eln' | rebase -v -O -T - +@@ -654,7 +654,7 @@ endif + $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(doc_obj) + $(AM_V_GEN)$(MKDIR_P) $(etc) + $(AM_V_at)rm -f $(etc)/DOC +- $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \ ++ make-docfile -d $(srcdir) \ + $(SOME_MACHINE_OBJECTS) $(doc_obj) > $(etc)/DOC + + $(libsrc)/make-docfile$(EXEEXT) $(libsrc)/make-fingerprint$(EXEEXT): \ +@@ -671,7 +671,7 @@ buildobj.h: Makefile + GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) + + gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) +- $(AM_V_GLOBALS)$(libsrc)/make-docfile -d $(srcdir) -g $(doc_obj) > globals.tmp ++ make-docfile -d $(srcdir) -g $(doc_obj) > globals.tmp + $(AM_V_at)$(top_srcdir)/build-aux/move-if-change globals.tmp globals.h + $(AM_V_at)echo timestamp > $@ + +@@ -685,7 +685,7 @@ $(LIBEGNU_ARCHIVE): $(config_h) + $(MAKE) -C $(dir $@) all + + ifeq ($(HAVE_PDUMPER),yes) +-MAKE_PDUMPER_FINGERPRINT = $(libsrc)/make-fingerprint$(EXEEXT) ++MAKE_PDUMPER_FINGERPRINT = make-fingerprint + else + MAKE_PDUMPER_FINGERPRINT = + endif +Index: emacs-29.1/lisp/Makefile.in +=================================================================== +--- emacs-29.1.orig/lisp/Makefile.in ++++ emacs-29.1/lisp/Makefile.in +@@ -53,7 +53,7 @@ FIND_DELETE = @FIND_DELETE@ + # We never change directory before running Emacs, so a relative file + # name is fine, and makes life easier. If we need to change + # directory, we can use emacs --chdir. +-EMACS = ../src/emacs${EXEEXT} ++EMACS = bootstrap-emacs + + # Command line flags for Emacs. + +@@ -109,7 +109,7 @@ MAIN_FIRST = ./emacs-lisp/eieio.el ./ema + ./org/oc.el ./org/ol.el ./emacs-lisp/cl-lib.el + + # Prevent any settings in the user environment causing problems. +-unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++unexport EMACSDOC EMACSPATH + + # The actual Emacs command run in the targets below. + emacs = '$(EMACS)' $(EMACSOPT) +Index: emacs-29.1/Makefile.in +=================================================================== +--- emacs-29.1.orig/Makefile.in ++++ emacs-29.1/Makefile.in +@@ -328,7 +328,7 @@ GLIB_COMPILE_SCHEMAS = glib-compile-sche + TRANSFORM = @program_transform_name@ + + # Prevent any settings in the user environment causing problems. +-unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++unexport EMACSDOC EMACSPATH + + # What emacs should be called when installed. + EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'` diff --git a/meta-openembedded/meta-oe/recipes-support/emacs/files/usemake-docfile-native.patch b/meta-openembedded/meta-oe/recipes-support/emacs/files/usemake-docfile-native.patch deleted file mode 100644 index 95b4281836..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/emacs/files/usemake-docfile-native.patch +++ /dev/null @@ -1,85 +0,0 @@ -Upstream-Status: Inappropriate [OE-Specific] - -When building emacs, it builds some tools for the HOST -that are then used to build for target, such as -make-fingerprint and make-docfile, this needs to be -adapted to be used by bitbake, otherwise the compiled -executables arent compatible with the HOST. - -Use the above mentioned tools provided by the native -version of the recipe instead. - -Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> - -Index: emacs-28.2/src/Makefile.in -=================================================================== ---- emacs-28.2.orig/src/Makefile.in -+++ emacs-28.2/src/Makefile.in -@@ -462,7 +462,7 @@ ifeq ($(CHECK_STRUCTS),true) - pdumper.o: dmpstruct.h - endif - dmpstruct.h: $(srcdir)/dmpstruct.awk --dmpstruct.h: $(libsrc)/make-fingerprint$(EXEEXT) $(dmpstruct_headers) -+dmpstruct.h: $(dmpstruct_headers) - $(AM_V_GEN)POSIXLY_CORRECT=1 awk -f $(srcdir)/dmpstruct.awk \ - $(dmpstruct_headers) > $@ - -@@ -563,8 +563,7 @@ SYSTEM_TYPE = @SYSTEM_TYPE@ - ## Strictly speaking, emacs does not depend directly on all of $lisp, - ## since not all pieces are used on all platforms. But DOC depends - ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. --emacs$(EXEEXT): temacs$(EXEEXT) \ -- lisp.mk $(etc)/DOC $(lisp) \ -+emacs$(EXEEXT): lisp.mk $(etc)/DOC $(lisp) \ - $(lispsource)/international/charprop.el ${charsets} - ifeq ($(SYSTEM_TYPE),cygwin) - find ${top_builddir} -name '*.eln' | rebase -v -O -T - -@@ -597,15 +596,15 @@ endif - ## for the first time, this prevents any variation between configurations - ## in the contents of the DOC file. - ## --$(etc)/DOC: lisp.mk $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) -+$(etc)/DOC: lisp.mk $(obj) $(lisp) - $(AM_V_GEN)$(MKDIR_P) $(etc) - $(AM_V_at)rm -f $(etc)/DOC -- $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \ -+ make-docfile -d $(srcdir) \ - $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC -- $(AM_V_at)$(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) \ -+ make-docfile -a $(etc)/DOC -d $(lispsource) \ - $(shortlisp) - --$(libsrc)/make-docfile$(EXEEXT) $(libsrc)/make-fingerprint$(EXEEXT): \ -+$(libsrc)/make-fingerprint$(EXEEXT): \ - $(lib)/libgnu.a - $(MAKE) -C $(dir $@) $(notdir $@) - -@@ -618,8 +617,8 @@ buildobj.h: Makefile - - GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) - --gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) -- $(AM_V_GLOBALS)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) > globals.tmp -+gl-stamp: $(GLOBAL_SOURCES) -+ make-docfile -d $(srcdir) -g $(obj) > globals.tmp - $(AM_V_at)$(top_srcdir)/build-aux/move-if-change globals.tmp globals.h - $(AM_V_at)echo timestamp > $@ - -@@ -633,7 +632,7 @@ $(LIBEGNU_ARCHIVE): $(config_h) - $(MAKE) -C $(dir $@) all - - ifeq ($(HAVE_PDUMPER),yes) -- MAKE_PDUMPER_FINGERPRINT = $(libsrc)/make-fingerprint$(EXEEXT) -+ MAKE_PDUMPER_FINGERPRINT = make-fingerprint - else - MAKE_PDUMPER_FINGERPRINT = - endif -@@ -643,7 +642,7 @@ endif - ## This goes on to affect various things, and the emacs binary fails - ## to start if Vinstallation_directory has the wrong value. - temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(EMACSRES) \ -- $(charsets) $(charscript) ${emoji-zwj} $(MAKE_PDUMPER_FINGERPRINT) -+ $(charsets) $(charscript) ${emoji-zwj} - $(AM_V_CCLD)$(CC) -o $@.tmp \ - $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \ - $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(W32_RES_LINK) $(LIBES) diff --git a/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.21.bb b/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.21.bb index f319b994bd..4a5227f206 100644 --- a/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.21.bb +++ b/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.21.bb @@ -12,7 +12,7 @@ SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz \ file://0001-agent-meson-Replace-filename-with-basename.patch" SRC_URI[sha256sum] = "72e73a2acf20f59093e21d5601606e405873503eb35f346fa621de23e99b3b39" -DEPENDS = "glib-2.0 gnutls" +DEPENDS = "glib-2.0 gnutls ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}" PACKAGECONFIG[gupnp] = "-Dgupnp=enabled,-Dgupnp=disabled,gupnp" PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0" diff --git a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_10.0.0.bb b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_10.1.1.bb index a8e6e563da..d6706d3e7a 100644 --- a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_10.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_10.1.1.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=b9257785fc4f3803a4b71b76c1412729" SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https" -SRCREV = "a0b8a92e3d1532361c2f7feb63babc5c18d00ef2" +SRCREV = "f5e54359df4c26b6230fc61d38aa294581393084" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.6.0.bb b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.6.0.bb index 1c8867f049..c09ce73f98 100644 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.6.0.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" SRC_URI = " \ - git://github.com/google/glog.git;nobranch=1;protocol=https \ + git://github.com/google/glog.git;branch=master;protocol=https \ file://libexecinfo.patch \ file://0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2018-12-18.bb b/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2018-12-18.bb index a27968079e..9e09b971c9 100644 --- a/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2018-12-18.bb +++ b/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2018-12-18.bb @@ -13,7 +13,7 @@ LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=56a22a6e5bcce45e2c8ac184f81412b5" SRCREV = "0d6e3307bbdb8df4d56043d5f373eeeffe4cbef3" -SRC_URI = "git://git.savannah.gnu.org/git/gnulib.git;branch=master \ +SRC_URI = "git://git.savannah.gnu.org/git/gnulib.git;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/gosu/gosu_1.16.bb b/meta-openembedded/meta-oe/recipes-support/gosu/gosu_1.16.bb index b209de16a4..70c7275bc4 100644 --- a/meta-openembedded/meta-oe/recipes-support/gosu/gosu_1.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/gosu/gosu_1.16.bb @@ -11,6 +11,9 @@ SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https \ SRCREV = "0e7347714352cd7f2e5edc9d2cf838d9934e6036" #v1.1.0 SRCREV_runc = "067aaf8548d78269dcb2c13b856775e27c410f9c" + +SRCREV_FORMAT .= "_runc" + inherit go CGO_ENABLED = "1" diff --git a/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.15.bb b/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.15.bb index 3656e1cfdc..6c5766a0e7 100644 --- a/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.15.bb +++ b/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.15.bb @@ -13,3 +13,5 @@ BBCLASSEXTEND = "native" S = "${WORKDIR}/lcms2-${PV}" inherit autotools + +CVE_PRODUCT += "littlecms:little_cms_color_engine" diff --git a/meta-openembedded/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch b/meta-openembedded/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch new file mode 100644 index 0000000000..57f5486084 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch @@ -0,0 +1,65 @@ +From dfd3ef4caac300f517f8eeb378f0b0f9ba6a9b06 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Tue, 15 Aug 2023 15:41:03 +0200 +Subject: [PATCH] remove dropped gtkdoc templates + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Pending +--- +--- a/gtkdoc/gtk-doc.make 2011-08-25 23:20:22.000000000 +0200 ++++ b/gtkdoc/gtk-doc.make 2023-08-15 18:08:02.430729073 +0200 +@@ -33,9 +33,9 @@ + $(HTML_IMAGES) \ + $(SETUP_FILES) + +-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ ++DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ +- tmpl.stamp sgml.stamp html.stamp pdf.stamp ++ sgml.stamp html.stamp pdf.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -120,27 +120,12 @@ + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +-#### templates #### +- +-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt +- @echo ' DOC Rebuilding template files' +- @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +- if test -w $(abs_srcdir) ; then \ +- cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ +- fi \ +- fi +- @touch tmpl-build.stamp +- +-tmpl.stamp: tmpl-build.stamp +- @true +- + $(srcdir)/tmpl/*.sgml: + @true + + #### xml #### + +-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++sgml-build.stamp: $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo ' DOC Building XML' + @-chmod -R u+w $(srcdir) + @_source_dir='' ; \ + --- a/gtkdoc/Makefile.am 2009-01-21 21:52:46.000000000 +0100 ++++ b/gtkdoc/Makefile.am 2023-08-15 17:41:59.002498772 +0200 +@@ -31,10 +31,6 @@ + # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml + MKDB_OPTIONS=--sgml-mode --output-format=xml + +-# Extra options to supply to gtkdoc-mktmpl +-# e.g. MKTMPL_OPTIONS=--only-section-tmpl +-MKTMPL_OPTIONS= +- + # Extra options to supply to gtkdoc-fixref. Not normally needed. + # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html + FIXXREF_OPTIONS= diff --git a/meta-openembedded/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb b/meta-openembedded/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb index 20fe910ebe..95c9479588 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb @@ -12,6 +12,7 @@ SRC_URI = " \ http://0pointer.de/lennart/projects/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch \ file://0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch \ + file://0001-remove-dropped-templates.patch \ " SRC_URI[md5sum] = "34cb7e4430afaf6f447c4ebdb9b42072" SRC_URI[sha256sum] = "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72" diff --git a/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch b/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch new file mode 100644 index 0000000000..d9e10469d3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch @@ -0,0 +1,43 @@ +From 655c5c32b37a2bea12389ed69c0869215fcf5abe Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 3 Sep 2023 11:22:35 +0200 +Subject: [PATCH] CMakeLists.txt: don't fall back CMAKE_INSTALL_LIBDIR to lib + +* testing ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} existence + doesn't really work in cross compilation and on some hosts was causing: + + ERROR: QA Issue: libcyusbserial: Files/directories were installed but not shipped in any package: + /usr/lib/libcyusbserial.so.1 + /usr/lib/libcyusbserial.so + Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. + libcyusbserial: 2 installed and not shipped files. [installed-vs-shipped] + + with multilib using /usr/lib32 or /usr/lib64 when the same didn't + exist on host. + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + lib/CMakeLists.txt | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 2b031cb..53a7263 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -6,15 +6,6 @@ if (NOT CMAKE_INSTALL_LIBDIR) + include(GNUInstallDirs) + endif (NOT CMAKE_INSTALL_LIBDIR) + +-# Fall back to just "lib" if the item provided by GNUInstallDirs doesn't exist +-# For example, on Ubuntu 13.10 with CMake 2.8.11.2, +-# /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} doesn't exist. +-if (NOT EXISTS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +- message(STATUS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} does not exist. Defaulting libcyusbserial install location to ${CMAKE_INSTALL_PREFIX}/lib.") +- set(CMAKE_INSTALL_LIBDIR lib) +-endif() +- +- + ################################################################################ + # Include paths + ################################################################################ diff --git a/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb b/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb index 81453fb888..a69194996b 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb @@ -8,7 +8,9 @@ DEPENDS = "libusb udev" PV = "1.0.0+git${SRCPV}" SRCREV = "655e2d544183d094f0e2d119c7e0c6206a0ddb3f" -SRC_URI = "git://github.com/cyrozap/${BPN}.git;branch=master;protocol=https" +SRC_URI = "git://github.com/cyrozap/${BPN}.git;branch=master;protocol=https \ + file://0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch \ +" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-tools-test-bats-modify.patch b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-tools-test-bats-modify.patch deleted file mode 100644 index 0b2a5e6a8c..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-tools-test-bats-modify.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 53f9670d6af1bd0745c1df9c469b269c72607b23 Mon Sep 17 00:00:00 2001 -From: Joe Slater <joe.slater@windriver.com> -Date: Tue, 6 Jun 2023 08:04:27 -0700 -Subject: [PATCH] tools: tests: modify delays in toggle test - -The test "gpioset: toggle (continuous)" uses fixed delays to test -toggling values. This is not reliable, so we switch to looking -for transitions from one value to another. - -We wait for a transition up to 1.5 seconds. - -Signed-off-by: Joe Slater <joe.slater@windriver.com> -Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> - -Upstream-Status: Accepted - -Signed-off-by: Joe Slater <joe.slater@windriver.com> ---- - tools/gpio-tools-test.bats | 21 ++++++++++++++++----- - 1 file changed, 16 insertions(+), 5 deletions(-) - -diff --git a/tools/gpio-tools-test.bats b/tools/gpio-tools-test.bats -index c83ca7d..929c35a 100755 ---- a/tools/gpio-tools-test.bats -+++ b/tools/gpio-tools-test.bats -@@ -141,6 +141,20 @@ gpiosim_check_value() { - [ "$VAL" = "$EXPECTED" ] - } - -+gpiosim_wait_value() { -+ local OFFSET=$2 -+ local EXPECTED=$3 -+ local DEVNAME=${GPIOSIM_DEV_NAME[$1]} -+ local CHIPNAME=${GPIOSIM_CHIP_NAME[$1]} -+ local PORT=$GPIOSIM_SYSFS/$DEVNAME/$CHIPNAME/sim_gpio$OFFSET/value -+ -+ for i in {1..15}; do -+ [ "$(<$PORT)" = "$EXPECTED" ] && return -+ sleep 0.1 -+ done -+ return 1 -+} -+ - gpiosim_cleanup() { - for CHIP in ${!GPIOSIM_CHIP_NAME[@]} - do -@@ -1567,15 +1581,12 @@ request_release_line() { - gpiosim_check_value sim0 4 0 - gpiosim_check_value sim0 7 0 - -- sleep 1 -- -- gpiosim_check_value sim0 1 0 -+ gpiosim_wait_value sim0 1 0 - gpiosim_check_value sim0 4 1 - gpiosim_check_value sim0 7 1 - -- sleep 1 - -- gpiosim_check_value sim0 1 1 -+ gpiosim_wait_value sim0 1 1 - gpiosim_check_value sim0 4 0 - gpiosim_check_value sim0 7 0 - } --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.0.1.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.0.2.bb index 6958f2d841..7533e0a258 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.0.2.bb @@ -9,9 +9,7 @@ LIC_FILES_CHKSUM = " \ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" -SRC_URI += "file://gpio-tools-test-bats-modify.patch" - -SRC_URI[sha256sum] = "b5367d28d045b36007a4ffd42cceda4c358737ef4f2ce22b0c1d05ec57a38392" +SRC_URI[sha256sum] = "c3c923dc63b7b1b02639c9179c81e3d9febf0887bbaa59775990229cdbedb88b" # Enable all project features for ptest PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit" diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_0.25.bb index ecbd2c8641..3bdd445213 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_0.25.bb @@ -4,10 +4,9 @@ SECTION = "libs" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" -SRCREV = "eee8cba6f42177a094ebe16759606a719676fda7" -PV = "0.25" +SRCREV = "b6028fdeef888ab45f7c1dd6e4ed9480ae4b55e3" -SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=master" +SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=main" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.3.1.bb b/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.3.1.bb index b81050b25a..2f6b1f247f 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.3.1.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" HOMEPAGE = "https://www.msweet.org/mxml/" BUGTRACKER = "https://github.com/michaelrsweet/mxml/issues" -SRC_URI = "git://github.com/michaelrsweet/mxml.git;nobranch=1;protocol=https" +SRC_URI = "git://github.com/michaelrsweet/mxml.git;branch=master;protocol=https" SRCREV = "fd47c7d115191c8a6bce2c781ffee41e179530f2" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch b/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch new file mode 100644 index 0000000000..778a1f6e1e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch @@ -0,0 +1,28 @@ +From 123b5a4c5e09f4262d4545a0bc5edb01a19b6b76 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Mon, 21 Aug 2023 10:06:55 +0200 +Subject: [PATCH] meson.build: allow crosscompiling gir + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 39b739e..46f2252 100644 +--- a/meson.build ++++ b/meson.build +@@ -29,7 +29,7 @@ libosinfo_pkgconfdir = join_paths(libosinfo_libdir, 'pkgconfig') + + # gobject introspection + gir = find_program('g-ir-scanner', required: get_option('enable-introspection')) +-enable_introspection = gir.found() and not meson.is_cross_build() ++enable_introspection = gir.found() + + # vala + vapi_opt = get_option('enable-vala') +-- +2.41.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.10.bb b/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.10.bb new file mode 100644 index 0000000000..d724c52ea9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.10.bb @@ -0,0 +1,32 @@ +SUMMARY = "API for managing information about operating systems, hypervisors and the (virtual) hardware devices." +HOMEPAGE = "https://libosinfo.org" + +LICENSE = "LGPL-2.1-only & GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2b0e9926530c269f5ae95560370195af" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = " \ + git://gitlab.com/libosinfo/libosinfo.git;branch=main;protocol=https \ + file://0001-meson.build-allow-crosscompiling-gir.patch \ +" + +SRCREV = "f503ff7a9e13963bcf396776bce0b209a819ba9b" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig gtk-doc gobject-introspection vala + +DEPENDS = "glib-2.0 libsoup libxslt" + +GIR_MESON_OPTION = "enable-introspection" +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = "enable-gtk-doc" + +EXTRA_OEMESON += " \ + -Dwith-pci-ids-path=${datadir}/pci.ids \ + -Dwith-usb-ids-path=${datadir}/usb.ids \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Denable-vala=enabled', '-Denable-vala=disabled', d)} \ +" + +RDEPENDS:${PN} = "pciutils-ids usbids" diff --git a/meta-openembedded/meta-oe/recipes-support/libssh/libssh/run-ptest b/meta-openembedded/meta-oe/recipes-support/libssh/libssh/run-ptest index 159994e9bb..6346b72d50 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh/libssh/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/libssh/libssh/run-ptest @@ -1,53 +1,17 @@ #!/bin/sh -# Valid tests to run -tests="torture_bind_config \ - torture_buffer \ - torture_bytearray \ - torture_callbacks \ - torture_channel \ - torture_config \ - torture_crypto \ - torture_hashes \ - torture_init \ - torture_isipaddr \ - torture_keyfiles \ - torture_knownhosts_parsing \ - torture_list \ - torture_misc \ - torture_moduli \ - torture_options \ - torture_packet \ - torture_packet_filter \ - torture_pki \ - torture_pki_ecdsa \ - torture_pki_ed25519 \ - torture_pki_rsa \ - torture_push_pop_dir \ - torture_rand \ - torture_session_keys \ - torture_temp_dir \ - torture_temp_file \ - torture_threads_buffer \ - torture_threads_crypto \ - torture_threads_init \ - torture_threads_pki_rsa \ - torture_tokens \ - " - ptestdir=$(dirname "$(readlink -f "$0")") cd "$ptestdir"/tests || exit -# Run specified tests +tests=$(find * -type f -name 'torture_*') + for f in $tests do - if test -e ./"$f"; then + if test -x ./"$f"; then if ./"$f" > ./"$f".out 2> ./"$f".err; then echo "PASS: $f" else echo "FAIL: $f" fi - else - echo "SKIP: $f" fi done diff --git a/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.10.4.bb b/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.10.5.bb index 4b2ced5e50..f33987acf5 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.10.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.10.5.bb @@ -11,7 +11,7 @@ SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \ file://run-ptest \ " -SRCREV = "e8322817a9e5aaef0698d779ddd467a209a85d85" +SRCREV = "479eca13aaaa46b43e68c52186e3783f06ae6f34" S = "${WORKDIR}/git" @@ -34,12 +34,15 @@ EXTRA_OECMAKE = " \ do_compile:prepend () { if [ ${PTEST_ENABLED} = "1" ]; then sed -i -e 's|${B}|${PTEST_PATH}|g' ${B}/config.h + sed -i -e 's|${S}|${PTEST_PATH}|g' ${B}/config.h fi } do_install_ptest () { install -d ${D}${PTEST_PATH}/tests cp -f ${B}/tests/unittests/torture_* ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/unittests + cp -f ${S}/tests/unittests/hello*.sh ${D}${PTEST_PATH}/tests/unittests/ } BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-Fixes-build-failure-on-.-configure-make-shuffle-2836.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-Fixes-build-failure-on-.-configure-make-shuffle-2836.patch new file mode 100644 index 0000000000..0cf8548e4c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-Fixes-build-failure-on-.-configure-make-shuffle-2836.patch @@ -0,0 +1,34 @@ +From c34dca74854cb6e7f2b09affa2a4ab0145e62371 Mon Sep 17 00:00:00 2001 +From: Kartik Mahajan <stonebrakert6@gmail.com> +Date: Fri, 30 Jun 2023 11:34:07 +0530 +Subject: [PATCH] Fixes build failure on ./configure && make + --shuffle=2836571325 + +./configure && make --shuffle=2836571325 fails. +The build fails on parallel builds for me and above command reproduces it. +Note that --shuffle options is available on make version >= 4.4 +Target ffi_libname in src/Makefile should have a additional dependency +upon $(liburing_sobjs) + +Upstream-Status: Backport [https://github.com/axboe/liburing/commit/c34dca74854cb6e7f2b09affa2a4ab0145e62371] +Signed-off-by: Kartik Mahajan <stonebrakert6@gmail.com> +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index c4c28cb..7832095 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -81,7 +81,7 @@ liburing-ffi.a: $(liburing_objs) $(liburing_ffi_objs) + $(libname): $(liburing_sobjs) liburing.map + $(QUIET_CC)$(CC) $(SO_CFLAGS) -shared -Wl,--version-script=liburing.map -Wl,-soname=$(soname) -o $@ $(liburing_sobjs) $(LINK_FLAGS) + +-$(ffi_libname): $(liburing_ffi_objs) $(liburing_ffi_sobjs) liburing-ffi.map ++$(ffi_libname): $(liburing_ffi_objs) $(liburing_ffi_sobjs) $(liburing_sobjs) liburing-ffi.map + $(QUIET_CC)$(CC) $(SO_CFLAGS) -shared -Wl,--version-script=liburing-ffi.map -Wl,-soname=$(ffi_soname) -o $@ $(liburing_sobjs) $(liburing_ffi_sobjs) $(LINK_FLAGS) + + install: $(all_targets) +-- +2.41.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-examples-test-Remove-unused-linux-errqueue.h.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-examples-test-Remove-unused-linux-errqueue.h.patch deleted file mode 100644 index 21aaf8d991..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-examples-test-Remove-unused-linux-errqueue.h.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0fbcc44fe1fb2dc6807660b2cff1c2995add095b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 18 Feb 2023 18:01:22 -0800 -Subject: [PATCH] examples,test: Remove unused linux/errqueue.h - -This header is not needed therefore remove it, this cleanup also helps -compiling on musl/clang - -/usr/include/linux/errqueue.h:57:20: error: array has incomplete element typ -e 'struct timespec' - struct timespec ts[3]; - ^ - -Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/798] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - examples/send-zerocopy.c | 1 - - test/send-zerocopy.c | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/examples/send-zerocopy.c b/examples/send-zerocopy.c -index 6092af9..cf1fa8b 100644 ---- a/examples/send-zerocopy.c -+++ b/examples/send-zerocopy.c -@@ -13,7 +13,6 @@ - #include <string.h> - - #include <arpa/inet.h> --#include <linux/errqueue.h> - #include <linux/if_packet.h> - #include <linux/ipv6.h> - #include <linux/socket.h> -diff --git a/test/send-zerocopy.c b/test/send-zerocopy.c -index 86a31cd..5d578c6 100644 ---- a/test/send-zerocopy.c -+++ b/test/send-zerocopy.c -@@ -11,7 +11,6 @@ - #include <string.h> - - #include <arpa/inet.h> --#include <linux/errqueue.h> - #include <linux/if_packet.h> - #include <linux/ipv6.h> - #include <linux/socket.h> --- -2.39.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.3.bb b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.4.bb index 7d8c2f596d..e5dba70df0 100644 --- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.4.bb @@ -10,12 +10,11 @@ LICENSE = "LGPL-2.1-only | MIT" LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af" SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \ - file://0001-examples-test-Remove-unused-linux-errqueue.h.patch" + file://0001-Fixes-build-failure-on-.-configure-make-shuffle-2836.patch" SRC_URI:append:libc-musl:riscv64 = " file://0001-do-not-build-examples.patch " SRC_URI:append:libc-musl:riscv32 = " file://0001-do-not-build-examples.patch " -SRCREV = "f5cac78e621ab452d3035902085f66d2bf73243b" +SRCREV = "298c083d75ecde5a8833366167b3b6abff0c8d39" -PV .= "+2.4+git${SRCPV}" S = "${WORKDIR}/git" DEPENDS:append:libc-musl = " libucontext" diff --git a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service index ba92f1ab83..d7d394cfe1 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service +++ b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service @@ -4,7 +4,7 @@ Requires=sys-kernel-config.mount After=sys-kernel-config.mount [Service] -Type=simple +Type=oneshot ExecStart=/usr/bin/gadget-start [Install] diff --git a/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb index 0e16b15c97..5193df3174 100644 --- a/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb @@ -18,12 +18,12 @@ inherit cmake # Incompatible with archs other than armv7, armv7ve and aarch64 COMPATIBLE_MACHINE = "(^$)" COMPATIBLE_MACHINE:aarch64 = "(.*)" -COMPATIBLE_MACHINE:armv7a = "(.*)" -COMPATIBLE_MACHINE:armv7ve = "(.*)" +COMPATIBLE_MACHINE:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","(.*)","(^$)",d)}" +COMPATIBLE_MACHINE:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon","(.*)","(^$)",d)}" NE10_TARGET_ARCH = "" NE10_TARGET_ARCH:aarch64 = "aarch64" -NE10_TARGET_ARCH:armv7a = "armv7" -NE10_TARGET_ARCH:armv7ve = "armv7" +NE10_TARGET_ARCH:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","",d)}" +NE10_TARGET_ARCH:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","",d)}" EXTRA_OECMAKE = '-DGNULINUX_PLATFORM=ON -DNE10_BUILD_SHARED=ON -DNE10_LINUX_TARGET_ARCH="${NE10_TARGET_ARCH}"' diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch new file mode 100644 index 0000000000..cc942fad77 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch @@ -0,0 +1,46 @@ +From 591235c8b6c65a2eee88991b9ae73490fd9afdfe Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Fri, 18 Aug 2023 11:36:06 +0000 +Subject: [PATCH] OutlineItem::open: Fix crash on malformed files + +Fixes #1399 + +CVE: CVE-2023-34872 + +Upstream-Status: Backport [https://gitlab.freedesktop.org/poppler/poppler/-/commit/591235c8b6c65a2eee88991b9ae73490fd9afdfe] + +Signed-off-by: Yogita Urade <yogita.urade@windriver.com> +--- + poppler/Outline.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/poppler/Outline.cc b/poppler/Outline.cc +index cbb6cb4..4c68be9 100644 +--- a/poppler/Outline.cc ++++ b/poppler/Outline.cc +@@ -14,7 +14,7 @@ + // under GPL version 2 or later + // + // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com> +-// Copyright (C) 2008, 2016-2019, 2021 Albert Astals Cid <aacid@kde.org> ++// Copyright (C) 2008, 2016-2019, 2021, 2023 Albert Astals Cid <aacid@kde.org> + // Copyright (C) 2009 Nick Jones <nick.jones@network-box.com> + // Copyright (C) 2016 Jason Crain <jason@aquaticape.us> + // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com> +@@ -483,8 +483,12 @@ void OutlineItem::open() + { + if (!kids) { + Object itemDict = xref->fetch(ref); +- const Object &firstRef = itemDict.dictLookupNF("First"); +- kids = readItemList(this, &firstRef, xref, doc); ++ if (itemDict.isDict()) { ++ const Object &firstRef = itemDict.dictLookupNF("First"); ++ kids = readItemList(this, &firstRef, xref, doc); ++ } else { ++ kids = new std::vector<OutlineItem *>(); ++ } + } + } + +-- +2.35.5 diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_23.04.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_23.04.0.bb index 896176801b..f4411e1163 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_23.04.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_23.04.0.bb @@ -8,6 +8,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://basename-include.patch \ file://0001-cmake-Do-not-use-isystem.patch \ file://jpeg-stdio.patch \ + file://CVE-2023-34872.patch \ " SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1" diff --git a/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils/0001-sg_dd.c-Use-off_t-instead-of-uint.patch b/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils/0001-sg_dd.c-Use-off_t-instead-of-uint.patch deleted file mode 100644 index 317876f197..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils/0001-sg_dd.c-Use-off_t-instead-of-uint.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9a8ede03ef61cdf527ce3a80771150a7452e4603 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 11 Mar 2023 22:56:17 -0800 -Subject: [PATCH] sg_dd.c: Use off_t instead of uint - -uint is not available on every platform e.g. linux/musl systems. Use -uint32_t instead to represent 'off' variable, Fixes - -sg_dd.c:2402:17: error: use of undeclared identifier 'uint'; did you mean 'int'? - uint off; - ^~~~ - int -1 error generated. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/sg_dd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sg_dd.c b/src/sg_dd.c -index 9d05c93..35e2423 100644 ---- a/src/sg_dd.c -+++ b/src/sg_dd.c -@@ -2399,7 +2399,7 @@ main(int argc, char * argv[]) - res = blocks * blk_sz; - if (iflag.zero && iflag.ff && (blk_sz >= 4)) { - uint32_t pos = (uint32_t)skip; -- uint off; -+ uint32_t off; - - for (k = 0, off = 0; k < blocks; ++k, off += blk_sz, ++pos) { - for (j = 0; j < (blk_sz - 3); j += 4) --- -2.39.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.47.bb b/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb index 1aa65e6cc4..6c3d813983 100644 --- a/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.47.bb +++ b/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb @@ -8,13 +8,12 @@ SECTION = "console/admin" LICENSE = "GPL-2.0-or-later & BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=f685699d3ac82f108aa880043fa3feb7" -SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz \ - file://0001-sg_dd.c-Use-off_t-instead-of-uint.patch" +SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz" MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" UPSTREAM_CHECK_REGEX = "sg3_utils-(?P<pver>\d+(\.\d+)+)\.tgz" -SRC_URI[sha256sum] = "8673c7faca849b6b34764332d2aa91f72db05bff7382bb836d0688795199c3e1" +SRC_URI[sha256sum] = "d62b6c3cf20390fa7357044390084166d25f1d932a1135c450b69fe5c283d773" inherit autotools-brokensep diff --git a/meta-openembedded/meta-oe/recipes-support/tio/tio_2.6.bb b/meta-openembedded/meta-oe/recipes-support/tio/tio_2.6.bb index 1a83a2e420..faef290737 100644 --- a/meta-openembedded/meta-oe/recipes-support/tio/tio_2.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/tio/tio_2.6.bb @@ -6,7 +6,7 @@ DESCRIPTION = "tio is a simple serial device tool which features a \ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=0e1a95b7892d3015ecd6d0016f601f2c" -SRC_URI = "git://github.com/tio/tio;protocol=https;nobranch=1" +SRC_URI = "git://github.com/tio/tio;protocol=https;branch=master" SRCREV = "88ef473362c5a1ff0dcd389fd5b1d4d6bf202472" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb b/meta-openembedded/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb new file mode 100644 index 0000000000..b0dd72fb25 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb @@ -0,0 +1,18 @@ +SUMMARY = "usb device database." +HOMEPAGE = "https://github.com/usbids/usbids" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" + +SRC_URI = "git://github.com/usbids/usbids.git;branch=master;protocol=https" + +SRCREV = "7963233faf69eb9c80ffca8dfc1f31940f75999f" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${datadir} + install -m0644 ${S}/usb.ids ${D}${datadir} +} + +FILES:${PN} = "${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.40.5.bb b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.40.5.bb index 7218dbb5ef..5d43f3a8d1 100644 --- a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.40.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.40.5.bb @@ -102,9 +102,21 @@ EXTRA_OECMAKE:append:powerpc = " -DENABLE_JIT=OFF " EXTRA_OECMAKE:append:powerpc64 = " -DENABLE_JIT=OFF " # ARM JIT code does not build on ARMv4/5/6 anymore +EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " -EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " + +# And for armv7* don't enable it for softfp, because after: +# https://github.com/WebKit/WebKit/commit/a2ec4ef1997d6fafa6ffc607bffb54e76168a918 +# https://bugs.webkit.org/show_bug.cgi?id=242172 +# softfp armv7* fails because WEBASSEMBLY is left enabled by default and JIT gets +# explicitly disabled causing: +# http://errors.yoctoproject.org/Errors/Details/734587/ +# PR was sent upstream, but the end result is the same both JIT and WEBASSEMBLY disabled +# https://github.com/WebKit/WebKit/pull/17447 +EXTRA_OECMAKE:append:armv7a = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" +EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" +EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " diff --git a/meta-openembedded/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.4.bb b/meta-openembedded/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb index 35dee632a2..e10ccd04ea 100644 --- a/meta-openembedded/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb @@ -14,6 +14,6 @@ inherit meson pkgconfig SRC_URI = "git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main" S = "${WORKDIR}/git" -SRCREV = "6bfe8c32ab23f8c1d80af7a70b3d318a79a17652" +SRCREV = "7466c8137fc06f863fde8486521984e43a26cd10" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp/0001-Fix-CMake-export-files-1077.patch b/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp/0001-Fix-CMake-export-files-1077.patch deleted file mode 100644 index b6c4a3b883..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp/0001-Fix-CMake-export-files-1077.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 3d436f6cfc2dfe52fc1533c01f57c25ae7ffac9c Mon Sep 17 00:00:00 2001 -From: Felix Schwitzer <flx107809@gmail.com> -Date: Fri, 1 Apr 2022 05:26:47 +0200 -Subject: [PATCH] Fix CMake export files (#1077) - -After configuring the file `yaml-cpp-config.cmake.in`, the result ends up with -empty variables. (see also the discussion in #774). - -Rework this file and the call to `configure_package_config_file` according the -cmake documentation -(https://cmake.org/cmake/help/v3.22/module/CMakePackageConfigHelpers.html?highlight=configure_package_config#command:configure_package_config_file) -to overcome this issue and allow a simple `find_package` after install. - -As there was some discussion about the place where to install the -`yaml-cpp-config.cmake` file, e.g. #1055, factor out the install location into -an extra variable to make it easier changing this location in the future. - -Also untabify CMakeLists.txt in some places to align with the other code parts in this file. - -Upstream-Status: Accepted [https://github.com/jbeder/yaml-cpp/pull/1077] - -Signed-off-by: Jasper Orschulko <jasper@fancydomain.eu> ---- - CMakeLists.txt | 29 ++++++++++++++++++----------- - yaml-cpp-config.cmake.in | 10 ++++++---- - 2 files changed, 24 insertions(+), 15 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b230b9e..983d1a4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -127,10 +127,16 @@ set_target_properties(yaml-cpp PROPERTIES - PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}" - DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") - -+# FIXME(felix2012): A more common place for the cmake export would be -+# `CMAKE_INSTALL_LIBDIR`, as e.g. done in ubuntu or in this project for GTest -+set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") -+set(EXPORT_TARGETS yaml-cpp) - configure_package_config_file( - "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in" - "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" -- INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") -+ INSTALL_DESTINATION "${CONFIG_EXPORT_DIR}" -+ PATH_VARS CMAKE_INSTALL_INCLUDEDIR CONFIG_EXPORT_DIR) -+unset(EXPORT_TARGETS) - - write_basic_package_version_file( - "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" -@@ -139,30 +145,31 @@ write_basic_package_version_file( - configure_file(yaml-cpp.pc.in yaml-cpp.pc @ONLY) - - if (YAML_CPP_INSTALL) -- install(TARGETS yaml-cpp -+ install(TARGETS yaml-cpp - EXPORT yaml-cpp-targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ -+ install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -- FILES_MATCHING PATTERN "*.h") -+ FILES_MATCHING PATTERN "*.h") - install(EXPORT yaml-cpp-targets -- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") -- install(FILES -- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" -- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" -- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") -+ DESTINATION "${CONFIG_EXPORT_DIR}") -+ install(FILES -+ "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" -+ "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" -+ DESTINATION "${CONFIG_EXPORT_DIR}") - install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc" - DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) - endif() -+unset(CONFIG_EXPORT_DIR) - - if(YAML_CPP_BUILD_TESTS) -- add_subdirectory(test) -+ add_subdirectory(test) - endif() - - if(YAML_CPP_BUILD_TOOLS) -- add_subdirectory(util) -+ add_subdirectory(util) - endif() - - if (YAML_CPP_CLANG_FORMAT_EXE) -diff --git a/yaml-cpp-config.cmake.in b/yaml-cpp-config.cmake.in -index 7b41e3f..a7ace3d 100644 ---- a/yaml-cpp-config.cmake.in -+++ b/yaml-cpp-config.cmake.in -@@ -3,12 +3,14 @@ - # YAML_CPP_INCLUDE_DIR - include directory - # YAML_CPP_LIBRARIES - libraries to link against - --# Compute paths --get_filename_component(YAML_CPP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) --set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@") -+@PACKAGE_INIT@ -+ -+set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") - - # Our library dependencies (contains definitions for IMPORTED targets) --include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake") -+include(@PACKAGE_CONFIG_EXPORT_DIR@/yaml-cpp-targets.cmake) - - # These are IMPORTED targets created by yaml-cpp-targets.cmake - set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@") -+ -+check_required_components(@EXPORT_TARGETS@) --- -2.39.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb index e04d4705a4..44ac0687a7 100644 --- a/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb @@ -8,8 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6a8aaf0595c2efc1a9c2e0913e9c1a2c" # yaml-cpp releases are stored as archive files in github. # download the exact revision of release SRC_URI = "git://github.com/jbeder/yaml-cpp.git;branch=master;protocol=https" -SRC_URI += "file://0001-Fix-CMake-export-files-1077.patch" -SRCREV = "0579ae3d976091d7d664aa9d2527e0d0cff25763" +SRCREV = "f7320141120f720aecc4c32be25586e7da9eb978" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.13.0.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.14.0.bb index 2327f85d46..8c75f936de 100644 --- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.13.0.bb +++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.14.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" PROVIDES += "gmock gtest" S = "${WORKDIR}/git" -SRCREV = "b796f7d44681514f58a683a3a71ff17c94edb0c1" +SRCREV = "f8d7d77c06936315286eb55f8de22cd23c188571" SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-test/libfaketime/libfaketime/0001-Makefile-Detect-compiler-in-makefile.patch b/meta-openembedded/meta-oe/recipes-test/libfaketime/libfaketime/0001-Makefile-Detect-compiler-in-makefile.patch new file mode 100644 index 0000000000..ff04837652 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/libfaketime/libfaketime/0001-Makefile-Detect-compiler-in-makefile.patch @@ -0,0 +1,45 @@ +From 735bb5d053efad274aa4ea5a6682e656ff792909 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 24 Aug 2023 01:49:48 -0700 +Subject: [PATCH] Makefile: Detect compiler in makefile + +Add compiler specific options based on detected compiler gcc/clang + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Makefile | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 62e924c..c15eb33 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -110,7 +110,23 @@ PREFIX ?= /usr/local + LIBDIRNAME ?= /lib/faketime + PLATFORM ?=$(shell uname) + +-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) ++ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang version"), 1) ++COMPILER := clang ++else ++COMPILER := gcc ++endif ++export COMPILER ++ ++CFLAGS += -std=gnu99 -Wall -Wextra -Werror -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) ++ ++ifeq ($(COMPILER),clang) ++CFLAGS += -Wno-tautological-pointer-compare ++endif ++ ++ifeq ($(COMPILER),gcc) ++CFLAGS += -Wno-nonnull-compare ++endif ++ + ifeq ($(PLATFORM),SunOS) + CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 + endif +-- +2.42.0 + diff --git a/meta-openembedded/meta-oe/recipes-test/libfaketime/libfaketime_0.9.10.bb b/meta-openembedded/meta-oe/recipes-test/libfaketime/libfaketime_0.9.10.bb new file mode 100644 index 0000000000..f13925ee18 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/libfaketime/libfaketime_0.9.10.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "A library for faking the system time in user-space programs" +SECTION = "libs" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRCREV = "d475b925943ad404c6c728ac868dc73949e7281c" + +SRC_URI = "git://github.com/wolfcw/libfaketime.git;branch=master;protocol=https \ + file://0001-Makefile-Detect-compiler-in-makefile.patch \ + " + +S = "${WORKDIR}/git" + +CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" + +do_configure[noexec] = "1" +do_compile () { + oe_runmake +} +do_install () { + install -d ${D}${libdir}/faketime + oe_libinstall -C src libfaketime ${D}${libdir}/faketime + install -d ${D}${bindir} + install -m 0755 src/faketime ${D}${bindir} +} + +FILES:${PN} = "${bindir}/faketime ${libdir}/faketime/lib*${SOLIBS}" +FILES:${PN}-dev += "${libdir}/faketime/lib*${SOLIBSDEV}" |