diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2023-11-25 01:10:21 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2023-11-25 01:17:50 +0300 |
| commit | 10926d29aed78e18949591afc166babfa9a4da6f (patch) | |
| tree | 763df398a152dbee928b509e8aa675778757e491 /meta-openembedded | |
| parent | 398afb76d72b06c33a92fb9e1fa7eec829fb7ff8 (diff) | |
| download | openbmc-10926d29aed78e18949591afc166babfa9a4da6f.tar.xz | |
subtree updates
poky: 8d0ba08aa6..bf9f2f6f60:
Alassane Yattara (4):
bitbake: Update toaster-requirements to add django-log-viewer==1.1.7
bitbake: toaster: bug-fix on tests.browser.test_most_recent_builds_states
bitbake: Toaster: Bug-fix failure on tests.browser.test_layerdetails_page
bitbake: Toaster: Fixed javascript issue on tests.browser.test_js_unit_tests
Alberto Pianon (1):
bitbake: fetch2: Add API for upstream source tracing
Alejandro Hernandez Samaniego (2):
qemuarmv5: Drop QB_DTB conditional for older kernels
baremetal-helloworld: Pull in fix for race condition on x86-64
Alex Stewart (1):
libsndfile1: fix CVE-2022-33065
Alexandre Belloni (1):
strace: further clean up of ptest folders
Archana Polampalli (1):
vim: Upgrade 9.0.2048 -> 9.0.2068
Arne Schwerdt (1):
ref-manual: Warn about COMPATIBLE_MACHINE skipping native recipes
BELHADJ SALEM Talel (6):
ref-manual: Fix PACKAGECONFIG term and add an example
dev-manual: layers: Add notes about layer.conf
ref-manual: variables: add RECIPE_SYSROOT and RECIPE_SYSROOT_NATIVE
ref-manual: variables: add TOOLCHAIN_OPTIONS variable
ref-manual: variables: add example for SYSROOT_DIRS variable
overview-manual: concepts: Add Bitbake Tasks Map
Bruce Ashfield (10):
linux-yocto/6.1: update to v6.1.56
linux-yocto/6.5: update to v6.5.6
linux-yocto/6.1: tiny: fix arm 32 boot
linux-yocto/6.5: tiny: fix arm 32 boot
linux-yocto/6.5: update to v6.5.7
linux-yocto/6.1: update to v6.1.57
linux-yocto/6.4: drop recipes
linux-yocto/6.5: avoid serial port suspend issues
linux-yocto/6.5: config: remove VIDEO_STK1160_COMMON
linux-yocto/6.5: serial: core: integrate upstream fixes
Chris Laplante (1):
bitbake: codeparser: replace deprecated ast.Str and 's'
Dmitry Baryshkov (1):
kernel-arch: drop CCACHE from KERNEL_STRIP definition
Eero Aaltonen (1):
ref-manual: add systemd-resolved to distro features
Jon Mason (2):
qemu: drop unreferenced patch
linux-yocto: Update dtb path for qemuarmv5
Joshua Watt (1):
goarch: Move Go architecture mapping to a library
Julien Stephan (1):
oeqa/selftest/devtool: abort if a local workspace already exist
Jérémy Rosen (5):
insane: Add unimplemented-ptest infrastructure
insane: Detect python and perl based tests
insane: Detect build-system test harnesses
insane: Add a naive heuristic to detect test subdirectories
ref-manual: Add documentation for the unimplemented-ptest QA warning
Khem Raj (5):
gcompat: Add fcntl64 wrapper
gcompat: Upgrade to 1.1.0 release
python3-urllib3: Update to 2.0.6
llvm: Upgrade to 17.0.3
kernel.bbclass: Use strip utility used for kernel build in do_package
Lee Chee Yang (4):
qemu: ignore RHEL specific CVE-2023-2680
machine: drop obsolete SERIAL_CONSOLES_CHECK
documentation.conf: drop SERIAL_CONSOLES_CHECK
release-notes-4.3: add Repositories / Downloads section
Marlon Rodriguez Garcia (4):
bitbake: toaster: updated bootstrap version 3.3.6 -> 3.3.7
bitbake: toaster: Update bootstrap version to 3.4.1
bitbake: toaster: update jquery version 2.0.3 -> 3.7.1
bitbake: toaster: fixed functional test
Marta Rybczynska (4):
SECURITY.md: add file
bitbake: SECURITY.md: add file
dev-manual: add security team processes
dev-manual: extend the description of CVE patch preparation
Max Krummenacher (1):
Revert "bin_package.bbclass: Inhibit the default dependencies"
Michael Halstead (1):
docs: add support for nanbield (4.3) release
Michael Opdenacker (25):
manuals: update linux-yocto append examples
dev-manual: wic: update "wic list images" output
sdk-manual: appendix-obtain: improve and update descriptions
manuals: update list of supported machines
bsp-guide: bsp: skip Intel machines no longer supported in Poky
brief-yoctoprojectqs: use new CDN mirror for sstate
dev-manual: start.rst: remove obsolete reference
manuals: correct "yocto-linux" by "linux-yocto"
test-manual: reproducible-builds: stop mentioning LTO bug
ref-manual: document KERNEL_LOCALVERSION
ref-manual: variables: document OEQA_REPRODUCIBLE_TEST_PACKAGE
migration-guides: updates for 4.3
migration-guides: mention runqemu change in serial port management
ref-manual: document KERNEL_STRIP
migration-guides: further updates for 4.3
manuals: improve description of CVE_STATUS and CVE_STATUS_GROUPS
ref-manual: document MESON_TARGET
ref-manual: document cargo_c class
ref-manual: variables: mention new CDN for SSTATE_MIRRORS
ref-manual: variables: add RECIPE_MAINTAINER
ref-manual: variables: remove SERIAL_CONSOLES_CHECK
migration-guides: further updates for release 4.3
bsp-guide: bsp.rst: update beaglebone example
ref-manual: classes: explain cml1 class name
migration-guides: fix empty sections
Mickael RAMILISON (1):
scripts/patchreview: Add a custom pattern for finding recipe patches
Paul Eggleton (12):
Remove references to apm in MACHINE_FEATURES
ref-manual: update SDK_NAME variable documentation
ref-manual: remove semicolons from *PROCESS_COMMAND variables
release-notes-4.3: fix some typos
release-notes-4.3: tweaks to existing text
release-notes-4.3: add CVEs, recipe upgrades, license changes, contributors
release-notes-4.3: remove the Distribution section
release-notes-4.3: move new classes to Rust section
release-notes-4.3: feature additions
migration-4.3: remove some unnecessary items
migration-4.3: adjustments to existing text
migration-4.3: additional migration items
Peter Kjellerstedt (1):
bb-matrix-plot.sh: Show underscores correctly in labels
Peter Marko (1):
openssl: Upgrade 3.1.3 -> 3.1.4
Quentin Schulz (2):
recipes-rt: update README to match newer override syntax
ref-manual: variables: provide no-match example for COMPATIBLE_MACHINE
Richard Purdie (12):
reproducible: Exclude rust for now again
linux/cve-exclusion6.1/6.5: Update to latest kernel point releases
oeqa/qemurunner: Drop newlines serial workaround
local.conf.sample: Document new CDN mirror for sstate
poky.conf: Bump version for 4.3 nanbield release
build-appliance-image: Update to master head revision
build-appliance-image: Update to nanbield head revision
build-appliance-image: Update to nanbield head revision
build-appliance-image: Update to nanbield head revision
layer.conf: Switch layer to nanbield series only
base: Ensure recipes using mercurial-native have certificates
vim: Improve locale handling
Robert P. J. Day (2):
dev-manual: new-recipe.rst: add missing parenthesis to "Patching Code" section
profile-manual: aesthetic cleanups
Ross Burton (24):
patchtest: sort when reading patches from a directory
linux-yocto: update CVE exclusions
libxml2: ignore disputed CVE-2023-45322
zlib: ignore CVE-2023-45853
pixman: ignore CVE-2023-37769
cve-check: sort the package list in the JSON report
cve-check: slightly more verbose warning when adding the same package twice
cve-check: don't warn if a patch is remote
migration-guides: add debian 12 to newly supported distros
migration-guides: edgerouter machine removed
migration-guides: QEMU_USE_SLIRP variable removed
migration-guides: remove non-notable change
migration-guides: mention LLVM 17
migration-guides: mention CDN
migration-guides: add kernel notes
migration-guides: remove SERIAL_CONSOLES_CHECK
migration-guides: enabling SPDX only for Poky, not a global default
migration-guides: add testing notes
migration-guides: add utility notes
migration-guides: add BitBake changes
migration-guides: packaging changes
migration-guides: git recipes reword
patchtest: remove unused imports
oeqa/selftest/debuginfod: improve selftest
Rouven Czerwinski (1):
glib-2.0: Remove unnecessary assignement
Siddharth Doshi (2):
vim: Upgrade 9.0.1894 -> 9.0.2009
vim: Upgrade 9.0.2009 -> 9.0.2048
Steve Sakoman (3):
vim: use upstream generated .po files
poky.conf: bump version for 4.3.1 release
build-appliance-image: Update to nanbield head revision
Trevor Gamblin (27):
patchtest: improve test issue messages
patchtest: clean up test suite
patchtest/requirements.txt: update
patchtest: add supporting modules
patchtest: add scripts to oe-core
patchtest: set default repo and testdir targets
patchtest: update SPDX identifiers
patchtest/selftest: fix command arguments
patchtest: check for untracked changes
contributor-guide: add patchtest section
contributor-guide: clarify patchtest usage
patchtest: test regardless of mergeability
patchtest: skip merge test if not targeting master
patchtest: fix lic_files_chksum test regex
patchtest-send-results: improve subject line
patchtest: disable merge test
patchtest-send-results: check max line length, simplify responses
patchtest/selftest: add XSKIP, update test files
patchtest: simplify test directory structure
patchtest: reduce checksum test output length
patchtest: shorten test result outputs
patchtest-send-results: send results to submitter
patchtest-send-results: add In-Reply-To
patchtest: make pylint tests compatible with 3.x
patchtest: remove test for CVE tag in mbox
patchtest-send-results: fix sender parsing
patchtest: rework license checksum tests
Wang Mingyu (3):
openssh: upgrade 9.4p1 -> 9.5p1
ell: upgrade 0.58 -> 0.59
libsdl2: upgrade 2.28.3 -> 2.28.4
William Lyu (1):
perl: fix intermittent test failure
Xiangyu Chen (1):
linux-yocto: make sure the pahole-native available before do_kernel_configme
Yoann Congal (2):
insane: skip unimplemented-ptest on S=WORKDIR recipes
insane: unimplemented-ptest: ignore source file errors
luca fancellu (1):
oeqa/ssh: Handle SSHCall timeout error code
meta-raspberrypi: 482d864b8f..8231f97534:
Andrei Gherzan (1):
docs: Fix ReadTheDocs builds.os requirement
Carlos Alberto Lopez Perez (1):
linux-raspberrypi: stop setting powersave as the default CPU governor
Jose Quaresma (2):
linux-raspberrypi/linux-raspberrypi-v7: drop 5.10 version
rpi-base: Adds EXTRA_IMAGEDEPENDS to fix the image task do_populate_lic_deploy
Khem Raj (1):
linux-raspberrypi_6.1.bb: Update to 6.1.61 release
Leon Anavi (2):
rpi-config: Upgrade to tip of tree
rpi-config: reintroduce start_x
Matthew Draws (1):
rpi-eeprom: Update to 2023.10.18-2712
Vincent Davis Jr (1):
rpidistro-vlc: add new patch po-Fix-typos-in-oc
meta-arm: e914891eee..0bd7fece41:
Abdellatif El Khlifi (6):
arm-bsp/linux-yocto: corstone1000: bump to v6.5%
arm-bsp/documentation: corstone1000: enable debug-tweaks
arm-bsp/documentation: corstone1000: update the release note
arm-bsp/documentation: corstone1000: update the change log
arm-bsp/documentation: corstone1000: update the user guide
kas: corstone1000: pin the SHAs
Ali Can Ozaslan (1):
arm-bsp/documentation: corstone1000: Update the user guide
Debbie Martin (10):
arm-bsp/u-boot: Divide the U-boot configuration by machine
arm-bsp/fvp-base: Merge fvp-common.inc into fvp-base.conf
arm-bsp/trusted-firmware-a/fvp-base: Add stdout path and virtio net and rng
arm-bsp/u-boot/fvp-base: Configure FVP base U-boot machine and enable U-boot sysreset, CRC-32 and virtio RNG
arm-bsp/fvp-base: Configure grub as the EFI provider
arm/fvp-base: Update the default testsuites
arm-systemready: Introduce the Arm SystemReady layer
arm-bsp/systemready: Bring up the Arm SystemReady IR ACS 2.0 suite on FVP base
kas: Add kas configuration for Arm SystemReady and fvp-base
ci: Add fvpboot to IMAGE_CLASSES
Delane Brandy (1):
arm-bsp/documentation: corstone1000: Update the user guide
Drew Reed (2):
arm-bsp: Enable TF-A test building for the N1SDP
CI: Enable TF-A TFTF test builds
Emekcan Aras (17):
arm-bsp/u-boot: corstone1000: enable on-disk capsule update
arm-bsp/u-boot: corstone1000: fix runtime capsule update flag checks
arm-bsp/trusted-firmware-m: fix capsule update alignment
arm-bsp/trusted-firmware-m: update the upstream status of the out-of-tree patches
arm-bsp/u-boot: corstone1000: scatter gather list workaround for ondisk capsule update
arm-bsp/trusted-services: enable signaled handling interrupts for SPs
arm-bsp/corstone1000: fix synchronization issue on openamp notification
arm/fvp-corstone1000: upgrade to 11.23_25
arm-bsp/corstone1000-fvp: Add virtio-net configuration
arm-bsp/corstone1000-fvp: add unpadded image support for MMC card config
arm-bsp/corstone1000-fvp: Disable Time Annotation
arm-bsp/u-boot: corstone1000: enable virtio-net support for FVP
arm-bsp/documentation: corstone1000: update the architecture document
arm-bsp/documentation: corstone1000: Add EFI system partition section
arm-bsp/documentation: corstone1000: add a note and fix instructions
arm-bsp/documentation: corstone1000: add readthedocs.yaml file
arm-bsp/documentation: corstone1000: fix the requirements.txt and conf.py path
Harsimran Singh Tungal (4):
arm-bsp/u-boot: corstone1000: Remove External system patches
arm-bsp/linux: corstone1000: update the defconfig
arm-bsp/linux: corstone1000: Remove External system patches
arm-bsp/images: corstone1000: Remove the external system test package
Javier Tia (1):
trusted-firmware-a: fix build error when using ccache
Jon Mason (9):
arm-bsp/linux-yocto: add recipe for v6.4 kernel
arm/linux-yocto: remove defconfig patch
CI: add sbsa-acs to recipe report
arm/linux-yocto: remove PHYS_VIRT config frag
arm-bsp/optee: remove 3.18 recipes and patches
arm-bsp/edk2: remove 202211
arm/hafnium: update to v2.9
arm/optee: update to 4.0.0
arm/optee: cleanups from code review
Mariam Elshakfy (3):
arm-bsp/n1sdp: Move OP-TEE to DDR4
arm-bsp/n1sdp: Enable OP-TEE cache in N1SDP
arm-bsp/corstone1000: Remove inappropriate kernel delay patch
Ross Burton (21):
arm/oeqa/selftest: tag all tests with "meta-arm"
CI: don't hardcode the selftest tests to run
CI: also run the _qemutiny testcase for poky-tiny
CI: track nanbield branches
arm/fvp-corstone1000: upgrade to 11.22.35, add aarch64 binaries
kas/corstone1000: don't limit the FVP use to x86-64
CI: don't pin corstone1000-fvp to x86-64
CI: build both aarch64 and x86-64 packages for as many FVPs as possible
arm-bsp/u-boot: remove 2023.01
arm/trusted-firmware-a: update mbedtls to recommended release
CI: Add meta-secure-core to pending-upgrades for corstone1000
arm-bsp: corstone1000 depends on meta-efi-secure-boot
arm/generic-arm64: remove obsolete SERIAL_CONSOLES_CHECK
arm/lib/fvp/runner: don't pass '' as cwd
scripts/runfvp: exit code should be the FVP exit code
arm/selftest: add test that DISPLAY is forwarded into the runfvp child
CI: use nanbield branch for meta-virtualization
CI: use nanbield branch of meta-clang
arm/optee: handle CVE-2021-36133 as disputed
arm-bsp/optee-os: backport fix for CVE-2023-41325
arm-bsp/optee-os: update Upstream-Status tags
Vikas Katariya (1):
arm-bsp/corstone1000: Fix RSA key generation issue
Xueliang Zhong (2):
Update Corstone-1000 doc with security issue reporting guideline
arm-bsp/n1sdp: update to linux yocto kernel 6.5
meta-security: 3f7d40b0fc..5938fa5839:
Gowtham Suresh Kumar (1):
Update parsec recipes
Mingli Yu (1):
samhain: remove the buildpath
Stefan Berger (1):
ima,evm: Add two variables to write filenames and signatures into
meta-openembedded: c40aebd422..1750c66ae8:
Ahmad Fatoum (1):
signing.bbclass: don't export OPENSSL environment variables globally
Akash Hadke (1):
libeigen: Update GPL-3.0-only to GPL-2.0-only
Alex Kiernan (2):
mdns: Upgrade 1790.80.10 -> 2200.0.8
jq: Upgrade 1.6+git -> 1.7
Andrew Jeffery (1):
mdio-tools: Add virtual/kernel dependency to avoid stale SPDX reference
Archana Polampalli (1):
nodejs: upgrade 18.17.1 -> 20.5.1
Armin Kuster (1):
meta-openemnedded: Add myself as nanbield maintainer
Beniamin Sandu (2):
libnet: upgrade version v1.2 -> v1.3
mbedtls: upgrade 3.4.1 -> 3.5.0
Benjamin Bara (1):
libvpx: upgrade 1.13.0 -> 1.13.1
Bruce Ashfield (2):
zfs: update to v2.2.0-rc4
vboxguestdrivers: fix kernel v6.5 build
Carlos Alberto Lopez Perez (1):
libbacktrace: Update version and enable shared library.
Charles Perry (2):
libosip2: add recipe
libexosip2: add recipe
Chen Qi (1):
libblockdev: fix QA error in case of multilib
Chi Xu (1):
re2: Add ptest support
Christophe Vu-Brugier (4):
libnvme: upgrade 1.5 -> 1.6
nvme-cli: upgrade 2.5 -> 2.6
libnvme: apply patch already upstream to fix build with musl
exfatprogs: upgrade 1.2.1 -> 1.2.2
Clément Péron (9):
etcd-cpp-apiv3: upgrade 0.14.3 -> 0.15.3
devtools: grpc: bump to 1.56.2
protobuf: upgrade 4.22.2 -> 4.23.4
protobuf-c: bump to next release to support protobuf 4.23.x
mariadb: add missing <cstdint> in rocksdb string_util.h
etcd-cpp-apiv3: fix build when gRPC is cross compiled
Revert "protobuf: stage protoc binary to sysroot"
proj: Upgrade to 9.3.0 release
pcapplusplus: Add recipe for 23.09 release
Daniel Klauer (1):
graphviz: Fix build to not use $prefix as search dir
Daniel McGregor (1):
python3-pylint: allow native build
David Pierret (3):
libtext: add ptest
cjson: Add ptest
python3-rapidjson: add missing ptest dependency
Denys Zagorui (1):
libbpf: add arm, powerpc and mips64 to COMPATIBLE_HOST
Derek Straka (32):
python3-apiflask: Update version 2.0.1 -> 2.0.2
python3-argh: Update version 0.29.3 -> 0.29.4
python3-async-timeout: remove old version of the library
python3-pydantic: Update version 1.10.7 -> 2.4.1
python3-pyhamcrest: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX
python3-pyasn1-modules: Update version 0.2.8 -> 0.3.0
python-pyiface: Update version from git -> 0.0.11
python3-pymysql: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX
python3-pymysql: update verion 1.0.2 -> 1.1.0
python3-pyproj: update version 3.6.0 -> 3.6.1
python3-pyproject-api: update version 1.5.1 -> 1.6.1
python3-redis: update version 5.0.0 -> 5.0.1
python3-traitlets: update version 5.9.0 -> 5.10.1
python3-xxhash: update version 3.2.0 -> 3.3.0
python3-pyzmq: update version 25.0.0 -> 25.1.1
python3-cachecontrol: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX
python3-flask-babel: update version 2.0.0 -> 3.1.0
python3-idna-ssl: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX
python3-ninja-syntax: Fix upstream check by specifying the UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX
python3-prettytable: update version 3.6.0 -> 3.9.0
python3-pytz-deprecation-shim: Remove outdated recipe meant to be a short lived shim
python3-tzlocal: Remove dependency on pytz_deprecation_shim removed in release 5.0
python3-astroid: update version 2.16.6 -> 3.0.0
python3-flask: update version 2.3.2 -> 2.3.3
python3-google-api-core: update version 2.12.0
python3-google-api-python-client: update version 2.100.0 -> 2.101.0
python3-google-auth: update version 2.23.0 -> 2.23.1
python3-parse-type: update version 0.5.2 -> 0.6.2
python3-nacl: Add recipe for the latest release of PyNaCl
python3-botocore: add recipe for latest version of botocore
python3-boto3: add recipe for latest version of boto3
python3-flask-cors: add initial version of the recipe for 4.0.0
Etienne Cordonnier (1):
uutils-coreutils: upgrade 0.0.21 -> 0.0.22
Fabien Thomas (10):
meta-filesystems/layer.conf : Add meta-networking dependency
Add static-passwd and static-group files
Add static-passwd and static-group files
Add static-passwd and static-group files
Add static-passwd and static-group files
Add static-passwd and static-group files
Add static-passwd and static-group files
Add static-passwd and static-group files
klibc/klibc.inc : Add DEBUG_PREFIX_MAP flag.
samba.bb : Disable ad-dc by default
Fabio Estevam (1):
edid-decode: Upgrade to latest master
Gianfranco Costamagna (9):
mosquitto: upgrade 2.0.17 -> 2.0.18
dlt-daemon: Make it work without systemd
dlt-daemon: Enable experimental coredumphandler feature
dlt-daemon: update patch 544.patch
dlt-daemon: do not disable dlt-system build when systemd is set to off
dlt-daemon: Add an additional fix for non-systemd builds
cpprestsdk: fix typo in comment, tag is actually 2.0.18
vbxguestdrivers: upgrade 7.0.10 -> 7.0.12
cpulimit: add DESCRIPTION field
Jeffrey Pautler (2):
bolt: disable CVE checking for this recipe
bolt: change product name used for CVE checking
Joe Slater (2):
nginx: add configure option
python3-pynacl: add RCONFLICTS with python3-nacl
Johannes Kauffmann (1):
open62541: add Backport status and link to patch
Jose Quaresma (4):
ostree: Upgrade 2023.5 -> 2023.6
ostree: drop trivial-httpd-cmdline
ostree: add ed25519-openssl
ostree: Upgrade 2023.6 -> 2023.7
Jörg Sommer (1):
collectd: Use https in SRC_URI, add HOMEPAGE
Khem Raj (40):
mozjs-115: Apply autoconf tuple mismatch fix
cpp-netlib: Fix build with boost 1.80+
cpp-netlib: Fix buildpaths in generated cmake files
python3-pybluez: Fix patch upstream-status
python3-pynetlinux: Fix patch upstream-status
libnet-idn-encode: Add recipe
libio-socket-ssl-perl: Change libnet-libidn-perl->libnet-idn-encode rdep for ptests
libnfs: Drop -Wno-implicit-function-declaration
webkitgtk3: Do not use musttail with clang on arm
fftw: Fix ptest result reporting
nodejs: Fix ptest result reporting
relayd: Update to latest tip of trunk
relayd: Fix build with clang
kernel-selftest: Build headers before compiling tests
python3-pyroute2: Add missing dependency on sqlite3 for ptests
python3-pylint: Upgrade to 3.0.0
python3-lz4: use python3-unittest-automake-output
minicoredumber: Fix ptest reporting
images: Inherit from core-image-base
images: Delete layer specific base images
images: Rename <layer>-image to <layer>-image-all
images: Rename ptest images to rhyme with oe-core ptest images
ptest-image: Switch to using core-image-minimal
stressapptest: Upgrade to 1.0.11 release
klibc: Upgrade to 2.0.13 release
libnvme: Fix test builds on musl
kernel-selftest: Build bpf tests again
ptest-packagelists-meta-oe: Add kernel-selftest to x86/x86-64 images
kernel-selftest: Copy the .config from kernel build
kernel-selftest: Use clang options when clang is available
libnet-idn-encode: Fix build with perl 2.38 and gcc13
poco: Fix data race when create POSIX thread
static-group: Match nogroup id to base-passwd from core.
gutenprint: Upgrade to 5.3.4
meta-perl: Add libtext-diff-perl to fast ptest list
leveldb: Upgrade to 1.23 plus latest git
meta-python: Add python3-rapidjson to PTESTS_FAST_META_PYTHON
leveldb: Print uint64_t with PRI64
network-manager-applet,networkmanager-openvpn, networkmanager: Apply linker versioning patch when using lld only
emlog: Add PV
Lei Maohui (1):
gexiv2: Fix do_package QA issue when usrmerge enabled.
Leon Anavi (1):
sip: upgrade 6.7.11 -> 6.7.12
Luca Fancellu (5):
linuxptp: update linuxptp recipe to 4.1
linuxptp: install default configuration file in sysconfdir
linuxptp: add systemd services
linuxptp: Drop unneeded downstream patches
linuxptp: Use templates for the systemd services
Marek Vasut (2):
lvgl: lv-drivers: Allow empty package
lvgl: Allow empty package
Markus Volk (22):
gedit: Upgrade 44.2 -> 46.1
tepl: Upgrade 6.4.0 -> 6.8.0
libblockdev: Upgrade 2.28 -> 3.03
udisks2: Upgrade 2.9.4 -> 2.10.1
mozjs: Upgrade 102.15.0 -> 102.15.1
libnfs: dont install libnfs-config.cmake
gnome-remote-desktop: Upgrade 44.2 -> 45.0
pugixml: Update 1.13 -> 1.14
pipewire: Upgrade 0.3.80 -> 0.3.81
gnome-control-center: Fix polkit gettext issue
libdecor: Upgrade 0.1.99 -> 0.2.0
wireplumber: Upgrade 0.4.14 -> 0.4.15
pipewire: Update 0.3.81 -> 0.3.83
gnome-software: Update 45.0 -> 45.1
gnome-calendar: Update 45.0 -> 45.1
gnome-disk-utility: Update 44.0 -> 45.0
gnome-control-center: Update 45.0 -> 45.1
eog: Update 45.0 -> 45.1
gnome-remote-desktop: Update 45.0 -> 45.1
gnome-shell: Add missing dependency on pipewire
gnome-shell: Remove deprecated libcroco dependency
openbox: Drop deprecated libcroco dependency
Martin Jansa (14):
gupnp: fix build with meson-1.2.0
minifi-cpp, mozjs-115, redis-7.2.1, pv: add missing Upstream-Status
mozjs: fix filename in MULTILIB_SCRIPTS
gupnp-tools: fix build with meson-1.2.0
gnome-tweaks, networkmanager-fortisslvpn, libesmtp, json-schema-validator, python3-pybluez, python3-pynetlinux, apache2: Fix Malformed Upstream-Status
mozjs: use PV in MULTILIB_SCRIPTS
mosquitto, etcd-cpp-apiv3: add missing Upstream-Status
meta-oe/dynamic-layers: add Upstream-Status where missing
meta-oe/dynamic-layers: add one more missing Upstream-Status and fix one malformed
opencv: Fix build with protobuf v22 and dnn enabled
nodejs: update to latest v20 version 20.8.1
nodejs: Revert io_uring support from bundled libuv-1.46.0
opencv: refresh protobuf-v22 compatibility patch with backported version
leveldb: prevent installing gtest
Martin Maurer (1):
libqmi: Upgrade 1.32.4 -> 1.34.0
Matthias Klein (1):
paho-mqtt-c: upgrade 1.3.12 -> 1.3.13
Michał Iwanicki (1):
python3-pyu2f: add recipe
Mickael RAMILISON (1):
python3-rapidjson: add ptest
Mingli Yu (1):
mozjs-102: Remove the buildpath
Pawel Langowski (1):
recipes-connectivity: Add tayga recipe
Peter Kjellerstedt (2):
libwebsockets: Support building for native
mosquitto: Support building for native again
Petr Gotthard (2):
libmbim: upgrade 1.28.4 -> 1.30.0
modemmanager: upgrade 1.20.6 -> 1.22.0
Philip-Dylan Gleonec (1):
cukinia: Fix license field
Richard Purdie (4):
meta-python: Drop broken BBCLASSEXTEND variants
meta-oe: Drop broken BBCLASSEXTEND variants
meta-networking: Drop broken BBCLASSEXTEND variants
meta-perl: Drop broken BBCLASSEXTEND variants
Ross Burton (1):
webkitgtk3: reduce size of -dbg package
Sam Van Den Berge (1):
netdata: Upgrade 1.36.1 -> 1.43.0
Samantha Jalabert (6):
Remove python3-rdflib
Remove python3-license-expression
Remove python3-xmltodict
Remove python3-booleanpy
Remove python3-click
Remove python3-isodate
Samuli Piippo (1):
protobuf: stage protoc binary to sysroot
Thomas Roos (1):
python3-boto3, python3-botocore: remove recipes
Tim Orling (2):
po4a: remove old recipe
debsums: remove old recipe
Tom Hochstein (1):
libcamera: Avoid build break in signature recalculation
Trevor Gamblin (5):
python-git-pw: add from meta-patchtest
python3-py-cpuinfo: disable broken ptests
python3-arrow: add from meta-patchtest
python3-pytest-mock: disable broken ptests
meta-python: update ptests status for py-cpuinfo, pytest-mock
Vyacheslav Yurkov (3):
overlayfs-tools: Drop unneeded dependency
overlayfs-tools: Bump up the version
overlayfs-tools: Install fsck binary
Wang Mingyu (84):
dnf-plugin-tui: create symlinks from /usr/ to /.
c-ares: upgrade 1.19.1 -> 1.20.1
adw-gtk3: upgrade 4.9 -> 5.1
ctags: upgrade 6.0.20230917.0 -> 6.0.20231001.0
dialog: upgrade 1.3-20230209 -> 1.3-20231002
freerdp: upgrade 2.11.1 -> 2.11.2
gnome-backgrounds: upgrade 44.0 -> 45.0
gnome-calculator: upgrade 45.0 -> 45.0.2
gnome-font-viewer: upgrade 44.0 -> 45.0
ipc-run: upgrade 20220807.0 -> 20231003.0
libbytesize: upgrade 2.9 -> 2.10
libcoap: upgrade 4.3.3 -> 4.3.4
libyang: upgrade 2.1.111 -> 2.1.128
lvgl: upgrade 8.3.9 -> 8.3.10
metacity: upgrade 3.46.1 -> 3.50.0
nautilus: upgrade 45.0 -> 45.1
ceres-solver: upgrade 2.1.0 -> 2.2.0
python3-eth-abi: upgrade 3.0.1 -> 4.2.1
python3-mypy: upgrade 1.5.1 -> 1.6.1
python3-pylint: upgrade 3.0.0 -> 3.0.1
python3-aiodns: upgrade 3.0.0 -> 3.1.1
python3-aiohttp: upgrade 3.8.5 -> 3.8.6
python3-astroid: upgrade 3.0.0 -> 3.0.1
python3-bitarray: upgrade 2.8.1 -> 2.8.2
python3-bitstruct: upgrade 8.17.0 -> 8.18.0
python3-blinker: upgrade 1.6.2 -> 1.6.3
python3-charset-normalizer: upgrade 3.2.0 -> 3.3.0
python3-cmake: upgrade 3.27.5 -> 3.27.7
python3-coverage: upgrade 7.3.1 -> 7.3.2
python3-croniter: upgrade 1.4.1 -> 2.0.1
python3-dbus-fast: upgrade 1.85.0 -> 2.12.0
python3-email-validator: upgrade 1.3.1 -> 2.0.0
python3-engineio: upgrade 4.7.1 -> 4.8.0
python3-eth-typing: upgrade 3.4.0 -> 3.5.0
python3-eth-utils: upgrade 2.2.1 -> 2.2.2
python3-executing: upgrade 1.2.0 -> 2.0.0
python3-flask-babel: upgrade 3.1.0 -> 4.0.0
python3-flask-jwt-extended: upgrade 4.5.2 -> 4.5.3
python3-google-api-python-client: upgrade 2.101.0 -> 2.104.0
python3-googleapis-common-protos: upgrade 1.60.0 -> 1.61.0
python3-google-auth: upgrade 2.23.1 -> 2.23.3
python3-h5py: upgrade 3.9.0 -> 3.10.0
python3-huey: upgrade 2.4.5 -> 2.5.0
python3-imageio: upgrade 2.31.3 -> 2.31.5
python3-ipython: upgrade 8.15.0 -> 8.16.1
python3-jedi: upgrade 0.19.0 -> 0.19.1
python3-meson-python: upgrade 0.13.1 -> 0.14.0
python3-msgpack: upgrade 1.0.6 -> 1.0.7
python3-platformdirs: upgrade 3.10.0 -> 3.11.0
python3-prompt-toolkit: upgrade 3.0.36 -> 3.0.39
python3-protobuf: upgrade 4.24.3 -> 4.24.4
python3-pycares: upgrade 4.3.0 -> 4.4.0
python3-pycodestyle: upgrade 2.11.0 -> 2.11.1
python3-pydantic: upgrade 2.4.1 -> 2.4.2
python3-pyephem: upgrade 4.1.4 -> 4.1.5
python3-pytest-timeout: upgrade 2.1.0 -> 2.2.0
python3-rapidjson: upgrade 1.11 -> 1.12
python3-regex: upgrade 2023.8.8 -> 2023.10.3
python3-rich: upgrade 13.5.3 -> 13.6.0
python3-schedule: upgrade 1.2.0 -> 1.2.1
python3-semver: upgrade 3.0.1 -> 3.0.2
python3-simplejson: upgrade 3.19.1 -> 3.19.2
python3-socketio: upgrade 5.9.0 -> 5.10.0
python3-sqlalchemy: upgrade 2.0.21 -> 2.0.22
python3-stack-data: upgrade 0.6.2 -> 0.6.3
python3-texttable: upgrade 1.6.7 -> 1.7.0
python3-traitlets: upgrade 5.10.1 -> 5.11.2
python3-types-psutil: upgrade 5.9.5.16 -> 5.9.5.17
python3-tzlocal: upgrade 5.0.1 -> 5.1
python3-web3: upgrade 6.10.0 -> 6.11.1
python3-websocket-client: upgrade 1.6.3 -> 1.6.4
python3-xlsxwriter: upgrade 3.1.3 -> 3.1.8
python3-xxhash: upgrade 3.3.0 -> 3.4.1
python3-zeroconf: upgrade 0.112.0 -> 0.119.0
python3-zopeinterface: upgrade 6.0 -> 6.1
rdma-core: upgrade 47.0 -> 48.0
redis: upgrade 7.2.1 -> 7.2.2
remmina: upgrade 1.4.32 -> 1.4.33
tesseract: upgrade 5.3.2 -> 5.3.3
thingsboard-gateway: upgrade 3.3 -> 3.4.1
tio: upgrade 2.6 -> 2.7
wireshark: upgrade 4.0.8 -> 4.0.10
xterm: upgrade 384 -> 387
zchunk: upgrade 1.3.1 -> 1.3.2
Xiangyu Chen (3):
mosh: add support of protobuf 4.22.x
protobuf: upgrade 3.21.12 -> 4.22.2
protobuf-c: add support of protobuf 4.22.x
Yi Zhao (6):
samba: upgrade 4.18.6 -> 4.18.8
samba: use external cmocka instead of bundled cmocka
libtevent: fix ptest
libldb: add ptest
conntrack-tools: upgrade 1.4.7 -> 1.4.8
nftables: upgrade 1.0.8 -> 1.0.9
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Icadb12eae4fd40dd775a4eff9259684fbcd12e74
Diffstat (limited to 'meta-openembedded')
472 files changed, 8135 insertions, 2547 deletions
diff --git a/meta-openembedded/README.md b/meta-openembedded/README.md index 7318f09cdb..82f2e9699a 100644 --- a/meta-openembedded/README.md +++ b/meta-openembedded/README.md @@ -1,6 +1,6 @@ Collection of layers for the OE-core universe -Main layer maintainer: Khem Raj <raj.khem@gmail.com> +Main layer maintainer: Armin Kuster <akuster808@gmail.com> This repository is a collection of layers to suppliment OE-Core with additional packages, Each layer have designated maintainer diff --git a/meta-openembedded/meta-filesystems/README.md b/meta-openembedded/meta-filesystems/README.md index 78a4429ce2..49ce350571 100644 --- a/meta-openembedded/meta-filesystems/README.md +++ b/meta-openembedded/meta-filesystems/README.md @@ -11,26 +11,26 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core layers: meta - branch: master + branch: nanbield URI: git://git.openembedded.org/meta-openembedded layers: meta-oe - branch: master + branch: nanbield Patches ======= Please submit any patches against the filesystems layer to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) -with '[meta-filesystems]' in the subject. +with '[meta-filesystems][nanbield]' in the subject. -Layer maintainer: Khem Raj <raj.khem@gmail.com> +Layer maintainer: Armin Kuster <akuster808@gmail.com> When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix='meta-filesystems][PATCH' + --subject-prefix='meta-filesystems][nanbield][PATCH' Table of Contents diff --git a/meta-openembedded/meta-filesystems/conf/layer.conf b/meta-openembedded/meta-filesystems/conf/layer.conf index 318e992628..4f13bd911c 100644 --- a/meta-openembedded/meta-filesystems/conf/layer.conf +++ b/meta-openembedded/meta-filesystems/conf/layer.conf @@ -13,6 +13,6 @@ BBFILE_PRIORITY_filesystems-layer = "5" # cause compatibility issues with other layers LAYERVERSION_filesystems-layer = "1" -LAYERDEPENDS_filesystems-layer = "core openembedded-layer" +LAYERDEPENDS_filesystems-layer = "core openembedded-layer networking-layer" LAYERSERIES_COMPAT_filesystems-layer = "nanbield" diff --git a/meta-openembedded/meta-filesystems/files/static-passwd-meta-filesystems b/meta-openembedded/meta-filesystems/files/static-passwd-meta-filesystems new file mode 100644 index 0000000000..157697f3e7 --- /dev/null +++ b/meta-openembedded/meta-filesystems/files/static-passwd-meta-filesystems @@ -0,0 +1,3 @@ +fsgqa:x:700:nogroup::/:/bin/nologin +123456-fsgqa:x:701:nogroup::/:/bin/nologin +fsgqa2:x:702:nogroup::/:/bin/nologin
\ No newline at end of file diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-all.bb index ca21d2a0ed..80fb9f9137 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-all.bb @@ -1,3 +1,3 @@ -require meta-filesystems-image-base.bb +require recipes-core/images/core-image-base.bb IMAGE_INSTALL += "packagegroup-meta-filesystems" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-base.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-base.bb deleted file mode 100644 index c89b1e1362..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-base.bb +++ /dev/null @@ -1,7 +0,0 @@ -SUMMARY = "meta-filesystems build test image" - -IMAGE_INSTALL = "packagegroup-core-boot" - -LICENSE = "MIT" - -inherit core-image diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.0.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.0.bb index a62a8a39b1..db6f725b6a 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.0.bb @@ -4,7 +4,7 @@ LICENSE = "CDDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7087caaf1dc8a2856585619f4a787faa" HOMEPAGE ="https://github.com/openzfs/zfs" -SRCREV = "009d3288dea524c7ad373b04b65bee8bb6f0bfea" +SRCREV = "229ca7d738ccbf4c55076977467ee93e20b6f01b" SRC_URI = "git://github.com/openzfs/zfs;protocol=https;branch=zfs-2.2-release \ file://0001-Define-strndupa-if-it-does-not-exist.patch \ file://aaf28a4630af60496c9d33db1d06a7d7d8983422.patch \ diff --git a/meta-openembedded/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.1.bb b/meta-openembedded/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.2.bb index 3767ec48f5..0dd5d8f5e7 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.1.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.2.bb @@ -12,7 +12,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" -SRC_URI[sha256sum] = "a6f3b1fb4bd37835c8f8cb421aac4eb75b880a51342b29850c4063973162227b" +SRC_URI[sha256sum] = "61d517231f8ec177eeb5955fd6edb89748d3f88ba412c48bcb32741b430e359a" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch deleted file mode 100644 index 2c001834b6..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs/0001-Makefile-proper-location-of-LDFLAGS.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8eeaee82dcfdf47f16ad880e416b722827f41bdb Mon Sep 17 00:00:00 2001 -From: Vyacheslav Yurkov <Vyacheslav.Yurkov@bruker.com> -Date: Mon, 23 May 2022 19:37:32 +0200 -Subject: [PATCH] Makefile: proper location of LDFLAGS - -Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@bruker.com> ---- -Upstream-Status: Pending - - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index e3c5207..14b155e 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,5 @@ - CFLAGS = -Wall -g --LFLAGS = -lm -+LDFLAGS = -lm - CC = gcc - - all: overlay -@@ -7,7 +7,7 @@ all: overlay - objects = fsck.o common.o lib.o check.o mount.o path.o overlayfs.o - - overlay: $(objects) -- $(CC) $(LFLAGS) $(objects) -o fsck.overlay -+ $(CC) $(objects) -o fsck.overlay $(LDFLAGS) - - .c.o: - $(CC) $(CFLAGS) -c $< diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb deleted file mode 100644 index 9d58b9a63f..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-progs_git.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "File system check utility for OverlayFS" -HOMEPAGE = "https://github.com/hisilicon/overlayfs-progs" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d12946881e13cb3b548d1173851" - -SRC_URI = "\ - git://github.com/hisilicon/overlayfs-progs.git;protocol=https;branch=master \ - file://0001-Makefile-proper-location-of-LDFLAGS.patch \ -" - -PV = "1.0+git${SRCPV}" -SRCREV = "e10ef686570d9c7eff42f52461593a5c15da56bd" - -S = "${WORKDIR}/git" -B = "${S}" - -# Required to have the fts.h header for musl -DEPENDS:append:libc-musl = " fts" -# Fix the missing fts libs when using musl -EXTRA_OEMAKE:append:libc-musl = " LDFLAGS='-lfts'" - -EXTRA_OEMAKE += "'CC=${CC} -O2' " -TARGET_CC_ARCH += "${LDFLAGS}" - -do_compile () { - oe_runmake -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 ${B}/fsck.overlay ${D}${bindir} -} diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch deleted file mode 100644 index ed84d92c7c..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 81b4fbb5f52044cb348534c23f10b3884972b09b Mon Sep 17 00:00:00 2001 -From: Beat Schaer <beat.schaer@wabtec.com> -Date: Fri, 19 Mar 2021 08:18:58 +0100 -Subject: [PATCH] Fixed includes so that it compiles on Ubuntu 20.04 - ---- -Upstream-Status: Pending - - logic.c | 3 +-- - main.c | 3 ++- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/logic.c b/logic.c -index 97767f5..47ebfaa 100644 ---- a/logic.c -+++ b/logic.c -@@ -7,8 +7,7 @@ - #include <string.h> - #include <errno.h> - #include <unistd.h> --#include <attr/xattr.h> --#include <attr/attributes.h> -+#include <sys/xattr.h> - #include <fts.h> - #include <libgen.h> - #include "logic.h" -diff --git a/main.c b/main.c -index aa11239..f462b98 100644 ---- a/main.c -+++ b/main.c -@@ -12,7 +12,8 @@ - #include <linux/limits.h> - #include <stdbool.h> - #include <sys/stat.h> --#include <attr/xattr.h> -+#include <sys/xattr.h> -+#include <errno.h> - #ifndef _SYS_STAT_H - #include <linux/stat.h> - #endif --- -2.25.1 - diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch deleted file mode 100644 index 8fbb250f04..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-makefile-fix-linking-flags.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b4ff5886797e72d1c21da43261ca7648412f3186 Mon Sep 17 00:00:00 2001 -From: Vyacheslav Yurkov <Vyacheslav.Yurkov@bruker.com> -Date: Mon, 23 May 2022 19:53:21 +0200 -Subject: [PATCH] makefile: fix linking flags - -LDLIBS should be placed at the end according to -https://www.gnu.org/software/make/manual/html_node/Catalogue-of-Rules.html - -Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@bruker.com> ---- -Upstream-Status: Pending - - makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/makefile b/makefile -index fb1bed4..038c7ce 100644 ---- a/makefile -+++ b/makefile -@@ -1,11 +1,11 @@ - CFLAGS = -Wall -std=c99 --LFLAGS = -lm -+LDLIBS = -lm - CC = gcc - - all: overlay - - overlay: main.o logic.o sh.o -- $(CC) $(LFLAGS) main.o logic.o sh.o -o overlay -+ $(CC) main.o logic.o sh.o -o overlay $(LDLIBS) - - main.o: main.c logic.h - $(CC) $(CFLAGS) -c main.c diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb index eb6e4963a5..ca2ec9cc4f 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb @@ -5,17 +5,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f312a7c4d02230e8f2b537295d375c69" SRC_URI = "\ git://github.com/kmxz/overlayfs-tools.git;protocol=https;branch=master \ - file://0001-Fixed-includes-so-that-it-compiles-on-Ubuntu-20.04.patch \ - file://0002-makefile-fix-linking-flags.patch \ " PV = "1.0+git${SRCPV}" -SRCREV = "291c7f4a3fb548d06c572700650c2e3bccb0cd27" +SRCREV = "b5e5a829895ac98ccfe4629fbfbd8b819262bd00" S = "${WORKDIR}/git" B = "${S}" -DEPENDS += "attr" # Required to have the fts.h header for musl DEPENDS:append:libc-musl = " fts" @@ -24,11 +21,8 @@ EXTRA_OEMAKE += "'CC=${CC} -O2'" EXTRA_OEMAKE:append:libc-musl = " LDLIBS=-lfts" TARGET_CC_ARCH += "${LDFLAGS}" -do_compile () { - oe_runmake -} - do_install () { install -d ${D}${bindir} install -m 0755 ${B}/overlay ${D}${bindir} + install -m 0755 ${B}/fsck.overlay ${D}${bindir} } diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb index fdfe045749..cfb6e4fd82 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2023.03.05.bb @@ -28,7 +28,7 @@ RDEPENDS:${PN} += "\ e2fsprogs-resize2fs \ libaio \ libcap-bin \ - overlayfs-progs \ + overlayfs-tools \ perl \ python3 \ python3-core \ diff --git a/meta-openembedded/meta-gnome/README.md b/meta-openembedded/meta-gnome/README.md index fbb0d72476..ef202bca17 100644 --- a/meta-openembedded/meta-gnome/README.md +++ b/meta-openembedded/meta-gnome/README.md @@ -3,14 +3,14 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: nanbield URI: git://git.openembedded.org/meta-openembedded -branch: master +branch: nanbield -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome][nanbield]' in the subject' When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-gnome][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-gnome][nanbield][PATCH' -Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> +Layer maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/meta-openembedded/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_44.2.bb b/meta-openembedded/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_45.1.bb index 48e4d9f32f..9e887056ea 100644 --- a/meta-openembedded/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_44.2.bb +++ b/meta-openembedded/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_45.1.bb @@ -8,11 +8,12 @@ inherit gnomebase gettext gsettings features_check REQUIRED_DISTRO_FEATURES = "opengl" -SRC_URI[archive.sha256sum] = "7a9ffd341b5fcb636d26675e9f6269650952163fff5295327618cc2d5cc87b8e" +SRC_URI[archive.sha256sum] = "dcd9c18ac2306695631fcf00a88645c38e370eba05c69df39f540204d4eafd8d" DEPENDS = " \ asciidoc-native \ libdrm \ + libei \ libepoxy \ cairo \ glib-2.0 \ @@ -30,6 +31,7 @@ PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ " +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,pipewire-native wireplumber-native dbus-native" PACKAGECONFIG[vnc] = "-Dvnc=true,-Dvnc=false,libvncserver" PACKAGECONFIG[rdp] = "-Drdp=true,-Drdp=false,freerdp fuse3 libxkbcommon" PACKAGECONFIG[fdk_aac] = "-Dfdk_aac=true,-Dfdk_aac=false,fdk-aac" diff --git a/meta-openembedded/meta-gnome/files/static-passwd-meta-gnome b/meta-openembedded/meta-gnome/files/static-passwd-meta-gnome new file mode 100644 index 0000000000..4502d8bd10 --- /dev/null +++ b/meta-openembedded/meta-gnome/files/static-passwd-meta-gnome @@ -0,0 +1 @@ +gdm:x:680:nogroup::/:/bin/nologin
\ No newline at end of file diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-script-Do-not-export-_IO_stdin_used.patch b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch index eafd497ae2..eafd497ae2 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-script-Do-not-export-_IO_stdin_used.patch +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.32.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.32.0.bb index 20fc0f3868..058aeb58d2 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.32.0.bb @@ -9,7 +9,7 @@ inherit features_check gnomebase gsettings gtk-icon-cache gettext pkgconfig ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI:append:libc-musl = " file://0001-linker-script-Do-not-export-_IO_stdin_used.patch" +SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" SRC_URI[archive.sha256sum] = "a2b5affa1505ad43902959fdbe09e5bcec57b11ed333fa60458ffb9c62efba38" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb deleted file mode 100644 index fbc8f38454..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Actions, Menus and Toolbars Kit" -LICENSE = "LGPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" - -DEPENDS = " \ - glib-2.0-native \ - gtk+3 \ - gtk-doc-native \ - libxslt-native \ - docbook-xsl-stylesheets-native \ - python3-pygments-native \ -" - -GNOMEBASEBUILDCLASS = "meson" - -GIR_MESON_OPTION = "" - -inherit gnomebase gettext features_check gobject-introspection - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -SRC_URI[archive.sha256sum] = "d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_45.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_45.1.bb index eb3d07ce10..41bd5d8827 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_45.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_45.1.bb @@ -22,7 +22,7 @@ inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg fea # FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used. REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data" -SRC_URI[archive.sha256sum] = "05cb2c9a66ba15870f47358cd4c1ce670f17e4c8b22e050d627d728ff88b57ba" +SRC_URI[archive.sha256sum] = "c17f86704c722b36c01a168f1e51439be0bb279f2c6646f48b66e9d0f3a24cd2" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb index 34c782297c..01d7a072aa 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb @@ -6,27 +6,34 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" GNOMEBASEBUILDCLASS = "meson" DEPENDS = " \ + appstream-glib-native \ + desktop-file-utils-native \ + libgedit-amtk \ + libgedit-gtksourceview \ gdk-pixbuf-native \ gtk+3 \ gsettings-desktop-schemas \ libpeas \ libsoup \ gspell \ - gtksourceview4 \ tepl \ " -inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg python3targetconfig +inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg gtk-icon-cache python3targetconfig def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "3bbb1b3775d4c277daf54aaab44b0eb83a4eb1f09f0391800041c9e56893ec11" +SRC_URI[archive.sha256sum] = "a1a6e37f041765dff7227a1f5578b6f49faaf016b1e17e869caf5bfb94c6aa4e" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +do_install:prepend() { + sed -i -e 's|${B}||g' ${B}/plugins/filebrowser/gedit-file-browser-enum-types.c +} + GIR_MESON_OPTION = "" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb new file mode 100644 index 0000000000..11da836ff4 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "libgedit-amtk - Actions, Menus and Toolbars Kit for GTK applications" +SECTION = "gnome" +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" + +DEPENDS = "glib-2.0 gtk+3" + +inherit meson pkgconfig gobject-introspection features_check gtk-doc + +SRC_URI = "git://github.com/gedit-technology/libgedit-amtk.git;protocol=https;branch=main" +S = "${WORKDIR}/git" +SRCREV = "f6fbfd1c57de3d97cab2056a5c3088b0da49e8a4" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +GIR_MESON_OPTION = "gobject_introspection" +GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb new file mode 100644 index 0000000000..3a655f6509 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb @@ -0,0 +1,24 @@ +SUMMARY = "Gedit Technology - Source code editing widget" +SECTION = "gnome" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = "glib-2.0 gtk+3 libxml2" + +inherit meson pkgconfig gobject-introspection features_check gtk-doc + +SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=main" +S = "${WORKDIR}/git" +SRCREV = "7062264d635f6efe04d88217a893a97ff385b873" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +GIR_MESON_OPTION = "gobject_introspection" +GTKDOC_MESON_OPTION = "gtk_doc" + +do_install:prepend() { + sed -i -e 's|${B}||g' ${B}/gtksourceview/gtksource-enumtypes.c + sed -i -e 's|${B}||g' ${B}/gtksourceview/gtksource-enumtypes.h +} + +FILES:${PN} += "${datadir}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb index 15091d4cd4..19d31f4286 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb @@ -25,3 +25,11 @@ src_package_preprocess () { sed -i -e "s,${B}/../${BPN}-${PV}/${BPN}/,,g" \ ${B}/gexiv2/gexiv2-enums.cpp } + +do_install:append() { + # gexiv2 harcodes usr/lib as install path, so this corrects it to actual libdir + if [ "${prefix}/lib" != "${libdir}" ]; then + mv ${D}/${prefix}/lib/* ${D}/${libdir}/ + rm -rf ${D}/${prefix}/lib + fi +} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_44.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_45.0.bb index 2934b7398b..534f9a4c23 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_44.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_45.0.bb @@ -8,7 +8,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext allarch -SRC_URI[archive.sha256sum] = "4a8393b387135f2a6a424a1a0c3ac94e0742b62b8235a0923c929f51e04be04e" +SRC_URI[archive.sha256sum] = "cee0e688fbae5ef7a75f335ada2d10779e08ebca9445f1586de32c5a9b6dee2d" FILES:${PN} += " \ ${datadir}/backgrounds \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_45.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_45.0.2.bb index ed2cb854d7..cde2e1d3cb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_45.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_45.0.2.bb @@ -29,7 +29,7 @@ def gnome_verdir(v): REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRC_URI[archive.sha256sum] = "e58df0b5646111baf93ec5309b225d27b7c7f45deeee484af7914331b8cd2822" +SRC_URI[archive.sha256sum] = "7dcbf32384897171cbe5483ec664d994e5e755e912ae1df911624f03c90867c2" FILES:${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_45.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_45.1.bb index a8b8123f80..1f63c8aeb6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_45.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_45.1.bb @@ -23,7 +23,7 @@ inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-versi REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRC_URI[archive.sha256sum] = "8c1483cbba4388db410875ed09d64e9003f929b555d704076a6fe7bd7c1e65b2" +SRC_URI[archive.sha256sum] = "7fa8507543865aa7432bb5319830c87158b5447ca09cca45b607dc6796c71008" do_install:prepend() { sed -i -e 's|${S}/src|/usr/src/debug/${PN}/${PV}-${PR}/src|g' ${B}/src/gcal-enum-types.h diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.1.bb index 1122ee5ea0..34e054f99c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.1.bb @@ -39,7 +39,7 @@ inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" -SRC_URI[archive.sha256sum] = "83df6a90f98914f2c19a872ce06562acef40927637f679c383099265ccfa42cf" +SRC_URI[archive.sha256sum] = "d286c7627150e112aacbb4b7b91717fad8e89076061479dfc610b2dd744b577a" PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" PACKAGECONFIG[cups] = ",,cups,cups" @@ -48,6 +48,8 @@ PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}" +export XDG_DATA_DIRS = "${STAGING_DATADIR}" + USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_44.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_45.0.bb index d8674fca24..7cae5dbcc1 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_44.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_45.0.bb @@ -30,7 +30,7 @@ PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" PACKAGECONFIG[x11] = ",,libcanberra" SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-gnome-disk-utility-remove-libcanberra-dependency.patch', '', d)}" -SRC_URI[archive.sha256sum] = "02031097896cdb37d8717a5823f93e3723d4dfce7fdc4002c9dfcb16b7e7a3ef" +SRC_URI[archive.sha256sum] = "3d8625faa99047bc4aefd29921ad728ab4d700cff86e0f2ec67e8dba877d0dd3" EXTRA_OEMESON = "-Dman=false" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_44.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_45.0.bb index ff5e1e2c8c..2b24e54fe5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_44.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_45.0.bb @@ -16,7 +16,7 @@ inherit gnomebase gtk-icon-cache gettext features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRC_URI[archive.sha256sum] = "a1511df30b228cc2ef1175dd9d2b93438ea912e25913404b263cf3d457bb9f97" +SRC_URI[archive.sha256sum] = "97cb6b68dda60de0ab3038383586f1e4bc1da5a48f44025bd6bbe74ea05c2b08" FILES:${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.0.bb index 66c05a1ff1..8dc4d8317f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.0.bb @@ -13,8 +13,9 @@ DEPENDS = " \ geocode-glib \ gjs \ gnome-autoar \ + gnome-desktop \ polkit \ - libcroco \ + pipewire \ libsoup-3.0 \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'startup-notification', d)} \ ibus \ @@ -37,7 +38,7 @@ SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.pat PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth" -PACKAGECONFIG[nm] = "-Dnetworkmanager=true, -Dnetworkmanager=false,networkmanager,networkmanager" +PACKAGECONFIG[nm] = "-Dnetworkmanager=true, -Dnetworkmanager=false,networkmanager libsecret,networkmanager" PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" EXTRA_OEMESON = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_45.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_45.1.bb index 89a6f05f4f..d5ed29c8a3 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_45.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-software/gnome-software_45.1.bb @@ -29,7 +29,7 @@ RDEPENDS:${PN} = "iso-codes" EXTRA_OEMESON += "-Dtests=false -Dsoup2=false" -SRC_URI[archive.sha256sum] = "61f42c2fd4d19b894a2484f691369032dc8b2a32a014ce6ca4d02c4fa4f75a14" +SRC_URI[archive.sha256sum] = "d72485f7a6e0917f64edbedd68fd7b57246c6ebf10c5a45108b63946635778a2" PACKAGECONFIG ?= "flatpak" PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch index bd7e76f208..d921ff3308 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch @@ -3,7 +3,7 @@ From: Mae Dartmann <hello@maedartmann.name> Date: Wed, 16 Feb 2022 06:08:41 +0000 Subject: [PATCH] meson: fix invalid positional argument -Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8] +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8] --- data/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.46.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.50.0.bb index 3ada6515f8..2f8173c017 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.46.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.50.0.bb @@ -23,7 +23,7 @@ REQUIRED_DISTRO_FEATURES = "x11" inherit gnomebase gsettings gettext upstream-version-is-even features_check -SRC_URI[archive.sha256sum] = "00ba49f7612088f2b3baeca79c45eb2a30423c2e4a7bea4015872beae25dd6c5" +SRC_URI[archive.sha256sum] = "18e9b106438d46394e4148bcb83acc6367312be54559cdb564e270c1ccaeb60f" SRC_URI += "file://0001-drop-zenity-detection.patch" PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_45.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_45.1.bb index a083d1799f..4853c0ce30 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_45.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_45.1.bb @@ -23,7 +23,7 @@ DEPENDS = " \ inherit gnomebase gsettings gobject-introspection gi-docgen gettext features_check mime-xdg gtk-icon-cache -SRC_URI[archive.sha256sum] = "b311c465ce2ca7bc648f61b865187b4451388dec9358a169f3277e741718ab5d" +SRC_URI[archive.sha256sum] = "23bdaa9a85466c5937a89daddd080ed03bcc2b49e8b64af607206353bde82fe3" REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.4.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb index 1eecfff4b0..6c9c36f3ed 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.4.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb @@ -6,8 +6,8 @@ DEPENDS = " \ gsettings-desktop-schemas \ glib-2.0 \ gtk+3 \ - gtksourceview4 \ - amtk \ + libgedit-amtk \ + libgedit-gtksourceview \ libxml2 \ uchardet \ gtk-doc-native \ @@ -21,7 +21,7 @@ inherit meson gobject-introspection gettext features_check pkgconfig ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI = "git://gitlab.gnome.org/swilmet/tepl;protocol=https;branch=main" -SRCREV = "d1e9cc2e4a0738f68d9002f13724b7239f075844" +SRCREV = "16ab2567257a053bd957699f89080fafd0999035" S = "${WORKDIR}/git" # gobject-introspection is mandatory and cannot be configured diff --git a/meta-openembedded/meta-initramfs/README.md b/meta-openembedded/meta-initramfs/README.md index 119293a741..07704abc6d 100644 --- a/meta-openembedded/meta-initramfs/README.md +++ b/meta-openembedded/meta-initramfs/README.md @@ -12,19 +12,19 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/meta-openembedded -branch: master +branch: nanbield Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org -with '[meta-initramfs]' in the subject. +with '[meta-initramfs][nanbield]' in the subject. When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-initramfs][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-initramfs][nanbield][PATCH' -Interm layer maintainer: Khem Raj <raj.khem@gmail.com> +Interm layer maintainer: Armin Kuster <akuster808@gmail.com> License diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch deleted file mode 100644 index 4fc4b45fb1..0000000000 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a33c262f828f803fffdad8e1f44d524dc9c75856 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings <ben@decadent.org.uk> -Date: Wed, 3 Aug 2022 01:10:01 +0200 -Subject: [PATCH] fcntl: Fix build failure for some architectures with Linux - 5.19 - -Starting from Linux 5.19, the kernel UAPI headers now only define -__ARCH_FLOCK64_PAD if the architecture actually needs padding in -struct flock64. Wrap its use with #ifdef, - -Upstream-Status: Backport [https://git.kernel.org/pub/scm/libs/klibc/klibc.git/commit/?id=bb2fde5ddbc18a2e7795ca4d24759230c2aae9d0] -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - usr/include/fcntl.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/usr/include/fcntl.h b/usr/include/fcntl.h -index ed703a6..cb2e4e5 100644 ---- a/usr/include/fcntl.h -+++ b/usr/include/fcntl.h -@@ -33,7 +33,9 @@ struct flock { - __kernel_loff_t l_start; - __kernel_loff_t l_len; - __kernel_pid_t l_pid; -+#ifdef __ARCH_FLOCK64_PAD - __ARCH_FLOCK64_PAD -+#endif - }; - - #ifdef F_GETLK64 --- -2.37.2 - diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch index 15b5144e44..e4ae3728a4 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch @@ -14,8 +14,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/usr/klibc/Kbuild +++ b/usr/klibc/Kbuild -@@ -183,7 +183,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash - targets += interp.o +@@ -190,7 +190,8 @@ $(SOHASH): $(SOLIB) $(SOLIB).hash + targets += shared-stub.o quiet_cmd_interp = BUILD $@ - cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__ \ @@ -23,4 +23,4 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> + -D__ASSEMBLY__ \ -DLIBDIR=\"$(SHLIBDIR)\" \ -DSOHASH=\"$(SOLIBHASH)\" \ - $(KLIBCSTACKFLAGS) \ + -c -o $@ $< diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch index 585fb2d439..7b29eaf200 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/armv4-fix-v4bx.patch @@ -16,8 +16,8 @@ Upstream-Status: Pending --- a/usr/klibc/arch/arm/MCONFIG +++ b/usr/klibc/arch/arm/MCONFIG -@@ -27,6 +27,7 @@ else - KLIBCSHAREDFLAGS = $(LD_IMAGE_BASE_OPT) 0x01800000 +@@ -23,6 +23,7 @@ else + # Extra linkflags when building the shared version of the library ifeq ($(CONFIG_AEABI),y) KLIBCREQFLAGS += -mabi=aapcs-linux -mno-thumb-interwork +KLIBCLDFLAGS += $(FIX_ARMV4_EABI_BX) diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.10.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.13.bb index 4011aa231e..4011aa231e 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.10.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.13.bb diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.10.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.13.bb index 0de580781b..0de580781b 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.10.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.13.bb diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.10.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.13.bb index 2f26093cbe..2f26093cbe 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.10.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.13.bb diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc index 5acf679983..6093e19b7c 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -20,7 +20,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/klibc/2.0/klibc-${PV}.tar.xz \ file://0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch \ file://cross-clang.patch \ file://0001-workaround-for-overlapping-sections-in-binary.patch \ - file://0001-fcntl-Fix-build-failure-for-some-architectures-with-.patch \ " ARMPATCHES ?= "" @@ -28,11 +27,12 @@ ARMPATCHES ?= "" ARMPATCHES:arm = " \ file://armv4-fix-v4bx.patch \ " -SRC_URI[sha256sum] = "662753da8889e744dfc0db6eb4021c3377ee7ef8ed66d7d57765f8c9e25939cd" +SRC_URI[sha256sum] = "d673a294f742d59368222ff5c38462d81098c55063799de6fb8a7ba3d4af0436" S = "${WORKDIR}/klibc-${PV}" OPTFLAGS = "${TUNE_CCARGS} -Os -fcommon" +OPTFLAGS:append = " ${DEBUG_PREFIX_MAP}" OPTFLAGS:append:toolchain-clang = " -fno-builtin-bcmp" OPTFLAGS:append:toolchain-clang:mipsarch = " -no-integrated-as" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.10.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.13.bb index 8dda9a8cdc..8dda9a8cdc 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.10.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.13.bb diff --git a/meta-openembedded/meta-multimedia/README.md b/meta-openembedded/meta-multimedia/README.md index 235c34331b..70d46afc82 100644 --- a/meta-openembedded/meta-multimedia/README.md +++ b/meta-openembedded/meta-multimedia/README.md @@ -1,17 +1,17 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: nanbield URI: git://git.openembedded.org/meta-openembedded layers: meta-oe -branch: master +branch: nanbield -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia]' in the subject +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia][nanbield]' in the subject When sending single patches, please use something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-multimedia][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-multimedia][nanbield][PATCH' You are encouraged to fork the mirror on github https://github.com/openembedded/meta-openembedded to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like GitLab, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch <remote>' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> +Layer maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/meta-openembedded/meta-multimedia/files/static-group-meta-multimedia b/meta-openembedded/meta-multimedia/files/static-group-meta-multimedia new file mode 100644 index 0000000000..c762331719 --- /dev/null +++ b/meta-openembedded/meta-multimedia/files/static-group-meta-multimedia @@ -0,0 +1,2 @@ +pipewire:x:660: +mpd:x:665:
\ No newline at end of file diff --git a/meta-openembedded/meta-multimedia/files/static-passwd-meta-multimedia b/meta-openembedded/meta-multimedia/files/static-passwd-meta-multimedia new file mode 100644 index 0000000000..94e1310ead --- /dev/null +++ b/meta-openembedded/meta-multimedia/files/static-passwd-meta-multimedia @@ -0,0 +1,2 @@ +pipewire:x:660:660::/:/bin/nologin +mpd:x:665:665::/:/bin/nologin
\ No newline at end of file diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch new file mode 100644 index 0000000000..5c13ce0bd5 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch @@ -0,0 +1,56 @@ +From 4c86f814fbe17eb5774055d69102408bbfc1cd63 Mon Sep 17 00:00:00 2001 +From: Jens Georg <mail@jensge.org> +Date: Sun, 9 Jul 2023 21:47:48 +0200 +Subject: [PATCH] build: Fix wrap file syntax + +No idea why it worked in the first place + +Fixes #26 + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp-tools/-/commit/1372f9ebe45180d58cefb6c0475fafe77de37ef2] +--- + subprojects/gssdp-1.2.wrap | 4 ++-- + subprojects/gupnp-1.2.wrap | 4 ++-- + subprojects/gupnp-av-1.0.wrap | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/subprojects/gssdp-1.2.wrap b/subprojects/gssdp-1.2.wrap +index 34d9b0b..f78d2fa 100644 +--- a/subprojects/gssdp-1.2.wrap ++++ b/subprojects/gssdp-1.2.wrap +@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git + revision = master + depth = 1 + +-[provides] +-dependency_name = gssdp-1.2 ++[provide] ++dependency_names = gssdp-1.2 + +diff --git a/subprojects/gupnp-1.2.wrap b/subprojects/gupnp-1.2.wrap +index c345910..f92c055 100644 +--- a/subprojects/gupnp-1.2.wrap ++++ b/subprojects/gupnp-1.2.wrap +@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp.git + revision = master + depth = 1 + +-[provides] +-dependency_name = gupnp-1.2 ++[provide] ++dependency_names = gupnp-1.2 + +diff --git a/subprojects/gupnp-av-1.0.wrap b/subprojects/gupnp-av-1.0.wrap +index 967e6d3..8c3b490 100644 +--- a/subprojects/gupnp-av-1.0.wrap ++++ b/subprojects/gupnp-av-1.0.wrap +@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp-av.git + revision = master + depth = 1 + +-[provides] +-dependency_name = gupnp-av-1.0 ++[provide] ++dependency_names = gupnp-av-1.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb index 20aced8329..9731ede274 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb @@ -9,7 +9,9 @@ inherit features_check meson pkgconfig gettext gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz" +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz \ + file://0001-build-Fix-wrap-file-syntax.patch \ +" SRC_URI[sha256sum] = "6de49ef4b375b8a164f74b766168b1184e0d28196b6b07a4f5341f08dfd85d6c" RRECOMMENDS:${PN} = "adwaita-icon-theme" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch new file mode 100644 index 0000000000..66f07094c5 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch @@ -0,0 +1,25 @@ +From 7a4515a356a3d5eb2af1f602c77a42a544e71efa Mon Sep 17 00:00:00 2001 +From: Jan Beich <jbeich@FreeBSD.org> +Date: Sun, 9 Jul 2023 03:30:47 +0000 +Subject: [PATCH] build: properly spell [provide] in *.wrap files + +meson.build:1:0: ERROR: Unexpected "[provides]" section, did you mean "[provide]"? + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp/-/commit/884639bd29323cbb8fbd36bc69d08097a2ae2cd1] +--- + subprojects/gssdp-1.2.wrap | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/subprojects/gssdp-1.2.wrap b/subprojects/gssdp-1.2.wrap +index 469c75d..466b83b 100644 +--- a/subprojects/gssdp-1.2.wrap ++++ b/subprojects/gssdp-1.2.wrap +@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git + revision = gssdp-1.4 + depth = 1 + +-[provides] ++[provide] + dependency_name = gssdp-1.2 + diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb index c21e7a05bf..efeb66f28f 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb @@ -9,6 +9,7 @@ inherit meson pkgconfig vala gobject-introspection SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz \ file://0001-all-Drop-xmlRecoverMemory.patch \ + file://0001-build-properly-spell-provide-in-.wrap-files.patch \ " SRC_URI[sha256sum] = "899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-all.bb index 9f2fda9fef..dc76265a9b 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-all.bb @@ -1,3 +1,3 @@ -require meta-multimedia-image-base.bb +require recipes-core/images/core-image-base.bb IMAGE_INSTALL += "packagegroup-meta-multimedia" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-base.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-base.bb deleted file mode 100644 index 249f989a4b..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-base.bb +++ /dev/null @@ -1,7 +0,0 @@ -SUMMARY = "meta-multimedia build test image" - -IMAGE_INSTALL = "packagegroup-core-boot" - -LICENSE = "MIT" - -inherit core-image diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb index bc1c52ad48..bc2e858b42 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/images/multimedia-libcamera-image.bb @@ -4,7 +4,7 @@ DESCRIPTION = "libcamera image" LICENSE = "MIT" -require meta-multimedia-image.bb +require meta-multimedia-image-all.bb IMAGE_INSTALL += " \ kernel-modules \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb index ece1be6f32..2a3c6473ee 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb @@ -50,8 +50,11 @@ do_install:append() { chrpath -d ${D}${libexecdir}/libcamera/v4l2-compat.so } -addtask do_recalculate_ipa_signatures_package after do_package before do_packagedata -do_recalculate_ipa_signatures_package() { +do_package:append() { + bb.build.exec_func("do_package_recalculate_ipa_signatures", d) +} + +do_package_recalculate_ipa_signatures() { local modules for module in $(find ${PKGD}/usr/lib/libcamera -name "*.so.sign"); do module="${module%.sign}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.80.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.83.bb index a134820daa..2414f1397a 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.80.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.83.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "dbus ncurses" -SRCREV = "35cca08d2bef14248ac25ff2a1efb0bf274d0a6f" +SRCREV = "6fd7f39dbec9c3a65aa2de0123c6bfbda7c53a85" SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.14.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.15.bb index 6f93b443d2..679921922e 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.14.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.15.bb @@ -11,7 +11,7 @@ DEPENDS = "glib-2.0 glib-2.0-native lua pipewire \ ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "python3-native python3-lxml-native doxygen-native", "", d)} \ " -SRCREV = "6d0c7f7b7f484b3cd2aaf2e2b3cc902c095b4946" +SRCREV = "d67b48e595cb4612fd7fd47f97df6b8883ef7f60" SRC_URI = " \ git://gitlab.freedesktop.org/pipewire/wireplumber.git;branch=master;protocol=https \ file://90-OE-disable-session-dbus-dependent-features.lua \ @@ -133,7 +133,7 @@ CONFFILES:${PN} += " \ # itself to become a daemon, in practice, the PipeWire daemon is used. RRECOMMENDS:${PN} += "pipewire ${PN}-scripts ${PN}-modules-meta" -FILES:${PN} += "${systemd_user_unitdir} ${systemd_system_unitdir}" +FILES:${PN} += "${systemd_user_unitdir} ${systemd_system_unitdir} ${datadir}/zsh" FILES:libwireplumber = " \ ${libdir}/libwireplumber-*.so.* \ diff --git a/meta-openembedded/meta-networking/MAINTAINERS b/meta-openembedded/meta-networking/MAINTAINERS index ce53ec471b..42d5e90277 100644 --- a/meta-openembedded/meta-networking/MAINTAINERS +++ b/meta-openembedded/meta-networking/MAINTAINERS @@ -2,13 +2,13 @@ This file contains a list of maintainers for the meta-networking layer. Please submit any patches against meta-networking to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) with -'[meta-networking]' in the subject. +'[meta-networking][nanbield]' in the subject. When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix='meta-networking][PATCH' + --subject-prefix='meta-networking][nanbield][PATCH' You may also contact the maintainers directly. @@ -26,18 +26,9 @@ Please keep this list in alphabetical order. Maintainers List (try to look for most precise areas first) COMMON -M: Khem Raj <raj.khem@gmail.com> -M: "Joe MacDonald (backup)" <joe@deserted.net> +M: Armin Kuster <akuster808@gmail.com> L: openembedded-devel@lists.openembedded.org Q: https://patchwork.openembedded.org/project/oe/ S: Maintained F: conf F: recipes-* - -NETKIT -M: Armin Kuster <akuster808@gmail.com> -F: recipes-netkit - -OPENTHREAD -M: Stefan Schmidt <stefan@datenfreihafen.org> -F: recipes-connectivity/openthread/ diff --git a/meta-openembedded/meta-networking/README.md b/meta-openembedded/meta-networking/README.md index 34e11a96dd..e4d616e3a8 100644 --- a/meta-openembedded/meta-networking/README.md +++ b/meta-openembedded/meta-networking/README.md @@ -18,22 +18,21 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: nanbield For some recipes, the meta-oe layer is required: URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-oe -branch: master +branch: nanbield URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-python -branch: master +branch: nanbield Maintenance ----------- -Layer maintainers: Khem Raj <raj.khem@gmail.com> - Armin Kuster <akuster808@gmail.com> (recipes-netkit) +Layer maintainers: Armin Kuster <akuster808@gmail.com> Please see the MAINTAINERS file for information on contacting the diff --git a/meta-openembedded/meta-networking/files/static-group-meta-networking b/meta-openembedded/meta-networking/files/static-group-meta-networking new file mode 100644 index 0000000000..6896a181ea --- /dev/null +++ b/meta-openembedded/meta-networking/files/static-group-meta-networking @@ -0,0 +1,14 @@ +ftp:x:630: +dovecot:x:631: +dovenull:x:632: +postfix:x:633: +postdrop:x:634: +vmail:x:635: +rasvd:x:636: +frr:x:637: +frrvty:x:638: +nogroup:x:65534: +ftp:x:640: +rwhod:x:641: +lldpd:x:642: +opensaf:x:643: diff --git a/meta-openembedded/meta-networking/files/static-passwd-meta-networking b/meta-openembedded/meta-networking/files/static-passwd-meta-networking new file mode 100644 index 0000000000..77c2b36f94 --- /dev/null +++ b/meta-openembedded/meta-networking/files/static-passwd-meta-networking @@ -0,0 +1,19 @@ +ftp:x:630:630::/:/bin/nologin +dovecot:x:631:631::/:/bin/nologin +dovenull:x:632:632::/:/bin/nologin +postfix:x:633:633::/:/bin/nologin +vmail:x:635:635::/:/bin/nologin +radvd:x:636:636::/:/bin/nologin +frr:x:637:637::/:/bin/nologin +ftp:x:640:640::/:/bin/nologin +rwhod:x:641:641::/:/bin/nologin +lldpd:x:642:642::/:/bin/nologin +opensaf:x:643:643::/:/bin/nologin +tinyproxy:x:650:nogroup::/:/bin/nologin +radiusd:x:651:nogroup::/:/bin/nologin +nm-openconnect:x:652:nogroup::/:/bin/nologin +ntp:x:653:nogroup::/:/bin/nologin +nm-fortisslvpn:x:654:nogroup::/:/bin/nologin +nm-openvpn:x:655:nogroup::/:/bin/nologin +squid:x:656:nogroup::/:/bin/nologin +mosquitto:x:657:nogroup::/:/bin/nologin
\ No newline at end of file diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-AES-NI-use-target-attributes-for-x86-32-bit-intrinsi.patch b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-AES-NI-use-target-attributes-for-x86-32-bit-intrinsi.patch new file mode 100644 index 0000000000..5030fb99f9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-AES-NI-use-target-attributes-for-x86-32-bit-intrinsi.patch @@ -0,0 +1,87 @@ +From 80d3e73ad0648f558a067a9dbfe3bc80e6b614f8 Mon Sep 17 00:00:00 2001 +From: Beniamin Sandu <beniaminsandu@gmail.com> +Date: Mon, 30 Oct 2023 19:15:56 +0000 +Subject: [PATCH] AES-NI: use target attributes for x86 32-bit intrinsics + +This way we build with 32-bit gcc/clang out of the box. +We also fallback to assembly for 64-bit clang-cl if needed cpu +flags are not provided, instead of throwing an error. + +Upstream-Status: Backport [https://github.com/Mbed-TLS/mbedtls/commit/800f2b7c020678a84abfa9688962b91c36e6693d] + +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com> +--- + library/aesni.c | 20 ++++++++++++++++++++ + library/aesni.h | 8 +++++--- + 2 files changed, 25 insertions(+), 3 deletions(-) + +diff --git a/library/aesni.c b/library/aesni.c +index 5f25a8249..481fa3822 100644 +--- a/library/aesni.c ++++ b/library/aesni.c +@@ -41,6 +41,17 @@ + #include <immintrin.h> + #endif + ++#if defined(MBEDTLS_ARCH_IS_X86) ++#if defined(MBEDTLS_COMPILER_IS_GCC) ++#pragma GCC push_options ++#pragma GCC target ("pclmul,sse2,aes") ++#define MBEDTLS_POP_TARGET_PRAGMA ++#elif defined(__clang__) ++#pragma clang attribute push (__attribute__((target("pclmul,sse2,aes"))), apply_to=function) ++#define MBEDTLS_POP_TARGET_PRAGMA ++#endif ++#endif ++ + #if !defined(MBEDTLS_AES_USE_HARDWARE_ONLY) + /* + * AES-NI support detection routine +@@ -396,6 +407,15 @@ static void aesni_setkey_enc_256(unsigned char *rk_bytes, + } + #endif /* !MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH */ + ++#if defined(MBEDTLS_POP_TARGET_PRAGMA) ++#if defined(__clang__) ++#pragma clang attribute pop ++#elif defined(__GNUC__) ++#pragma GCC pop_options ++#endif ++#undef MBEDTLS_POP_TARGET_PRAGMA ++#endif ++ + #else /* MBEDTLS_AESNI_HAVE_CODE == 1 */ + + #if defined(__has_feature) +diff --git a/library/aesni.h b/library/aesni.h +index ba1429029..37ae02c82 100644 +--- a/library/aesni.h ++++ b/library/aesni.h +@@ -50,6 +50,10 @@ + #if defined(__GNUC__) && defined(__AES__) && defined(__PCLMUL__) + #define MBEDTLS_AESNI_HAVE_INTRINSICS + #endif ++/* For 32-bit, we only support intrinsics */ ++#if defined(MBEDTLS_ARCH_IS_X86) && (defined(__GNUC__) || defined(__clang__)) ++#define MBEDTLS_AESNI_HAVE_INTRINSICS ++#endif + + /* Choose the implementation of AESNI, if one is available. + * +@@ -60,13 +64,11 @@ + #if defined(MBEDTLS_AESNI_HAVE_INTRINSICS) + #define MBEDTLS_AESNI_HAVE_CODE 2 // via intrinsics + #elif defined(MBEDTLS_HAVE_ASM) && \ +- defined(__GNUC__) && defined(MBEDTLS_ARCH_IS_X64) ++ (defined(__GNUC__) || defined(__clang__)) && defined(MBEDTLS_ARCH_IS_X64) + /* Can we do AESNI with inline assembly? + * (Only implemented with gas syntax, only for 64-bit.) + */ + #define MBEDTLS_AESNI_HAVE_CODE 1 // via assembly +-#elif defined(__GNUC__) +-# error "Must use `-mpclmul -msse2 -maes` for MBEDTLS_AESNI_C" + #else + #error "MBEDTLS_AESNI_C defined, but neither intrinsics nor assembly available" + #endif +-- +2.34.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-aesce-do-not-specify-an-arch-version-when-enabling-c.patch b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-aesce-do-not-specify-an-arch-version-when-enabling-c.patch deleted file mode 100644 index 44d74754c9..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0001-aesce-do-not-specify-an-arch-version-when-enabling-c.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2246925e3cb16183e25d4e2cfd13fb800df86270 Mon Sep 17 00:00:00 2001 -From: Beniamin Sandu <beniaminsandu@gmail.com> -Date: Sun, 25 Jun 2023 19:58:08 +0300 -Subject: [PATCH] aesce: do not specify an arch version when enabling crypto - instructions - -Building mbedtls with different aarch64 tuning variations revealed -that we should use the crypto extensions without forcing a particular -architecture version or core, as that can create issues. - -Upstream-Status: Backport [https://github.com/Mbed-TLS/mbedtls/commit/471a975942dec76bf0ccb92b6c6da055385683fb] - -Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com> ---- - library/aesce.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/library/aesce.c b/library/aesce.c -index fe056dc4c..843de3973 100644 ---- a/library/aesce.c -+++ b/library/aesce.c -@@ -60,7 +60,7 @@ - # error "A more recent GCC is required for MBEDTLS_AESCE_C" - # endif - # pragma GCC push_options --# pragma GCC target ("arch=armv8-a+crypto") -+# pragma GCC target ("+crypto") - # define MBEDTLS_POP_TARGET_PRAGMA - # else - # error "Only GCC and Clang supported for MBEDTLS_AESCE_C" --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0002-aesce-use-correct-target-attribute-when-building-wit.patch b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0002-aesce-use-correct-target-attribute-when-building-wit.patch deleted file mode 100644 index c8f6cb7509..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls/0002-aesce-use-correct-target-attribute-when-building-wit.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 03d3523f974536f2358047382aadb0d4cc762f8a Mon Sep 17 00:00:00 2001 -From: Beniamin Sandu <beniaminsandu@gmail.com> -Date: Mon, 26 Jun 2023 12:07:21 +0300 -Subject: [PATCH] aesce: use correct target attribute when building with clang - -Seems clang has its own issues when it comes to crypto extensions, -and right now the best way to avoid them is to accurately enable -the needed instructions instead of the broad crypto feature. - -E.g.: https://github.com/llvm/llvm-project/issues/61645 - -Upstream-Status: Backport [https://github.com/Mbed-TLS/mbedtls/commit/aa4f6219014d863bed51453e5261178adc66be34] - -Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com> ---- - library/aesce.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/library/aesce.c b/library/aesce.c -index 843de3973..7bea088ba 100644 ---- a/library/aesce.c -+++ b/library/aesce.c -@@ -53,7 +53,7 @@ - # if __clang_major__ < 4 - # error "A more recent Clang is required for MBEDTLS_AESCE_C" - # endif --# pragma clang attribute push (__attribute__((target("crypto"))), apply_to=function) -+# pragma clang attribute push (__attribute__((target("aes"))), apply_to=function) - # define MBEDTLS_POP_TARGET_PRAGMA - # elif defined(__GNUC__) - # if __GNUC__ < 6 --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.4.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.5.0.bb index a6f8583b23..5f284227ed 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.4.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.5.0.bb @@ -23,10 +23,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "libs" S = "${WORKDIR}/git" -SRCREV = "72718dd87e087215ce9155a826ee5a66cfbe9631" +SRCREV = "1ec69067fa1351427f904362c1221b31538c8b57" SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=master \ - file://0001-aesce-do-not-specify-an-arch-version-when-enabling-c.patch \ - file://0002-aesce-use-correct-target-attribute-when-building-wit.patch \ + file://0001-AES-NI-use-target-attributes-for-x86-32-bit-intrinsi.patch \ file://run-ptest" inherit cmake update-alternatives ptest diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/2894.patch b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/2894.patch new file mode 100644 index 0000000000..7374cbd26f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/2894.patch @@ -0,0 +1,25 @@ +From: Joachim Zobel <jz-2017@heute-morgen.de> +Date: Wed, 13 Sep 2023 09:55:34 +0200 +Subject: [PATCH] Link correctly with shared websockets library if needed see: + https://github.com/eclipse/mosquitto/pull/2751 + +Patch contributed by Joachim Zobel <jz-2017@heute-morgen.de> and Daniel Engberg <daniel.engberg.lists@pyret.net> +--- +Upstream-Status: Pending + + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9380a04..dce8313 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -200,7 +200,7 @@ if (WITH_WEBSOCKETS) + link_directories(${mosquitto_SOURCE_DIR}) + endif (WIN32) + else (STATIC_WEBSOCKETS) +- set (MOSQ_LIBS ${MOSQ_LIBS} websockets) ++ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared) + endif (STATIC_WEBSOCKETS) + endif (WITH_WEBSOCKETS) + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/2895.patch b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/2895.patch new file mode 100644 index 0000000000..853f881754 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/files/2895.patch @@ -0,0 +1,27 @@ +From: Joachim Zobel <jz-2017@heute-morgen.de> +Date: Wed, 13 Sep 2023 10:05:43 +0200 +Subject: [PATCH] Mosquitto now waits for network-online when starting + (Closes: #1036450) + +See: https://github.com/eclipse/mosquitto/issues/2878 +--- +Upstream-Status: Pending + + service/systemd/mosquitto.service.simple | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/service/systemd/mosquitto.service.simple b/service/systemd/mosquitto.service.simple +index 15ee0d6..c2a330b 100644 +--- a/service/systemd/mosquitto.service.simple ++++ b/service/systemd/mosquitto.service.simple +@@ -1,8 +1,8 @@ + [Unit] + Description=Mosquitto MQTT Broker + Documentation=man:mosquitto.conf(5) man:mosquitto(8) +-After=network.target +-Wants=network.target ++After=network-online.target ++Wants=network-online.target + + [Service] + ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb index 690b6bc126..ea9eb4857b 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.17.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb @@ -17,9 +17,11 @@ DEPENDS = "uthash cjson" SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://mosquitto.init \ file://1571.patch \ + file://2894.patch \ + file://2895.patch \ " -SRC_URI[sha256sum] = "3be7a911236567c1a9fbe25baf3e3167004ba4a0c151a448ef1f7fc077dba52f" +SRC_URI[sha256sum] = "d665fe7d0032881b1371a47f34169ee4edab67903b2cd2b4c083822823f4448a" inherit systemd update-rc.d useradd cmake pkgconfig @@ -87,4 +89,4 @@ USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false \ --user-group mosquitto" -BBCLASSEXTEND += "native nativesdk" +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch index 0a568fa23c..2e84a334f0 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0001-fix-ppp-2.5.0-build.patch @@ -7,7 +7,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Accepted +Upstream-Status: Backport Signed-off-by: Eivind Næss <eivnaes@yahoo.com> --- Makefile.am | 5 +- diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch index 798a57b0da..6ac8f2b643 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn/0002-fix-ppp-2.5.0-build.patch @@ -6,7 +6,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Accepted +Upstream-Status: Backport Signed-off-by: Eivind Næss <eivnaes@yahoo.com> --- configure.ac | 6 +----- diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-script-Do-not-export-_IO_stdin_used.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch index eafd497ae2..eafd497ae2 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-script-Do-not-export-_IO_stdin_used.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.2.bb index 024ef39361..a9afe3a7e4 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.2.bb @@ -10,7 +10,7 @@ inherit gnomebase useradd gettext systemd SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz" -SRC_URI:append:libc-musl = " file://0001-linker-script-Do-not-export-_IO_stdin_used.patch" +SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" SRC_URI[sha256sum] = "62f0f2a8782221b923f212ac2a8ebbc1002efd6a90ee945dad4adfb56d076d21" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.44.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.44.0.bb index 84ef70c9af..8d1c877baa 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.44.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.44.0.bb @@ -31,7 +31,7 @@ SRC_URI = " \ file://enable-dhcpcd.conf \ file://enable-iwd.conf \ " -SRC_URI:append:libc-musl = " file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch" +SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" SRC_URI[sha256sum] = "edca09637d182f806b3b12d8c5623d7badbd73ccca1ae63be20d2f298779fb9f" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch deleted file mode 100644 index eaaf30460f..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2fa326b26dc479942367dc4283e2f87372403988 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Jun 2017 09:32:04 -0700 -Subject: [PATCH] rtnl_flush: Error on failed write() - -Fixes -route.c:45:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] -| write(fd, "-1", 2); -| ^~~~~~~~~~~~~~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - route.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/route.c b/route.c -index c552d1f..fc5c31e 100644 ---- a/route.c -+++ b/route.c -@@ -42,7 +42,8 @@ static void rtnl_flush(void) - if (fd < 0) - return; - -- write(fd, "-1", 2); -+ if (write(fd, "-1", 2) < 0 ) -+ perror("write"); - close(fd); - } - --- -2.13.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb index 1da18d7ca0..79e1743fdf 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://main.c;endline=17;md5=86aad799085683e0a2e1c2684a20bab DEPENDS = "libubox" -SRC_URI = "git://git.openwrt.org/project/relayd.git;branch=master \ - file://0001-rtnl_flush-Error-on-failed-write.patch \ -" +SRC_URI = "git://git.openwrt.org/project/relayd.git;branch=master" -SRCREV = "f4d759be54ceb37714e9a6ca320d5b50c95e9ce9" +SRCREV = "f646ba40489371e69f624f2dee2fc4e19ceec00e" PV = "0.0.1+git${SRCPV}" UPSTREAM_CHECK_COMMITS = "1" @@ -17,3 +15,5 @@ UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" inherit cmake + +CFLAGS:append:toolchain-clang = " -Wno-error=gnu-variable-sized-type-not-at-end" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/cmocka-uintptr_t.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/cmocka-uintptr_t.patch deleted file mode 100644 index e6e8784338..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/cmocka-uintptr_t.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 14f8ee7cd1318567b00e52217d57f0a528fd2cf7 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Wed, 25 Jul 2018 09:55:25 +0800 -Subject: [PATCH] samba: cmocka.h: fix musl libc conflicting types error - -Fix build on qemumips64(el) - -taken from: -[PATCH] libldb: fix musl libc conflicting types error - -/third_party/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t' - typedef unsigned int uintptr_t; - ^~~~~~~~~ -use __DEFINED_uintptr_t in alltypes.h to check if uintptr already defined - -Upstream-Status: Pending - -Signed-off-by: Changqing Li <changqing.li@windriver.com> -Signed-off-by: Andrea Adami <andrea.adami@gmail.com> ---- - third_party/cmocka/cmocka.h | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h -index e6861c8..238201d 100644 ---- a/third_party/cmocka/cmocka.h -+++ b/third_party/cmocka/cmocka.h -@@ -111,7 +111,7 @@ typedef uintmax_t LargestIntegralType; - ((LargestIntegralType)(value)) - - /* Smallest integral type capable of holding a pointer. */ --#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) -+#if !defined(__DEFINED_uintptr_t) - # if defined(_WIN32) - /* WIN32 is an ILP32 platform */ - typedef unsigned int uintptr_t; -@@ -135,9 +135,8 @@ typedef uintmax_t LargestIntegralType; - # endif /* __WORDSIZE */ - # endif /* _WIN32 */ - --# define _UINTPTR_T --# define _UINTPTR_T_DEFINED --#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ -+# define __DEFINED_uintptr_t -+#endif /* !defined(__DEFINED_uintptr_t) */ - - /* Perform an unsigned cast to uintptr_t. */ - #define cast_to_pointer_integral_type(value) \ --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.18.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb index c40e102245..f80742640f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.18.6.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.18.8.bb @@ -29,10 +29,9 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ SRC_URI:append:libc-musl = " \ file://samba-pam.patch \ file://samba-4.3.9-remove-getpwent_r.patch \ - file://cmocka-uintptr_t.patch \ " -SRC_URI[sha256sum] = "284c8a994ce989c87cd6808c390fcb9d00c36b21a0dc1a8a75474b67c9e715e7" +SRC_URI[sha256sum] = "4fb87bceaeb01d832a59046c197a044b7e8e8000581548b5d577a6cda03344d1" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.18(\.\d+)+).tar.gz" @@ -43,7 +42,7 @@ CVE_STATUS[CVE-2011-2411] = "not-applicable-platform: vulnerable only on HP NonS # remove default added RDEPENDS on perl RDEPENDS:${PN}:remove = "perl" -DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 jansson libparse-yapp-perl-native gnutls" +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 libtasn1-native jansson libparse-yapp-perl-native gnutls cmocka" inherit features_check REQUIRED_DISTRO_FEATURES = "pam" @@ -75,7 +74,7 @@ export WAF_NO_PREFORK="yes" # Use krb5. Build active domain controller. # PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \ - acl cups ad-dc ldap mitkrb5 \ + acl cups ldap mitkrb5 \ " PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" @@ -105,7 +104,7 @@ SAMBA4_MODULES="${SAMBA4_IDMAP_MODULES},${SAMBA4_PDB_MODULES},${SAMBA4_AUTH_MODU # .so files so there will not be a conflict. This is not done consistantly, so be very careful # when adding to this list. # -SAMBA4_LIBS="heimdal,cmocka,NONE" +SAMBA4_LIBS="heimdal,NONE" EXTRA_OECONF += "--enable-fhs \ --with-piddir=/run \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/0001-include-sys-uio.patch b/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/0001-include-sys-uio.patch new file mode 100644 index 0000000000..0c6f1609af --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/0001-include-sys-uio.patch @@ -0,0 +1,18 @@ + +This patch addresses the following clang failure: tayga-0.9.2/nat64.c:119:6: +error: call to undeclared function 'writev'; ISO C99 and later do not support +implicit function declarations [-Wimplicit-function-declaration] + +Upstream-Status: Pending +Signed-off-by: Pawel Langowski <pawel.langowski@3mdeb.com> + +--- tayga.h 2023-09-29 14:38:05.005837695 +0200 ++++ tayga-2.h 2023-09-29 14:37:45.560837257 +0200 +@@ -20,6 +20,7 @@ + #include <sys/stat.h> + #include <sys/ioctl.h> + #include <sys/socket.h> ++#include <sys/uio.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <unistd.h> diff --git a/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/tayga.conf b/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/tayga.conf new file mode 100644 index 0000000000..c1b6163a45 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/tayga.conf @@ -0,0 +1,103 @@ +# +# Sample configuration file for TAYGA 0.9.2 +# +# Modify this to use your own addresses!! +# + +# +# TUN device that TAYGA will use to exchange IPv4 and IPv6 packets with the +# kernel. You may use any name you like, but `nat64' is recommended. +# +# This device may be created before starting the tayga daemon by running +# `tayga --mktun`. This allows routing and firewall rules to be set up prior +# to commencement of packet translation. +# +# Mandatory. +# +tun-device nat64 + +# +# TAYGA's IPv4 address. This is NOT your router's IPv4 address! TAYGA +# requires its own address because it acts as an IPv4 and IPv6 router, and +# needs to be able to send ICMP messages. TAYGA will also respond to ICMP +# echo requests (ping) at this address. +# +# This address can safely be located inside the dynamic-pool prefix. +# +# Mandatory. +# +ipv4-addr 192.168.254.1 + +# +# TAYGA's IPv6 address. This is NOT your router's IPv6 address! TAYGA +# requires its own address because it acts as an IPv4 and IPv6 router, and +# needs to be able to send ICMP messages. TAYGA will also respond to ICMP +# echo requests (ping6) at this address. +# +# You can leave ipv6-addr unspecified and TAYGA will construct its IPv6 +# address using ipv4-addr and the NAT64 prefix. +# +# Optional if the NAT64 prefix is specified, otherwise mandatory. It is also +# mandatory if the NAT64 prefix is 64:ff9b::/96 and ipv4-addr is a private +# (RFC1918) address. +# +#ipv6-addr 2001:db8:1::2 +ipv6-addr fdaa:bb:1::1 + +# +# The NAT64 prefix. The IPv4 address space is mapped into the IPv6 address +# space by prepending this prefix to the IPv4 address. Using a /96 prefix is +# recommended in most situations, but all lengths specified in RFC 6052 are +# supported. +# +# This must be a prefix selected from your organization's IPv6 address space +# or the Well-Known Prefix 64:ff9b::/96. Note that using the Well-Known +# Prefix will prohibit IPv6 hosts from contacting IPv4 hosts that have private +# (RFC1918) addresses, per RFC 6052. +# +# The NAT64 prefix need not be specified if all required address mappings are +# listed in `map' directives. (See below.) +# +# Optional. +# +##prefix 2001:db8:1:ffff::/96 +prefix 64:ff9b::/96 + +# +# Dynamic pool prefix. IPv6 hosts which send traffic through TAYGA (and do +# not correspond to a static map or an IPv4-translatable address in the NAT64 +# prefix) will be assigned an IPv4 address from the dynamic pool. Dynamic +# maps are valid for 124 minutes after the last matching packet is seen. +# +# If no unassigned addresses remain in the dynamic pool (or no dynamic pool is +# configured), packets from unknown IPv6 hosts will be rejected with an ICMP +# unreachable error. +# +# Optional. +# +dynamic-pool 192.168.254.0/24 + +# +# Persistent data storage directory. The dynamic.map file, which saves the +# dynamic maps that are created from dynamic-pool, is stored in this +# directory. Omit if you do not need these maps to be persistent between +# instances of TAYGA. +# +# Optional. +# +data-dir /var/spool/tayga + +# +# Establishes a single-host map. If an IPv6 host should be consistently +# reachable at a specific IPv4 address, the mapping can be specified in a +# `map' directive. (IPv6 hosts numbered with an IPv4-translatable address do +# not need map directives.) +# +# IPv4 addresses specified in the `map' directive can safely be located inside +# the dynamic-pool prefix. +# +# Optional. +# +#map 192.168.5.42 2001:db8:1:4444::1 +#map 192.168.5.43 2001:db8:1:4444::2 +#map 192.168.255.2 2001:db8:1:569::143 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/tayga.service b/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/tayga.service new file mode 100644 index 0000000000..0bffeb92a5 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/tayga/files/tayga.service @@ -0,0 +1,12 @@ +[Unit] +SourcePath=/usr/sbin/tayga +Description=LSB: userspace NAT64 + +[Service] +Type=forking +ExecStart=/usr/sbin/tayga -d --config /etc/tayga.conf +RemainAfterExit=yes +TimeoutStopSec=infinity + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb new file mode 100644 index 0000000000..36d35e6dee --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb @@ -0,0 +1,21 @@ +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = " \ + http://www.litech.org/tayga/tayga-${PV}.tar.bz2 \ + file://tayga.conf \ + file://tayga.service \ + file://0001-include-sys-uio.patch;striplevel=0 \ + " +SRC_URI[sha256sum] = "2b1f7927a9d2dcff9095aff3c271924b052ccfd2faca9588b277431a44f0009c" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "tayga.service" + +do_install:append() { + install -m 0644 ${WORKDIR}/tayga.conf ${D}${sysconfdir}/tayga.conf + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/tayga.service ${D}${systemd_unitdir}/system/ +} + +inherit autotools systemd diff --git a/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image.bb b/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-all.bb index f4c7401b35..20d3271c94 100644 --- a/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image.bb +++ b/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-all.bb @@ -1,3 +1,3 @@ -require meta-networking-image-base.bb +require recipes-core/images/core-image-base.bb IMAGE_INSTALL += "packagegroup-meta-networking" diff --git a/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-base.bb b/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-base.bb deleted file mode 100644 index eaf1409537..0000000000 --- a/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-base.bb +++ /dev/null @@ -1,7 +0,0 @@ -SUMMARY = "meta-networking build test image" - -IMAGE_INSTALL = "packagegroup-core-boot" - -LICENSE = "MIT" - -inherit core-image diff --git a/meta-openembedded/meta-networking/recipes-devtools/libcoap/libcoap_4.3.3.bb b/meta-openembedded/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb index 6e5bc07c59..20bdbee252 100644 --- a/meta-openembedded/meta-networking/recipes-devtools/libcoap/libcoap_4.3.3.bb +++ b/meta-openembedded/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1978dbc41673ab1c20e64b287c8317bc" SRC_URI = "git://github.com/obgm/libcoap.git;branch=main;protocol=https \ file://run-ptest \ " -SRCREV = "9cde7cdee171e3f47486c6e70d479fdf49f3d2d6" +SRCREV = "5fd2f89ef068214130e5d60b7087ef48711fa615" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb b/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb index 0c6fd90d34..07e01845d7 100644 --- a/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.7.bb +++ b/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb @@ -8,12 +8,12 @@ DEPENDS = "libnfnetlink libnetfilter-conntrack libnetfilter-cttimeout \ EXTRA_OECONF += "LIBS=-ltirpc CPPFLAGS=-I${STAGING_INCDIR}/tirpc" -SRC_URI = "http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${PV}.tar.bz2 \ +SRC_URI = "http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${PV}.tar.xz \ file://conntrack-failover \ file://init \ file://conntrackd.service \ " -SRC_URI[sha256sum] = "099debcf57e81690ced57f516b493588a73518f48c14d656f823b29b4fc24b5d" +SRC_URI[sha256sum] = "067677f4c5f6564819e78ed3a9d4a8980935ea9273f3abb22a420ea30ab5ded6" inherit autotools update-rc.d pkgconfig systemd diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.8.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb index 00fe483bbd..43d606f5d1 100644 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.8.bb +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb @@ -9,7 +9,7 @@ DEPENDS = "libmnl libnftnl bison-native \ SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ file://run-ptest \ " -SRC_URI[sha256sum] = "9373740de41a82dbc98818e0a46a073faeb8a8d0689fa4fa1a74399c32bf3d50" +SRC_URI[sha256sum] = "a3c304cd9ba061239ee0474f9afb938a9bb99d89b960246f66f0c3a0a85e14cd" inherit autotools manpages pkgconfig ptest @@ -23,8 +23,7 @@ PACKAGECONFIG[python] = ",, python3-setuptools-native" PACKAGECONFIG[readline] = "--with-cli=readline, , readline, , , editline linenoise" PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" -# Disable the python via autoconf so we can build it separately via setuptools3 -EXTRA_OECONF = "--disable-python \ +EXTRA_OECONF = " \ ${@bb.utils.contains_any('PACKAGECONFIG', 'editline linenoise readline', '', '--without-cli', d)}" SETUPTOOLS_SETUP_PATH = "${S}/py" diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch new file mode 100644 index 0000000000..daee318ae4 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch @@ -0,0 +1,38 @@ +From 1cc54320306e07c1fc0eed98e7fbcbb07a2f3b28 Mon Sep 17 00:00:00 2001 +From: Stefan Agner <stefan@agner.ch> +Date: Fri, 23 Jun 2023 10:10:00 +0200 +Subject: [PATCH] Handle interface without `ifa_addr` + +It seems that certain interface types may have `ifa_addr` set to null. +Handle this case gracefully. + +Upstream-Status: Submitted [https://github.com/apple-oss-distributions/mDNSResponder/pull/2/commits/11b410d4d683c90e693c40315997bb3e8ec90e9a] + +Signed-off-by: Stefan Agner <stefan@agner.ch> +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSPosix/mDNSPosix.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index d7f31cc4d5cf..f10301253f58 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -1895,6 +1895,7 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) + continue; + + if ((ifa_loop4 == NULL) && ++ ((*ifi)->ifa_addr != NULL) && + ((*ifi)->ifa_addr->sa_family == AF_INET) && + ((*ifi)->ifa_flags & IFF_UP) && + ((*ifi)->ifa_flags & IFF_LOOPBACK)) +@@ -1903,7 +1904,8 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) + continue; + } + +- if ( (((*ifi)->ifa_addr->sa_family == AF_INET) ++ if ( ((*ifi)->ifa_addr != NULL) && ++ (((*ifi)->ifa_addr->sa_family == AF_INET) + #if HAVE_IPV6 + || ((*ifi)->ifa_addr->sa_family == AF_INET6) + #endif diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0003-mDNSShared-Drop-MacOS-specific-__block-qualifier.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0003-mDNSShared-Drop-MacOS-specific-__block-qualifier.patch deleted file mode 100644 index 0ac0bb6a45..0000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0003-mDNSShared-Drop-MacOS-specific-__block-qualifier.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4c0954f77ba05d77192ee1519929a39fbc978321 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Mon, 5 Dec 2022 15:14:22 +0000 -Subject: [PATCH 3/6] mDNSShared: Drop MacOS specific __block qualifier - -Support for this extension only exists in MacOS/Clang, also it's not -actually used here, so we can just drop it. - -Upstream-Status: Pending -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> ---- - mDNSShared/uds_daemon.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mDNSShared/uds_daemon.c b/mDNSShared/uds_daemon.c -index 9ae5f78542d6..8c006b71a4ea 100644 ---- a/mDNSShared/uds_daemon.c -+++ b/mDNSShared/uds_daemon.c -@@ -2912,7 +2912,7 @@ exit: - mDNSlocal mStatus add_domain_to_browser(request_state *info, const domainname *d) - { - browser_t *b, *p; -- __block mStatus err; -+ mStatus err; - - for (p = info->u.browser.browsers; p; p = p->next) - { --- -2.35.1 - diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch index 39e67cdf48..4cda71bdb1 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch @@ -1,28 +1,25 @@ -From 60533a8947af714cc593bae6b20d47f3a4828589 Mon Sep 17 00:00:00 2001 +From 764b6202402e9e5687ff873330e5ad6be6f69df7 Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Mon, 5 Dec 2022 22:49:49 +0000 -Subject: [PATCH 5/6] mDNSCore: Fix broken debug parameter +Subject: [PATCH] mDNSCore: Fix broken debug parameter -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> ---- Upstream-Status: Pending +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- mDNSCore/mDNS.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c -index 66979587ee82..e0a982fa1762 100644 +index eecd7daa724e..1e843c081938 100644 --- a/mDNSCore/mDNS.c +++ b/mDNSCore/mDNS.c -@@ -9831,7 +9831,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage * +@@ -10210,7 +10210,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage * #else const DNSServRef dnsserv = qptr->qDNSServer; #endif -- debugf("mDNSCoreReceiveNoUnicastAnswers making negative cache entry TTL %d for %##s (%s)", negttl, name->c, DNSTypeName(q.qtype)); +- debugf("mDNSCoreReceiveNoUnicastAnswers making negative cache entry TTL %d for %##s (%s)", negttl, currentQName, DNSTypeName(q.qtype)); + debugf("mDNSCoreReceiveNoUnicastAnswers making negative cache entry TTL %d for %##s (%s)", negttl, currentQName->c, DNSTypeName(q.qtype)); // Create a negative record for the current name in the CNAME chain. MakeNegativeCacheRecord(m, &m->rec.r, currentQName, currentQNameHash, q.qtype, q.qclass, negttl, mDNSInterface_Any, dnsserv, response->h.flags); --- -2.35.1 - diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch new file mode 100644 index 0000000000..9fe721ff07 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch @@ -0,0 +1,23 @@ +From 9fc45a2cf3b78573a568abf538a6e6f4bd30b2d7 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Wed, 27 Sep 2023 11:45:26 +0100 +Subject: [PATCH] Add missing limits.h + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSShared/PlatformCommon.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mDNSShared/PlatformCommon.c b/mDNSShared/PlatformCommon.c +index 9ce15468e217..c308af3e8b0e 100644 +--- a/mDNSShared/PlatformCommon.c ++++ b/mDNSShared/PlatformCommon.c +@@ -32,6 +32,7 @@ + #include <time.h> + #include <sys/time.h> // Needed for #include <sys/time.h>(). + #include <assert.h> ++#include <limits.h> + + + #include "mDNSEmbeddedAPI.h" // Defines the interface provided to the client layer above diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.0.8.bb index aff7954f50..8370ed50c0 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.0.8.bb @@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=31c50371921e0fb731003bbc665f29bf" DEPENDS:append:libc-musl = " musl-nscd" -SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https;branch=rel/mDNSResponder-1790 \ +SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https;branch=main \ file://0001-dns-sd-Include-missing-headers.patch \ file://0002-make-Set-libdns_sd.so-soname-correctly.patch \ - file://0003-mDNSShared-Drop-MacOS-specific-__block-qualifier.patch \ file://0004-make-Separate-TLS-targets-from-libraries.patch \ file://0005-mDNSCore-Fix-broken-debug-parameter.patch \ file://0006-make-Add-top-level-Makefile.patch \ @@ -23,8 +22,10 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https file://0008-Handle-errors-from-socket-calls.patch \ file://0009-remove-unneeded-headers.patch \ file://mdns.service \ + file://0015-Add-missing-limits.h.patch \ + file://0001-Handle-interface-without-ifa_addr.patch \ " -SRCREV = "8769ab51605e465425d33d757f602ce5905ca639" +SRCREV = "d5029b5dff8aa59d1fc07ed796e994106ef58dee" # We install a stub Makefile in the top directory so that the various checks # in base.bbclass pass their tests for a Makefile, this ensures (that amongst diff --git a/meta-openembedded/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch b/meta-openembedded/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch index a84290218d..b93e311054 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/opcua/open62541/0001-fix-build-do-not-install-git-files.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix(build): do not install git files Signed-off-by: Vyacheslav Yurkov <v.yurkov@precitec.de> --- -Upstream-Status: Pending +Upstream-Status: Backport [https://github.com/open62541/open62541/commit/a0328d4cb527f9778a262fc4a6b42bfbdffc38e9] CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch b/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch index 64938a4820..dbdd644830 100644 --- a/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch +++ b/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/0001-Add-build-option-for-NTLM-support.patch @@ -11,7 +11,7 @@ disabled by default. Like 1.0.6, it will check openssl MD4 algorithm support as MD4 is insecure and modern systems may drop MD4 support. -Upstream-Status: Accepted [https://github.com/libesmtp/libESMTP/commit/1c304e7886a08fb56485e41614ff3f8685afb59d] +Upstream-Status: Backport [https://github.com/libesmtp/libESMTP/commit/1c304e7886a08fb56485e41614ff3f8685afb59d] Signed-off-by: Jiaqing Zhao <jiaqing.zhao@intel.com> --- meson.build | 13 ++++++++++--- diff --git a/meta-openembedded/meta-networking/recipes-support/libexosip2/libexosip2_5.3.0.bb b/meta-openembedded/meta-networking/recipes-support/libexosip2/libexosip2_5.3.0.bb new file mode 100644 index 0000000000..99a32fd4d0 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libexosip2/libexosip2_5.3.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "Extend the capability of the oSIP library" +DESCRIPTION = "eXosip is a GPL library that extend the capability of \ +the oSIP library. It aims to implement a simple high \ +layer API to control SIP (rfc3261) for sessions establishements \ +and common extensions." +HOMEPAGE = "http://savannah.gnu.org/projects/exosip" +SECTION = "libs" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://src/eXosip.c;beginline=1;endline=32;md5=db3c08b79afd8f4d5e5dc8f0a5dc687e" +DEPENDS = "libosip2" + +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/exosip/${BPN}-${PV}.tar.gz" +SRC_URI[sha256sum] = "5b7823986431ea5cedc9f095d6964ace966f093b2ae7d0b08404788bfcebc9c2" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/cmocka-fix-musl-libc-conflicting-types-error.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/cmocka-fix-musl-libc-conflicting-types-error.patch deleted file mode 100644 index 8e756d8d3a..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/cmocka-fix-musl-libc-conflicting-types-error.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a37eb0a46669592e32ed4e004abb2698ee4f90c5 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Wed, 25 Jul 2018 09:55:25 +0800 -Subject: [PATCH] cmocka: fix musl libc conflicting types error - -/third_party/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t' - typedef unsigned int uintptr_t; - ^~~~~~~~~ -use __DEFINED_uintptr_t in alltypes.h to check if uintptr already defined - -Upstream-Status: Pending - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - third_party/cmocka/cmocka.h | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h -index e6861c8..238201d 100644 ---- a/third_party/cmocka/cmocka.h -+++ b/third_party/cmocka/cmocka.h -@@ -111,7 +111,7 @@ typedef uintmax_t LargestIntegralType; - ((LargestIntegralType)(value)) - - /* Smallest integral type capable of holding a pointer. */ --#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) -+#if !defined(__DEFINED_uintptr_t) - # if defined(_WIN32) - /* WIN32 is an ILP32 platform */ - typedef unsigned int uintptr_t; -@@ -135,9 +135,8 @@ typedef uintmax_t LargestIntegralType; - # endif /* __WORDSIZE */ - # endif /* _WIN32 */ - --# define _UINTPTR_T --# define _UINTPTR_T_DEFINED --#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ -+# define __DEFINED_uintptr_t -+#endif /* !defined(__DEFINED_uintptr_t) */ - - /* Perform an unsigned cast to uintptr_t. */ - #define cast_to_pointer_integral_type(value) \ --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/run-ptest b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/run-ptest new file mode 100644 index 0000000000..f0de0578c4 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests="test_ldb_dn test_ldb_qsort" + +for f in $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.7.2.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.7.2.bb index daf0f73b89..c4b7602bf8 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.7.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.7.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://ldb.samba.org" SECTION = "libs" LICENSE = "LGPL-3.0-or-later & LGPL-2.1-or-later & GPL-3.0-or-later" -DEPENDS += "libtdb libtalloc libtevent popt" +DEPENDS += "libtdb libtalloc libtevent popt cmocka" RDEPENDS:pyldb += "python3" export PYTHONHASHSEED="1" @@ -12,10 +12,9 @@ SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ file://0001-do-not-import-target-module-while-cross-compile.patch \ file://0002-ldb-Add-configure-options-for-packages.patch \ file://0003-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://run-ptest \ " -SRC_URI:append:libc-musl = " file://cmocka-fix-musl-libc-conflicting-types-error.patch" - PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ @@ -37,7 +36,7 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada SRC_URI[sha256sum] = "26ee72d647854e662d99643eb2b2d341655abf31f4990838d6650fb5cf9209c8" -inherit pkgconfig waf-samba +inherit pkgconfig waf-samba ptest S = "${WORKDIR}/ldb-${PV}" @@ -47,7 +46,7 @@ export WAF_NO_PREFORK="yes" EXTRA_OECONF += "--disable-rpath \ --disable-rpath-install \ - --bundled-libraries=cmocka \ + --bundled-libraries=NONE \ --builtin-libraries=replace \ --with-modulesdir=${libdir}/ldb/modules \ --with-privatelibdir=${libdir}/ldb \ @@ -81,3 +80,8 @@ do_configure:prepend() { # For a clean rebuild rm -fr bin/ } + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/test_ldb_* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-networking/recipes-support/libosip2/libosip2_5.3.1.bb b/meta-openembedded/meta-networking/recipes-support/libosip2/libosip2_5.3.1.bb new file mode 100644 index 0000000000..fa99d33e1c --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libosip2/libosip2_5.3.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "The GNU oSIP library is an implementation of SIP - rfc3261" +DESCRIPTION = "SIP stands for the Session Initiation Protocol and is described \ +by the rfc3261 (wich deprecates rfc2543). This library aims to provide multimedia \ +and telecom software developers an easy and powerful interface to initiate and \ +control SIP based sessions in their applications. SIP is a open standard \ +replacement from IETF for H323." +HOMEPAGE = "http://www.gnu.org/software/osip/osip.html" +SECTION = "libs" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://src/osip2/osip.c;beginline=1;endline=19;md5=22ca0da0e41276c50c81b733953c208d" + +SRC_URI = "${GNU_MIRROR}/osip/${BPN}-${PV}.tar.gz" +SRC_URI[sha256sum] = "fe82fe841608266ac15a5c1118216da00c554d5006e2875a8ac3752b1e6adc79" + +inherit autotools diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/cmocka-fix-musl-libc-conflicting-types-error.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/cmocka-fix-musl-libc-conflicting-types-error.patch deleted file mode 100644 index 5795ff3bd1..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/cmocka-fix-musl-libc-conflicting-types-error.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1d4dedab5039bb671f44566d8573ee3532ba7176 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Wed, 25 Jul 2018 09:55:25 +0800 -Subject: [PATCH] cmocka: fix musl libc conflicting types error - -/third_party/cmocka/cmocka.h:126:28: error: conflicting types for 'uintptr_t' - typedef unsigned int uintptr_t; - ^~~~~~~~~ -use __DEFINED_uintptr_t in alltypes.h to check if uintptr already defined - -Upstream-Status: Pending - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - third_party/cmocka/cmocka.h | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/third_party/cmocka/cmocka.h b/third_party/cmocka/cmocka.h -index e6861c8..238201d 100644 ---- a/third_party/cmocka/cmocka.h -+++ b/third_party/cmocka/cmocka.h -@@ -111,7 +111,7 @@ typedef uintmax_t LargestIntegralType; - ((LargestIntegralType)(value)) - - /* Smallest integral type capable of holding a pointer. */ --#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) -+#if !defined(__DEFINED_uintptr_t) - # if defined(_WIN32) - /* WIN32 is an ILP32 platform */ - typedef unsigned int uintptr_t; -@@ -135,9 +135,8 @@ typedef uintmax_t LargestIntegralType; - # endif /* __WORDSIZE */ - # endif /* _WIN32 */ - --# define _UINTPTR_T --# define _UINTPTR_T_DEFINED --#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ -+# define __DEFINED_uintptr_t -+#endif /* !defined(__DEFINED_uintptr_t) */ - - /* Perform an unsigned cast to uintptr_t. */ - #define cast_to_pointer_integral_type(value) \ --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/run-ptest b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/run-ptest new file mode 100644 index 0000000000..19f7a4a3a6 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests="replace_testsuite test_tevent_tag test_tevent_trace" + +for f in $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb index b34c186ca5..9a2b5ede27 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://tevent.samba.org" SECTION = "libs" LICENSE = "LGPL-3.0-or-later" -DEPENDS += "libtalloc libtirpc" +DEPENDS += "libtalloc libtirpc cmocka" RDEPENDS:python3-tevent = "python3" export PYTHONHASHSEED="1" @@ -11,10 +11,9 @@ export PYTHONHASHSEED="1" SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ file://0001-Add-configure-options-for-packages.patch \ file://0002-Fix-pyext_PATTERN-for-cross-compilation.patch \ + file://run-ptest \ " -SRC_URI:append:libc-musl = " file://cmocka-fix-musl-libc-conflicting-types-error.patch" - LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681" SRC_URI[sha256sum] = "ef85fcaa80ffd2351036ba4b347630fef2a1ac3da964a7f1820466bad03cd00d" @@ -42,27 +41,22 @@ export WAF_NO_PREFORK="yes" EXTRA_OECONF += "--disable-rpath \ --disable-rpath-install \ - --bundled-libraries=cmocka \ + --bundled-libraries=NONE \ --builtin-libraries=replace \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ --without-gettext \ " -do_install:append() { - install -Dm 0755 ${B}/bin/test_tevent_trace ${D}${bindir}/test_tevent_trace - install -Dm 0755 ${B}/bin/test_tevent_tag ${D}${bindir}/test_tevent_tag - install -Dm 0755 ${B}/bin/replace_testsuite ${D}${bindir}/replace_testsuite +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/test_tevent_* ${D}${PTEST_PATH}/tests/ + install -m 0755 ${B}/bin/replace_testsuite ${D}${PTEST_PATH}/tests/ } PACKAGES += "python3-tevent" RPROVIDES:${PN}-dbg += "python3-tevent-dbg" -FILES:${PN} += "${libdir}/tevent/*" -FILES:${PN}-ptest += "${bindir}/replace_testsuite \ - ${bindir}/test_tevent_tag \ - ${bindir}/test_tevent_trace \ - ${libdir}/libcmocka-tevent.so" FILES:python3-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" INSANE_SKIP:${MLPREFIX}python3-tevent = "dev-so" diff --git a/meta-openembedded/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb b/meta-openembedded/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb index 004330e1b4..341eab015c 100644 --- a/meta-openembedded/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/netsniff-ng/netsniff-ng_0.6.8.bb @@ -33,4 +33,4 @@ do_install() { oe_runmake DESTDIR=${D} netsniff-ng_install } -BBCLASSEXTEND = "native nativesdk" +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_47.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_48.0.bb index ac417435ce..b9e07604d2 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_47.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_48.0.bb @@ -7,7 +7,7 @@ RDEPENDS:${PN} = "bash perl" SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch" -SRCREV = "ccb120cc7b7faceca90cfa55189a1b35b0adc78d" +SRCREV = "3e039515b959fea70356b010ed093e43cf360e99" S = "${WORKDIR}/git" #Default Dual License https://github.com/linux-rdma/rdma-core/blob/master/COPYING.md diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.0.8.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.0.10.bb index 2117e9ee3c..008aa8cb12 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.0.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.0.10.bb @@ -17,7 +17,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \ UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "16663585c0ffefd5593a6628d4a20cc8241b9703b11283cfe71ead2b750888c8" +SRC_URI[sha256sum] = "b2e3ff03fa2be9058a9ffbedd12b0a670433bd16c8cc6c432ab48dabc2df1898" PE = "1" diff --git a/meta-openembedded/meta-oe/README.md b/meta-openembedded/meta-oe/README.md index 676a2c8925..ec551ef3f8 100644 --- a/meta-openembedded/meta-oe/README.md +++ b/meta-openembedded/meta-oe/README.md @@ -4,7 +4,7 @@ meta-oe This layer depends on: URI: git://github.com/openembedded/openembedded-core.git -branch: master +branch: nanbield luajit recipe requires host compiler to be able to generate 32bit code when target is 32bit e.g. arm, so ensure that $CC -m32 is functional on build host, if building this recipe, needed @@ -16,10 +16,10 @@ pacman -S lib32-gcc-libs lib32-glibc Ubuntu sudo apt-get install gcc-multilib linux-libc-dev:i386 -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe][nanbield]' in the subject' When sending single patches, please use something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix="meta-oe][PATCH"' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix="meta-oe][nanbield][PATCH"' You are encouraged to fork the mirror on GitHub https://github.com/openembedded/meta-openembedded to share your patches, this is preferred for patch sets consisting of more than one patch. @@ -28,4 +28,4 @@ Other services like GitLab, repo.or.cz or self-hosted setups are of course accep 'git fetch <remote>' works the same on all of them. We recommend GitHub because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -layer maintainer: Khem Raj <raj.khem@gmail.com> +layer maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/meta-openembedded/meta-oe/classes/signing.bbclass b/meta-openembedded/meta-oe/classes/signing.bbclass index 5c74a319e4..79944e3fe9 100644 --- a/meta-openembedded/meta-oe/classes/signing.bbclass +++ b/meta-openembedded/meta-oe/classes/signing.bbclass @@ -224,6 +224,12 @@ signing_import_install() { } signing_prepare() { + export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules" + export OPENSSL_ENGINES="${STAGING_LIBDIR_NATIVE}/engines-3" + export OPENSSL_CONF="${STAGING_LIBDIR_NATIVE}/ssl-3/openssl.cnf" + export SSL_CERT_DIR="${STAGING_LIBDIR_NATIVE}/ssl-3/certs" + export SSL_CERT_FILE="${STAGING_LIBDIR_NATIVE}/ssl-3/cert.pem" + if [ -f ${OPENSSL_CONF} ]; then echo "Using '${OPENSSL_CONF}' for OpenSSL configuration" else @@ -308,9 +314,3 @@ signing_get_module() { python () { signing_class_prepare(d) } - -export OPENSSL_MODULES="${STAGING_LIBDIR_NATIVE}/ossl-modules" -export OPENSSL_ENGINES="${STAGING_LIBDIR_NATIVE}/engines-3" -export OPENSSL_CONF="${STAGING_LIBDIR_NATIVE}/ssl-3/openssl.cnf" -export SSL_CERT_DIR="${STAGING_LIBDIR_NATIVE}/ssl-3/certs" -export SSL_CERT_FILE="${STAGING_LIBDIR_NATIVE}/ssl-3/cert.pem" diff --git a/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index 81094bf9a5..bab9d4372c 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 @@ -36,6 +36,7 @@ PTESTS_FAST_META_OE = "\ uthash \ xmlsec1 \ zeromq \ + cjson \ " PTESTS_FAST_META_OE:append:x86 = " mcelog" PTESTS_FAST_META_OE:append:x86-64 = " mcelog" @@ -49,11 +50,14 @@ PTESTS_SLOW_META_OE = "\ libusb-compat \ rsyslog \ mariadb \ + re2 \ " +PTESTS_SLOW_META_OE:append:x86 = " kernel-selftest" +PTESTS_SLOW_META_OE:append:x86-64 = " kernel-selftest" +PTESTS_SLOW_META_OE:remove:libc-musl = "kernel-selftest" PTESTS_PROBLEMS_META_OE ="\ jemalloc \ - kernel-selftest \ keyutils \ libdbi-perl \ libgpiod \ diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff index 8ab5386dc1..cdb29f24dc 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff @@ -1,3 +1,5 @@ +Upstream-Status: Pending + === modified file 'openbox-xdgmenu.c' --- openbox-xdgmenu.c 2011-09-03 20:13:39 +0000 +++ openbox-xdgmenu.c 2013-12-28 17:41:04 +0000 diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/fix-menu-generation.patch b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/fix-menu-generation.patch index 03b357263f..3def090eb1 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/fix-menu-generation.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/fix-menu-generation.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: openbox-xdgmenu-0.3/openbox-xdgmenu.c =================================================================== --- openbox-xdgmenu-0.3.orig/openbox-xdgmenu.c diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/port-gnome-menus3.patch b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/port-gnome-menus3.patch index 3fcc319164..6d123482e8 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/port-gnome-menus3.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/port-gnome-menus3.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: openbox-xdgmenu-0.3/openbox-xdgmenu.c =================================================================== --- openbox-xdgmenu-0.3.orig/openbox-xdgmenu.c diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch index 0e38f7d8ec..d4c8a3d7fc 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -10,6 +10,8 @@ input.h [1] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + plugins/devinput.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Makefile.am-do-not-clobber-PYTHONPATH-from-build-env.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Makefile.am-do-not-clobber-PYTHONPATH-from-build-env.patch index 089ed23c73..11f6485b27 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Makefile.am-do-not-clobber-PYTHONPATH-from-build-env.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Makefile.am-do-not-clobber-PYTHONPATH-from-build-env.patch @@ -8,6 +8,8 @@ and so lirc's variable has to be named something else. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- +Upstream-Status: Pending + Makefile.am | 2 +- pylint.mak | 2 +- tools/Makefile.am | 2 +- diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch index e58a93b6f6..73bacc9139 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch @@ -7,7 +7,7 @@ This bites during cross compiling where the target is different than build host and build host might be ubuntu but that does not matter in cross compilation case. This fails builds when usrmerge feature is used -Upstream-Status: Inappropriates [ Cross-compile specific ] +Upstream-Status: Inappropriate [ Cross-compile specific ] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- configure.ac | 2 +- diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/fix_build_errors.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/fix_build_errors.patch index 41353dbbdc..ed840cd098 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/fix_build_errors.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/fix_build_errors.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff --git a/configure.ac b/configure.ac index 58347d8..8c7fca2 100644 --- a/configure.ac diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch index 8779c251a5..0bd7f80c26 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch @@ -5,6 +5,8 @@ Subject: [PATCH] don't fail if GLOB_BRACE is not defined Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + src/util.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.3.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.4.1.bb index 0987522ac8..79b263d9ba 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.3.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.4.1.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://thingsboard.io/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -SRC_URI[sha256sum] = "4d27661113c54e3b0998328f15ca7fd9e4837d1975c7c213595cb940f4b11484" +SRC_URI[sha256sum] = "680211741de1f8de20e91022a89d3c206737559e97b729fcf88b215237e7d85d" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend index 8cb8d22a2d..5c48fd5c03 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +++ b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend @@ -1 +1 @@ -RDEPENDS:packagegroup-meta-oe-support += "debsums rasdaemon" +RDEPENDS:packagegroup-meta-oe-support += "rasdaemon" diff --git a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/debsums/debsums_2.2.2.bb b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/debsums/debsums_2.2.2.bb deleted file mode 100644 index 252db1994e..0000000000 --- a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/debsums/debsums_2.2.2.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "Miscellaneous utilities specific to Debian" -SUMMARY:${PN}-cron = "Cron scripts to control automatic debsum checking" -DESCRIPTION = "A tool for verification of installed package files against \ -MD5 checksums debsums can verify the integrity of installed package files \ -against MD5 checksums installed by the package, or generated from a .deb \ -archive." -DESCRIPTION:${PN}-cron = "Cron scripts to control automatic system integrity \ -checking via debsums." -SECTION = "base" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=770d751553e6559e9eaefd2e11ccf7e9" - -SRC_URI = "http://snapshot.debian.org/archive/debian/20170530T212108Z/pool/main/d/debsums/debsums_2.2.2.tar.xz" -SRC_URI[md5sum] = "82b0710855a7e5212d4358163a269e79" -SRC_URI[sha256sum] = "aa61896f93a6bbfe0161c21dcd67529ae8e1ec8c3ccf244523c52c4ad8253d97" - -# the package is taken from snapshots.debian.org; that source is static and goes stale -# so we check the latest upstream from a directory that does get updated -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/" - -inherit perlnative gettext - -DEPENDS += "po4a-native" - -do_install() { - install -d ${D}/${sysconfdir}/cron.daily ${D}/${sysconfdir}/cron.weekly - install -d ${D}/${sysconfdir}/cron.monthly ${D}${sbindir} ${D}${bindir} - install -d ${D}${mandir}/man1 ${D}${mandir}/man8 - install -m 0755 debsums ${D}${bindir}/ - install -m 0755 rdebsums ${D}${bindir}/ - install -m 0755 debsums_init ${D}${sbindir} - install -m 0644 man/debsums.1 ${D}${mandir}/man1/ - install -m 0644 man/rdebsums.1 ${D}${mandir}/man1/ - install -m 0644 man/debsums_init.8 ${D}${mandir}/man8/ - install -m 0644 debian/cron.daily \ - ${D}/${sysconfdir}/cron.daily/debsums - install -m 0644 debian/cron.weekly \ - ${D}/${sysconfdir}/cron.weekly/debsums - install -m 0644 debian/cron.monthly \ - ${D}/${sysconfdir}/cron.monthly/debsums - # Must exist, defaults to empty. - touch ${D}/${sysconfdir}/debsums-ignore -} - -PACKAGES =+ "${PN}-cron" - -RDEPENDS:${PN} = "dpkg dpkg-perl libfile-fnmatch-perl perl \ - perl-module-constant perl-module-digest-md5 \ - perl-module-errno perl-module-fcntl \ - perl-module-file-basename perl-module-file-copy \ - perl-module-file-find perl-module-file-glob \ - perl-module-file-path perl-module-file-spec \ - perl-module-file-temp perl-module-getopt-long \ - perl-module-posix" - -FILES:${PN}-cron = "${sysconfdir}/cron.*" diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-Fixes-for-yocto-build.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-Fixes-for-yocto-build.patch index dcf27d805e..1d18d47ec3 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-Fixes-for-yocto-build.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-Fixes-for-yocto-build.patch @@ -8,6 +8,8 @@ Signed-off-by: JJ Robertson <jrobertson@snapchat.com> Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> --- +Upstream-Status: Pending + system/core/adb/daemon/file_sync_service.cpp | 4 ++-- system/core/adb/daemon/framebuffer_service.h | 2 -- system/core/adb/daemon/main.cpp | 5 +++-- diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch index 2b95ad2b0a..e749366bb6 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0002-android-tools-modifications-to-make-it-build-in-yoct.patch @@ -13,6 +13,8 @@ Subject: [PATCH] android-tools: modifications to make it build in yocto Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> --- +Upstream-Status: Pending + debian/external/boringssl/libcrypto.mk | 1 + debian/system/core/append2simg.mk | 2 +- debian/system/core/fastboot.mk | 2 +- diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch index 7ea040c68a..ea934f44d8 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch @@ -37,6 +37,8 @@ Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com> Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> --- +Upstream-Status: Pending + system/core/adb/client/usb_linux.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0004-adb-Fix-build-on-big-endian-systems.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0004-adb-Fix-build-on-big-endian-systems.patch index 83fe4475c3..c82423908f 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0004-adb-Fix-build-on-big-endian-systems.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0004-adb-Fix-build-on-big-endian-systems.patch @@ -21,6 +21,8 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> --- +Upstream-Status: Pending + system/core/adb/daemon/usb_ffs.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0005-adb-Allow-adbd-to-be-run-as-root.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0005-adb-Allow-adbd-to-be-run-as-root.patch index 3fbdcd4bac..dfbdc2af66 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0005-adb-Allow-adbd-to-be-run-as-root.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0005-adb-Allow-adbd-to-be-run-as-root.patch @@ -6,6 +6,8 @@ Subject: [PATCH] adb: Allow adbd to be run as root Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> --- +Upstream-Status: Pending + system/core/adb/daemon/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Add-riscv64-support.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Add-riscv64-support.patch index 4669f89d07..9fd0fa792c 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Add-riscv64-support.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Add-riscv64-support.patch @@ -24,6 +24,8 @@ Signed-off-by: Lifang Xia <lifang_xia@linux.alibaba.com> Signed-off-by: Mao Han <han_mao@linux.alibaba.com> Change-Id: Ib21ddf23cc83f332af202df7bffcaceec16063e0 --- +Upstream-Status: Pending + system/core/libunwindstack/Android.bp | 1 + system/core/libunwindstack/Elf.cpp | 2 + system/core/libunwindstack/Regs.cpp | 10 ++ diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Added-missing-headers.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Added-missing-headers.patch index c07e93660f..d827d7d3c2 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Added-missing-headers.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Added-missing-headers.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Added missing headers causing compile errors Author: Umang Parmar <umangjparmar@gmail.com> Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Nonnull.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Nonnull.patch index 8d1408a48e..54bd52c61a 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Nonnull.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Nonnull.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Bring Clang's _Nonnull keyword to GCC Author: Kai-Chung Yan Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Vector-cast.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Vector-cast.patch index b32d5f6f54..b2881e0213 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Vector-cast.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/Vector-cast.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Fix the weird error by GCC7 that fails to match the correct parent method. Author: Kai-Chung Yan Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/add-missing-headers.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/add-missing-headers.patch index 49d3ecefbb..681d2c6553 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/add-missing-headers.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/add-missing-headers.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Forwarded: not-needed --- a/system/core/fs_mgr/liblp/reader.cpp +++ b/system/core/fs_mgr/liblp/reader.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch index b926eddcdf..e8e216161e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Off-by-one error in the dwarf_to_unw_regnum function in include/dwarf_i.h in libunwind 1.1 allows local users to have unspecified impact via invalid dwarf opcodes. --- a/external/libunwind/include/dwarf_i.h diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/legacy_built-in_sync_functions.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/legacy_built-in_sync_functions.patch index ce1d4e52eb..a04a887c68 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/legacy_built-in_sync_functions.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/legacy_built-in_sync_functions.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Replace the legacy __sync built-in functions with __atomic ones libunwind uses the built-in __sync_* functions which are deprecated by GCC and should be replaced by __atomic_* ones. See the official manuals [1]. diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/user_pt_regs.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/user_pt_regs.patch index 600471f126..35df944d1c 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/user_pt_regs.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/user_pt_regs.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Author: Kai-Chung Yan <seamlikok@gmail.com> Last-Update: 2016-08-24 Description: Manual definition of struct user_pt_regs diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-attribute-issue-with-gcc.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-attribute-issue-with-gcc.patch index e0b4275579..441031f536 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-attribute-issue-with-gcc.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-attribute-issue-with-gcc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: remove clang-ism Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-build-on-non-x86.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-build-on-non-x86.patch index 98a5078244..b1caa60c4a 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-build-on-non-x86.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-build-on-non-x86.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: non-x86 arches do not have PAGE_SIZE Forwarded: not-needed --- a/system/core/base/cmsg.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-gettid-exception-declaration.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-gettid-exception-declaration.patch index 7fd228bff6..5f24d0b4a0 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-gettid-exception-declaration.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-gettid-exception-declaration.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: get libcutils building Forwarded: not-needed --- a/system/core/libcutils/include/cutils/threads.h diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-standard-namespace-errors.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-standard-namespace-errors.patch index e41a3576ae..4380308f13 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-standard-namespace-errors.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/fix-standard-namespace-errors.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Add missing 'std::' scope identifiers. Forwarded: not-needed --- a/system/core/libunwindstack/include/unwindstack/DwarfMemory.h diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/hard-code-build-number.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/hard-code-build-number.patch index 2a332eb689..4d7323bd2f 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/hard-code-build-number.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/hard-code-build-number.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: just hard code rather than deal with circular deps Forwarded: not-needed --- a/system/core/adb/adb.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/libusb-header-path.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/libusb-header-path.patch index 1663aae465..122bd70e7d 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/libusb-header-path.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/libusb-header-path.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: libusb.h comes from different location Author: Umang Parmar <umangjparmar@gmail.com> Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/move-log-file-to-proper-dir.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/move-log-file-to-proper-dir.patch index 006564b024..e8494ab433 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/move-log-file-to-proper-dir.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/move-log-file-to-proper-dir.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Update log file directory. Author: Umang Parmar <umangjparmar@gmail.com> Last Updated: 2018-05-17 diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/simg_dump-python3.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/simg_dump-python3.patch index e6933ef145..6664dc2aa5 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/simg_dump-python3.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/simg_dump-python3.patch @@ -5,6 +5,8 @@ Last-Update: 2019-01-05 Origin: https://bugs.debian.org/945646 --- +Upstream-Status: Pending + Index: android-platform-tools/system/core/libsparse/simg_dump.py =================================================================== --- android-platform-tools.orig/system/core/libsparse/simg_dump.py diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stdatomic.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stdatomic.patch index ea3711dfa2..e11f3cc783 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stdatomic.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stdatomic.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Fix incompatibility between <stdatomic.h> and <atomic> This 2 headers combined will cause errors for both GCC and Clang. This patch makes sure only one of them is present at any time. diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stub-out-fastdeploy.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stub-out-fastdeploy.patch index d2426a781d..d86ef230f7 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stub-out-fastdeploy.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/stub-out-fastdeploy.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Defer packaging fastdeploy with adb for 29.x.x tags. Forwarded: not-needed --- a/system/core/adb/client/commandline.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Add-riscv64-support.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Add-riscv64-support.patch index 4669f89d07..9fd0fa792c 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Add-riscv64-support.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Add-riscv64-support.patch @@ -24,6 +24,8 @@ Signed-off-by: Lifang Xia <lifang_xia@linux.alibaba.com> Signed-off-by: Mao Han <han_mao@linux.alibaba.com> Change-Id: Ib21ddf23cc83f332af202df7bffcaceec16063e0 --- +Upstream-Status: Pending + system/core/libunwindstack/Android.bp | 1 + system/core/libunwindstack/Elf.cpp | 2 + system/core/libunwindstack/Regs.cpp | 10 ++ diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Added-missing-headers.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Added-missing-headers.patch index c07e93660f..d827d7d3c2 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Added-missing-headers.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Added-missing-headers.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Added missing headers causing compile errors Author: Umang Parmar <umangjparmar@gmail.com> Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Nonnull.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Nonnull.patch index 8d1408a48e..54bd52c61a 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Nonnull.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Nonnull.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Bring Clang's _Nonnull keyword to GCC Author: Kai-Chung Yan Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Vector-cast.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Vector-cast.patch index b32d5f6f54..b2881e0213 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Vector-cast.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/Vector-cast.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Fix the weird error by GCC7 that fails to match the correct parent method. Author: Kai-Chung Yan Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/add-missing-headers.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/add-missing-headers.patch index 49d3ecefbb..681d2c6553 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/add-missing-headers.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/add-missing-headers.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Forwarded: not-needed --- a/system/core/fs_mgr/liblp/reader.cpp +++ b/system/core/fs_mgr/liblp/reader.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-attribute-issue-with-gcc.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-attribute-issue-with-gcc.patch index e0b4275579..441031f536 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-attribute-issue-with-gcc.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-attribute-issue-with-gcc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: remove clang-ism Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-build-on-non-x86.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-build-on-non-x86.patch index 98a5078244..b1caa60c4a 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-build-on-non-x86.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-build-on-non-x86.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: non-x86 arches do not have PAGE_SIZE Forwarded: not-needed --- a/system/core/base/cmsg.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-gettid-exception-declaration.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-gettid-exception-declaration.patch index 7fd228bff6..5f24d0b4a0 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-gettid-exception-declaration.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-gettid-exception-declaration.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: get libcutils building Forwarded: not-needed --- a/system/core/libcutils/include/cutils/threads.h diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-standard-namespace-errors.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-standard-namespace-errors.patch index e41a3576ae..4380308f13 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-standard-namespace-errors.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/fix-standard-namespace-errors.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Add missing 'std::' scope identifiers. Forwarded: not-needed --- a/system/core/libunwindstack/include/unwindstack/DwarfMemory.h diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/hard-code-build-number.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/hard-code-build-number.patch index 2a332eb689..4d7323bd2f 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/hard-code-build-number.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/hard-code-build-number.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: just hard code rather than deal with circular deps Forwarded: not-needed --- a/system/core/adb/adb.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/libusb-header-path.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/libusb-header-path.patch index 1663aae465..122bd70e7d 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/libusb-header-path.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/libusb-header-path.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: libusb.h comes from different location Author: Umang Parmar <umangjparmar@gmail.com> Forwarded: not-needed diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/move-log-file-to-proper-dir.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/move-log-file-to-proper-dir.patch index 006564b024..e8494ab433 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/move-log-file-to-proper-dir.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/move-log-file-to-proper-dir.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Update log file directory. Author: Umang Parmar <umangjparmar@gmail.com> Last Updated: 2018-05-17 diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/simg_dump-python3.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/simg_dump-python3.patch index e6933ef145..6664dc2aa5 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/simg_dump-python3.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/simg_dump-python3.patch @@ -5,6 +5,8 @@ Last-Update: 2019-01-05 Origin: https://bugs.debian.org/945646 --- +Upstream-Status: Pending + Index: android-platform-tools/system/core/libsparse/simg_dump.py =================================================================== --- android-platform-tools.orig/system/core/libsparse/simg_dump.py diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stdatomic.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stdatomic.patch index ea3711dfa2..e11f3cc783 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stdatomic.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stdatomic.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Fix incompatibility between <stdatomic.h> and <atomic> This 2 headers combined will cause errors for both GCC and Clang. This patch makes sure only one of them is present at any time. diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stub-out-fastdeploy.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stub-out-fastdeploy.patch index d2426a781d..d86ef230f7 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stub-out-fastdeploy.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/stub-out-fastdeploy.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Defer packaging fastdeploy with adb for 29.x.x tags. Forwarded: not-needed --- a/system/core/adb/client/commandline.cpp diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/throw-exception-on-unknown-os.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/throw-exception-on-unknown-os.patch index 6b07f17bfc..70e732131f 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/throw-exception-on-unknown-os.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/system/core/throw-exception-on-unknown-os.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Turn #error into exceptions So the library can be built on non-Linux platforms too, although can't guarauntee its functionality regarding that piece of code. diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/throw-exception-on-unknown-os.patch b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/throw-exception-on-unknown-os.patch index 6b07f17bfc..70e732131f 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/throw-exception-on-unknown-os.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/throw-exception-on-unknown-os.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Turn #error into exceptions So the library can be built on non-Linux platforms too, although can't guarauntee its functionality regarding that piece of code. diff --git a/meta-openembedded/meta-oe/files/static-group-meta-oe b/meta-openembedded/meta-oe/files/static-group-meta-oe new file mode 100644 index 0000000000..09c7cab2c4 --- /dev/null +++ b/meta-openembedded/meta-oe/files/static-group-meta-oe @@ -0,0 +1,8 @@ +redis:x:600: +xrdp:x:601: +sanlock:x:602: +mysql:x:603: +postgres:x:604: +zabbix:x:605: +mail:x:606: +nogroup:x:65534: diff --git a/meta-openembedded/meta-oe/files/static-passwd-meta-oe b/meta-openembedded/meta-oe/files/static-passwd-meta-oe new file mode 100644 index 0000000000..4c312b7b1f --- /dev/null +++ b/meta-openembedded/meta-oe/files/static-passwd-meta-oe @@ -0,0 +1,11 @@ +redis:x:600:600::/:/bin/nologin +xrdp:x:601:601::/:/bin/nologin +sanlock:x:602:602::/:/bin/nologin +mysql:x:603:603::/:/bin/nologin +postgres:x:604:604::/:/bin/nologin +zabbix:x:605:605::/:/bin/nologin +cyrus:x:606:nogroup::/:/bin/nologin +pcp:x:620:nogroup::/:/bin/nologin +pcpqa:x:621:nogroup::/:/bin/nologin +influxdb:x:622:nogroup::/:/bin/nologin +mongodb:x:623:nogroup::/:/bin/nologin
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0001-configure-Add-with-cpu.patch b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0001-configure-Add-with-cpu.patch deleted file mode 100644 index 41fb456c6c..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0001-configure-Add-with-cpu.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 73049e5a9e3698cc6d51471d70ac5e06bed803cc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Dec 2022 10:24:48 -0800 -Subject: [PATCH] configure: Add --with-cpu - -Some cross build systems e.g. yocto may use architectures different from cross compiler target tuple -arm-yoe-gnueabi but build for armv7a, AC_CANONICAL_HOST will fail in -this case even though target will be armv7a it will detect it as arm and -disable armv7a specific optimization paths. This option provides the -needed knob so it can be set explicitly e.g. --with-cpu=armv7a etc. if needed. - -Upstream-Status: Submitted [https://github.com/stressapptest/stressapptest/pull/100] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c839c87..403728c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -11,7 +11,14 @@ else - AC_MSG_NOTICE([Compiling with dynamically linked libraries.]) - fi - --AC_CANONICAL_HOST -+AC_ARG_WITH(cpu, [ --with-cpu define host cpu]) -+ -+if test -z "$with_cpu" -+then -+ AC_CANONICAL_HOST -+else -+ host_cpu=$with_cpu -+fi - # Checking for target cpu and setting custom configuration - # for the different platforms - AS_CASE(["$host_cpu"], diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0002-Replace-lfs64-functions-and-defines.patch b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0002-Replace-lfs64-functions-and-defines.patch deleted file mode 100644 index 48ff3ef93b..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0002-Replace-lfs64-functions-and-defines.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 9ab360fd018d267fe174713d7e14454408b26043 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Dec 2022 10:33:01 -0800 -Subject: [PATCH] Replace lfs64 functions and defines - -AC_SYS_LARGEFILE is already in use in configure.ac which detects -enabling lfs64 functions as needed, it will define _FILE_OFFSET_BITS=64 -which should make lseek same as lseek64 since off_t is 64bit on most of -current 32bit linux platforms - -Upstream-Status: Submitted [https://github.com/stressapptest/stressapptest/pull/100] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/os.cc | 18 ++++++------------ - src/worker.cc | 6 +++--- - 2 files changed, 9 insertions(+), 15 deletions(-) - -diff --git a/src/os.cc b/src/os.cc -index 1928e0a..faa6068 100644 ---- a/src/os.cc -+++ b/src/os.cc -@@ -142,7 +142,7 @@ int OsLayer::AddressMode() { - uint64 OsLayer::VirtualToPhysical(void *vaddr) { - uint64 frame, paddr, pfnmask, pagemask; - int pagesize = sysconf(_SC_PAGESIZE); -- off64_t off = ((uintptr_t)vaddr) / pagesize * 8; -+ off_t off = ((uintptr_t)vaddr) / pagesize * 8; - int fd = open(kPagemapPath, O_RDONLY); - - /* -@@ -154,7 +154,7 @@ uint64 OsLayer::VirtualToPhysical(void *vaddr) { - if (fd < 0) - return 0; - -- if (lseek64(fd, off, SEEK_SET) != off || read(fd, &frame, 8) != 8) { -+ if (lseek(fd, off, SEEK_SET) != off || read(fd, &frame, 8) != 8) { - int err = errno; - string errtxt = ErrorString(err); - logprintf(0, "Process Error: failed to access %s with errno %d (%s)\n", -@@ -607,9 +607,9 @@ bool OsLayer::AllocateTestMem(int64 length, uint64 paddr_base) { - dynamic_mapped_shmem_ = true; - } else { - // Do a full mapping here otherwise. -- shmaddr = mmap64(NULL, length, PROT_READ | PROT_WRITE, -- MAP_SHARED | MAP_NORESERVE | MAP_LOCKED | MAP_POPULATE, -- shm_object, 0); -+ shmaddr = mmap(NULL, length, PROT_READ | PROT_WRITE, -+ MAP_SHARED | MAP_NORESERVE | MAP_LOCKED | MAP_POPULATE, -+ shm_object, 0); - if (shmaddr == reinterpret_cast<void*>(-1)) { - int err = errno; - string errtxt = ErrorString(err); -@@ -704,18 +704,12 @@ void *OsLayer::PrepareTestMem(uint64 offset, uint64 length) { - if (dynamic_mapped_shmem_) { - // TODO(nsanders): Check if we can support MAP_NONBLOCK, - // and evaluate performance hit from not using it. --#ifdef HAVE_MMAP64 -- void * mapping = mmap64(NULL, length, PROT_READ | PROT_WRITE, -- MAP_SHARED | MAP_NORESERVE | MAP_LOCKED | MAP_POPULATE, -- shmid_, offset); --#else - void * mapping = mmap(NULL, length, PROT_READ | PROT_WRITE, - MAP_SHARED | MAP_NORESERVE | MAP_LOCKED | MAP_POPULATE, - shmid_, offset); --#endif - if (mapping == MAP_FAILED) { - string errtxt = ErrorString(errno); -- logprintf(0, "Process Error: PrepareTestMem mmap64(%llx, %llx) failed. " -+ logprintf(0, "Process Error: PrepareTestMem mmap(%llx, %llx) failed. " - "error: %s.\n", - offset, length, errtxt.c_str()); - sat_assert(0); -diff --git a/src/worker.cc b/src/worker.cc -index 745a816..41e93a0 100644 ---- a/src/worker.cc -+++ b/src/worker.cc -@@ -1705,7 +1705,7 @@ bool FileThread::WritePages(int fd) { - int strict = sat_->strict(); - - // Start fresh at beginning of file for each batch of pages. -- lseek64(fd, 0, SEEK_SET); -+ lseek(fd, 0, SEEK_SET); - for (int i = 0; i < sat_->disk_pages(); i++) { - struct page_entry src; - if (!GetValidPage(&src)) -@@ -1943,7 +1943,7 @@ bool FileThread::ReadPages(int fd) { - bool result = true; - - // Read our data back out of the file, into it's new location. -- lseek64(fd, 0, SEEK_SET); -+ lseek(fd, 0, SEEK_SET); - for (int i = 0; i < sat_->disk_pages(); i++) { - struct page_entry dst; - if (!GetEmptyPage(&dst)) -@@ -3153,7 +3153,7 @@ bool DiskThread::ValidateBlockOnDisk(int fd, BlockData *block) { - - // Read block from disk and time the read. If it takes longer than the - // threshold, complain. -- if (lseek64(fd, address * kSectorSize, SEEK_SET) == -1) { -+ if (lseek(fd, address * kSectorSize, SEEK_SET) == -1) { - logprintf(0, "Process Error: Unable to seek to sector %lld in " - "DiskThread::ValidateSectorsOnDisk on disk %s " - "(thread %d).\n", address, device_name_.c_str(), thread_num_); diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0003-configure-Check-for-pthread_rwlockattr_setkind_np-be.patch b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0003-configure-Check-for-pthread_rwlockattr_setkind_np-be.patch deleted file mode 100644 index b21a534d94..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/0003-configure-Check-for-pthread_rwlockattr_setkind_np-be.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d64a282b57352dde5f5b007947c005e504dc9a6b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Dec 2022 10:46:31 -0800 -Subject: [PATCH] configure: Check for pthread_rwlockattr_setkind_np before use - -musl does not implement this therefore detect this non-posix API before -using it - -Upstream-Status: Submitted [https://github.com/stressapptest/stressapptest/pull/100] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 1 + - src/worker.cc | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 403728c..47968cb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -157,6 +157,7 @@ AC_FUNC_STRERROR_R - AC_FUNC_VPRINTF - AC_CHECK_FUNCS([ftruncate gettimeofday memset munmap select socket strtol strtoull]) - AC_CHECK_FUNCS([mmap64 posix_memalign rand_r sched_getaffinity]) -+AC_CHECK_FUNCS([pthread_rwlockattr_setkind_np]) - - AC_CONFIG_FILES([Makefile src/Makefile]) - AC_OUTPUT -diff --git a/src/worker.cc b/src/worker.cc -index 41e93a0..c4abc87 100644 ---- a/src/worker.cc -+++ b/src/worker.cc -@@ -133,9 +133,11 @@ void WorkerStatus::Initialize() { - - pthread_rwlockattr_t attrs; - sat_assert(0 == pthread_rwlockattr_init(&attrs)); -+#ifdef HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP - // Avoid writer lock starvation. - sat_assert(0 == pthread_rwlockattr_setkind_np( - &attrs, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP)); -+#endif - sat_assert(0 == pthread_rwlock_init(&status_rwlock_, &attrs)); - - #ifdef HAVE_PTHREAD_BARRIERS diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/libcplusplus-compat.patch b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/libcplusplus-compat.patch deleted file mode 100644 index 8754e40697..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/libcplusplus-compat.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix compile on sytems using libc++ instead of libstdc++ - -libc++ does not really implement __gnu_cxx namespace and it -compiles fine without this namespace, therefore detect libc++ -and if it is used them exclude this namespace - -See https://github.com/stressapptest/stressapptest/issues/47 - -Fixes - -./sattypes.h:33:17: error: expected namespace name -using namespace __gnu_cxx; //NOLINT - -Upstream-Status: Submitted [https://github.com/stressapptest/stressapptest/pull/100] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- stressapptest-1.0.9.orig/src/sattypes.h -+++ stressapptest-1.0.9/src/sattypes.h -@@ -30,7 +30,9 @@ - #include "stressapptest_config_android.h" // NOLINT - #else - #include "stressapptest_config.h" // NOLINT -+#ifndef _LIBCPP_VERSION - using namespace __gnu_cxx; //NOLINT -+#endif // _LIBCPP_VERSION - #endif // __ANDROID__ - using namespace std; - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/read_sysfs_for_cachesize.patch b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/read_sysfs_for_cachesize.patch deleted file mode 100644 index 19261657ac..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest/read_sysfs_for_cachesize.patch +++ /dev/null @@ -1,72 +0,0 @@ -sysconf params like _SC_LEVEL1_DCACHE_LINESIZE are not universally -implemented, therefore check for them being available, if not there -then read the sysfs directly to get the value - -Upstream-Status: Submitted [https://github.com/stressapptest/stressapptest/pull/100] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/src/sat.cc -+++ b/src/sat.cc -@@ -1482,15 +1482,47 @@ int Sat::CpuCount() { - return sysconf(_SC_NPROCESSORS_CONF); - } - -+int Sat::ReadInt(const char *filename, int *value) { -+ char line[64]; -+ int fd = open(filename, O_RDONLY), err = -1; -+ -+ if (fd < 0) -+ return -1; -+ if (read(fd, line, sizeof(line)) > 0) { -+ *value = atoi(line); -+ err = 0; -+ } -+ -+ close(fd); -+ return err; -+} -+ - // Return the worst case (largest) cache line size of the various levels of - // cache actually prsent in the machine. - int Sat::CacheLineSize() { -- int max_linesize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); -- int linesize = sysconf(_SC_LEVEL2_CACHE_LINESIZE); -+ int max_linesize, linesize; -+#ifdef _SC_LEVEL1_DCACHE_LINESIZE -+ max_linesize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); -+#else -+ ReadInt("/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size", &max_linesize); -+#endif -+#ifdef _SC_LEVEL2_DCACHE_LINESIZE -+ linesize = sysconf(_SC_LEVEL2_DCACHE_LINESIZE); -+#else -+ ReadInt("/sys/devices/system/cpu/cpu0/cache/index1/coherency_line_size", &linesize); -+#endif - if (linesize > max_linesize) max_linesize = linesize; -- linesize = sysconf(_SC_LEVEL3_CACHE_LINESIZE); -+#ifdef _SC_LEVEL3_DCACHE_LINESIZE -+ linesize = sysconf(_SC_LEVEL3_DCACHE_LINESIZE); -+#else -+ ReadInt("/sys/devices/system/cpu/cpu0/cache/index2/coherency_line_size", &linesize); -+#endif - if (linesize > max_linesize) max_linesize = linesize; -- linesize = sysconf(_SC_LEVEL4_CACHE_LINESIZE); -+#ifdef _SC_LEVEL4_DCACHE_LINESIZE -+ linesize = sysconf(_SC_LEVEL4_DCACHE_LINESIZE); -+#else -+ ReadInt("/sys/devices/system/cpu/cpu0/cache/index3/coherency_line_size", &linesize); -+#endif - if (linesize > max_linesize) max_linesize = linesize; - return max_linesize; - } ---- a/src/sat.h -+++ b/src/sat.h -@@ -136,7 +136,8 @@ class Sat { - int CpuCount(); - // Return the worst-case (largest) cache line size of the system. - int CacheLineSize(); -- -+ // Read int values from kernel file system e.g. sysfs -+ int ReadInt(const char *filename, int *value); - // Collect error counts from threads. - int64 GetTotalErrorCount(); - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.11.bb index 02144c558a..ba61ff971e 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.9.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/stressapptest/stressapptest_1.0.11.bb @@ -9,22 +9,14 @@ SECTION = "benchmark" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=55ea9d559f985fb4834317d8ed6b9e58" -SRCREV = "9146a8bfe3e3daefa95f7a61b75183e5fc64af2c" - -PV .= "+1.0.10git${SRCPV}" +SRCREV = "25e31a2c1fcc66f3a43e91998f0819b016322a70" EXTRA_AUTOCONF:append:armv7a = " --with-cpu=armv7a" EXTRA_AUTOCONF:append:armv7ve = " --with-cpu=armv7a" GI_DATA_ENABLED:libc-musl:armv7a = "False" GI_DATA_ENABLED:libc-musl:armv7ve = "False" -SRC_URI = "git://github.com/stressapptest/stressapptest;branch=master;protocol=https \ - file://libcplusplus-compat.patch \ - file://read_sysfs_for_cachesize.patch \ - file://0001-configure-Add-with-cpu.patch \ - file://0002-Replace-lfs64-functions-and-defines.patch \ - file://0003-configure-Check-for-pthread_rwlockattr_setkind_np-be.patch \ - " +SRC_URI = "git://github.com/stressapptest/stressapptest;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-bsp/bolt/bolt_0.9.5.bb b/meta-openembedded/meta-oe/recipes-bsp/bolt/bolt_0.9.5.bb index b6ad6337ce..0cc9d85422 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/bolt/bolt_0.9.5.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/bolt/bolt_0.9.5.bb @@ -12,6 +12,8 @@ SRCREV = "5a8a5866a847561566499847d46a97c612b4e6dd" S = "${WORKDIR}/git" +CVE_PRODUCT = "freedesktop:bolt" + inherit cmake pkgconfig meson features_check FILES:${PN} += "${datadir}/dbus-1/* \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.5.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.6.bb index 492de65a85..0d8923f342 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.5.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.6.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022 \ file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" DEPENDS = "json-c libnvme" -SRCREV = "d6c07e0de9be777009ebb9ab7475bee1ae3e0e95" +SRCREV = "bd2f882a49a14b0e21a94c928128b1979e4316fd" SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.28.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.30.0.bb index a35d9898ec..59d5e87b8e 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.28.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.30.0.bb @@ -11,8 +11,8 @@ DEPENDS = "glib-2.0 glib-2.0-native libgudev" inherit meson pkgconfig bash-completion gobject-introspection -SRCREV = "7f1c7907c4654ba5c619a635cef5475ca161d027" -SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libmbim.git;protocol=https;branch=mbim-1-28" +SRCREV = "8415687e4f30ae5e36f407f179c8147f1529725c" +SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libmbim.git;protocol=https;branch=mbim-1-30" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-.patch b/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-.patch deleted file mode 100644 index a32414bdf6..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet/0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a1659e261888bdbed51803132d52d9a6c6803c8a Mon Sep 17 00:00:00 2001 -From: Joachim Nilsson <troglobit@gmail.com> -Date: Sat, 19 Oct 2019 12:26:26 +0200 -Subject: [PATCH] Use standard int64_t instead of __int64_t for mingw cross - build - -Signed-off-by: Joachim Nilsson <troglobit@gmail.com> ---- -Upstream-Status: Pending - - include/libnet/libnet-structures.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/libnet/libnet-structures.h b/include/libnet/libnet-structures.h -index 6084caa..34fffc6 100644 ---- a/include/libnet/libnet-structures.h -+++ b/include/libnet/libnet-structures.h -@@ -49,9 +49,9 @@ struct libnet_port_list_chain - /* libnet statistics structure */ - struct libnet_stats - { -- __int64_t packets_sent; /* packets sent */ -- __int64_t packet_errors; /* packets errors */ -- __int64_t bytes_written; /* bytes written */ -+ int64_t packets_sent; /* packets sent */ -+ int64_t packet_errors; /* packets errors */ -+ int64_t bytes_written; /* bytes written */ - }; - - --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.3.bb index eaa0a0445d..b4648832f1 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.3.bb @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=07f291bf6e78efa05cec668cf6a09acc" DEPENDS = "libpcap" -SRC_URI = "git://github.com/libnet/libnet.git;protocol=https;branch=master \ - file://0001-Use-standard-int64_t-instead-of-__int64_t-for-mingw-.patch" +SRC_URI = "git://github.com/libnet/libnet.git;protocol=https;branch=master" SRC_URI[sha256sum] = "1e9e9054d688b059bcbaf878d8c4fbf69bfc0c9386cd4e7779fbb53339050d2e" -SRCREV = "deeeeaeb84f8bc5d2299913d4ccf53d0d4c26966" +SRCREV = "deaebdfe2743e8a6f04d3c307d9272afeeecfade" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb index e0df18a50c..afec2753cb 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs_5.0.2.bb @@ -3,10 +3,15 @@ HOMEPAGE = "https://github.com/sahlberg/libnfs" LICENSE = "LGPL-2.1-only & BSD-2-Clause & GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=825301ba17efc9d188ee0abd4b924ada" -SRC_URI = "git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \ - file://0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch \ +SRC_URI = " \ + git://github.com/sahlberg/libnfs.git;protocol=https;branch=master \ + file://0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch \ " SRCREV = "40348f45d6beb8a8f50b6b63414a98fc1a061b7d" S = "${WORKDIR}/git" inherit cmake + +do_install:append() { + rm -f ${D}${libdir}/cmake/libnfs/libnfs-config.cmake +} diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.32.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.34.0.bb index 7b7a3b2350..2cb843a4af 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.32.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.34.0.bb @@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 glib-2.0-native" inherit meson pkgconfig bash-completion gobject-introspection -SRCREV = "6e248aceb66f53b467b343bca1c467a8211dd30d" -SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-32" +SRCREV = "3f07d6e5b4677558543b3b4484ea88ad92257e92" +SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-34" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb index 5e6069fb81..95c2854fa6 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb @@ -4,6 +4,7 @@ LICENSE = "MIT & Zlib & BSD-3-Clause & Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=382bfdf329e774859fd401eaf850d29b" DEPENDS = "zlib" +DEPENDS:append:class-native = " libcap-native" S = "${WORKDIR}/git" SRCREV = "b0a749c8e7a8294b68581ce4feac0e55045eb00b" @@ -61,3 +62,5 @@ RDEPENDS:${PN}-dev += " ${@bb.utils.contains('PACKAGECONFIG', 'static', '${PN}-s # Avoid absolute paths to end up in the sysroot. SSTATE_SCAN_FILES += "*.cmake" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch index 60f2079d37..ae54469927 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-include-string.h-for-strncpy.patch @@ -1,4 +1,4 @@ -From d49b4fb8063ecd89617587e5ea566cc9da9393ef Mon Sep 17 00:00:00 2001 +From ecfc8e287eb6811e42c4e2800a913822f554d7c8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 31 Aug 2022 19:09:18 -0700 Subject: [PATCH] include string.h for strncpy() @@ -6,12 +6,13 @@ Subject: [PATCH] include string.h for strncpy() Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- interface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/interface.c b/interface.c -index 65bdff0..5228db9 100644 +index 29229ad..9a83c36 100644 --- a/interface.c +++ b/interface.c @@ -5,6 +5,7 @@ @@ -22,6 +23,3 @@ index 65bdff0..5228db9 100644 #include "interface.h" struct interface { --- -2.37.3 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-makefile-use-conditional-assignment-for-KBUILD_OUTPU.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-makefile-use-conditional-assignment-for-KBUILD_OUTPU.patch deleted file mode 100644 index fb51906521..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0001-makefile-use-conditional-assignment-for-KBUILD_OUTPU.patch +++ /dev/null @@ -1,42 +0,0 @@ -From dfd38cb29c0768692f886d3ab9158bd2b3132582 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 22 Nov 2022 15:20:48 +0800 -Subject: [PATCH] makefile: use conditional assignment for KBUILD_OUTPUT - -Refer [1],from make 4.4, all variables that are marked as export will -also be passed to the shell started by the shell function. use "=" will -make KBUILD_OUTPUT always empty for shell function, use "?=" to make -"export KBUILD_OUTPUT" in enrironment can work. - -[snip of 4.4 NEWS] -* WARNING: Backward-incompatibility! - Previously makefile variables marked as export were not exported to commands - started by the $(shell ...) function. Now, all exported variables are - exported to $(shell ...). -[snip] - -[1] https://git.savannah.gnu.org/cgit/make.git/tree/NEWS?h=4.4&id=ed493f6c9116cc217b99c2cfa6a95f15803235a2#n74 - -Upstream-Status: Submitted [linuxptp-devel@lists.sourceforge.net] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/makefile b/makefile -index 529d8a0..3db60fa 100644 ---- a/makefile -+++ b/makefile -@@ -15,7 +15,7 @@ - # with this program; if not, write to the Free Software Foundation, Inc., - # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - --KBUILD_OUTPUT = -+KBUILD_OUTPUT ?= - - DEBUG = - CC ?= $(CROSS_COMPILE)gcc --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch new file mode 100644 index 0000000000..e6a3386df0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0002-linuxptp-Use-CC-in-incdefs.sh.patch @@ -0,0 +1,34 @@ +From 2cc19a679ec37715df546dd9f00d8d9b0ab20059 Mon Sep 17 00:00:00 2001 +From: Luca Fancellu <luca.fancellu@arm.com> +Date: Wed, 18 Oct 2023 11:10:18 +0100 +Subject: [PATCH] linuxptp: Use ${CC} in incdefs.sh + +The Makefile is defining CC and incdefs.sh is using +${CROSS_COMPILE}cpp inside it, allowing both to use different +compilers depending on what the user pass during make invocation +as CC. + +Align them using ${CC} also inside incdefs.sh + +Signed-off-by: Luca Fancellu <luca.fancellu@arm.com> +Upstream-Status: Pending +--- + incdefs.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/incdefs.sh b/incdefs.sh +index a9e94f777f6b..391e63c7fac6 100755 +--- a/incdefs.sh ++++ b/incdefs.sh +@@ -27,7 +27,7 @@ user_flags() + printf " -D_GNU_SOURCE" + + # Get list of directories searched for header files. +- dirs=$(echo "" | ${CROSS_COMPILE}cpp -Wp,-v 2>&1 >/dev/null | grep ^" /") ++ dirs=$(${CC} -E -Wp,-v -xc /dev/null 2>&1 >/dev/null | grep ^" /") + + # Look for clock_adjtime(). + for d in $dirs; do +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch deleted file mode 100644 index 876088649e..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/Use-cross-cpp-in-incdefs.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8a4cad5e2f2cbb6a34bdc6e877fe499502b8c4c8 Mon Sep 17 00:00:00 2001 -From: Marcel Ziswiler <marcel.ziswiler@toradex.com> -Date: Fri, 23 Dec 2016 18:12:29 +0100 -Subject: [PATCH] linuxptp: Use cross cpp in incdefs - -Use cross cpp incdefs.sh shell script since we are doing cross compiling -we need to ensure we use correct setttings from toolchain - -Upstream-Status: Inappropriate [OE-Specific] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - - makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/incdefs.sh -+++ b/incdefs.sh -@@ -27,7 +27,7 @@ user_flags() - printf " -D_GNU_SOURCE" - - # Get list of directories searched for header files. -- dirs=$(echo "" | ${CROSS_COMPILE}cpp -Wp,-v 2>&1 >/dev/null | grep ^" /") -+ dirs=$(${CPP} -Wp,-v -xc /dev/null 2>&1 >/dev/null | grep ^" /") - - # Look for clock_adjtime(). - for d in $dirs; do diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch deleted file mode 100644 index 55ce4c9a90..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch +++ /dev/null @@ -1,37 +0,0 @@ -From af485c638c61fa883212ea424e676fbf90bee594 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Tue, 1 Jul 2014 17:37:31 -0300 -Subject: [PATCH] build: Allow CC and prefix to be overriden - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/makefile b/makefile -index 22e7d0d..809cc8f 100644 ---- a/makefile -+++ b/makefile -@@ -18,7 +18,7 @@ - KBUILD_OUTPUT = - - DEBUG = --CC = $(CROSS_COMPILE)gcc -+CC ?= $(CROSS_COMPILE)gcc - VER = -DVER=$(version) - CFLAGS = -Wall $(VER) $(incdefs) $(DEBUG) $(EXTRA_CFLAGS) - LDLIBS = -lm -lrt -pthread $(EXTRA_LDFLAGS) -@@ -43,7 +43,7 @@ incdefs := $(shell $(srcdir)/incdefs.sh) - version := $(shell $(srcdir)/version.sh $(srcdir)) - VPATH = $(srcdir) - --prefix = /usr/local -+prefix ?= /usr/local - sbindir = $(prefix)/sbin - mandir = $(prefix)/man - man8dir = $(mandir)/man8 --- -1.7.10.4 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/phc2sys@.service.in b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/phc2sys@.service.in new file mode 100644 index 0000000000..f66dd2d010 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/phc2sys@.service.in @@ -0,0 +1,13 @@ +[Unit] +Description=Synchronize system clock or PTP hardware clock (PHC) +Documentation=man:phc2sys +Requires=ptp4l.service +After=ptp4l.service +Before=time-sync.target + +[Service] +Type=simple +ExecStart=@SBINDIR@/phc2sys -w -s %I + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/ptp4l@.service.in b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/ptp4l@.service.in new file mode 100644 index 0000000000..2502181412 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/systemd/ptp4l@.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=Precision Time Protocol (PTP) service for %I +Documentation=man:ptp4l +After=sys-subsystem-net-devices-%i.device + +[Service] +Type=simple +ExecStart=@SBINDIR@/ptp4l -f @SYSCONFDIR@/linuxptp/ptp4l.conf -i %I + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.1.bb deleted file mode 100644 index 5903cb38ca..0000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux" -HOMEPAGE = "http://linuxptp.sourceforge.net/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v3.1/linuxptp-${PV}.tgz \ - file://build-Allow-CC-and-prefix-to-be-overriden.patch \ - file://Use-cross-cpp-in-incdefs.patch \ - file://0001-include-string.h-for-strncpy.patch \ - file://0001-makefile-use-conditional-assignment-for-KBUILD_OUTPU.patch \ - " - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/linuxptp/files/" -UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" - -SRC_URI[sha256sum] = "94d6855f9b7f2d8e9b0ca6d384e3fae6226ce6fc012dbad02608bdef3be1c0d9" - -EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}' mandir=${mandir}" - -export KBUILD_OUTPUT="${RECIPE_SYSROOT}" - -do_install() { - oe_runmake install DESTDIR=${D} prefix=${prefix} - - # Install example configs from source tree - install -d ${D}${docdir}/${PN} - cp -R --no-dereference --preserve=mode,links ${S}/configs ${D}${docdir}/${PN} -} - -PACKAGES =+ "${PN}-configs" - -FILES:${PN}-configs = "${docdir}" -FILES:${PN}-doc = "${mandir}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb new file mode 100644 index 0000000000..9a5c9b5204 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb @@ -0,0 +1,62 @@ +SUMMARY = "linuxptp package for linux" +DESCRIPTION = "Precision Time Protocol (PTP) according to IEEE standard 1588 \ +for Linux" +HOMEPAGE = "http://linuxptp.sourceforge.net/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +LINUXPTP_SRC_URI = "http://sourceforge.net/projects/linuxptp" + +SRC_URI = "${LINUXPTP_SRC_URI}/files/v4.1/linuxptp-${PV}.tgz \ + file://0001-include-string.h-for-strncpy.patch \ + file://0002-linuxptp-Use-CC-in-incdefs.sh.patch \ + file://systemd/phc2sys@.service.in \ + file://systemd/ptp4l@.service.in \ + " + +SRC_URI[md5sum] = "1db8699fc155965341759be5e5aad938" +SRC_URI[sha256sum] = "e1743d44f8208897e30895da3579e670ff919b914feb4b5a949f3e421ddde535" + +inherit systemd + +UPSTREAM_CHECK_URI = "${LINUXPTP_SRC_URI}/files/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" + +EXTRA_OEMAKE = "CC='${CC}' EXTRA_CFLAGS='${CFLAGS}' mandir='${mandir}' \ + sbindir='${sbindir}'" + +export KBUILD_OUTPUT="${RECIPE_SYSROOT}" + +LINUXPTP_SYSTEMD_SERVICES = "phc2sys@.service ptp4l@.service" + +do_install() { + oe_runmake install DESTDIR=${D} + + # Install example configs from source tree + install -d ${D}${docdir}/${PN} + cp -R --no-dereference --preserve=mode,links ${S}/configs \ + ${D}${docdir}/${PN} + + # Install default configuration files + install -d ${D}/${sysconfdir}/linuxptp/ + install -m 644 ${S}/configs/default.cfg \ + ${D}${sysconfdir}/linuxptp/ptp4l.conf + + # Install systemd services + install -d ${D}/${systemd_unitdir}/system/ + for service in ${LINUXPTP_SYSTEMD_SERVICES}; do + sed -i -e 's,@SBINDIR@,${sbindir},g' \ + ${WORKDIR}/systemd/$service.in + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${WORKDIR}/systemd/$service.in + install -m 644 ${WORKDIR}/systemd/$service.in \ + ${D}/${systemd_unitdir}/system/$service + done +} + +SYSTEMD_SERVICE:${PN} = "${LINUXPTP_SYSTEMD_SERVICES}" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" + +PACKAGES =+ "${PN}-configs" + +FILES:${PN}-configs += "${docdir}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.20.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.22.0.bb index ba82d21508..95884f44c3 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.20.6.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.22.0.bb @@ -12,8 +12,8 @@ inherit gnomebase gettext systemd gobject-introspection bash-completion DEPENDS = "glib-2.0 libgudev libxslt-native dbus" -SRCREV = "6aa0ff583d04aea88b4da7a1c20049f57062dab6" -SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=mm-1-20" +SRCREV = "03f786ce66360d67c669f4f122f8aa458e6f01ea" +SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=mm-1-22" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh/0001-configure.ac-add-support-of-protobuf-4.22.x.patch b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh/0001-configure.ac-add-support-of-protobuf-4.22.x.patch new file mode 100644 index 0000000000..088124391c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh/0001-configure.ac-add-support-of-protobuf-4.22.x.patch @@ -0,0 +1,63 @@ +From d9a1a6aac5a3b270449d09ec0d2a556807ab9287 Mon Sep 17 00:00:00 2001 +From: Xiangyu Chen <xiangyu.chen@windriver.com> +Date: Wed, 29 Mar 2023 13:53:44 +0800 +Subject: [PATCH] configure.ac: add support of protobuf 4.22.x + +the protobuf 4.22x is using c++14 as default, this caused the mosh cannot compile anymore and report following error: + +.... +/usr/include/google/protobuf/port_def.inc:200:15: error: static assertion failed: Protobuf only supports C++14 and newer. +| 200 | static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and newer."); +| | ^~~~~~~~~~~~~~~~~~~~~~ +.... + +Upstream-Status: Pending [https://github.com/mobile-shell/mosh/pull/1266] + +Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> +--- + configure.ac | 8 ++++++++ + src/frontend/Makefile.am | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ee70c7b..5457009 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -26,6 +26,10 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + AS_IF([pkg-config --atleast-version 3.6.0 protobuf], + [AX_CXX_COMPILE_STDCXX([11])]) + ++# If current protobuf 4.22+ update the requires to C++14. ++AS_IF([pkg-config --atleast-version 4.22.0 protobuf], ++ [AX_CXX_COMPILE_STDCXX([14])]) ++ + WARNING_CXXFLAGS="" + PICKY_CXXFLAGS="" + DISTCHECK_CXXFLAGS="" +@@ -311,6 +315,10 @@ AC_CHECK_FUNCS(m4_normalize([ + pledge + ])) + ++AS_IF([pkg-config --atleast-version 4.22.0 protobuf], ++ [PKG_CHECK_MODULES([ABSL_LOG_INTERNAL_CHECK_OP], [absl_log_internal_check_op],[], ++ [AC_MSG_ERROR([Missing abseil-cpp library.])])]) ++ + # Start by trying to find the needed tinfo parts by pkg-config + PKG_CHECK_MODULES([TINFO], [tinfo], + [AC_DEFINE([HAVE_CURSES_H], [1], [Define to 1 if <curses.h> is present])], +diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am +index 1aa83fd..399ecd6 100644 +--- a/src/frontend/Makefile.am ++++ b/src/frontend/Makefile.am +@@ -1,7 +1,7 @@ + AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(CRYPTO_CFLAGS) + AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS) + AM_LDFLAGS = $(HARDEN_LDFLAGS) $(CODE_COVERAGE_LIBS) +-LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS) $(CRYPTO_LIBS) ++LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS) $(CRYPTO_LIBS) $(ABSL_LOG_INTERNAL_CHECK_OP_LIBS) + + mosh_server_LDADD = $(LDADD) + +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb index 2869e06336..0ee050da99 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb @@ -12,9 +12,12 @@ HOMEPAGE = "http://mosh.mit.edu" LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter" +DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter abseil-cpp" + +SRC_URI = "https://mosh.org/${BP}.tar.gz \ + file://0001-configure.ac-add-support-of-protobuf-4.22.x.patch \ + " -SRC_URI = "https://mosh.org/${BP}.tar.gz" SRC_URI[sha256sum] = "872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.12.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.13.bb index 4decb098c7..6f229001f6 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.12.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.13.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \ SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=https;branch=master" -SRCREV = "4157a27d39f1dd5b95750ecb6acd1481432785d8" +SRCREV = "07a875788d8cc6f5833b12581d6e3e349b34d719" DEPENDS = "openssl" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb b/meta-openembedded/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb new file mode 100644 index 0000000000..39c6942c83 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb @@ -0,0 +1,21 @@ +SUMMARY = "A multiplatform C++ library for capturing, parsing and crafting of network packets" +HOMEPAGE = "https://pcapplusplus.github.io/" +BUGTRACKER = "https://github.com/seladb/PcapPlusPlus/issues" +SECTION = "libs/network" +LICENSE = "Unlicense" +LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" + +DEPENDS = "libpcap" + +SRC_URI = "git://github.com/seladb/PcapPlusPlus.git;protocol=https;branch=master" +SRCREV = "4cf8ed44f9dd145f874dc1dd747dfefcfcab75be" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGECONFIG ??= "" +PACKAGECONFIG[examples] = "-DPCAPPP_BUILD_EXAMPLES=ON,-DPCAPPP_BUILD_EXAMPLES=OFF" +PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF" +PACKAGECONFIG[tests] = "-DPCAPPP_BUILD_TESTS=ON,-DPCAPPP_BUILD_TESTS=OFF" +PACKAGECONFIG[zstd] = "-DLIGHT_PCAPNG_ZSTD=ON,-DLIGHT_PCAPNG_ZSTD=OFF,zstd" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.13.bb b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.13.bb index a4c244d447..47f2c26ce4 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.13.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.3.13.bb @@ -14,5 +14,3 @@ SRC_URI[sha256sum] = "ed8b98448d535111d9a593b067601a8b53e2874814d706b2421a9490a6 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" inherit autotools pkgconfig - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb index 86fde7ccfb..ce9d758d9f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb @@ -30,8 +30,6 @@ PACKAGECONFIG[nss] = "-DCZMQ_WITH_NSS=ON,-DCZMQ_WITH_NSS=OFF,nss" PACKAGECONFIG[systemd] = "-DCZMQ_WITH_SYSTEMD=ON,-DCZMQ_WITH_SYSTEMD=OFF,systemd" PACKAGECONFIG[uuid] = "-DCZMQ_WITH_UUID=ON,-DCZMQ_WITH_UUID=OFF,util-linux" -BBCLASSEXTEND = "nativesdk" - do_install:append() { mkdir -p ${D}/${includedir}/${BPN} mv ${D}/${includedir}/sha1.h ${D}/${includedir}/${BPN}/. diff --git a/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc b/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc index 0972aff32c..160a5a9f87 100644 --- a/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc +++ b/meta-openembedded/meta-oe/recipes-core/emlog/emlog.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=https;branch=master" SRCREV = "a9bbf324fde131ff4cf064e32674086c4ced4dca" - +PV = "0.70+git${SRCPV}" S = "${WORKDIR}/git" EXTRA_OEMAKE += " \ diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-all.bb index 1565549059..1338adf29f 100644 --- a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image.bb +++ b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-all.bb @@ -1,4 +1,4 @@ -require meta-oe-image-base.bb +require recipes-core/images/core-image-base.bb SUMMARY = "meta-oe build test image" diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-base.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-base.bb deleted file mode 100644 index df92f16705..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-base.bb +++ /dev/null @@ -1,7 +0,0 @@ -SUMMARY = "meta-oe build test image" - -IMAGE_INSTALL = "packagegroup-core-boot" - -LICENSE = "MIT" - -inherit core-image diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb index 0ea03dd2e3..e8e1750b0e 100644 --- a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb +++ b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb @@ -12,9 +12,9 @@ require conf/include/ptest-packagelists-meta-oe.inc PTESTS_META_OE = "${PTESTS_FAST_META_OE} ${PTESTS_SLOW_META_OE}" do_testimage[noexec] = "1" -do_testimage[depends] = "${@' '.join(['meta-oe-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_OE').split()])}" +do_testimage[depends] = "${@' '.join(['meta-oe-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_OE').split()])}" -do_build[depends] = "${@' '.join(['meta-oe-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_OE').split()])}" +do_build[depends] = "${@' '.join(['meta-oe-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_OE').split()])}" # normally image.bbclass would do this EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-fast.bb index f56e841ff1..46b48d65d6 100644 --- a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb +++ b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-fast.bb @@ -1,4 +1,4 @@ -require meta-oe-ptest-all-image.bb +require meta-oe-image-ptest-all.bb DESCRIPTION = "Recipe to trigger execution of all fast meta-oe ptest images." diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-image.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest.bb index 613da02977..4cd1f4497c 100644 --- a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-ptest-image.bb +++ b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest.bb @@ -1,10 +1,9 @@ inherit features_check REQUIRED_DISTRO_FEATURES = "ptest" +require recipes-core/images/core-image-minimal.bb require conf/include/ptest-packagelists-meta-oe.inc -require meta-oe-image-base.bb - SUMMARY = "meta-oe ptest test image" DESCRIPTION += "Also including the ${MCNAME} ptest package." diff --git a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc index 90a5017af9..71ab9f9ec3 100644 --- a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc +++ b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc @@ -6,34 +6,34 @@ SRC_URI += " \ crate://crates.io/aho-corasick/1.0.4 \ crate://crates.io/android-tzdata/0.1.1 \ crate://crates.io/android_system_properties/0.1.5 \ - crate://crates.io/anstream/0.3.2 \ + crate://crates.io/anstream/0.5.0 \ crate://crates.io/anstyle/1.0.0 \ crate://crates.io/anstyle-parse/0.2.0 \ crate://crates.io/anstyle-query/1.0.0 \ - crate://crates.io/anstyle-wincon/1.0.1 \ + crate://crates.io/anstyle-wincon/2.1.0 \ crate://crates.io/arrayref/0.3.6 \ - crate://crates.io/arrayvec/0.7.2 \ + crate://crates.io/arrayvec/0.7.4 \ crate://crates.io/autocfg/1.1.0 \ crate://crates.io/bigdecimal/0.4.0 \ crate://crates.io/binary-heap-plus/0.5.0 \ crate://crates.io/bindgen/0.63.0 \ crate://crates.io/bitflags/1.3.2 \ - crate://crates.io/bitflags/2.3.3 \ - crate://crates.io/blake2b_simd/1.0.1 \ - crate://crates.io/blake3/1.4.0 \ + crate://crates.io/bitflags/2.4.0 \ + crate://crates.io/blake2b_simd/1.0.2 \ + crate://crates.io/blake3/1.5.0 \ crate://crates.io/block-buffer/0.10.3 \ - crate://crates.io/bstr/1.6.0 \ + crate://crates.io/bstr/1.7.0 \ crate://crates.io/bumpalo/3.11.1 \ - crate://crates.io/bytecount/0.6.3 \ - crate://crates.io/byteorder/1.4.3 \ + crate://crates.io/bytecount/0.6.4 \ + crate://crates.io/byteorder/1.5.0 \ crate://crates.io/cc/1.0.79 \ crate://crates.io/cexpr/0.6.0 \ crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/chrono/0.4.28 \ + crate://crates.io/chrono/0.4.31 \ crate://crates.io/clang-sys/1.4.0 \ - crate://crates.io/clap/4.3.21 \ - crate://crates.io/clap_builder/4.3.21 \ - crate://crates.io/clap_complete/4.3.0 \ + crate://crates.io/clap/4.4.2 \ + crate://crates.io/clap_builder/4.4.2 \ + crate://crates.io/clap_complete/4.4.0 \ crate://crates.io/clap_lex/0.5.0 \ crate://crates.io/clap_mangen/0.2.9 \ crate://crates.io/colorchoice/1.0.0 \ @@ -41,7 +41,7 @@ SRC_URI += " \ crate://crates.io/console/0.15.7 \ crate://crates.io/const-random/0.1.15 \ crate://crates.io/const-random-macro/0.1.15 \ - crate://crates.io/constant_time_eq/0.2.4 \ + crate://crates.io/constant_time_eq/0.3.0 \ crate://crates.io/conv/0.3.3 \ crate://crates.io/core-foundation-sys/0.8.3 \ crate://crates.io/coz/0.1.3 \ @@ -59,7 +59,7 @@ SRC_URI += " \ crate://crates.io/crossterm_winapi/0.9.1 \ crate://crates.io/crunchy/0.2.2 \ crate://crates.io/crypto-common/0.1.6 \ - crate://crates.io/ctrlc/3.4.0 \ + crate://crates.io/ctrlc/3.4.1 \ crate://crates.io/custom_derive/0.1.7 \ crate://crates.io/data-encoding/2.4.0 \ crate://crates.io/data-encoding-macro/0.1.13 \ @@ -67,14 +67,13 @@ SRC_URI += " \ crate://crates.io/diff/0.1.13 \ crate://crates.io/digest/0.10.7 \ crate://crates.io/dlv-list/0.5.0 \ - crate://crates.io/dns-lookup/2.0.2 \ + crate://crates.io/dns-lookup/2.0.3 \ crate://crates.io/dunce/1.0.4 \ crate://crates.io/either/1.8.0 \ crate://crates.io/encode_unicode/0.3.6 \ crate://crates.io/env_logger/0.8.4 \ - crate://crates.io/errno/0.3.1 \ - crate://crates.io/errno-dragonfly/0.1.2 \ - crate://crates.io/exacl/0.10.0 \ + crate://crates.io/errno/0.3.5 \ + crate://crates.io/exacl/0.11.0 \ crate://crates.io/fastrand/2.0.0 \ crate://crates.io/file_diff/1.0.0 \ crate://crates.io/filetime/0.2.22 \ @@ -99,7 +98,7 @@ SRC_URI += " \ crate://crates.io/generic-array/0.14.6 \ crate://crates.io/getrandom/0.2.9 \ crate://crates.io/glob/0.3.1 \ - crate://crates.io/half/2.2.1 \ + crate://crates.io/half/2.3.1 \ crate://crates.io/hashbrown/0.13.2 \ crate://crates.io/hermit-abi/0.3.2 \ crate://crates.io/hex/0.4.3 \ @@ -111,7 +110,6 @@ SRC_URI += " \ crate://crates.io/inotify/0.9.6 \ crate://crates.io/inotify-sys/0.1.5 \ crate://crates.io/io-lifetimes/1.0.11 \ - crate://crates.io/is-terminal/0.4.9 \ crate://crates.io/itertools/0.11.0 \ crate://crates.io/itoa/1.0.4 \ crate://crates.io/js-sys/0.3.64 \ @@ -120,7 +118,7 @@ SRC_URI += " \ crate://crates.io/kqueue-sys/1.0.3 \ crate://crates.io/lazy_static/1.4.0 \ crate://crates.io/lazycell/1.3.0 \ - crate://crates.io/libc/0.2.147 \ + crate://crates.io/libc/0.2.149 \ crate://crates.io/libloading/0.7.4 \ crate://crates.io/libm/0.2.7 \ crate://crates.io/linux-raw-sys/0.1.4 \ @@ -130,21 +128,20 @@ SRC_URI += " \ crate://crates.io/log/0.4.17 \ crate://crates.io/lscolors/0.15.0 \ crate://crates.io/match_cfg/0.1.0 \ - crate://crates.io/md-5/0.10.5 \ + crate://crates.io/md-5/0.10.6 \ crate://crates.io/memchr/2.6.2 \ - crate://crates.io/memmap2/0.7.0 \ + crate://crates.io/memmap2/0.9.0 \ crate://crates.io/memoffset/0.8.0 \ crate://crates.io/minimal-lexical/0.2.1 \ crate://crates.io/miniz_oxide/0.5.4 \ crate://crates.io/mio/0.8.6 \ - crate://crates.io/nix/0.26.2 \ + crate://crates.io/nix/0.27.1 \ crate://crates.io/nom/7.1.3 \ crate://crates.io/notify/6.0.1 \ crate://crates.io/nu-ansi-term/0.49.0 \ crate://crates.io/num-bigint/0.4.4 \ crate://crates.io/num-integer/0.1.45 \ - crate://crates.io/num-traits/0.2.16 \ - crate://crates.io/num_cpus/1.16.0 \ + crate://crates.io/num-traits/0.2.17 \ crate://crates.io/num_threads/0.1.6 \ crate://crates.io/number_prefix/0.4.0 \ crate://crates.io/once_cell/1.18.0 \ @@ -154,7 +151,7 @@ SRC_URI += " \ crate://crates.io/os_display/0.1.3 \ crate://crates.io/parking_lot/0.12.1 \ crate://crates.io/parking_lot_core/0.9.8 \ - crate://crates.io/parse_datetime/0.4.0 \ + crate://crates.io/parse_datetime/0.5.0 \ crate://crates.io/peeking_take_while/0.1.2 \ crate://crates.io/phf/0.11.2 \ crate://crates.io/phf_codegen/0.11.2 \ @@ -177,13 +174,14 @@ SRC_URI += " \ crate://crates.io/rand_chacha/0.3.1 \ crate://crates.io/rand_core/0.6.4 \ crate://crates.io/rand_pcg/0.3.1 \ - crate://crates.io/rayon/1.7.0 \ - crate://crates.io/rayon-core/1.11.0 \ + crate://crates.io/rayon/1.8.0 \ + crate://crates.io/rayon-core/1.12.0 \ crate://crates.io/redox_syscall/0.3.5 \ + crate://crates.io/redox_syscall/0.4.0 \ crate://crates.io/reference-counted-singleton/0.1.2 \ - crate://crates.io/regex/1.9.5 \ - crate://crates.io/regex-automata/0.3.8 \ - crate://crates.io/regex-syntax/0.7.5 \ + crate://crates.io/regex/1.10.1 \ + crate://crates.io/regex-automata/0.4.2 \ + crate://crates.io/regex-syntax/0.8.2 \ crate://crates.io/relative-path/1.8.0 \ crate://crates.io/rlimit/0.10.1 \ crate://crates.io/roff/0.2.1 \ @@ -202,8 +200,8 @@ SRC_URI += " \ crate://crates.io/selinux-sys/0.6.2 \ crate://crates.io/semver/1.0.14 \ crate://crates.io/serde/1.0.147 \ - crate://crates.io/sha1/0.10.5 \ - crate://crates.io/sha2/0.10.7 \ + crate://crates.io/sha1/0.10.6 \ + crate://crates.io/sha2/0.10.8 \ crate://crates.io/sha3/0.10.8 \ crate://crates.io/shlex/1.1.0 \ crate://crates.io/signal-hook/0.3.17 \ @@ -215,14 +213,12 @@ SRC_URI += " \ crate://crates.io/smallvec/1.11.0 \ crate://crates.io/smawk/0.3.1 \ crate://crates.io/socket2/0.5.3 \ - crate://crates.io/static_assertions/1.1.0 \ crate://crates.io/strsim/0.10.0 \ - crate://crates.io/subtle/2.4.1 \ crate://crates.io/syn/1.0.109 \ crate://crates.io/syn/2.0.23 \ crate://crates.io/tempfile/3.8.0 \ - crate://crates.io/term_grid/0.1.7 \ crate://crates.io/terminal_size/0.2.6 \ + crate://crates.io/terminal_size/0.3.0 \ crate://crates.io/textwrap/0.16.0 \ crate://crates.io/thiserror/1.0.37 \ crate://crates.io/thiserror-impl/1.0.37 \ @@ -234,13 +230,14 @@ SRC_URI += " \ crate://crates.io/unicode-ident/1.0.5 \ crate://crates.io/unicode-linebreak/0.1.5 \ crate://crates.io/unicode-segmentation/1.10.1 \ - crate://crates.io/unicode-width/0.1.10 \ + crate://crates.io/unicode-width/0.1.11 \ crate://crates.io/unicode-xid/0.2.4 \ crate://crates.io/unindent/0.2.1 \ crate://crates.io/utf8parse/0.2.1 \ crate://crates.io/uuid/1.2.2 \ + crate://crates.io/uutils_term_grid/0.3.0 \ crate://crates.io/version_check/0.9.4 \ - crate://crates.io/walkdir/2.3.2 \ + crate://crates.io/walkdir/2.4.0 \ crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ crate://crates.io/wasm-bindgen/0.2.87 \ crate://crates.io/wasm-bindgen-backend/0.2.87 \ @@ -248,10 +245,10 @@ SRC_URI += " \ crate://crates.io/wasm-bindgen-macro-support/0.2.87 \ crate://crates.io/wasm-bindgen-shared/0.2.87 \ crate://crates.io/which/4.3.0 \ - crate://crates.io/wild/2.1.0 \ + crate://crates.io/wild/2.2.0 \ crate://crates.io/winapi/0.3.9 \ crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ - crate://crates.io/winapi-util/0.1.5 \ + crate://crates.io/winapi-util/0.1.6 \ crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ crate://crates.io/windows-sys/0.45.0 \ crate://crates.io/windows-sys/0.48.0 \ @@ -281,34 +278,34 @@ SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41 SRC_URI[aho-corasick-1.0.4.sha256sum] = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -SRC_URI[anstream-0.3.2.sha256sum] = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +SRC_URI[anstream-0.5.0.sha256sum] = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" SRC_URI[anstyle-1.0.0.sha256sum] = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" SRC_URI[anstyle-parse-0.2.0.sha256sum] = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" SRC_URI[anstyle-query-1.0.0.sha256sum] = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -SRC_URI[anstyle-wincon-1.0.1.sha256sum] = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +SRC_URI[anstyle-wincon-2.1.0.sha256sum] = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" SRC_URI[arrayref-0.3.6.sha256sum] = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" -SRC_URI[arrayvec-0.7.2.sha256sum] = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +SRC_URI[arrayvec-0.7.4.sha256sum] = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" SRC_URI[bigdecimal-0.4.0.sha256sum] = "5274a6b6e0ee020148397245b973e30163b7bffbc6d473613f850cb99888581e" SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb602777988669be09447d536ff4388d1def11296" SRC_URI[bindgen-0.63.0.sha256sum] = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -SRC_URI[bitflags-2.3.3.sha256sum] = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" -SRC_URI[blake2b_simd-1.0.1.sha256sum] = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" -SRC_URI[blake3-1.4.0.sha256sum] = "729b71f35bd3fa1a4c86b85d32c8b9069ea7fe14f7a53cfabb65f62d4265b888" +SRC_URI[bitflags-2.4.0.sha256sum] = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +SRC_URI[blake2b_simd-1.0.2.sha256sum] = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" +SRC_URI[blake3-1.5.0.sha256sum] = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" SRC_URI[block-buffer-0.10.3.sha256sum] = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" -SRC_URI[bstr-1.6.0.sha256sum] = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +SRC_URI[bstr-1.7.0.sha256sum] = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" SRC_URI[bumpalo-3.11.1.sha256sum] = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" -SRC_URI[bytecount-0.6.3.sha256sum] = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" -SRC_URI[byteorder-1.4.3.sha256sum] = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +SRC_URI[bytecount-0.6.4.sha256sum] = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7" +SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -SRC_URI[chrono-0.4.28.sha256sum] = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" +SRC_URI[chrono-0.4.31.sha256sum] = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" SRC_URI[clang-sys-1.4.0.sha256sum] = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" -SRC_URI[clap-4.3.21.sha256sum] = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" -SRC_URI[clap_builder-4.3.21.sha256sum] = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" -SRC_URI[clap_complete-4.3.0.sha256sum] = "a04ddfaacc3bc9e6ea67d024575fafc2a813027cf374b8f24f7bc233c6b6be12" +SRC_URI[clap-4.4.2.sha256sum] = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" +SRC_URI[clap_builder-4.4.2.sha256sum] = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +SRC_URI[clap_complete-4.4.0.sha256sum] = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" SRC_URI[clap_lex-0.5.0.sha256sum] = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" SRC_URI[clap_mangen-0.2.9.sha256sum] = "bb0f09a0ca8f0dd8ac92c546b426f466ef19828185c6d504c80c48c9c2768ed9" SRC_URI[colorchoice-1.0.0.sha256sum] = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" @@ -316,7 +313,7 @@ SRC_URI[compare-0.1.0.sha256sum] = "120133d4db2ec47efe2e26502ee984747630c67f5197 SRC_URI[console-0.15.7.sha256sum] = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" SRC_URI[const-random-0.1.15.sha256sum] = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" SRC_URI[const-random-macro-0.1.15.sha256sum] = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" -SRC_URI[constant_time_eq-0.2.4.sha256sum] = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" +SRC_URI[constant_time_eq-0.3.0.sha256sum] = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" SRC_URI[conv-0.3.3.sha256sum] = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299" SRC_URI[core-foundation-sys-0.8.3.sha256sum] = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" SRC_URI[coz-0.1.3.sha256sum] = "cef55b3fe2f5477d59e12bc792e8b3c95a25bd099eadcfae006ecea136de76e2" @@ -334,7 +331,7 @@ SRC_URI[crossterm-0.27.0.sha256sum] = "f476fe445d41c9e991fd07515a6f463074b782242 SRC_URI[crossterm_winapi-0.9.1.sha256sum] = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" SRC_URI[crunchy-0.2.2.sha256sum] = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -SRC_URI[ctrlc-3.4.0.sha256sum] = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" +SRC_URI[ctrlc-3.4.1.sha256sum] = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" SRC_URI[custom_derive-0.1.7.sha256sum] = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" SRC_URI[data-encoding-2.4.0.sha256sum] = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" SRC_URI[data-encoding-macro-0.1.13.sha256sum] = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99" @@ -342,14 +339,13 @@ SRC_URI[data-encoding-macro-internal-0.1.11.sha256sum] = "8fdf3fce3ce863539ec1d7 SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" SRC_URI[dlv-list-0.5.0.sha256sum] = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" -SRC_URI[dns-lookup-2.0.2.sha256sum] = "8f332aa79f9e9de741ac013237294ef42ce2e9c6394dc7d766725812f1238812" +SRC_URI[dns-lookup-2.0.3.sha256sum] = "8d0fa3cd8dc96ada974e126a940d37d4079bbbe6a24aca15b1113c2f362441c5" SRC_URI[dunce-1.0.4.sha256sum] = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" SRC_URI[either-1.8.0.sha256sum] = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" SRC_URI[env_logger-0.8.4.sha256sum] = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -SRC_URI[errno-0.3.1.sha256sum] = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -SRC_URI[errno-dragonfly-0.1.2.sha256sum] = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -SRC_URI[exacl-0.10.0.sha256sum] = "1cfeb22a59deb24c3262c43ffcafd1eb807180f371f9fcc99098d181b5d639be" +SRC_URI[errno-0.3.5.sha256sum] = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +SRC_URI[exacl-0.11.0.sha256sum] = "c695152c1c2777163ea93fff517edc6dd1f8fc226c14b0d60cdcde0beb316d9f" SRC_URI[fastrand-2.0.0.sha256sum] = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" SRC_URI[file_diff-1.0.0.sha256sum] = "31a7a908b8f32538a2143e59a6e4e2508988832d5d4d6f7c156b3cbc762643a5" SRC_URI[filetime-0.2.22.sha256sum] = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" @@ -374,7 +370,7 @@ SRC_URI[gcd-2.3.0.sha256sum] = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d5 SRC_URI[generic-array-0.14.6.sha256sum] = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" SRC_URI[getrandom-0.2.9.sha256sum] = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -SRC_URI[half-2.2.1.sha256sum] = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +SRC_URI[half-2.3.1.sha256sum] = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" SRC_URI[hashbrown-0.13.2.sha256sum] = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" SRC_URI[hermit-abi-0.3.2.sha256sum] = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" @@ -386,7 +382,6 @@ SRC_URI[indicatif-0.17.3.sha256sum] = "cef509aa9bc73864d6756f0d34d35504af3cf0844 SRC_URI[inotify-0.9.6.sha256sum] = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" SRC_URI[inotify-sys-0.1.5.sha256sum] = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" SRC_URI[io-lifetimes-1.0.11.sha256sum] = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -SRC_URI[is-terminal-0.4.9.sha256sum] = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" SRC_URI[itertools-0.11.0.sha256sum] = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" SRC_URI[itoa-1.0.4.sha256sum] = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" SRC_URI[js-sys-0.3.64.sha256sum] = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" @@ -395,7 +390,7 @@ SRC_URI[kqueue-1.0.7.sha256sum] = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78 SRC_URI[kqueue-sys-1.0.3.sha256sum] = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" SRC_URI[lazycell-1.3.0.sha256sum] = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" -SRC_URI[libc-0.2.147.sha256sum] = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +SRC_URI[libc-0.2.149.sha256sum] = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" SRC_URI[libloading-0.7.4.sha256sum] = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" SRC_URI[libm-0.2.7.sha256sum] = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" SRC_URI[linux-raw-sys-0.1.4.sha256sum] = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" @@ -405,21 +400,20 @@ SRC_URI[lock_api-0.4.9.sha256sum] = "435011366fe56583b16cf956f9df0095b405b82d764 SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" SRC_URI[lscolors-0.15.0.sha256sum] = "bf7015a04103ad78abb77e4b79ed151e767922d1cfde5f62640471c629a2320d" SRC_URI[match_cfg-0.1.0.sha256sum] = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" -SRC_URI[md-5-0.10.5.sha256sum] = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" SRC_URI[memchr-2.6.2.sha256sum] = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" -SRC_URI[memmap2-0.7.0.sha256sum] = "180d4b35be83d33392d1d1bfbd2ae1eca7ff5de1a94d3fc87faaa99a069e7cbd" +SRC_URI[memmap2-0.9.0.sha256sum] = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" SRC_URI[memoffset-0.8.0.sha256sum] = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" SRC_URI[miniz_oxide-0.5.4.sha256sum] = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" SRC_URI[mio-0.8.6.sha256sum] = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -SRC_URI[nix-0.26.2.sha256sum] = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +SRC_URI[nix-0.27.1.sha256sum] = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" SRC_URI[notify-6.0.1.sha256sum] = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51" SRC_URI[nu-ansi-term-0.49.0.sha256sum] = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" SRC_URI[num-bigint-0.4.4.sha256sum] = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -SRC_URI[num-traits-0.2.16.sha256sum] = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +SRC_URI[num-traits-0.2.17.sha256sum] = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" SRC_URI[num_threads-0.1.6.sha256sum] = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" SRC_URI[once_cell-1.18.0.sha256sum] = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" @@ -429,7 +423,7 @@ SRC_URI[ordered-multimap-0.6.0.sha256sum] = "4ed8acf08e98e744e5384c8bc63ceb0364e SRC_URI[os_display-0.1.3.sha256sum] = "7a6229bad892b46b0dcfaaeb18ad0d2e56400f5aaea05b768bde96e73676cf75" SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" SRC_URI[parking_lot_core-0.9.8.sha256sum] = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -SRC_URI[parse_datetime-0.4.0.sha256sum] = "fecceaede7767a9a98058687a321bc91742eff7670167a34104afb30fc8757df" +SRC_URI[parse_datetime-0.5.0.sha256sum] = "3bbf4e25b13841080e018a1e666358adfe5e39b6d353f986ca5091c210b586a1" SRC_URI[peeking_take_while-0.1.2.sha256sum] = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" SRC_URI[phf-0.11.2.sha256sum] = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" SRC_URI[phf_codegen-0.11.2.sha256sum] = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" @@ -452,13 +446,14 @@ SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c390 SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" SRC_URI[rand_pcg-0.3.1.sha256sum] = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" -SRC_URI[rayon-1.7.0.sha256sum] = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -SRC_URI[rayon-core-1.11.0.sha256sum] = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +SRC_URI[rayon-1.8.0.sha256sum] = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +SRC_URI[rayon-core-1.12.0.sha256sum] = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +SRC_URI[redox_syscall-0.4.0.sha256sum] = "ded0bce2d41cc3c57aefa284708ced249a64acb01745dbbe72bd78610bfd644c" SRC_URI[reference-counted-singleton-0.1.2.sha256sum] = "f1bfbf25d7eb88ddcbb1ec3d755d0634da8f7657b2cb8b74089121409ab8228f" -SRC_URI[regex-1.9.5.sha256sum] = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" -SRC_URI[regex-automata-0.3.8.sha256sum] = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" -SRC_URI[regex-syntax-0.7.5.sha256sum] = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +SRC_URI[regex-1.10.1.sha256sum] = "aaac441002f822bc9705a681810a4dd2963094b9ca0ddc41cb963a4c189189ea" +SRC_URI[regex-automata-0.4.2.sha256sum] = "5011c7e263a695dc8ca064cddb722af1be54e517a280b12a5356f98366899e5d" +SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" SRC_URI[relative-path-1.8.0.sha256sum] = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" SRC_URI[rlimit-0.10.1.sha256sum] = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8" SRC_URI[roff-0.2.1.sha256sum] = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" @@ -477,8 +472,8 @@ SRC_URI[selinux-0.4.0.sha256sum] = "a00576725d21b588213fbd4af84cd7e4cc4304e8e9bd SRC_URI[selinux-sys-0.6.2.sha256sum] = "806d381649bb85347189d2350728817418138d11d738e2482cb644ec7f3c755d" SRC_URI[semver-1.0.14.sha256sum] = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" SRC_URI[serde-1.0.147.sha256sum] = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" -SRC_URI[sha1-0.10.5.sha256sum] = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -SRC_URI[sha2-0.10.7.sha256sum] = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" SRC_URI[shlex-1.1.0.sha256sum] = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" SRC_URI[signal-hook-0.3.17.sha256sum] = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" @@ -490,14 +485,12 @@ SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5f SRC_URI[smallvec-1.11.0.sha256sum] = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" SRC_URI[smawk-0.3.1.sha256sum] = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" SRC_URI[socket2-0.5.3.sha256sum] = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" -SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -SRC_URI[subtle-2.4.1.sha256sum] = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" SRC_URI[syn-2.0.23.sha256sum] = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" SRC_URI[tempfile-3.8.0.sha256sum] = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -SRC_URI[term_grid-0.1.7.sha256sum] = "230d3e804faaed5a39b08319efb797783df2fd9671b39b7596490cb486d702cf" SRC_URI[terminal_size-0.2.6.sha256sum] = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +SRC_URI[terminal_size-0.3.0.sha256sum] = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" SRC_URI[textwrap-0.16.0.sha256sum] = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" SRC_URI[thiserror-1.0.37.sha256sum] = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" SRC_URI[thiserror-impl-1.0.37.sha256sum] = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" @@ -509,13 +502,14 @@ SRC_URI[typenum-1.15.0.sha256sum] = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817 SRC_URI[unicode-ident-1.0.5.sha256sum] = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" SRC_URI[unicode-segmentation-1.10.1.sha256sum] = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" -SRC_URI[unicode-width-0.1.10.sha256sum] = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" SRC_URI[unicode-xid-0.2.4.sha256sum] = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" SRC_URI[unindent-0.2.1.sha256sum] = "5aa30f5ea51ff7edfc797c6d3f9ec8cbd8cfedef5371766b7181d33977f4814f" SRC_URI[utf8parse-0.2.1.sha256sum] = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" SRC_URI[uuid-1.2.2.sha256sum] = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +SRC_URI[uutils_term_grid-0.3.0.sha256sum] = "b389452a568698688dda38802068378a16c15c4af9b153cdd99b65391292bbc7" SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -SRC_URI[walkdir-2.3.2.sha256sum] = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +SRC_URI[walkdir-2.4.0.sha256sum] = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" SRC_URI[wasm-bindgen-0.2.87.sha256sum] = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" SRC_URI[wasm-bindgen-backend-0.2.87.sha256sum] = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" @@ -523,10 +517,10 @@ SRC_URI[wasm-bindgen-macro-0.2.87.sha256sum] = "dee495e55982a3bd48105a7b947fd2a9 SRC_URI[wasm-bindgen-macro-support-0.2.87.sha256sum] = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" SRC_URI[wasm-bindgen-shared-0.2.87.sha256sum] = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" SRC_URI[which-4.3.0.sha256sum] = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" -SRC_URI[wild-2.1.0.sha256sum] = "05b116685a6be0c52f5a103334cbff26db643826c7b3735fc0a3ba9871310a74" +SRC_URI[wild-2.2.0.sha256sum] = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +SRC_URI[winapi-util-0.1.6.sha256sum] = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" SRC_URI[windows-sys-0.45.0.sha256sum] = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" diff --git a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.21.bb b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.22.bb index a070fe780b..70eea77d68 100644 --- a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.21.bb +++ b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.22.bb @@ -11,7 +11,7 @@ SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;branch=main" # so src/uucore/src/lib/features.rs disables utmpx when targetting musl. COMPATIBLE_HOST:libc-musl = "null" -SRCREV = "7c7a6083d90af031ed14b585a9c60fa3b79422a0" +SRCREV = "73b7c46131a9ce35ca1015e76fea772c40d41dd7" S = "${WORKDIR}/git" require ${BPN}-crates.inc diff --git a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-CMakeLists.txt-fix-googletest-related-options.patch b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-CMakeLists.txt-fix-googletest-related-options.patch new file mode 100644 index 0000000000..b0bfb8bf16 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-CMakeLists.txt-fix-googletest-related-options.patch @@ -0,0 +1,55 @@ +From 77da477840f89da7ced29da315de77571e8f190e Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@gmail.com> +Date: Fri, 20 Oct 2023 22:57:48 +0200 +Subject: [PATCH] CMakeLists.txt: fix googletest related options + +* https://cmake.org/cmake/help/book/mastering-cmake/chapter/Writing%20CMakeLists%20Files.html + says that CMake options are case-sensitive and I don't see lower-case version in + currently used googletest submodules and gtest is indeed installed with leveldb + +* install_gmock option I don't see at all, so I've kept it as is, INSTALL_GTEST, BUILD_GMOCK + do exist as upper-case + +$ grep -Ri install_.*mock . +./CMakeLists.txt: set(install_gmock OFF) +./third_party/googletest/googlemock/CMakeLists.txt:install_project(gmock gmock_main) +$ grep -Ri build_gmock . +./CMakeLists.txt: set(BUILD_GMOCK ON) +./third_party/googletest/googletest/README.md:cmake .. -DBUILD_GMOCK=OFF +./third_party/googletest/CMakeLists.txt:option(BUILD_GMOCK "Builds the googlemock subproject" ON) +./third_party/googletest/CMakeLists.txt:if(BUILD_GMOCK) +$ grep -Ri install_gtest . +./CMakeLists.txt: set(INSTALL_GTEST OFF) +./third_party/googletest/googletest/cmake/internal_utils.cmake: if(INSTALL_GTEST) +./third_party/googletest/googletest/CMakeLists.txt:if (INSTALL_GTEST) +./third_party/googletest/CMakeLists.txt:option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON) + +* also use CACHE and FORCE as sugested in: + https://cmake.org/cmake/help/latest/command/set.html + https://stackoverflow.com/questions/20239334/cmake-set-subdirectory-options + for the value to correctly propagate into third_party/googletest subdirectory + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/google/leveldb/pull/1152] + + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fda9e01..f8a2629 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -295,9 +295,9 @@ if(LEVELDB_BUILD_TESTS) + + # Prevent overriding the parent project's compiler/linker settings on Windows. + set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +- set(install_gtest OFF) +- set(install_gmock OFF) +- set(build_gmock ON) ++ set(INSTALL_GTEST OFF CACHE BOOL "" FORCE) ++ set(install_gmock OFF CACHE BOOL "" FORCE) ++ set(BUILD_GMOCK ON CACHE BOOL "" FORCE) + + # This project is tested using GoogleTest. + add_subdirectory("third_party/googletest") diff --git a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-Fix-printing-64-bit-integer-types.patch b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-Fix-printing-64-bit-integer-types.patch new file mode 100644 index 0000000000..b9f45e773d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-Fix-printing-64-bit-integer-types.patch @@ -0,0 +1,43 @@ +From 1ccdb7513a7a0f24b8ce3b6766e52e690874bc64 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Oct 2023 19:08:12 -0700 +Subject: [PATCH] Fix printing 64-bit integer types + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + db/db_impl.cc | 5 +++-- + db/version_edit.h | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) + +--- a/db/db_impl.cc ++++ b/db/db_impl.cc +@@ -5,6 +5,7 @@ + #include "db/db_impl.h" + + #include <algorithm> ++#include <cinttypes> + #include <atomic> + #include <cstdint> + #include <cstdio> +@@ -520,8 +521,8 @@ Status DBImpl::WriteLevel0Table(MemTable + mutex_.Lock(); + } + +- Log(options_.info_log, "Level-0 table #%llu: %lld bytes %s", +- (unsigned long long)meta.number, (unsigned long long)meta.file_size, ++ Log(options_.info_log, "Level-0 table #%" PRIu64 " : %" PRIu64 " bytes %s", ++ meta.number, meta.file_size, + s.ToString().c_str()); + delete iter; + pending_outputs_.erase(meta.number); +--- a/db/version_edit.h ++++ b/db/version_edit.h +@@ -5,6 +5,7 @@ + #ifndef STORAGE_LEVELDB_DB_VERSION_EDIT_H_ + #define STORAGE_LEVELDB_DB_VERSION_EDIT_H_ + ++#include <cstdint> + #include <set> + #include <utility> + #include <vector> diff --git a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb index 6afc45ab7e..60b486df78 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.22.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb @@ -4,14 +4,16 @@ HOMEPAGE = "https://github.com/google/leveldb" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d" -SRC_URI = "git://github.com/google/${BPN}.git;branch=main;protocol=https \ - file://run-ptest" +SRC_URI = "gitsm://github.com/google/${BPN}.git;branch=main;protocol=https \ + file://0001-CMakeLists.txt-fix-googletest-related-options.patch \ + file://0001-Fix-printing-64-bit-integer-types.patch \ + file://run-ptest \ +" -SRCREV = "78b39d68c15ba020c0d60a3906fb66dbf1697595" +SRCREV = "068d5ee1a3ac40dabd00d211d5013af44be55bea" S = "${WORKDIR}/git" inherit cmake ptest - PACKAGECONFIG ??= "" PACKAGECONFIG[benchmarks] = "-DLEVELDB_BUILD_BENCHMARKS=ON,-DLEVELDB_BUILD_BENCHMARKS=OFF,sqlite" PACKAGECONFIG[snappy] = ",,snappy" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch index 12fbd75976..f8ccb998be 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -15,7 +15,8 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + storage/rocksdb/rocksdb/util/slice.cc | 1 + - 4 files changed, 4 insertions(+) + storage/rocksdb/rocksdb/util/string_util.h | 1 + + 5 files changed, 5 insertions(+) diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h index 963c1d8e..73487edd 100644 @@ -65,6 +66,19 @@ index 6db11cc9..c26b6a21 100644 #include "rocksdb/slice_transform.h" #include "rocksdb/slice.h" #include "util/string_util.h" + +diff --git a/util/string_util.h b/util/string_util.h +index 55d106fff02..11178fd1d7b 100644 +--- a/storage/rocksdb/rocksdb/util/string_util.h ++++ b/storage/rocksdb/rocksdb/util/string_util.h +@@ -6,6 +6,7 @@ + + #pragma once + ++#include <cstdint> + #include <sstream> + #include <string> + #include <unordered_map> -- 2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson/run-ptest b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson/run-ptest new file mode 100644 index 0000000000..f061e94665 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson/run-ptest @@ -0,0 +1,8 @@ +#!/bin/sh + +# exclude json_patch_tests +if ctest -E 'json_patch_tests' ; then + echo "PASS: cjson" +else + echo "FAIL: cjson" +fi diff --git a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb index 8bf7981ab0..1841aeffc1 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.15.bb @@ -4,12 +4,32 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0" -SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https" +SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https \ + file://run-ptest \ + " SRCREV = "d348621ca93571343a56862df7de4ff3bc9b5667" S = "${WORKDIR}/git" -inherit cmake pkgconfig +inherit cmake pkgconfig ptest + +RDEPENDS:${PN}-ptest += "cmake" + +do_install_ptest() { + # create directories + install -d ${D}${PTEST_PATH} ${D}${PTEST_PATH}/tests ${D}${PTEST_PATH}/fuzzing + install -d ${D}${PTEST_PATH}/tests/inputs ${D}${PTEST_PATH}/tests/json-patch-tests + # CTestTestfiles.cmake contain fully defined path generated by cmake. + # Change the fully defined path to ptest path on the target + sed s#${B}#${PTEST_PATH}# ${B}/CTestTestfile.cmake > ${D}${PTEST_PATH}/CTestTestfile.cmake + sed s#${B}#${PTEST_PATH}# ${B}/tests/CTestTestfile.cmake > ${D}${PTEST_PATH}/tests/CTestTestfile.cmake + sed s#${B}#${PTEST_PATH}# ${B}/fuzzing/CTestTestfile.cmake > ${D}${PTEST_PATH}/fuzzing/CTestTestfile.cmake + # install test artifacts + install ${B}/cJSON_test ${D}${PTEST_PATH} + install ${B}/tests/cjson_add ${B}/tests/*_tests ${B}/tests/parse_* ${B}/tests/print_* ${B}/tests/readme_examples ${D}${PTEST_PATH}/tests/ + install ${B}/tests/inputs/* ${D}${PTEST_PATH}/tests/inputs + install ${B}/fuzzing/fuzz_main ${D}${PTEST_PATH}/fuzzing +} EXTRA_OECMAKE += "\ -DENABLE_CJSON_UTILS=On \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230917.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20231001.0.bb index 02afbfbbba..c1ec9e8e8a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20230917.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20231001.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "481ad1b36daca1d40060dd32b0d825cddc97e9cb" +SRCREV = "0aa6d047ffd78c3baff508a53f4a176d97a28b5b" SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index 94023922a2..a5d614961a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ubinux/dnf-plugin-tui.git;branch=master;protocol=https" -SRCREV = "83917a3935ac7ce1d8d96e914d96a6679319a336" +SRCREV = "baac322a8a6d57e62c703f6ed523152baec18b4f" PV = "1.3" SRC_URI:append:class-target = " file://oe-remote.repo.sample" @@ -42,6 +42,4 @@ RDEPENDS:${PN} += " \ dnf \ libnewt-python \ " -DEPENDS:append:class-nativesdk = " file-replacement-nativesdk" -BBCLASSEXTEND = "nativesdk" SKIP_RECIPE[dnf-plugin-tui] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch deleted file mode 100644 index b245ad8657..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch +++ /dev/null @@ -1,62 +0,0 @@ -From dc593958e556dd496b774f35c5992285510d6859 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 19 Oct 2021 17:09:55 +0200 -Subject: [PATCH] Revert "Changed GRPCPP_ABSEIL_SYNC to GPR_ABSEIL_SYNC - (#25681)" - -This reverts commit 931f91b745cd5b2864a0d1787815871d0bd844ae. - -Fixes sysdig from meta-oe and other recipes (like com.webos.service.tts -libgoogleassistant from meta-webosose) failing with: - -| FAILED: userspace/sysdig/sysdig -| : && /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/x86_64-oe-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-sec -urity --sysroot=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -f -debug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/bu -ild/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/OE/build -/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -Wall -ggdb -std=c++0x -O3 -fno-strict-aliasing -DNDEBUG -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security ---sysroot=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-p -refix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe- -core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -fvisibility-inlines-hidden -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/OE/build/oe-cor -e/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-cor -e/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2- -64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -Wl,-z,relro,-z,now -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fmacro-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/ -oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0=/usr/src/debug/sysdig/0.27.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/ -core2-64-oe-linux/sysdig/0.27.1-r0/recipe-sysroot-native= -Wl,-z,relro,-z,now -rdynamic userspace/sysdig/CMakeFiles/sysdig.dir/fields_info.cpp.o userspace/sysdig/CMakeFiles/sysdig.dir/sysdig.cpp.o -o userspace/sysdig/sysdig userspace/libsinsp/libsinsp.a userspace/libscap/libscap.a - -lelf -lz -lcurl -ljsoncpp -ltbb -lcares -lgrpc++_unsecure -lgrpc_unsecure -lprotobuf -lcares -lgrpc++_unsecure -lgrpc_unsecure -lprotobuf -ljq -lb64 -lrt -lanl -lssl -lcrypto -lluajit-5.1 -ldl -lpthread && : -| /usr/include/grpcpp/impl/codegen/completion_queue.h:121: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()' -| /usr/include/grpcpp/impl/codegen/completion_queue.h:121: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()' -| /usr/include/grpcpp/impl/codegen/completion_queue.h:121: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()' -| /usr/include/grpcpp/impl/codegen/completion_queue.h:259: error: undefined reference to 'absl::lts_20210324::Mutex::~Mutex()' -| collect2: error: ld returned 1 exit status - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - ---- -Upstream-Status: Pending - - include/grpcpp/impl/codegen/sync.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/grpcpp/impl/codegen/sync.h b/include/grpcpp/impl/codegen/sync.h -index 4cb8133c7c..3d10d9a3a0 100644 ---- a/include/grpcpp/impl/codegen/sync.h -+++ b/include/grpcpp/impl/codegen/sync.h -@@ -47,7 +47,7 @@ - namespace grpc { - namespace internal { - --#ifdef GPR_ABSEIL_SYNC -+#ifdef GRPCPP_ABSEIL_SYNC - - using Mutex = absl::Mutex; - using MutexLock = absl::MutexLock; -@@ -142,7 +142,7 @@ class CondVar { - gpr_cv cv_; - }; - --#endif // GPR_ABSEIL_SYNC -+#endif // GRPCPP_ABSEIL_SYNC - - template <typename Predicate> - GRPC_DEPRECATED("incompatible with thread safety analysis") diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch deleted file mode 100644 index 679bd38829..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 3150cb043363e05588062dd392b940be25594713 Mon Sep 17 00:00:00 2001 -From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> -Date: Tue, 18 Feb 2020 14:17:07 +0100 -Subject: [PATCH] cmake: add separate export for plugin targets - -Upstream-Status: Submitted [https://github.com/grpc/grpc/pull/29328] - - ---- - CMakeLists.txt | 18 +++++++++++------- - 1 file changed, 11 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index efdaf8936d..6608b1b00c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10935,7 +10935,7 @@ target_link_libraries(grpc_cpp_plugin - - - if(gRPC_INSTALL) -- install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets -+ install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -10975,7 +10975,7 @@ target_link_libraries(grpc_csharp_plugin - - - if(gRPC_INSTALL) -- install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets -+ install(TARGETS grpc_csharp_plugin EXPORT gRPCPluginTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11015,7 +11015,7 @@ target_link_libraries(grpc_node_plugin - - - if(gRPC_INSTALL) -- install(TARGETS grpc_node_plugin EXPORT gRPCTargets -+ install(TARGETS grpc_node_plugin EXPORT gRPCPluginTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11055,7 +11055,7 @@ target_link_libraries(grpc_objective_c_plugin - - - if(gRPC_INSTALL) -- install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets -+ install(TARGETS grpc_objective_c_plugin EXPORT gRPCPluginTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11095,7 +11095,7 @@ target_link_libraries(grpc_php_plugin - - - if(gRPC_INSTALL) -- install(TARGETS grpc_php_plugin EXPORT gRPCTargets -+ install(TARGETS grpc_php_plugin EXPORT gRPCPluginTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11135,7 +11135,7 @@ target_link_libraries(grpc_python_plugin - - - if(gRPC_INSTALL) -- install(TARGETS grpc_python_plugin EXPORT gRPCTargets -+ install(TARGETS grpc_python_plugin EXPORT gRPCPluginTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -11175,7 +11175,7 @@ target_link_libraries(grpc_ruby_plugin - - - if(gRPC_INSTALL) -- install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets -+ install(TARGETS grpc_ruby_plugin EXPORT gRPCPluginTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -17349,6 +17349,10 @@ if(gRPC_INSTALL) - DESTINATION ${gRPC_INSTALL_CMAKEDIR} - NAMESPACE gRPC:: - ) -+ install(EXPORT gRPCPluginTargets -+ DESTINATION ${gRPC_INSTALL_CMAKEDIR} -+ NAMESPACE gRPC:: -+ ) - endif() - - include(CMakePackageConfigHelpers) --- -2.30.2 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-fix-CVE-2023-32732.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-fix-CVE-2023-32732.patch deleted file mode 100644 index ab46897b12..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-fix-CVE-2023-32732.patch +++ /dev/null @@ -1,81 +0,0 @@ -From d39489045b5aa73e27713e3cbacb8832c1140ec8 Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Wed, 9 Aug 2023 13:33:45 +0800 -Subject: [PATCH] fix CVE-2023-32732 - -CVE: CVE-2023-32732 - -Upstream-Status: Backport [https://github.com/grpc/grpc/pull/32309/commits/6a7850ef4f042ac26559854266dddc79bfbc75b2] -The original patch is adjusted to fit the current 1.50.1 version. - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - .../ext/transport/chttp2/transport/hpack_parser.cc | 10 +++++++--- - src/core/ext/transport/chttp2/transport/internal.h | 2 -- - src/core/ext/transport/chttp2/transport/parsing.cc | 6 ++---- - 3 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc -index f2e49022dc3..cd459d15238 100644 ---- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc -+++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc -@@ -1211,12 +1211,16 @@ class HPackParser::Parser { - "). GRPC_ARG_MAX_METADATA_SIZE can be set to increase this limit.", - *frame_length_, metadata_size_limit_); - if (metadata_buffer_ != nullptr) metadata_buffer_->Clear(); -+ // StreamId is used as a signal to skip this stream but keep the connection -+ // alive - return input_->MaybeSetErrorAndReturn( - [] { - return grpc_error_set_int( -- GRPC_ERROR_CREATE_FROM_STATIC_STRING( -- "received initial metadata size exceeds limit"), -- GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED); -+ grpc_error_set_int( -+ GRPC_ERROR_CREATE_FROM_STATIC_STRING( -+ "received initial metadata size exceeds limit"), -+ GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_RESOURCE_EXHAUSTED), -+ GRPC_ERROR_INT_STREAM_ID, 0); - }, - false); - } -diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h -index 4a2f4261d83..f8b544d9583 100644 ---- a/src/core/ext/transport/chttp2/transport/internal.h -+++ b/src/core/ext/transport/chttp2/transport/internal.h -@@ -542,8 +542,6 @@ struct grpc_chttp2_stream { - - grpc_core::Timestamp deadline = grpc_core::Timestamp::InfFuture(); - -- /** saw some stream level error */ -- grpc_error_handle forced_close_error = GRPC_ERROR_NONE; - /** how many header frames have we received? */ - uint8_t header_frames_received = 0; - /** number of bytes received - reset at end of parse thread execution */ -diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc -index 980f13543f6..afe6da190b6 100644 ---- a/src/core/ext/transport/chttp2/transport/parsing.cc -+++ b/src/core/ext/transport/chttp2/transport/parsing.cc -@@ -22,6 +22,7 @@ - #include <string.h> - - #include <string> -+#include <utility> - - #include "absl/base/attributes.h" - #include "absl/status/status.h" -@@ -719,10 +720,7 @@ static grpc_error_handle parse_frame_slice(grpc_chttp2_transport* t, - } - grpc_chttp2_parsing_become_skip_parser(t); - if (s) { -- s->forced_close_error = err; -- grpc_chttp2_add_rst_stream_to_next_write(t, t->incoming_stream_id, -- GRPC_HTTP2_PROTOCOL_ERROR, -- &s->stats.outgoing); -+ grpc_chttp2_cancel_stream(t, s, std::exchange(err, absl::OkStatus())); - } else { - GRPC_ERROR_UNREF(err); - } --- -2.34.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb index 45bfcb8570..c4dd6b9857 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.50.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.56.2.bb @@ -20,13 +20,10 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" # RDEPENDS:${PN}-dev += "${PN}-compiler" S = "${WORKDIR}/git" -SRCREV_grpc = "90ccf24d22b6fc909a1021ebd89fd8c838467d26" -BRANCH = "v1.50.x" +SRCREV_grpc = "c0d1c393d9365664d47df41746e992ae97b651ef" +BRANCH = "v1.56.x" SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ - file://0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch \ - file://0001-cmake-add-separate-export-for-plugin-targets.patch \ file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ - file://0001-fix-CVE-2023-32732.patch \ " # Fixes build with older compilers 4.8 especially on ubuntu 14.04 CXXFLAGS:append:class-native = " -Wl,--no-as-needed" diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb index 29937e26d0..be2c0f5394 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb @@ -29,4 +29,4 @@ EXTRA_OECMAKE += "-DHEAPTRACK_BUILD_GUI=OFF" COMPATIBLE_HOST:riscv32 = "null" COMPATIBLE_HOST:riscv64 = "null" -BBCLASSEXTEND = "native nativesdk" +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch b/meta-openembedded/meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch deleted file mode 100644 index e4d6ebb45b..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/jq/jq/0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 40bbd419ad8d1bd9cbe8b17063c323f8a40ab327 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 6 Sep 2022 09:59:31 -0700 -Subject: [PATCH 1/2] configure: Pass _XOPEN_SOURCE when checking for strptime - -Include sys/time.h for gettimeofday since thats where its in glibc - -Upstream-Status: Submitted [https://github.com/stedolan/jq/pull/2480] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a2cd99e..95afe06 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -139,7 +139,10 @@ AC_FUNC_ALLOCA - - AC_FIND_FUNC([isatty], [c], [#include <unistd.h>], [0]) - AC_FIND_FUNC([_isatty], [c], [#include <io.h>], [0]) -+OLD_CFLAGS=$CFLAGS -+CFLAGS="$CFLAGS -D_XOPEN_SOURCE" - AC_FIND_FUNC([strptime], [c], [#include <time.h>], [0, 0, 0]) -+CFLAGS=$OLD_CFLAGS - AC_FIND_FUNC([strftime], [c], [#include <time.h>], [0, 0, 0, 0]) - AC_FIND_FUNC([setenv], [c], [#include <stdlib.h>], [0, 0, 0]) - AC_FIND_FUNC([timegm], [c], [#include <time.h>], [0]) -@@ -147,7 +150,7 @@ AC_FIND_FUNC([gmtime_r], [c], [#include <time.h>], [0, 0]) - AC_FIND_FUNC([gmtime], [c], [#include <time.h>], [0]) - AC_FIND_FUNC([localtime_r], [c], [#include <time.h>], [0, 0]) - AC_FIND_FUNC([localtime], [c], [#include <time.h>], [0]) --AC_FIND_FUNC([gettimeofday], [c], [#include <time.h>], [0, 0]) -+AC_FIND_FUNC([gettimeofday], [c], [#include <sys/time.h>], [0, 0]) - AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define to 1 if the system has the tm_gmt_off field in struct tm])], - [], [[#include <time.h>]]) - AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[Define to 1 if the system has the __tm_gmt_off field in struct tm])], --- -2.37.3 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch b/meta-openembedded/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch deleted file mode 100644 index e849436578..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/jq/jq/0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cda1734bed3b048c01452c798877d05b8c2f4c15 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 6 Sep 2022 10:00:59 -0700 -Subject: [PATCH 2/2] builtin: Replace _BSD_SOURCE with _DEFAULT_SOURCE - -newer glibc has remove _BSD_SOURCE and wants it to be replaced with _DEFAULT_SOURCE - -Fixes -/usr/include/features.h:194:3: warning: "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-W#warnings] -warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" - -Uptream-Status: Submitted [https://github.com/stedolan/jq/pull/2480] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/builtin.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/builtin.c b/src/builtin.c -index 1c6b08c..2a31496 100644 ---- a/src/builtin.c -+++ b/src/builtin.c -@@ -1,4 +1,4 @@ --#define _BSD_SOURCE -+#define _DEFAULT_SOURCE - #define _GNU_SOURCE - #ifndef __sun__ - # define _XOPEN_SOURCE --- -2.37.3 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/jq/jq_git.bb b/meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.7.bb index 4fa98aa44f..5c2e3aae8f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jq/jq_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.7.bb @@ -2,22 +2,21 @@ SUMMARY = "Lightweight and flexible command-line JSON processor" DESCRIPTION = "jq is like sed for JSON data, you can use it to slice and \ filter and map and transform structured data with the same \ ease that sed, awk, grep and friends let you play with text." -HOMEPAGE = "https://stedolan.github.io/jq/" -BUGTRACKER = "https://github.com/stedolan/jq/issues" +HOMEPAGE = "https://jqlang.github.io/jq/" +BUGTRACKER = "https://github.com/jqlang/jq/issues" SECTION = "utils" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=2814b59e00e7918c864fa3b6bbe049b4" +LIC_FILES_CHKSUM = "file://COPYING;md5=488f4e0b04c0456337fb70d1ac1758ba" -PV = "1.6+git${SRCPV}" -SRC_URI = "git://github.com/stedolan/jq;protocol=https;branch=master \ - file://0001-configure-Pass-_XOPEN_SOURCE-when-checking-for-strpt.patch \ - file://0002-builtin-Replace-_BSD_SOURCE-with-_DEFAULT_SOURCE.patch \ +GITHUB_BASE_URI = "https://github.com/jqlang/${BPN}/releases/" +SRC_URI = "${GITHUB_BASE_URI}/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ file://run-ptest \ " -SRCREV = "cff5336ec71b6fee396a95bb0e4bea365e0cd1e8" -S = "${WORKDIR}/git" +SRC_URI[sha256sum] = "402a0d6975d946e6f4e484d1a84320414a0ff8eb6cf49d2c11d144d4d344db62" -inherit autotools-brokensep ptest +inherit autotools github-releases ptest + +UPSTREAM_CHECK_REGEX = "releases/tag/${BPN}-(?P<pver>\d+(\.\d+)+)" PACKAGECONFIG ?= "oniguruma" @@ -27,8 +26,12 @@ PACKAGECONFIG[oniguruma] = "--with-oniguruma,--without-oniguruma,onig" # enable if you want ptest running under valgrind PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind" +do_configure:append() { + sed -i -e "/^ac_cs_config=/ s:${WORKDIR}::g" ${B}/config.status +} + do_install_ptest() { - cp -rf ${B}/tests ${D}${PTEST_PATH} + cp -rf ${S}/tests ${D}${PTEST_PATH} cp -rf ${B}/.libs ${D}${PTEST_PATH} # libjq.so.* is packaged in the main jq component, so remove it from ptest rm -f ${D}${PTEST_PATH}/.libs/libjq.so.* diff --git a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch index 2ee0a39126..1c4b871bb6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0002-Fix-assumed-signed-char.patch @@ -11,7 +11,7 @@ GCC treats char as unsigned resulting in compile errors: Fix this by specifying signed char. -Upstream-Status: Accepted [https://github.com/pboettch/json-schema-validator/commit/491ac44026e08f31790f5cacffa62e168bb35e32] +Upstream-Status: Backport [https://github.com/pboettch/json-schema-validator/commit/491ac44026e08f31790f5cacffa62e168bb35e32] Signed-off-by: Parian Golchin <Parian.Golchin@iris-sensing.com> --- diff --git a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch index e0d0cf8ce9..eac997ae58 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/json-schema-validator/json-schema-validator/0003-For-root-value-use-empty-pointer.patch @@ -3,7 +3,7 @@ From: Sven Fink <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] +Upstream-Status: Backport [https://github.com/pboettch/json-schema-validator/commit/59c9d6200bf3cd54b4fc717ec1660c91eddb4d1a] Signed-off-by: Parian Golchin <Parian.Golchin@iris-sensing.com> --- diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.17/oe-npm-cache b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.5/oe-npm-cache index f596207648..f596207648 100755 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-18.17/oe-npm-cache +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.5/oe-npm-cache diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.17.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.5.bb index a61dd5018f..a61dd5018f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_18.17.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.5.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Revert-io_uring-changes-from-libuv-1.46.0.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Revert-io_uring-changes-from-libuv-1.46.0.patch new file mode 100644 index 0000000000..d98463d0d8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Revert-io_uring-changes-from-libuv-1.46.0.patch @@ -0,0 +1,3414 @@ +From 937dfa70104b7401a7570a98cf6e0a534e250557 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@gmail.com> +Date: Wed, 18 Oct 2023 22:43:55 +0200 +Subject: [PATCH] Revert io_uring changes from libuv-1.46.0 + +Included in nodejs-20.4.0 with the libuv upgrade to 1.46.0 in: +https://github.com/nodejs/node/commit/6199e1946c9abd59bd71a61870a4f6c85e100b18 + +Revert "linux: work around io_uring IORING_OP_CLOSE bug (#4059)" +This reverts commit 1752791c9ea89dbf54e2a20a9d9f899119a2d179. +Revert "linux: fs_read to use io_uring if iovcnt > IOV_MAX (#4023)" +This reverts commit e7b96331703e929e75d93c574573c9736e34b0c0. +Revert "linux: add some more iouring backed fs ops (#4012)" +This reverts commit 962b8e626ceaaf296eecab1d008e8b70dc6da5e7. +Revert "android: disable io_uring support (#4016)" +This reverts commit 281e6185cc9e77c582ff6ca9e4c00d57e6b90d95. +Revert "unix,win: replace QUEUE with struct uv__queue (#4022)" +This reverts commit 1b01b786c0180d29f07dccbb98001a2b3148828a. +Revert "fs: use WTF-8 on Windows (#2970)" +This reverts commit 8f32a14afaaa47514a7d28e1e069a8329e2dd939. + +Dropped deps/uv/docs deps/uv/test changes as these dirs aren't included +in nodejs tarballs. + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- +Upstream-Status: Inappropriate [OE specific] + + deps/uv/include/uv.h | 10 +- + deps/uv/include/uv/darwin.h | 6 +- + deps/uv/include/uv/linux.h | 2 +- + deps/uv/include/uv/threadpool.h | 2 +- + deps/uv/include/uv/unix.h | 44 ++-- + deps/uv/include/uv/win.h | 4 +- + deps/uv/src/queue.h | 154 ++++++----- + deps/uv/src/threadpool.c | 72 +++--- + deps/uv/src/unix/aix.c | 14 +- + deps/uv/src/unix/async.c | 52 ++-- + deps/uv/src/unix/core.c | 53 ++-- + deps/uv/src/unix/fs.c | 41 +-- + deps/uv/src/unix/fsevents.c | 84 +++--- + deps/uv/src/unix/internal.h | 11 - + deps/uv/src/unix/kqueue.c | 18 +- + deps/uv/src/unix/linux.c | 257 +++---------------- + deps/uv/src/unix/loop-watcher.c | 20 +- + deps/uv/src/unix/loop.c | 28 +- + deps/uv/src/unix/os390-syscalls.c | 24 +- + deps/uv/src/unix/os390-syscalls.h | 2 +- + deps/uv/src/unix/os390.c | 14 +- + deps/uv/src/unix/pipe.c | 2 +- + deps/uv/src/unix/posix-poll.c | 14 +- + deps/uv/src/unix/process.c | 38 +-- + deps/uv/src/unix/signal.c | 8 +- + deps/uv/src/unix/stream.c | 56 ++-- + deps/uv/src/unix/sunos.c | 18 +- + deps/uv/src/unix/tcp.c | 4 +- + deps/uv/src/unix/tty.c | 2 +- + deps/uv/src/unix/udp.c | 76 +++--- + deps/uv/src/uv-common.c | 28 +- + deps/uv/src/uv-common.h | 3 +- + deps/uv/src/win/core.c | 6 +- + deps/uv/src/win/fs.c | 311 ++++++++--------------- + deps/uv/src/win/handle-inl.h | 2 +- + deps/uv/src/win/pipe.c | 26 +- + deps/uv/src/win/tcp.c | 4 +- + deps/uv/src/win/udp.c | 4 +- + deps/uv/test/test-fs.c | 53 ---- + deps/uv/test/test-list.h | 2 - + deps/uv/test/test-queue-foreach-delete.c | 5 +- + deps/uv/test/test-threadpool-cancel.c | 5 - + 42 files changed, 625 insertions(+), 954 deletions(-) + +diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h +index 02397dd0fdd..1af95289776 100644 +--- a/deps/uv/include/uv.h ++++ b/deps/uv/include/uv.h +@@ -59,12 +59,6 @@ extern "C" { + #include <stdio.h> + #include <stdint.h> + +-/* Internal type, do not use. */ +-struct uv__queue { +- struct uv__queue* next; +- struct uv__queue* prev; +-}; +- + #if defined(_WIN32) + # include "uv/win.h" + #else +@@ -466,7 +460,7 @@ struct uv_shutdown_s { + uv_handle_type type; \ + /* private */ \ + uv_close_cb close_cb; \ +- struct uv__queue handle_queue; \ ++ void* handle_queue[2]; \ + union { \ + int fd; \ + void* reserved[4]; \ +@@ -1870,7 +1864,7 @@ struct uv_loop_s { + void* data; + /* Loop reference counting. */ + unsigned int active_handles; +- struct uv__queue handle_queue; ++ void* handle_queue[2]; + union { + void* unused; + unsigned int count; +diff --git a/deps/uv/include/uv/darwin.h b/deps/uv/include/uv/darwin.h +index 06962bfda80..d226415820b 100644 +--- a/deps/uv/include/uv/darwin.h ++++ b/deps/uv/include/uv/darwin.h +@@ -40,7 +40,7 @@ + void* cf_state; \ + uv_mutex_t cf_mutex; \ + uv_sem_t cf_sem; \ +- struct uv__queue cf_signals; \ ++ void* cf_signals[2]; \ + + #define UV_PLATFORM_FS_EVENT_FIELDS \ + uv__io_t event_watcher; \ +@@ -48,8 +48,8 @@ + int realpath_len; \ + int cf_flags; \ + uv_async_t* cf_cb; \ +- struct uv__queue cf_events; \ +- struct uv__queue cf_member; \ ++ void* cf_events[2]; \ ++ void* cf_member[2]; \ + int cf_error; \ + uv_mutex_t cf_mutex; \ + +diff --git a/deps/uv/include/uv/linux.h b/deps/uv/include/uv/linux.h +index 9f22f8cf726..9b38405a190 100644 +--- a/deps/uv/include/uv/linux.h ++++ b/deps/uv/include/uv/linux.h +@@ -28,7 +28,7 @@ + int inotify_fd; \ + + #define UV_PLATFORM_FS_EVENT_FIELDS \ +- struct uv__queue watchers; \ ++ void* watchers[2]; \ + int wd; \ + + #endif /* UV_LINUX_H */ +diff --git a/deps/uv/include/uv/threadpool.h b/deps/uv/include/uv/threadpool.h +index 24ce916fda4..9708ebdd530 100644 +--- a/deps/uv/include/uv/threadpool.h ++++ b/deps/uv/include/uv/threadpool.h +@@ -31,7 +31,7 @@ struct uv__work { + void (*work)(struct uv__work *w); + void (*done)(struct uv__work *w, int status); + struct uv_loop_s* loop; +- struct uv__queue wq; ++ void* wq[2]; + }; + + #endif /* UV_THREADPOOL_H_ */ +diff --git a/deps/uv/include/uv/unix.h b/deps/uv/include/uv/unix.h +index 09f88a56742..95447b8dd67 100644 +--- a/deps/uv/include/uv/unix.h ++++ b/deps/uv/include/uv/unix.h +@@ -92,8 +92,8 @@ typedef struct uv__io_s uv__io_t; + + struct uv__io_s { + uv__io_cb cb; +- struct uv__queue pending_queue; +- struct uv__queue watcher_queue; ++ void* pending_queue[2]; ++ void* watcher_queue[2]; + unsigned int pevents; /* Pending event mask i.e. mask at next tick. */ + unsigned int events; /* Current event mask. */ + int fd; +@@ -220,21 +220,21 @@ typedef struct { + #define UV_LOOP_PRIVATE_FIELDS \ + unsigned long flags; \ + int backend_fd; \ +- struct uv__queue pending_queue; \ +- struct uv__queue watcher_queue; \ ++ void* pending_queue[2]; \ ++ void* watcher_queue[2]; \ + uv__io_t** watchers; \ + unsigned int nwatchers; \ + unsigned int nfds; \ +- struct uv__queue wq; \ ++ void* wq[2]; \ + uv_mutex_t wq_mutex; \ + uv_async_t wq_async; \ + uv_rwlock_t cloexec_lock; \ + uv_handle_t* closing_handles; \ +- struct uv__queue process_handles; \ +- struct uv__queue prepare_handles; \ +- struct uv__queue check_handles; \ +- struct uv__queue idle_handles; \ +- struct uv__queue async_handles; \ ++ void* process_handles[2]; \ ++ void* prepare_handles[2]; \ ++ void* check_handles[2]; \ ++ void* idle_handles[2]; \ ++ void* async_handles[2]; \ + void (*async_unused)(void); /* TODO(bnoordhuis) Remove in libuv v2. */ \ + uv__io_t async_io_watcher; \ + int async_wfd; \ +@@ -257,7 +257,7 @@ typedef struct { + #define UV_PRIVATE_REQ_TYPES /* empty */ + + #define UV_WRITE_PRIVATE_FIELDS \ +- struct uv__queue queue; \ ++ void* queue[2]; \ + unsigned int write_index; \ + uv_buf_t* bufs; \ + unsigned int nbufs; \ +@@ -265,12 +265,12 @@ typedef struct { + uv_buf_t bufsml[4]; \ + + #define UV_CONNECT_PRIVATE_FIELDS \ +- struct uv__queue queue; \ ++ void* queue[2]; \ + + #define UV_SHUTDOWN_PRIVATE_FIELDS /* empty */ + + #define UV_UDP_SEND_PRIVATE_FIELDS \ +- struct uv__queue queue; \ ++ void* queue[2]; \ + struct sockaddr_storage addr; \ + unsigned int nbufs; \ + uv_buf_t* bufs; \ +@@ -286,8 +286,8 @@ typedef struct { + uv_connect_t *connect_req; \ + uv_shutdown_t *shutdown_req; \ + uv__io_t io_watcher; \ +- struct uv__queue write_queue; \ +- struct uv__queue write_completed_queue; \ ++ void* write_queue[2]; \ ++ void* write_completed_queue[2]; \ + uv_connection_cb connection_cb; \ + int delayed_error; \ + int accepted_fd; \ +@@ -300,8 +300,8 @@ typedef struct { + uv_alloc_cb alloc_cb; \ + uv_udp_recv_cb recv_cb; \ + uv__io_t io_watcher; \ +- struct uv__queue write_queue; \ +- struct uv__queue write_completed_queue; \ ++ void* write_queue[2]; \ ++ void* write_completed_queue[2]; \ + + #define UV_PIPE_PRIVATE_FIELDS \ + const char* pipe_fname; /* NULL or strdup'ed */ +@@ -311,19 +311,19 @@ typedef struct { + + #define UV_PREPARE_PRIVATE_FIELDS \ + uv_prepare_cb prepare_cb; \ +- struct uv__queue queue; \ ++ void* queue[2]; \ + + #define UV_CHECK_PRIVATE_FIELDS \ + uv_check_cb check_cb; \ +- struct uv__queue queue; \ ++ void* queue[2]; \ + + #define UV_IDLE_PRIVATE_FIELDS \ + uv_idle_cb idle_cb; \ +- struct uv__queue queue; \ ++ void* queue[2]; \ + + #define UV_ASYNC_PRIVATE_FIELDS \ + uv_async_cb async_cb; \ +- struct uv__queue queue; \ ++ void* queue[2]; \ + int pending; \ + + #define UV_TIMER_PRIVATE_FIELDS \ +@@ -352,7 +352,7 @@ typedef struct { + int retcode; + + #define UV_PROCESS_PRIVATE_FIELDS \ +- struct uv__queue queue; \ ++ void* queue[2]; \ + int status; \ + + #define UV_FS_PRIVATE_FIELDS \ +diff --git a/deps/uv/include/uv/win.h b/deps/uv/include/uv/win.h +index 6f8c47298e4..92a95fa15f1 100644 +--- a/deps/uv/include/uv/win.h ++++ b/deps/uv/include/uv/win.h +@@ -357,7 +357,7 @@ typedef struct { + /* Counter to started timer */ \ + uint64_t timer_counter; \ + /* Threadpool */ \ +- struct uv__queue wq; \ ++ void* wq[2]; \ + uv_mutex_t wq_mutex; \ + uv_async_t wq_async; + +@@ -486,7 +486,7 @@ typedef struct { + uint32_t payload_remaining; \ + uint64_t dummy; /* TODO: retained for ABI compat; remove this in v2.x. */ \ + } ipc_data_frame; \ +- struct uv__queue ipc_xfer_queue; \ ++ void* ipc_xfer_queue[2]; \ + int ipc_xfer_queue_length; \ + uv_write_t* non_overlapped_writes_tail; \ + CRITICAL_SECTION readfile_thread_lock; \ +diff --git a/deps/uv/src/queue.h b/deps/uv/src/queue.h +index 5f8489e9bc5..ff3540a0a51 100644 +--- a/deps/uv/src/queue.h ++++ b/deps/uv/src/queue.h +@@ -18,73 +18,91 @@ + + #include <stddef.h> + +-#define uv__queue_data(pointer, type, field) \ +- ((type*) ((char*) (pointer) - offsetof(type, field))) +- +-#define uv__queue_foreach(q, h) \ +- for ((q) = (h)->next; (q) != (h); (q) = (q)->next) +- +-static inline void uv__queue_init(struct uv__queue* q) { +- q->next = q; +- q->prev = q; +-} +- +-static inline int uv__queue_empty(const struct uv__queue* q) { +- return q == q->next; +-} +- +-static inline struct uv__queue* uv__queue_head(const struct uv__queue* q) { +- return q->next; +-} +- +-static inline struct uv__queue* uv__queue_next(const struct uv__queue* q) { +- return q->next; +-} +- +-static inline void uv__queue_add(struct uv__queue* h, struct uv__queue* n) { +- h->prev->next = n->next; +- n->next->prev = h->prev; +- h->prev = n->prev; +- h->prev->next = h; +-} +- +-static inline void uv__queue_split(struct uv__queue* h, +- struct uv__queue* q, +- struct uv__queue* n) { +- n->prev = h->prev; +- n->prev->next = n; +- n->next = q; +- h->prev = q->prev; +- h->prev->next = h; +- q->prev = n; +-} +- +-static inline void uv__queue_move(struct uv__queue* h, struct uv__queue* n) { +- if (uv__queue_empty(h)) +- uv__queue_init(n); +- else +- uv__queue_split(h, h->next, n); +-} +- +-static inline void uv__queue_insert_head(struct uv__queue* h, +- struct uv__queue* q) { +- q->next = h->next; +- q->prev = h; +- q->next->prev = q; +- h->next = q; +-} +- +-static inline void uv__queue_insert_tail(struct uv__queue* h, +- struct uv__queue* q) { +- q->next = h; +- q->prev = h->prev; +- q->prev->next = q; +- h->prev = q; +-} +- +-static inline void uv__queue_remove(struct uv__queue* q) { +- q->prev->next = q->next; +- q->next->prev = q->prev; +-} ++typedef void *QUEUE[2]; ++ ++/* Private macros. */ ++#define QUEUE_NEXT(q) (*(QUEUE **) &((*(q))[0])) ++#define QUEUE_PREV(q) (*(QUEUE **) &((*(q))[1])) ++#define QUEUE_PREV_NEXT(q) (QUEUE_NEXT(QUEUE_PREV(q))) ++#define QUEUE_NEXT_PREV(q) (QUEUE_PREV(QUEUE_NEXT(q))) ++ ++/* Public macros. */ ++#define QUEUE_DATA(ptr, type, field) \ ++ ((type *) ((char *) (ptr) - offsetof(type, field))) ++ ++/* Important note: mutating the list while QUEUE_FOREACH is ++ * iterating over its elements results in undefined behavior. ++ */ ++#define QUEUE_FOREACH(q, h) \ ++ for ((q) = QUEUE_NEXT(h); (q) != (h); (q) = QUEUE_NEXT(q)) ++ ++#define QUEUE_EMPTY(q) \ ++ ((const QUEUE *) (q) == (const QUEUE *) QUEUE_NEXT(q)) ++ ++#define QUEUE_HEAD(q) \ ++ (QUEUE_NEXT(q)) ++ ++#define QUEUE_INIT(q) \ ++ do { \ ++ QUEUE_NEXT(q) = (q); \ ++ QUEUE_PREV(q) = (q); \ ++ } \ ++ while (0) ++ ++#define QUEUE_ADD(h, n) \ ++ do { \ ++ QUEUE_PREV_NEXT(h) = QUEUE_NEXT(n); \ ++ QUEUE_NEXT_PREV(n) = QUEUE_PREV(h); \ ++ QUEUE_PREV(h) = QUEUE_PREV(n); \ ++ QUEUE_PREV_NEXT(h) = (h); \ ++ } \ ++ while (0) ++ ++#define QUEUE_SPLIT(h, q, n) \ ++ do { \ ++ QUEUE_PREV(n) = QUEUE_PREV(h); \ ++ QUEUE_PREV_NEXT(n) = (n); \ ++ QUEUE_NEXT(n) = (q); \ ++ QUEUE_PREV(h) = QUEUE_PREV(q); \ ++ QUEUE_PREV_NEXT(h) = (h); \ ++ QUEUE_PREV(q) = (n); \ ++ } \ ++ while (0) ++ ++#define QUEUE_MOVE(h, n) \ ++ do { \ ++ if (QUEUE_EMPTY(h)) \ ++ QUEUE_INIT(n); \ ++ else { \ ++ QUEUE* q = QUEUE_HEAD(h); \ ++ QUEUE_SPLIT(h, q, n); \ ++ } \ ++ } \ ++ while (0) ++ ++#define QUEUE_INSERT_HEAD(h, q) \ ++ do { \ ++ QUEUE_NEXT(q) = QUEUE_NEXT(h); \ ++ QUEUE_PREV(q) = (h); \ ++ QUEUE_NEXT_PREV(q) = (q); \ ++ QUEUE_NEXT(h) = (q); \ ++ } \ ++ while (0) ++ ++#define QUEUE_INSERT_TAIL(h, q) \ ++ do { \ ++ QUEUE_NEXT(q) = (h); \ ++ QUEUE_PREV(q) = QUEUE_PREV(h); \ ++ QUEUE_PREV_NEXT(q) = (q); \ ++ QUEUE_PREV(h) = (q); \ ++ } \ ++ while (0) ++ ++#define QUEUE_REMOVE(q) \ ++ do { \ ++ QUEUE_PREV_NEXT(q) = QUEUE_NEXT(q); \ ++ QUEUE_NEXT_PREV(q) = QUEUE_PREV(q); \ ++ } \ ++ while (0) + + #endif /* QUEUE_H_ */ +diff --git a/deps/uv/src/threadpool.c b/deps/uv/src/threadpool.c +index dbef67f2f10..51962bf0021 100644 +--- a/deps/uv/src/threadpool.c ++++ b/deps/uv/src/threadpool.c +@@ -37,10 +37,10 @@ static unsigned int slow_io_work_running; + static unsigned int nthreads; + static uv_thread_t* threads; + static uv_thread_t default_threads[4]; +-static struct uv__queue exit_message; +-static struct uv__queue wq; +-static struct uv__queue run_slow_work_message; +-static struct uv__queue slow_io_pending_wq; ++static QUEUE exit_message; ++static QUEUE wq; ++static QUEUE run_slow_work_message; ++static QUEUE slow_io_pending_wq; + + static unsigned int slow_work_thread_threshold(void) { + return (nthreads + 1) / 2; +@@ -56,7 +56,7 @@ static void uv__cancelled(struct uv__work* w) { + */ + static void worker(void* arg) { + struct uv__work* w; +- struct uv__queue* q; ++ QUEUE* q; + int is_slow_work; + + uv_sem_post((uv_sem_t*) arg); +@@ -68,49 +68,49 @@ static void worker(void* arg) { + + /* Keep waiting while either no work is present or only slow I/O + and we're at the threshold for that. */ +- while (uv__queue_empty(&wq) || +- (uv__queue_head(&wq) == &run_slow_work_message && +- uv__queue_next(&run_slow_work_message) == &wq && ++ while (QUEUE_EMPTY(&wq) || ++ (QUEUE_HEAD(&wq) == &run_slow_work_message && ++ QUEUE_NEXT(&run_slow_work_message) == &wq && + slow_io_work_running >= slow_work_thread_threshold())) { + idle_threads += 1; + uv_cond_wait(&cond, &mutex); + idle_threads -= 1; + } + +- q = uv__queue_head(&wq); ++ q = QUEUE_HEAD(&wq); + if (q == &exit_message) { + uv_cond_signal(&cond); + uv_mutex_unlock(&mutex); + break; + } + +- uv__queue_remove(q); +- uv__queue_init(q); /* Signal uv_cancel() that the work req is executing. */ ++ QUEUE_REMOVE(q); ++ QUEUE_INIT(q); /* Signal uv_cancel() that the work req is executing. */ + + is_slow_work = 0; + if (q == &run_slow_work_message) { + /* If we're at the slow I/O threshold, re-schedule until after all + other work in the queue is done. */ + if (slow_io_work_running >= slow_work_thread_threshold()) { +- uv__queue_insert_tail(&wq, q); ++ QUEUE_INSERT_TAIL(&wq, q); + continue; + } + + /* If we encountered a request to run slow I/O work but there is none + to run, that means it's cancelled => Start over. */ +- if (uv__queue_empty(&slow_io_pending_wq)) ++ if (QUEUE_EMPTY(&slow_io_pending_wq)) + continue; + + is_slow_work = 1; + slow_io_work_running++; + +- q = uv__queue_head(&slow_io_pending_wq); +- uv__queue_remove(q); +- uv__queue_init(q); ++ q = QUEUE_HEAD(&slow_io_pending_wq); ++ QUEUE_REMOVE(q); ++ QUEUE_INIT(q); + + /* If there is more slow I/O work, schedule it to be run as well. */ +- if (!uv__queue_empty(&slow_io_pending_wq)) { +- uv__queue_insert_tail(&wq, &run_slow_work_message); ++ if (!QUEUE_EMPTY(&slow_io_pending_wq)) { ++ QUEUE_INSERT_TAIL(&wq, &run_slow_work_message); + if (idle_threads > 0) + uv_cond_signal(&cond); + } +@@ -118,13 +118,13 @@ static void worker(void* arg) { + + uv_mutex_unlock(&mutex); + +- w = uv__queue_data(q, struct uv__work, wq); ++ w = QUEUE_DATA(q, struct uv__work, wq); + w->work(w); + + uv_mutex_lock(&w->loop->wq_mutex); + w->work = NULL; /* Signal uv_cancel() that the work req is done + executing. */ +- uv__queue_insert_tail(&w->loop->wq, &w->wq); ++ QUEUE_INSERT_TAIL(&w->loop->wq, &w->wq); + uv_async_send(&w->loop->wq_async); + uv_mutex_unlock(&w->loop->wq_mutex); + +@@ -139,12 +139,12 @@ static void worker(void* arg) { + } + + +-static void post(struct uv__queue* q, enum uv__work_kind kind) { ++static void post(QUEUE* q, enum uv__work_kind kind) { + uv_mutex_lock(&mutex); + if (kind == UV__WORK_SLOW_IO) { + /* Insert into a separate queue. */ +- uv__queue_insert_tail(&slow_io_pending_wq, q); +- if (!uv__queue_empty(&run_slow_work_message)) { ++ QUEUE_INSERT_TAIL(&slow_io_pending_wq, q); ++ if (!QUEUE_EMPTY(&run_slow_work_message)) { + /* Running slow I/O tasks is already scheduled => Nothing to do here. + The worker that runs said other task will schedule this one as well. */ + uv_mutex_unlock(&mutex); +@@ -153,7 +153,7 @@ static void post(struct uv__queue* q, enum uv__work_kind kind) { + q = &run_slow_work_message; + } + +- uv__queue_insert_tail(&wq, q); ++ QUEUE_INSERT_TAIL(&wq, q); + if (idle_threads > 0) + uv_cond_signal(&cond); + uv_mutex_unlock(&mutex); +@@ -220,9 +220,9 @@ static void init_threads(void) { + if (uv_mutex_init(&mutex)) + abort(); + +- uv__queue_init(&wq); +- uv__queue_init(&slow_io_pending_wq); +- uv__queue_init(&run_slow_work_message); ++ QUEUE_INIT(&wq); ++ QUEUE_INIT(&slow_io_pending_wq); ++ QUEUE_INIT(&run_slow_work_message); + + if (uv_sem_init(&sem, 0)) + abort(); +@@ -285,9 +285,9 @@ static int uv__work_cancel(uv_loop_t* loop, uv_req_t* req, struct uv__work* w) { + uv_mutex_lock(&mutex); + uv_mutex_lock(&w->loop->wq_mutex); + +- cancelled = !uv__queue_empty(&w->wq) && w->work != NULL; ++ cancelled = !QUEUE_EMPTY(&w->wq) && w->work != NULL; + if (cancelled) +- uv__queue_remove(&w->wq); ++ QUEUE_REMOVE(&w->wq); + + uv_mutex_unlock(&w->loop->wq_mutex); + uv_mutex_unlock(&mutex); +@@ -297,7 +297,7 @@ static int uv__work_cancel(uv_loop_t* loop, uv_req_t* req, struct uv__work* w) { + + w->work = uv__cancelled; + uv_mutex_lock(&loop->wq_mutex); +- uv__queue_insert_tail(&loop->wq, &w->wq); ++ QUEUE_INSERT_TAIL(&loop->wq, &w->wq); + uv_async_send(&loop->wq_async); + uv_mutex_unlock(&loop->wq_mutex); + +@@ -308,21 +308,21 @@ static int uv__work_cancel(uv_loop_t* loop, uv_req_t* req, struct uv__work* w) { + void uv__work_done(uv_async_t* handle) { + struct uv__work* w; + uv_loop_t* loop; +- struct uv__queue* q; +- struct uv__queue wq; ++ QUEUE* q; ++ QUEUE wq; + int err; + int nevents; + + loop = container_of(handle, uv_loop_t, wq_async); + uv_mutex_lock(&loop->wq_mutex); +- uv__queue_move(&loop->wq, &wq); ++ QUEUE_MOVE(&loop->wq, &wq); + uv_mutex_unlock(&loop->wq_mutex); + + nevents = 0; + +- while (!uv__queue_empty(&wq)) { +- q = uv__queue_head(&wq); +- uv__queue_remove(q); ++ while (!QUEUE_EMPTY(&wq)) { ++ q = QUEUE_HEAD(&wq); ++ QUEUE_REMOVE(q); + + w = container_of(q, struct uv__work, wq); + err = (w->work == uv__cancelled) ? UV_ECANCELED : 0; +diff --git a/deps/uv/src/unix/aix.c b/deps/uv/src/unix/aix.c +index 3af3009a216..f1afbed49ec 100644 +--- a/deps/uv/src/unix/aix.c ++++ b/deps/uv/src/unix/aix.c +@@ -136,7 +136,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + struct pollfd pqry; + struct pollfd* pe; + struct poll_ctl pc; +- struct uv__queue* q; ++ QUEUE* q; + uv__io_t* w; + uint64_t base; + uint64_t diff; +@@ -151,18 +151,18 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + int reset_timeout; + + if (loop->nfds == 0) { +- assert(uv__queue_empty(&loop->watcher_queue)); ++ assert(QUEUE_EMPTY(&loop->watcher_queue)); + return; + } + + lfields = uv__get_internal_fields(loop); + +- while (!uv__queue_empty(&loop->watcher_queue)) { +- q = uv__queue_head(&loop->watcher_queue); +- uv__queue_remove(q); +- uv__queue_init(q); ++ while (!QUEUE_EMPTY(&loop->watcher_queue)) { ++ q = QUEUE_HEAD(&loop->watcher_queue); ++ QUEUE_REMOVE(q); ++ QUEUE_INIT(q); + +- w = uv__queue_data(q, uv__io_t, watcher_queue); ++ w = QUEUE_DATA(q, uv__io_t, watcher_queue); + assert(w->pevents != 0); + assert(w->fd >= 0); + assert(w->fd < (int) loop->nwatchers); +diff --git a/deps/uv/src/unix/async.c b/deps/uv/src/unix/async.c +index 0ff2669e30a..5751b6d02be 100644 +--- a/deps/uv/src/unix/async.c ++++ b/deps/uv/src/unix/async.c +@@ -55,7 +55,7 @@ int uv_async_init(uv_loop_t* loop, uv_async_t* handle, uv_async_cb async_cb) { + handle->pending = 0; + handle->u.fd = 0; /* This will be used as a busy flag. */ + +- uv__queue_insert_tail(&loop->async_handles, &handle->queue); ++ QUEUE_INSERT_TAIL(&loop->async_handles, &handle->queue); + uv__handle_start(handle); + + return 0; +@@ -124,7 +124,7 @@ static void uv__async_spin(uv_async_t* handle) { + + void uv__async_close(uv_async_t* handle) { + uv__async_spin(handle); +- uv__queue_remove(&handle->queue); ++ QUEUE_REMOVE(&handle->queue); + uv__handle_stop(handle); + } + +@@ -132,8 +132,8 @@ void uv__async_close(uv_async_t* handle) { + static void uv__async_io(uv_loop_t* loop, uv__io_t* w, unsigned int events) { + char buf[1024]; + ssize_t r; +- struct uv__queue queue; +- struct uv__queue* q; ++ QUEUE queue; ++ QUEUE* q; + uv_async_t* h; + _Atomic int *pending; + +@@ -157,13 +157,13 @@ static void uv__async_io(uv_loop_t* loop, uv__io_t* w, unsigned int events) { + abort(); + } + +- uv__queue_move(&loop->async_handles, &queue); +- while (!uv__queue_empty(&queue)) { +- q = uv__queue_head(&queue); +- h = uv__queue_data(q, uv_async_t, queue); ++ QUEUE_MOVE(&loop->async_handles, &queue); ++ while (!QUEUE_EMPTY(&queue)) { ++ q = QUEUE_HEAD(&queue); ++ h = QUEUE_DATA(q, uv_async_t, queue); + +- uv__queue_remove(q); +- uv__queue_insert_tail(&loop->async_handles, q); ++ QUEUE_REMOVE(q); ++ QUEUE_INSERT_TAIL(&loop->async_handles, q); + + /* Atomically fetch and clear pending flag */ + pending = (_Atomic int*) &h->pending; +@@ -241,8 +241,8 @@ static int uv__async_start(uv_loop_t* loop) { + + + void uv__async_stop(uv_loop_t* loop) { +- struct uv__queue queue; +- struct uv__queue* q; ++ QUEUE queue; ++ QUEUE* q; + uv_async_t* h; + + if (loop->async_io_watcher.fd == -1) +@@ -251,13 +251,13 @@ void uv__async_stop(uv_loop_t* loop) { + /* Make sure no other thread is accessing the async handle fd after the loop + * cleanup. + */ +- uv__queue_move(&loop->async_handles, &queue); +- while (!uv__queue_empty(&queue)) { +- q = uv__queue_head(&queue); +- h = uv__queue_data(q, uv_async_t, queue); ++ QUEUE_MOVE(&loop->async_handles, &queue); ++ while (!QUEUE_EMPTY(&queue)) { ++ q = QUEUE_HEAD(&queue); ++ h = QUEUE_DATA(q, uv_async_t, queue); + +- uv__queue_remove(q); +- uv__queue_insert_tail(&loop->async_handles, q); ++ QUEUE_REMOVE(q); ++ QUEUE_INSERT_TAIL(&loop->async_handles, q); + + uv__async_spin(h); + } +@@ -275,20 +275,20 @@ void uv__async_stop(uv_loop_t* loop) { + + + int uv__async_fork(uv_loop_t* loop) { +- struct uv__queue queue; +- struct uv__queue* q; ++ QUEUE queue; ++ QUEUE* q; + uv_async_t* h; + + if (loop->async_io_watcher.fd == -1) /* never started */ + return 0; + +- uv__queue_move(&loop->async_handles, &queue); +- while (!uv__queue_empty(&queue)) { +- q = uv__queue_head(&queue); +- h = uv__queue_data(q, uv_async_t, queue); ++ QUEUE_MOVE(&loop->async_handles, &queue); ++ while (!QUEUE_EMPTY(&queue)) { ++ q = QUEUE_HEAD(&queue); ++ h = QUEUE_DATA(q, uv_async_t, queue); + +- uv__queue_remove(q); +- uv__queue_insert_tail(&loop->async_handles, q); ++ QUEUE_REMOVE(q); ++ QUEUE_INSERT_TAIL(&loop->async_handles, q); + + /* The state of any thread that set pending is now likely corrupt in this + * child because the user called fork, so just clear these flags and move +diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c +index 25c5181f370..55aa962787e 100644 +--- a/deps/uv/src/unix/core.c ++++ b/deps/uv/src/unix/core.c +@@ -344,7 +344,7 @@ static void uv__finish_close(uv_handle_t* handle) { + } + + uv__handle_unref(handle); +- uv__queue_remove(&handle->handle_queue); ++ QUEUE_REMOVE(&handle->handle_queue); + + if (handle->close_cb) { + handle->close_cb(handle); +@@ -380,7 +380,7 @@ int uv_backend_fd(const uv_loop_t* loop) { + static int uv__loop_alive(const uv_loop_t* loop) { + return uv__has_active_handles(loop) || + uv__has_active_reqs(loop) || +- !uv__queue_empty(&loop->pending_queue) || ++ !QUEUE_EMPTY(&loop->pending_queue) || + loop->closing_handles != NULL; + } + +@@ -389,8 +389,8 @@ static int uv__backend_timeout(const uv_loop_t* loop) { + if (loop->stop_flag == 0 && + /* uv__loop_alive(loop) && */ + (uv__has_active_handles(loop) || uv__has_active_reqs(loop)) && +- uv__queue_empty(&loop->pending_queue) && +- uv__queue_empty(&loop->idle_handles) && ++ QUEUE_EMPTY(&loop->pending_queue) && ++ QUEUE_EMPTY(&loop->idle_handles) && + (loop->flags & UV_LOOP_REAP_CHILDREN) == 0 && + loop->closing_handles == NULL) + return uv__next_timeout(loop); +@@ -399,7 +399,7 @@ static int uv__backend_timeout(const uv_loop_t* loop) { + + + int uv_backend_timeout(const uv_loop_t* loop) { +- if (uv__queue_empty(&loop->watcher_queue)) ++ if (QUEUE_EMPTY(&loop->watcher_queue)) + return uv__backend_timeout(loop); + /* Need to call uv_run to update the backend fd state. */ + return 0; +@@ -431,8 +431,7 @@ int uv_run(uv_loop_t* loop, uv_run_mode mode) { + + while (r != 0 && loop->stop_flag == 0) { + can_sleep = +- uv__queue_empty(&loop->pending_queue) && +- uv__queue_empty(&loop->idle_handles); ++ QUEUE_EMPTY(&loop->pending_queue) && QUEUE_EMPTY(&loop->idle_handles); + + uv__run_pending(loop); + uv__run_idle(loop); +@@ -448,7 +447,7 @@ int uv_run(uv_loop_t* loop, uv_run_mode mode) { + + /* Process immediate callbacks (e.g. write_cb) a small fixed number of + * times to avoid loop starvation.*/ +- for (r = 0; r < 8 && !uv__queue_empty(&loop->pending_queue); r++) ++ for (r = 0; r < 8 && !QUEUE_EMPTY(&loop->pending_queue); r++) + uv__run_pending(loop); + + /* Run one final update on the provider_idle_time in case uv__io_poll +@@ -827,17 +826,17 @@ int uv_fileno(const uv_handle_t* handle, uv_os_fd_t* fd) { + + + static void uv__run_pending(uv_loop_t* loop) { +- struct uv__queue* q; +- struct uv__queue pq; ++ QUEUE* q; ++ QUEUE pq; + uv__io_t* w; + +- uv__queue_move(&loop->pending_queue, &pq); ++ QUEUE_MOVE(&loop->pending_queue, &pq); + +- while (!uv__queue_empty(&pq)) { +- q = uv__queue_head(&pq); +- uv__queue_remove(q); +- uv__queue_init(q); +- w = uv__queue_data(q, uv__io_t, pending_queue); ++ while (!QUEUE_EMPTY(&pq)) { ++ q = QUEUE_HEAD(&pq); ++ QUEUE_REMOVE(q); ++ QUEUE_INIT(q); ++ w = QUEUE_DATA(q, uv__io_t, pending_queue); + w->cb(loop, w, POLLOUT); + } + } +@@ -892,8 +891,8 @@ static void maybe_resize(uv_loop_t* loop, unsigned int len) { + void uv__io_init(uv__io_t* w, uv__io_cb cb, int fd) { + assert(cb != NULL); + assert(fd >= -1); +- uv__queue_init(&w->pending_queue); +- uv__queue_init(&w->watcher_queue); ++ QUEUE_INIT(&w->pending_queue); ++ QUEUE_INIT(&w->watcher_queue); + w->cb = cb; + w->fd = fd; + w->events = 0; +@@ -919,8 +918,8 @@ void uv__io_start(uv_loop_t* loop, uv__io_t* w, unsigned int events) { + return; + #endif + +- if (uv__queue_empty(&w->watcher_queue)) +- uv__queue_insert_tail(&loop->watcher_queue, &w->watcher_queue); ++ if (QUEUE_EMPTY(&w->watcher_queue)) ++ QUEUE_INSERT_TAIL(&loop->watcher_queue, &w->watcher_queue); + + if (loop->watchers[w->fd] == NULL) { + loop->watchers[w->fd] = w; +@@ -945,8 +944,8 @@ void uv__io_stop(uv_loop_t* loop, uv__io_t* w, unsigned int events) { + w->pevents &= ~events; + + if (w->pevents == 0) { +- uv__queue_remove(&w->watcher_queue); +- uv__queue_init(&w->watcher_queue); ++ QUEUE_REMOVE(&w->watcher_queue); ++ QUEUE_INIT(&w->watcher_queue); + w->events = 0; + + if (w == loop->watchers[w->fd]) { +@@ -955,14 +954,14 @@ void uv__io_stop(uv_loop_t* loop, uv__io_t* w, unsigned int events) { + loop->nfds--; + } + } +- else if (uv__queue_empty(&w->watcher_queue)) +- uv__queue_insert_tail(&loop->watcher_queue, &w->watcher_queue); ++ else if (QUEUE_EMPTY(&w->watcher_queue)) ++ QUEUE_INSERT_TAIL(&loop->watcher_queue, &w->watcher_queue); + } + + + void uv__io_close(uv_loop_t* loop, uv__io_t* w) { + uv__io_stop(loop, w, POLLIN | POLLOUT | UV__POLLRDHUP | UV__POLLPRI); +- uv__queue_remove(&w->pending_queue); ++ QUEUE_REMOVE(&w->pending_queue); + + /* Remove stale events for this file descriptor */ + if (w->fd != -1) +@@ -971,8 +970,8 @@ void uv__io_close(uv_loop_t* loop, uv__io_t* w) { + + + void uv__io_feed(uv_loop_t* loop, uv__io_t* w) { +- if (uv__queue_empty(&w->pending_queue)) +- uv__queue_insert_tail(&loop->pending_queue, &w->pending_queue); ++ if (QUEUE_EMPTY(&w->pending_queue)) ++ QUEUE_INSERT_TAIL(&loop->pending_queue, &w->pending_queue); + } + + +diff --git a/deps/uv/src/unix/fs.c b/deps/uv/src/unix/fs.c +index 6b051c124f2..00d385c24b7 100644 +--- a/deps/uv/src/unix/fs.c ++++ b/deps/uv/src/unix/fs.c +@@ -62,6 +62,7 @@ + + #if defined(__linux__) + # include <sys/sendfile.h> ++# include <sys/utsname.h> + #endif + + #if defined(__sun) +@@ -903,6 +904,31 @@ out: + + + #ifdef __linux__ ++static unsigned uv__kernel_version(void) { ++ static _Atomic unsigned cached_version; ++ struct utsname u; ++ unsigned version; ++ unsigned major; ++ unsigned minor; ++ unsigned patch; ++ ++ version = atomic_load_explicit(&cached_version, memory_order_relaxed); ++ if (version != 0) ++ return version; ++ ++ if (-1 == uname(&u)) ++ return 0; ++ ++ if (3 != sscanf(u.release, "%u.%u.%u", &major, &minor, &patch)) ++ return 0; ++ ++ version = major * 65536 + minor * 256 + patch; ++ atomic_store_explicit(&cached_version, version, memory_order_relaxed); ++ ++ return version; ++} ++ ++ + /* Pre-4.20 kernels have a bug where CephFS uses the RADOS copy-from command + * in copy_file_range() when it shouldn't. There is no workaround except to + * fall back to a regular copy. +@@ -1905,9 +1931,6 @@ int uv_fs_link(uv_loop_t* loop, + uv_fs_cb cb) { + INIT(LINK); + PATH2; +- if (cb != NULL) +- if (uv__iou_fs_link(loop, req)) +- return 0; + POST; + } + +@@ -1920,9 +1943,6 @@ int uv_fs_mkdir(uv_loop_t* loop, + INIT(MKDIR); + PATH; + req->mode = mode; +- if (cb != NULL) +- if (uv__iou_fs_mkdir(loop, req)) +- return 0; + POST; + } + +@@ -2074,9 +2094,6 @@ int uv_fs_rename(uv_loop_t* loop, + uv_fs_cb cb) { + INIT(RENAME); + PATH2; +- if (cb != NULL) +- if (uv__iou_fs_rename(loop, req)) +- return 0; + POST; + } + +@@ -2123,9 +2140,6 @@ int uv_fs_symlink(uv_loop_t* loop, + INIT(SYMLINK); + PATH2; + req->flags = flags; +- if (cb != NULL) +- if (uv__iou_fs_symlink(loop, req)) +- return 0; + POST; + } + +@@ -2133,9 +2147,6 @@ int uv_fs_symlink(uv_loop_t* loop, + int uv_fs_unlink(uv_loop_t* loop, uv_fs_t* req, const char* path, uv_fs_cb cb) { + INIT(UNLINK); + PATH; +- if (cb != NULL) +- if (uv__iou_fs_unlink(loop, req)) +- return 0; + POST; + } + +diff --git a/deps/uv/src/unix/fsevents.c b/deps/uv/src/unix/fsevents.c +index df703f3635f..0535b4547aa 100644 +--- a/deps/uv/src/unix/fsevents.c ++++ b/deps/uv/src/unix/fsevents.c +@@ -80,13 +80,13 @@ enum uv__cf_loop_signal_type_e { + typedef enum uv__cf_loop_signal_type_e uv__cf_loop_signal_type_t; + + struct uv__cf_loop_signal_s { +- struct uv__queue member; ++ QUEUE member; + uv_fs_event_t* handle; + uv__cf_loop_signal_type_t type; + }; + + struct uv__fsevents_event_s { +- struct uv__queue member; ++ QUEUE member; + int events; + char path[1]; + }; +@@ -98,7 +98,7 @@ struct uv__cf_loop_state_s { + FSEventStreamRef fsevent_stream; + uv_sem_t fsevent_sem; + uv_mutex_t fsevent_mutex; +- struct uv__queue fsevent_handles; ++ void* fsevent_handles[2]; + unsigned int fsevent_handle_count; + }; + +@@ -150,22 +150,22 @@ static void (*pFSEventStreamStop)(FSEventStreamRef); + + #define UV__FSEVENTS_PROCESS(handle, block) \ + do { \ +- struct uv__queue events; \ +- struct uv__queue* q; \ ++ QUEUE events; \ ++ QUEUE* q; \ + uv__fsevents_event_t* event; \ + int err; \ + uv_mutex_lock(&(handle)->cf_mutex); \ + /* Split-off all events and empty original queue */ \ +- uv__queue_move(&(handle)->cf_events, &events); \ ++ QUEUE_MOVE(&(handle)->cf_events, &events); \ + /* Get error (if any) and zero original one */ \ + err = (handle)->cf_error; \ + (handle)->cf_error = 0; \ + uv_mutex_unlock(&(handle)->cf_mutex); \ + /* Loop through events, deallocating each after processing */ \ +- while (!uv__queue_empty(&events)) { \ +- q = uv__queue_head(&events); \ +- event = uv__queue_data(q, uv__fsevents_event_t, member); \ +- uv__queue_remove(q); \ ++ while (!QUEUE_EMPTY(&events)) { \ ++ q = QUEUE_HEAD(&events); \ ++ event = QUEUE_DATA(q, uv__fsevents_event_t, member); \ ++ QUEUE_REMOVE(q); \ + /* NOTE: Checking uv__is_active() is required here, because handle \ + * callback may close handle and invoking it after it will lead to \ + * incorrect behaviour */ \ +@@ -193,14 +193,14 @@ static void uv__fsevents_cb(uv_async_t* cb) { + + /* Runs in CF thread, pushed event into handle's event list */ + static void uv__fsevents_push_event(uv_fs_event_t* handle, +- struct uv__queue* events, ++ QUEUE* events, + int err) { + assert(events != NULL || err != 0); + uv_mutex_lock(&handle->cf_mutex); + + /* Concatenate two queues */ + if (events != NULL) +- uv__queue_add(&handle->cf_events, events); ++ QUEUE_ADD(&handle->cf_events, events); + + /* Propagate error */ + if (err != 0) +@@ -224,12 +224,12 @@ static void uv__fsevents_event_cb(const FSEventStreamRef streamRef, + char* path; + char* pos; + uv_fs_event_t* handle; +- struct uv__queue* q; ++ QUEUE* q; + uv_loop_t* loop; + uv__cf_loop_state_t* state; + uv__fsevents_event_t* event; + FSEventStreamEventFlags flags; +- struct uv__queue head; ++ QUEUE head; + + loop = info; + state = loop->cf_state; +@@ -238,9 +238,9 @@ static void uv__fsevents_event_cb(const FSEventStreamRef streamRef, + + /* For each handle */ + uv_mutex_lock(&state->fsevent_mutex); +- uv__queue_foreach(q, &state->fsevent_handles) { +- handle = uv__queue_data(q, uv_fs_event_t, cf_member); +- uv__queue_init(&head); ++ QUEUE_FOREACH(q, &state->fsevent_handles) { ++ handle = QUEUE_DATA(q, uv_fs_event_t, cf_member); ++ QUEUE_INIT(&head); + + /* Process and filter out events */ + for (i = 0; i < numEvents; i++) { +@@ -318,10 +318,10 @@ static void uv__fsevents_event_cb(const FSEventStreamRef streamRef, + event->events = UV_CHANGE; + } + +- uv__queue_insert_tail(&head, &event->member); ++ QUEUE_INSERT_TAIL(&head, &event->member); + } + +- if (!uv__queue_empty(&head)) ++ if (!QUEUE_EMPTY(&head)) + uv__fsevents_push_event(handle, &head, 0); + } + uv_mutex_unlock(&state->fsevent_mutex); +@@ -403,7 +403,7 @@ static void uv__fsevents_destroy_stream(uv__cf_loop_state_t* state) { + static void uv__fsevents_reschedule(uv__cf_loop_state_t* state, + uv_loop_t* loop, + uv__cf_loop_signal_type_t type) { +- struct uv__queue* q; ++ QUEUE* q; + uv_fs_event_t* curr; + CFArrayRef cf_paths; + CFStringRef* paths; +@@ -446,9 +446,9 @@ static void uv__fsevents_reschedule(uv__cf_loop_state_t* state, + + q = &state->fsevent_handles; + for (; i < path_count; i++) { +- q = uv__queue_next(q); ++ q = QUEUE_NEXT(q); + assert(q != &state->fsevent_handles); +- curr = uv__queue_data(q, uv_fs_event_t, cf_member); ++ curr = QUEUE_DATA(q, uv_fs_event_t, cf_member); + + assert(curr->realpath != NULL); + paths[i] = +@@ -486,8 +486,8 @@ final: + + /* Broadcast error to all handles */ + uv_mutex_lock(&state->fsevent_mutex); +- uv__queue_foreach(q, &state->fsevent_handles) { +- curr = uv__queue_data(q, uv_fs_event_t, cf_member); ++ QUEUE_FOREACH(q, &state->fsevent_handles) { ++ curr = QUEUE_DATA(q, uv_fs_event_t, cf_member); + uv__fsevents_push_event(curr, NULL, err); + } + uv_mutex_unlock(&state->fsevent_mutex); +@@ -606,7 +606,7 @@ static int uv__fsevents_loop_init(uv_loop_t* loop) { + if (err) + goto fail_sem_init; + +- uv__queue_init(&loop->cf_signals); ++ QUEUE_INIT(&loop->cf_signals); + + err = uv_sem_init(&state->fsevent_sem, 0); + if (err) +@@ -616,7 +616,7 @@ static int uv__fsevents_loop_init(uv_loop_t* loop) { + if (err) + goto fail_fsevent_mutex_init; + +- uv__queue_init(&state->fsevent_handles); ++ QUEUE_INIT(&state->fsevent_handles); + state->fsevent_need_reschedule = 0; + state->fsevent_handle_count = 0; + +@@ -675,7 +675,7 @@ fail_mutex_init: + void uv__fsevents_loop_delete(uv_loop_t* loop) { + uv__cf_loop_signal_t* s; + uv__cf_loop_state_t* state; +- struct uv__queue* q; ++ QUEUE* q; + + if (loop->cf_state == NULL) + return; +@@ -688,10 +688,10 @@ void uv__fsevents_loop_delete(uv_loop_t* loop) { + uv_mutex_destroy(&loop->cf_mutex); + + /* Free any remaining data */ +- while (!uv__queue_empty(&loop->cf_signals)) { +- q = uv__queue_head(&loop->cf_signals); +- s = uv__queue_data(q, uv__cf_loop_signal_t, member); +- uv__queue_remove(q); ++ while (!QUEUE_EMPTY(&loop->cf_signals)) { ++ q = QUEUE_HEAD(&loop->cf_signals); ++ s = QUEUE_DATA(q, uv__cf_loop_signal_t, member); ++ QUEUE_REMOVE(q); + uv__free(s); + } + +@@ -735,22 +735,22 @@ static void* uv__cf_loop_runner(void* arg) { + static void uv__cf_loop_cb(void* arg) { + uv_loop_t* loop; + uv__cf_loop_state_t* state; +- struct uv__queue* item; +- struct uv__queue split_head; ++ QUEUE* item; ++ QUEUE split_head; + uv__cf_loop_signal_t* s; + + loop = arg; + state = loop->cf_state; + + uv_mutex_lock(&loop->cf_mutex); +- uv__queue_move(&loop->cf_signals, &split_head); ++ QUEUE_MOVE(&loop->cf_signals, &split_head); + uv_mutex_unlock(&loop->cf_mutex); + +- while (!uv__queue_empty(&split_head)) { +- item = uv__queue_head(&split_head); +- uv__queue_remove(item); ++ while (!QUEUE_EMPTY(&split_head)) { ++ item = QUEUE_HEAD(&split_head); ++ QUEUE_REMOVE(item); + +- s = uv__queue_data(item, uv__cf_loop_signal_t, member); ++ s = QUEUE_DATA(item, uv__cf_loop_signal_t, member); + + /* This was a termination signal */ + if (s->handle == NULL) +@@ -778,7 +778,7 @@ int uv__cf_loop_signal(uv_loop_t* loop, + item->type = type; + + uv_mutex_lock(&loop->cf_mutex); +- uv__queue_insert_tail(&loop->cf_signals, &item->member); ++ QUEUE_INSERT_TAIL(&loop->cf_signals, &item->member); + + state = loop->cf_state; + assert(state != NULL); +@@ -807,7 +807,7 @@ int uv__fsevents_init(uv_fs_event_t* handle) { + handle->realpath_len = strlen(handle->realpath); + + /* Initialize event queue */ +- uv__queue_init(&handle->cf_events); ++ QUEUE_INIT(&handle->cf_events); + handle->cf_error = 0; + + /* +@@ -832,7 +832,7 @@ int uv__fsevents_init(uv_fs_event_t* handle) { + /* Insert handle into the list */ + state = handle->loop->cf_state; + uv_mutex_lock(&state->fsevent_mutex); +- uv__queue_insert_tail(&state->fsevent_handles, &handle->cf_member); ++ QUEUE_INSERT_TAIL(&state->fsevent_handles, &handle->cf_member); + state->fsevent_handle_count++; + state->fsevent_need_reschedule = 1; + uv_mutex_unlock(&state->fsevent_mutex); +@@ -872,7 +872,7 @@ int uv__fsevents_close(uv_fs_event_t* handle) { + /* Remove handle from the list */ + state = handle->loop->cf_state; + uv_mutex_lock(&state->fsevent_mutex); +- uv__queue_remove(&handle->cf_member); ++ QUEUE_REMOVE(&handle->cf_member); + state->fsevent_handle_count--; + state->fsevent_need_reschedule = 1; + uv_mutex_unlock(&state->fsevent_mutex); +diff --git a/deps/uv/src/unix/internal.h b/deps/uv/src/unix/internal.h +index fe588513603..6c5822e6a0d 100644 +--- a/deps/uv/src/unix/internal.h ++++ b/deps/uv/src/unix/internal.h +@@ -335,30 +335,20 @@ int uv__iou_fs_close(uv_loop_t* loop, uv_fs_t* req); + int uv__iou_fs_fsync_or_fdatasync(uv_loop_t* loop, + uv_fs_t* req, + uint32_t fsync_flags); +-int uv__iou_fs_link(uv_loop_t* loop, uv_fs_t* req); +-int uv__iou_fs_mkdir(uv_loop_t* loop, uv_fs_t* req); + int uv__iou_fs_open(uv_loop_t* loop, uv_fs_t* req); + int uv__iou_fs_read_or_write(uv_loop_t* loop, + uv_fs_t* req, + int is_read); +-int uv__iou_fs_rename(uv_loop_t* loop, uv_fs_t* req); + int uv__iou_fs_statx(uv_loop_t* loop, + uv_fs_t* req, + int is_fstat, + int is_lstat); +-int uv__iou_fs_symlink(uv_loop_t* loop, uv_fs_t* req); +-int uv__iou_fs_unlink(uv_loop_t* loop, uv_fs_t* req); + #else + #define uv__iou_fs_close(loop, req) 0 + #define uv__iou_fs_fsync_or_fdatasync(loop, req, fsync_flags) 0 +-#define uv__iou_fs_link(loop, req) 0 +-#define uv__iou_fs_mkdir(loop, req) 0 + #define uv__iou_fs_open(loop, req) 0 + #define uv__iou_fs_read_or_write(loop, req, is_read) 0 +-#define uv__iou_fs_rename(loop, req) 0 + #define uv__iou_fs_statx(loop, req, is_fstat, is_lstat) 0 +-#define uv__iou_fs_symlink(loop, req) 0 +-#define uv__iou_fs_unlink(loop, req) 0 + #endif + + #if defined(__APPLE__) +@@ -439,7 +429,6 @@ int uv__statx(int dirfd, + struct uv__statx* statxbuf); + void uv__statx_to_stat(const struct uv__statx* statxbuf, uv_stat_t* buf); + ssize_t uv__getrandom(void* buf, size_t buflen, unsigned flags); +-unsigned uv__kernel_version(void); + #endif + + typedef int (*uv__peersockfunc)(int, struct sockaddr*, socklen_t*); +diff --git a/deps/uv/src/unix/kqueue.c b/deps/uv/src/unix/kqueue.c +index b78242d3be4..82916d65933 100644 +--- a/deps/uv/src/unix/kqueue.c ++++ b/deps/uv/src/unix/kqueue.c +@@ -133,7 +133,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + struct timespec spec; + unsigned int nevents; + unsigned int revents; +- struct uv__queue* q; ++ QUEUE* q; + uv__io_t* w; + uv_process_t* process; + sigset_t* pset; +@@ -152,19 +152,19 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + int reset_timeout; + + if (loop->nfds == 0) { +- assert(uv__queue_empty(&loop->watcher_queue)); ++ assert(QUEUE_EMPTY(&loop->watcher_queue)); + return; + } + + lfields = uv__get_internal_fields(loop); + nevents = 0; + +- while (!uv__queue_empty(&loop->watcher_queue)) { +- q = uv__queue_head(&loop->watcher_queue); +- uv__queue_remove(q); +- uv__queue_init(q); ++ while (!QUEUE_EMPTY(&loop->watcher_queue)) { ++ q = QUEUE_HEAD(&loop->watcher_queue); ++ QUEUE_REMOVE(q); ++ QUEUE_INIT(q); + +- w = uv__queue_data(q, uv__io_t, watcher_queue); ++ w = QUEUE_DATA(q, uv__io_t, watcher_queue); + assert(w->pevents != 0); + assert(w->fd >= 0); + assert(w->fd < (int) loop->nwatchers); +@@ -307,8 +307,8 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + + /* Handle kevent NOTE_EXIT results */ + if (ev->filter == EVFILT_PROC) { +- uv__queue_foreach(q, &loop->process_handles) { +- process = uv__queue_data(q, uv_process_t, queue); ++ QUEUE_FOREACH(q, &loop->process_handles) { ++ process = QUEUE_DATA(q, uv_process_t, queue); + if (process->pid == fd) { + process->flags |= UV_HANDLE_REAP; + loop->flags |= UV_LOOP_REAP_CHILDREN; +diff --git a/deps/uv/src/unix/linux.c b/deps/uv/src/unix/linux.c +index 48b9c2c43e1..5f84ad0eea3 100644 +--- a/deps/uv/src/unix/linux.c ++++ b/deps/uv/src/unix/linux.c +@@ -48,7 +48,6 @@ + #include <sys/sysinfo.h> + #include <sys/sysmacros.h> + #include <sys/types.h> +-#include <sys/utsname.h> + #include <time.h> + #include <unistd.h> + +@@ -151,11 +150,6 @@ enum { + UV__IORING_OP_CLOSE = 19, + UV__IORING_OP_STATX = 21, + UV__IORING_OP_EPOLL_CTL = 29, +- UV__IORING_OP_RENAMEAT = 35, +- UV__IORING_OP_UNLINKAT = 36, +- UV__IORING_OP_MKDIRAT = 37, +- UV__IORING_OP_SYMLINKAT = 38, +- UV__IORING_OP_LINKAT = 39, + }; + + enum { +@@ -168,10 +162,6 @@ enum { + UV__IORING_SQ_CQ_OVERFLOW = 2u, + }; + +-enum { +- UV__MKDIRAT_SYMLINKAT_LINKAT = 1u, +-}; +- + struct uv__io_cqring_offsets { + uint32_t head; + uint32_t tail; +@@ -267,7 +257,7 @@ STATIC_ASSERT(EPOLL_CTL_MOD < 4); + + struct watcher_list { + RB_ENTRY(watcher_list) entry; +- struct uv__queue watchers; ++ QUEUE watchers; + int iterating; + char* path; + int wd; +@@ -310,31 +300,6 @@ static struct watcher_root* uv__inotify_watchers(uv_loop_t* loop) { + } + + +-unsigned uv__kernel_version(void) { +- static _Atomic unsigned cached_version; +- struct utsname u; +- unsigned version; +- unsigned major; +- unsigned minor; +- unsigned patch; +- +- version = atomic_load_explicit(&cached_version, memory_order_relaxed); +- if (version != 0) +- return version; +- +- if (-1 == uname(&u)) +- return 0; +- +- if (3 != sscanf(u.release, "%u.%u.%u", &major, &minor, &patch)) +- return 0; +- +- version = major * 65536 + minor * 256 + patch; +- atomic_store_explicit(&cached_version, version, memory_order_relaxed); +- +- return version; +-} +- +- + ssize_t + uv__fs_copy_file_range(int fd_in, + off_t* off_in, +@@ -420,9 +385,6 @@ int uv__io_uring_register(int fd, unsigned opcode, void* arg, unsigned nargs) { + + + static int uv__use_io_uring(void) { +-#if defined(__ANDROID_API__) +- return 0; /* Possibly available but blocked by seccomp. */ +-#else + /* Ternary: unknown=0, yes=1, no=-1 */ + static _Atomic int use_io_uring; + char* val; +@@ -437,7 +399,6 @@ static int uv__use_io_uring(void) { + } + + return use > 0; +-#endif + } + + +@@ -542,10 +503,6 @@ static void uv__iou_init(int epollfd, + iou->sqelen = sqelen; + iou->ringfd = ringfd; + iou->in_flight = 0; +- iou->flags = 0; +- +- if (uv__kernel_version() >= /* 5.15.0 */ 0x050F00) +- iou->flags |= UV__MKDIRAT_SYMLINKAT_LINKAT; + + for (i = 0; i <= iou->sqmask; i++) + iou->sqarray[i] = i; /* Slot -> sqe identity mapping. */ +@@ -727,7 +684,7 @@ static struct uv__io_uring_sqe* uv__iou_get_sqe(struct uv__iou* iou, + req->work_req.loop = loop; + req->work_req.work = NULL; + req->work_req.done = NULL; +- uv__queue_init(&req->work_req.wq); ++ QUEUE_INIT(&req->work_req.wq); + + uv__req_register(loop, req); + iou->in_flight++; +@@ -757,17 +714,6 @@ int uv__iou_fs_close(uv_loop_t* loop, uv_fs_t* req) { + struct uv__io_uring_sqe* sqe; + struct uv__iou* iou; + +- /* Work around a poorly understood bug in older kernels where closing a file +- * descriptor pointing to /foo/bar results in ETXTBSY errors when trying to +- * execve("/foo/bar") later on. The bug seems to have been fixed somewhere +- * between 5.15.85 and 5.15.90. I couldn't pinpoint the responsible commit +- * but good candidates are the several data race fixes. Interestingly, it +- * seems to manifest only when running under Docker so the possibility of +- * a Docker bug can't be completely ruled out either. Yay, computers. +- */ +- if (uv__kernel_version() < /* 5.15.90 */ 0x050F5A) +- return 0; +- + iou = &uv__get_internal_fields(loop)->iou; + + sqe = uv__iou_get_sqe(iou, loop, req); +@@ -808,55 +754,6 @@ int uv__iou_fs_fsync_or_fdatasync(uv_loop_t* loop, + } + + +-int uv__iou_fs_link(uv_loop_t* loop, uv_fs_t* req) { +- struct uv__io_uring_sqe* sqe; +- struct uv__iou* iou; +- +- iou = &uv__get_internal_fields(loop)->iou; +- +- if (!(iou->flags & UV__MKDIRAT_SYMLINKAT_LINKAT)) +- return 0; +- +- sqe = uv__iou_get_sqe(iou, loop, req); +- if (sqe == NULL) +- return 0; +- +- sqe->addr = (uintptr_t) req->path; +- sqe->fd = AT_FDCWD; +- sqe->addr2 = (uintptr_t) req->new_path; +- sqe->len = AT_FDCWD; +- sqe->opcode = UV__IORING_OP_LINKAT; +- +- uv__iou_submit(iou); +- +- return 1; +-} +- +- +-int uv__iou_fs_mkdir(uv_loop_t* loop, uv_fs_t* req) { +- struct uv__io_uring_sqe* sqe; +- struct uv__iou* iou; +- +- iou = &uv__get_internal_fields(loop)->iou; +- +- if (!(iou->flags & UV__MKDIRAT_SYMLINKAT_LINKAT)) +- return 0; +- +- sqe = uv__iou_get_sqe(iou, loop, req); +- if (sqe == NULL) +- return 0; +- +- sqe->addr = (uintptr_t) req->path; +- sqe->fd = AT_FDCWD; +- sqe->len = req->mode; +- sqe->opcode = UV__IORING_OP_MKDIRAT; +- +- uv__iou_submit(iou); +- +- return 1; +-} +- +- + int uv__iou_fs_open(uv_loop_t* loop, uv_fs_t* req) { + struct uv__io_uring_sqe* sqe; + struct uv__iou* iou; +@@ -879,86 +776,16 @@ int uv__iou_fs_open(uv_loop_t* loop, uv_fs_t* req) { + } + + +-int uv__iou_fs_rename(uv_loop_t* loop, uv_fs_t* req) { +- struct uv__io_uring_sqe* sqe; +- struct uv__iou* iou; +- +- iou = &uv__get_internal_fields(loop)->iou; +- +- sqe = uv__iou_get_sqe(iou, loop, req); +- if (sqe == NULL) +- return 0; +- +- sqe->addr = (uintptr_t) req->path; +- sqe->fd = AT_FDCWD; +- sqe->addr2 = (uintptr_t) req->new_path; +- sqe->len = AT_FDCWD; +- sqe->opcode = UV__IORING_OP_RENAMEAT; +- +- uv__iou_submit(iou); +- +- return 1; +-} +- +- +-int uv__iou_fs_symlink(uv_loop_t* loop, uv_fs_t* req) { +- struct uv__io_uring_sqe* sqe; +- struct uv__iou* iou; +- +- iou = &uv__get_internal_fields(loop)->iou; +- +- if (!(iou->flags & UV__MKDIRAT_SYMLINKAT_LINKAT)) +- return 0; +- +- sqe = uv__iou_get_sqe(iou, loop, req); +- if (sqe == NULL) +- return 0; +- +- sqe->addr = (uintptr_t) req->path; +- sqe->fd = AT_FDCWD; +- sqe->addr2 = (uintptr_t) req->new_path; +- sqe->opcode = UV__IORING_OP_SYMLINKAT; +- +- uv__iou_submit(iou); +- +- return 1; +-} +- +- +-int uv__iou_fs_unlink(uv_loop_t* loop, uv_fs_t* req) { +- struct uv__io_uring_sqe* sqe; +- struct uv__iou* iou; +- +- iou = &uv__get_internal_fields(loop)->iou; +- +- sqe = uv__iou_get_sqe(iou, loop, req); +- if (sqe == NULL) +- return 0; +- +- sqe->addr = (uintptr_t) req->path; +- sqe->fd = AT_FDCWD; +- sqe->opcode = UV__IORING_OP_UNLINKAT; +- +- uv__iou_submit(iou); +- +- return 1; +-} +- +- + int uv__iou_fs_read_or_write(uv_loop_t* loop, + uv_fs_t* req, + int is_read) { + struct uv__io_uring_sqe* sqe; + struct uv__iou* iou; + +- /* If iovcnt is greater than IOV_MAX, cap it to IOV_MAX on reads and fallback +- * to the threadpool on writes */ +- if (req->nbufs > IOV_MAX) { +- if (is_read) +- req->nbufs = IOV_MAX; +- else +- return 0; +- } ++ /* For the moment, if iovcnt is greater than IOV_MAX, fallback to the ++ * threadpool. In the future we might take advantage of IOSQE_IO_LINK. */ ++ if (req->nbufs > IOV_MAX) ++ return 0; + + iou = &uv__get_internal_fields(loop)->iou; + +@@ -1265,7 +1092,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + struct uv__iou* ctl; + struct uv__iou* iou; + int real_timeout; +- struct uv__queue* q; ++ QUEUE* q; + uv__io_t* w; + sigset_t* sigmask; + sigset_t sigset; +@@ -1311,11 +1138,11 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + + memset(&e, 0, sizeof(e)); + +- while (!uv__queue_empty(&loop->watcher_queue)) { +- q = uv__queue_head(&loop->watcher_queue); +- w = uv__queue_data(q, uv__io_t, watcher_queue); +- uv__queue_remove(q); +- uv__queue_init(q); ++ while (!QUEUE_EMPTY(&loop->watcher_queue)) { ++ q = QUEUE_HEAD(&loop->watcher_queue); ++ w = QUEUE_DATA(q, uv__io_t, watcher_queue); ++ QUEUE_REMOVE(q); ++ QUEUE_INIT(q); + + op = EPOLL_CTL_MOD; + if (w->events == 0) +@@ -2272,8 +2099,8 @@ static int uv__inotify_fork(uv_loop_t* loop, struct watcher_list* root) { + struct watcher_list* tmp_watcher_list_iter; + struct watcher_list* watcher_list; + struct watcher_list tmp_watcher_list; +- struct uv__queue queue; +- struct uv__queue* q; ++ QUEUE queue; ++ QUEUE* q; + uv_fs_event_t* handle; + char* tmp_path; + +@@ -2285,41 +2112,41 @@ static int uv__inotify_fork(uv_loop_t* loop, struct watcher_list* root) { + */ + loop->inotify_watchers = root; + +- uv__queue_init(&tmp_watcher_list.watchers); ++ QUEUE_INIT(&tmp_watcher_list.watchers); + /* Note that the queue we use is shared with the start and stop() +- * functions, making uv__queue_foreach unsafe to use. So we use the +- * uv__queue_move trick to safely iterate. Also don't free the watcher ++ * functions, making QUEUE_FOREACH unsafe to use. So we use the ++ * QUEUE_MOVE trick to safely iterate. Also don't free the watcher + * list until we're done iterating. c.f. uv__inotify_read. + */ + RB_FOREACH_SAFE(watcher_list, watcher_root, + uv__inotify_watchers(loop), tmp_watcher_list_iter) { + watcher_list->iterating = 1; +- uv__queue_move(&watcher_list->watchers, &queue); +- while (!uv__queue_empty(&queue)) { +- q = uv__queue_head(&queue); +- handle = uv__queue_data(q, uv_fs_event_t, watchers); ++ QUEUE_MOVE(&watcher_list->watchers, &queue); ++ while (!QUEUE_EMPTY(&queue)) { ++ q = QUEUE_HEAD(&queue); ++ handle = QUEUE_DATA(q, uv_fs_event_t, watchers); + /* It's critical to keep a copy of path here, because it + * will be set to NULL by stop() and then deallocated by + * maybe_free_watcher_list + */ + tmp_path = uv__strdup(handle->path); + assert(tmp_path != NULL); +- uv__queue_remove(q); +- uv__queue_insert_tail(&watcher_list->watchers, q); ++ QUEUE_REMOVE(q); ++ QUEUE_INSERT_TAIL(&watcher_list->watchers, q); + uv_fs_event_stop(handle); + +- uv__queue_insert_tail(&tmp_watcher_list.watchers, &handle->watchers); ++ QUEUE_INSERT_TAIL(&tmp_watcher_list.watchers, &handle->watchers); + handle->path = tmp_path; + } + watcher_list->iterating = 0; + maybe_free_watcher_list(watcher_list, loop); + } + +- uv__queue_move(&tmp_watcher_list.watchers, &queue); +- while (!uv__queue_empty(&queue)) { +- q = uv__queue_head(&queue); +- uv__queue_remove(q); +- handle = uv__queue_data(q, uv_fs_event_t, watchers); ++ QUEUE_MOVE(&tmp_watcher_list.watchers, &queue); ++ while (!QUEUE_EMPTY(&queue)) { ++ q = QUEUE_HEAD(&queue); ++ QUEUE_REMOVE(q); ++ handle = QUEUE_DATA(q, uv_fs_event_t, watchers); + tmp_path = handle->path; + handle->path = NULL; + err = uv_fs_event_start(handle, handle->cb, tmp_path, 0); +@@ -2341,7 +2168,7 @@ static struct watcher_list* find_watcher(uv_loop_t* loop, int wd) { + + static void maybe_free_watcher_list(struct watcher_list* w, uv_loop_t* loop) { + /* if the watcher_list->watchers is being iterated over, we can't free it. */ +- if ((!w->iterating) && uv__queue_empty(&w->watchers)) { ++ if ((!w->iterating) && QUEUE_EMPTY(&w->watchers)) { + /* No watchers left for this path. Clean up. */ + RB_REMOVE(watcher_root, uv__inotify_watchers(loop), w); + inotify_rm_watch(loop->inotify_fd, w->wd); +@@ -2356,8 +2183,8 @@ static void uv__inotify_read(uv_loop_t* loop, + const struct inotify_event* e; + struct watcher_list* w; + uv_fs_event_t* h; +- struct uv__queue queue; +- struct uv__queue* q; ++ QUEUE queue; ++ QUEUE* q; + const char* path; + ssize_t size; + const char *p; +@@ -2400,7 +2227,7 @@ static void uv__inotify_read(uv_loop_t* loop, + * What can go wrong? + * A callback could call uv_fs_event_stop() + * and the queue can change under our feet. +- * So, we use uv__queue_move() trick to safely iterate over the queue. ++ * So, we use QUEUE_MOVE() trick to safely iterate over the queue. + * And we don't free the watcher_list until we're done iterating. + * + * First, +@@ -2408,13 +2235,13 @@ static void uv__inotify_read(uv_loop_t* loop, + * not to free watcher_list. + */ + w->iterating = 1; +- uv__queue_move(&w->watchers, &queue); +- while (!uv__queue_empty(&queue)) { +- q = uv__queue_head(&queue); +- h = uv__queue_data(q, uv_fs_event_t, watchers); ++ QUEUE_MOVE(&w->watchers, &queue); ++ while (!QUEUE_EMPTY(&queue)) { ++ q = QUEUE_HEAD(&queue); ++ h = QUEUE_DATA(q, uv_fs_event_t, watchers); + +- uv__queue_remove(q); +- uv__queue_insert_tail(&w->watchers, q); ++ QUEUE_REMOVE(q); ++ QUEUE_INSERT_TAIL(&w->watchers, q); + + h->cb(h, path, events, 0); + } +@@ -2476,13 +2303,13 @@ int uv_fs_event_start(uv_fs_event_t* handle, + + w->wd = wd; + w->path = memcpy(w + 1, path, len); +- uv__queue_init(&w->watchers); ++ QUEUE_INIT(&w->watchers); + w->iterating = 0; + RB_INSERT(watcher_root, uv__inotify_watchers(loop), w); + + no_insert: + uv__handle_start(handle); +- uv__queue_insert_tail(&w->watchers, &handle->watchers); ++ QUEUE_INSERT_TAIL(&w->watchers, &handle->watchers); + handle->path = w->path; + handle->cb = cb; + handle->wd = wd; +@@ -2503,7 +2330,7 @@ int uv_fs_event_stop(uv_fs_event_t* handle) { + handle->wd = -1; + handle->path = NULL; + uv__handle_stop(handle); +- uv__queue_remove(&handle->watchers); ++ QUEUE_REMOVE(&handle->watchers); + + maybe_free_watcher_list(w, handle->loop); + +diff --git a/deps/uv/src/unix/loop-watcher.c b/deps/uv/src/unix/loop-watcher.c +index 2db8b515df7..b8c1c2a7102 100644 +--- a/deps/uv/src/unix/loop-watcher.c ++++ b/deps/uv/src/unix/loop-watcher.c +@@ -32,7 +32,7 @@ + int uv_##name##_start(uv_##name##_t* handle, uv_##name##_cb cb) { \ + if (uv__is_active(handle)) return 0; \ + if (cb == NULL) return UV_EINVAL; \ +- uv__queue_insert_head(&handle->loop->name##_handles, &handle->queue); \ ++ QUEUE_INSERT_HEAD(&handle->loop->name##_handles, &handle->queue); \ + handle->name##_cb = cb; \ + uv__handle_start(handle); \ + return 0; \ +@@ -40,21 +40,21 @@ + \ + int uv_##name##_stop(uv_##name##_t* handle) { \ + if (!uv__is_active(handle)) return 0; \ +- uv__queue_remove(&handle->queue); \ ++ QUEUE_REMOVE(&handle->queue); \ + uv__handle_stop(handle); \ + return 0; \ + } \ + \ + void uv__run_##name(uv_loop_t* loop) { \ + uv_##name##_t* h; \ +- struct uv__queue queue; \ +- struct uv__queue* q; \ +- uv__queue_move(&loop->name##_handles, &queue); \ +- while (!uv__queue_empty(&queue)) { \ +- q = uv__queue_head(&queue); \ +- h = uv__queue_data(q, uv_##name##_t, queue); \ +- uv__queue_remove(q); \ +- uv__queue_insert_tail(&loop->name##_handles, q); \ ++ QUEUE queue; \ ++ QUEUE* q; \ ++ QUEUE_MOVE(&loop->name##_handles, &queue); \ ++ while (!QUEUE_EMPTY(&queue)) { \ ++ q = QUEUE_HEAD(&queue); \ ++ h = QUEUE_DATA(q, uv_##name##_t, queue); \ ++ QUEUE_REMOVE(q); \ ++ QUEUE_INSERT_TAIL(&loop->name##_handles, q); \ + h->name##_cb(h); \ + } \ + } \ +diff --git a/deps/uv/src/unix/loop.c b/deps/uv/src/unix/loop.c +index a9468e8e19c..90a51b339de 100644 +--- a/deps/uv/src/unix/loop.c ++++ b/deps/uv/src/unix/loop.c +@@ -50,20 +50,20 @@ int uv_loop_init(uv_loop_t* loop) { + sizeof(lfields->loop_metrics.metrics)); + + heap_init((struct heap*) &loop->timer_heap); +- uv__queue_init(&loop->wq); +- uv__queue_init(&loop->idle_handles); +- uv__queue_init(&loop->async_handles); +- uv__queue_init(&loop->check_handles); +- uv__queue_init(&loop->prepare_handles); +- uv__queue_init(&loop->handle_queue); ++ QUEUE_INIT(&loop->wq); ++ QUEUE_INIT(&loop->idle_handles); ++ QUEUE_INIT(&loop->async_handles); ++ QUEUE_INIT(&loop->check_handles); ++ QUEUE_INIT(&loop->prepare_handles); ++ QUEUE_INIT(&loop->handle_queue); + + loop->active_handles = 0; + loop->active_reqs.count = 0; + loop->nfds = 0; + loop->watchers = NULL; + loop->nwatchers = 0; +- uv__queue_init(&loop->pending_queue); +- uv__queue_init(&loop->watcher_queue); ++ QUEUE_INIT(&loop->pending_queue); ++ QUEUE_INIT(&loop->watcher_queue); + + loop->closing_handles = NULL; + uv__update_time(loop); +@@ -85,7 +85,7 @@ int uv_loop_init(uv_loop_t* loop) { + err = uv__process_init(loop); + if (err) + goto fail_signal_init; +- uv__queue_init(&loop->process_handles); ++ QUEUE_INIT(&loop->process_handles); + + err = uv_rwlock_init(&loop->cloexec_lock); + if (err) +@@ -152,9 +152,9 @@ int uv_loop_fork(uv_loop_t* loop) { + if (w == NULL) + continue; + +- if (w->pevents != 0 && uv__queue_empty(&w->watcher_queue)) { ++ if (w->pevents != 0 && QUEUE_EMPTY(&w->watcher_queue)) { + w->events = 0; /* Force re-registration in uv__io_poll. */ +- uv__queue_insert_tail(&loop->watcher_queue, &w->watcher_queue); ++ QUEUE_INSERT_TAIL(&loop->watcher_queue, &w->watcher_queue); + } + } + +@@ -180,7 +180,7 @@ void uv__loop_close(uv_loop_t* loop) { + } + + uv_mutex_lock(&loop->wq_mutex); +- assert(uv__queue_empty(&loop->wq) && "thread pool work queue not empty!"); ++ assert(QUEUE_EMPTY(&loop->wq) && "thread pool work queue not empty!"); + assert(!uv__has_active_reqs(loop)); + uv_mutex_unlock(&loop->wq_mutex); + uv_mutex_destroy(&loop->wq_mutex); +@@ -192,8 +192,8 @@ void uv__loop_close(uv_loop_t* loop) { + uv_rwlock_destroy(&loop->cloexec_lock); + + #if 0 +- assert(uv__queue_empty(&loop->pending_queue)); +- assert(uv__queue_empty(&loop->watcher_queue)); ++ assert(QUEUE_EMPTY(&loop->pending_queue)); ++ assert(QUEUE_EMPTY(&loop->watcher_queue)); + assert(loop->nfds == 0); + #endif + +diff --git a/deps/uv/src/unix/os390-syscalls.c b/deps/uv/src/unix/os390-syscalls.c +index 7f90c270906..5861aaaa202 100644 +--- a/deps/uv/src/unix/os390-syscalls.c ++++ b/deps/uv/src/unix/os390-syscalls.c +@@ -27,7 +27,7 @@ + #include <termios.h> + #include <sys/msg.h> + +-static struct uv__queue global_epoll_queue; ++static QUEUE global_epoll_queue; + static uv_mutex_t global_epoll_lock; + static uv_once_t once = UV_ONCE_INIT; + +@@ -178,18 +178,18 @@ static void after_fork(void) { + + + static void child_fork(void) { +- struct uv__queue* q; ++ QUEUE* q; + uv_once_t child_once = UV_ONCE_INIT; + + /* reset once */ + memcpy(&once, &child_once, sizeof(child_once)); + + /* reset epoll list */ +- while (!uv__queue_empty(&global_epoll_queue)) { ++ while (!QUEUE_EMPTY(&global_epoll_queue)) { + uv__os390_epoll* lst; +- q = uv__queue_head(&global_epoll_queue); +- uv__queue_remove(q); +- lst = uv__queue_data(q, uv__os390_epoll, member); ++ q = QUEUE_HEAD(&global_epoll_queue); ++ QUEUE_REMOVE(q); ++ lst = QUEUE_DATA(q, uv__os390_epoll, member); + uv__free(lst->items); + lst->items = NULL; + lst->size = 0; +@@ -201,7 +201,7 @@ static void child_fork(void) { + + + static void epoll_init(void) { +- uv__queue_init(&global_epoll_queue); ++ QUEUE_INIT(&global_epoll_queue); + if (uv_mutex_init(&global_epoll_lock)) + abort(); + +@@ -225,7 +225,7 @@ uv__os390_epoll* epoll_create1(int flags) { + lst->items[lst->size - 1].revents = 0; + uv_once(&once, epoll_init); + uv_mutex_lock(&global_epoll_lock); +- uv__queue_insert_tail(&global_epoll_queue, &lst->member); ++ QUEUE_INSERT_TAIL(&global_epoll_queue, &lst->member); + uv_mutex_unlock(&global_epoll_lock); + } + +@@ -352,14 +352,14 @@ int epoll_wait(uv__os390_epoll* lst, struct epoll_event* events, + + + int epoll_file_close(int fd) { +- struct uv__queue* q; ++ QUEUE* q; + + uv_once(&once, epoll_init); + uv_mutex_lock(&global_epoll_lock); +- uv__queue_foreach(q, &global_epoll_queue) { ++ QUEUE_FOREACH(q, &global_epoll_queue) { + uv__os390_epoll* lst; + +- lst = uv__queue_data(q, uv__os390_epoll, member); ++ lst = QUEUE_DATA(q, uv__os390_epoll, member); + if (fd < lst->size && lst->items != NULL && lst->items[fd].fd != -1) + lst->items[fd].fd = -1; + } +@@ -371,7 +371,7 @@ int epoll_file_close(int fd) { + void epoll_queue_close(uv__os390_epoll* lst) { + /* Remove epoll instance from global queue */ + uv_mutex_lock(&global_epoll_lock); +- uv__queue_remove(&lst->member); ++ QUEUE_REMOVE(&lst->member); + uv_mutex_unlock(&global_epoll_lock); + + /* Free resources */ +diff --git a/deps/uv/src/unix/os390-syscalls.h b/deps/uv/src/unix/os390-syscalls.h +index d5f3bcf8b1c..9f504171d85 100644 +--- a/deps/uv/src/unix/os390-syscalls.h ++++ b/deps/uv/src/unix/os390-syscalls.h +@@ -45,7 +45,7 @@ struct epoll_event { + }; + + typedef struct { +- struct uv__queue member; ++ QUEUE member; + struct pollfd* items; + unsigned long size; + int msg_queue; +diff --git a/deps/uv/src/unix/os390.c b/deps/uv/src/unix/os390.c +index bbd37692d1d..a87c2d77faf 100644 +--- a/deps/uv/src/unix/os390.c ++++ b/deps/uv/src/unix/os390.c +@@ -815,7 +815,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + uv__os390_epoll* ep; + int have_signals; + int real_timeout; +- struct uv__queue* q; ++ QUEUE* q; + uv__io_t* w; + uint64_t base; + int count; +@@ -827,19 +827,19 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + int reset_timeout; + + if (loop->nfds == 0) { +- assert(uv__queue_empty(&loop->watcher_queue)); ++ assert(QUEUE_EMPTY(&loop->watcher_queue)); + return; + } + + lfields = uv__get_internal_fields(loop); + +- while (!uv__queue_empty(&loop->watcher_queue)) { ++ while (!QUEUE_EMPTY(&loop->watcher_queue)) { + uv_stream_t* stream; + +- q = uv__queue_head(&loop->watcher_queue); +- uv__queue_remove(q); +- uv__queue_init(q); +- w = uv__queue_data(q, uv__io_t, watcher_queue); ++ q = QUEUE_HEAD(&loop->watcher_queue); ++ QUEUE_REMOVE(q); ++ QUEUE_INIT(q); ++ w = QUEUE_DATA(q, uv__io_t, watcher_queue); + + assert(w->pevents != 0); + assert(w->fd >= 0); +diff --git a/deps/uv/src/unix/pipe.c b/deps/uv/src/unix/pipe.c +index d332f351830..ce91ac49b30 100644 +--- a/deps/uv/src/unix/pipe.c ++++ b/deps/uv/src/unix/pipe.c +@@ -297,7 +297,7 @@ out: + uv__req_init(handle->loop, req, UV_CONNECT); + req->handle = (uv_stream_t*)handle; + req->cb = cb; +- uv__queue_init(&req->queue); ++ QUEUE_INIT(&req->queue); + + /* Force callback to run on next tick in case of error. */ + if (err) +diff --git a/deps/uv/src/unix/posix-poll.c b/deps/uv/src/unix/posix-poll.c +index 2e016c2fbae..7e7de86845d 100644 +--- a/deps/uv/src/unix/posix-poll.c ++++ b/deps/uv/src/unix/posix-poll.c +@@ -137,7 +137,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + sigset_t set; + uint64_t time_base; + uint64_t time_diff; +- struct uv__queue* q; ++ QUEUE* q; + uv__io_t* w; + size_t i; + unsigned int nevents; +@@ -149,19 +149,19 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + int reset_timeout; + + if (loop->nfds == 0) { +- assert(uv__queue_empty(&loop->watcher_queue)); ++ assert(QUEUE_EMPTY(&loop->watcher_queue)); + return; + } + + lfields = uv__get_internal_fields(loop); + + /* Take queued watchers and add their fds to our poll fds array. */ +- while (!uv__queue_empty(&loop->watcher_queue)) { +- q = uv__queue_head(&loop->watcher_queue); +- uv__queue_remove(q); +- uv__queue_init(q); ++ while (!QUEUE_EMPTY(&loop->watcher_queue)) { ++ q = QUEUE_HEAD(&loop->watcher_queue); ++ QUEUE_REMOVE(q); ++ QUEUE_INIT(q); + +- w = uv__queue_data(q, uv__io_t, watcher_queue); ++ w = QUEUE_DATA(q, uv__io_t, watcher_queue); + assert(w->pevents != 0); + assert(w->fd >= 0); + assert(w->fd < (int) loop->nwatchers); +diff --git a/deps/uv/src/unix/process.c b/deps/uv/src/unix/process.c +index dd58c18d9b9..bbf367b57d3 100644 +--- a/deps/uv/src/unix/process.c ++++ b/deps/uv/src/unix/process.c +@@ -108,17 +108,17 @@ void uv__wait_children(uv_loop_t* loop) { + int status; + int options; + pid_t pid; +- struct uv__queue pending; +- struct uv__queue* q; +- struct uv__queue* h; ++ QUEUE pending; ++ QUEUE* q; ++ QUEUE* h; + +- uv__queue_init(&pending); ++ QUEUE_INIT(&pending); + + h = &loop->process_handles; +- q = uv__queue_head(h); ++ q = QUEUE_HEAD(h); + while (q != h) { +- process = uv__queue_data(q, uv_process_t, queue); +- q = uv__queue_next(q); ++ process = QUEUE_DATA(q, uv_process_t, queue); ++ q = QUEUE_NEXT(q); + + #ifndef UV_USE_SIGCHLD + if ((process->flags & UV_HANDLE_REAP) == 0) +@@ -149,18 +149,18 @@ void uv__wait_children(uv_loop_t* loop) { + + assert(pid == process->pid); + process->status = status; +- uv__queue_remove(&process->queue); +- uv__queue_insert_tail(&pending, &process->queue); ++ QUEUE_REMOVE(&process->queue); ++ QUEUE_INSERT_TAIL(&pending, &process->queue); + } + + h = &pending; +- q = uv__queue_head(h); ++ q = QUEUE_HEAD(h); + while (q != h) { +- process = uv__queue_data(q, uv_process_t, queue); +- q = uv__queue_next(q); ++ process = QUEUE_DATA(q, uv_process_t, queue); ++ q = QUEUE_NEXT(q); + +- uv__queue_remove(&process->queue); +- uv__queue_init(&process->queue); ++ QUEUE_REMOVE(&process->queue); ++ QUEUE_INIT(&process->queue); + uv__handle_stop(process); + + if (process->exit_cb == NULL) +@@ -176,7 +176,7 @@ void uv__wait_children(uv_loop_t* loop) { + + process->exit_cb(process, exit_status, term_signal); + } +- assert(uv__queue_empty(&pending)); ++ assert(QUEUE_EMPTY(&pending)); + } + + /* +@@ -978,7 +978,7 @@ int uv_spawn(uv_loop_t* loop, + UV_PROCESS_WINDOWS_VERBATIM_ARGUMENTS))); + + uv__handle_init(loop, (uv_handle_t*)process, UV_PROCESS); +- uv__queue_init(&process->queue); ++ QUEUE_INIT(&process->queue); + process->status = 0; + + stdio_count = options->stdio_count; +@@ -1041,7 +1041,7 @@ int uv_spawn(uv_loop_t* loop, + + process->pid = pid; + process->exit_cb = options->exit_cb; +- uv__queue_insert_tail(&loop->process_handles, &process->queue); ++ QUEUE_INSERT_TAIL(&loop->process_handles, &process->queue); + uv__handle_start(process); + } + +@@ -1103,10 +1103,10 @@ int uv_kill(int pid, int signum) { + + + void uv__process_close(uv_process_t* handle) { +- uv__queue_remove(&handle->queue); ++ QUEUE_REMOVE(&handle->queue); + uv__handle_stop(handle); + #ifdef UV_USE_SIGCHLD +- if (uv__queue_empty(&handle->loop->process_handles)) ++ if (QUEUE_EMPTY(&handle->loop->process_handles)) + uv_signal_stop(&handle->loop->child_watcher); + #endif + } +diff --git a/deps/uv/src/unix/signal.c b/deps/uv/src/unix/signal.c +index 63aba5a60e0..bb70523f561 100644 +--- a/deps/uv/src/unix/signal.c ++++ b/deps/uv/src/unix/signal.c +@@ -291,16 +291,16 @@ int uv__signal_loop_fork(uv_loop_t* loop) { + + + void uv__signal_loop_cleanup(uv_loop_t* loop) { +- struct uv__queue* q; ++ QUEUE* q; + + /* Stop all the signal watchers that are still attached to this loop. This + * ensures that the (shared) signal tree doesn't contain any invalid entries + * entries, and that signal handlers are removed when appropriate. +- * It's safe to use uv__queue_foreach here because the handles and the handle ++ * It's safe to use QUEUE_FOREACH here because the handles and the handle + * queue are not modified by uv__signal_stop(). + */ +- uv__queue_foreach(q, &loop->handle_queue) { +- uv_handle_t* handle = uv__queue_data(q, uv_handle_t, handle_queue); ++ QUEUE_FOREACH(q, &loop->handle_queue) { ++ uv_handle_t* handle = QUEUE_DATA(q, uv_handle_t, handle_queue); + + if (handle->type == UV_SIGNAL) + uv__signal_stop((uv_signal_t*) handle); +diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c +index 28c4d5463c4..03f92b5045a 100644 +--- a/deps/uv/src/unix/stream.c ++++ b/deps/uv/src/unix/stream.c +@@ -94,8 +94,8 @@ void uv__stream_init(uv_loop_t* loop, + stream->accepted_fd = -1; + stream->queued_fds = NULL; + stream->delayed_error = 0; +- uv__queue_init(&stream->write_queue); +- uv__queue_init(&stream->write_completed_queue); ++ QUEUE_INIT(&stream->write_queue); ++ QUEUE_INIT(&stream->write_completed_queue); + stream->write_queue_size = 0; + + if (loop->emfile_fd == -1) { +@@ -439,15 +439,15 @@ int uv__stream_open(uv_stream_t* stream, int fd, int flags) { + + void uv__stream_flush_write_queue(uv_stream_t* stream, int error) { + uv_write_t* req; +- struct uv__queue* q; +- while (!uv__queue_empty(&stream->write_queue)) { +- q = uv__queue_head(&stream->write_queue); +- uv__queue_remove(q); ++ QUEUE* q; ++ while (!QUEUE_EMPTY(&stream->write_queue)) { ++ q = QUEUE_HEAD(&stream->write_queue); ++ QUEUE_REMOVE(q); + +- req = uv__queue_data(q, uv_write_t, queue); ++ req = QUEUE_DATA(q, uv_write_t, queue); + req->error = error; + +- uv__queue_insert_tail(&stream->write_completed_queue, &req->queue); ++ QUEUE_INSERT_TAIL(&stream->write_completed_queue, &req->queue); + } + } + +@@ -627,7 +627,7 @@ static void uv__drain(uv_stream_t* stream) { + uv_shutdown_t* req; + int err; + +- assert(uv__queue_empty(&stream->write_queue)); ++ assert(QUEUE_EMPTY(&stream->write_queue)); + if (!(stream->flags & UV_HANDLE_CLOSING)) { + uv__io_stop(stream->loop, &stream->io_watcher, POLLOUT); + uv__stream_osx_interrupt_select(stream); +@@ -714,7 +714,7 @@ static void uv__write_req_finish(uv_write_t* req) { + uv_stream_t* stream = req->handle; + + /* Pop the req off tcp->write_queue. */ +- uv__queue_remove(&req->queue); ++ QUEUE_REMOVE(&req->queue); + + /* Only free when there was no error. On error, we touch up write_queue_size + * right before making the callback. The reason we don't do that right away +@@ -731,7 +731,7 @@ static void uv__write_req_finish(uv_write_t* req) { + /* Add it to the write_completed_queue where it will have its + * callback called in the near future. + */ +- uv__queue_insert_tail(&stream->write_completed_queue, &req->queue); ++ QUEUE_INSERT_TAIL(&stream->write_completed_queue, &req->queue); + uv__io_feed(stream->loop, &stream->io_watcher); + } + +@@ -837,7 +837,7 @@ static int uv__try_write(uv_stream_t* stream, + } + + static void uv__write(uv_stream_t* stream) { +- struct uv__queue* q; ++ QUEUE* q; + uv_write_t* req; + ssize_t n; + int count; +@@ -851,11 +851,11 @@ static void uv__write(uv_stream_t* stream) { + count = 32; + + for (;;) { +- if (uv__queue_empty(&stream->write_queue)) ++ if (QUEUE_EMPTY(&stream->write_queue)) + return; + +- q = uv__queue_head(&stream->write_queue); +- req = uv__queue_data(q, uv_write_t, queue); ++ q = QUEUE_HEAD(&stream->write_queue); ++ req = QUEUE_DATA(q, uv_write_t, queue); + assert(req->handle == stream); + + n = uv__try_write(stream, +@@ -899,19 +899,19 @@ error: + + static void uv__write_callbacks(uv_stream_t* stream) { + uv_write_t* req; +- struct uv__queue* q; +- struct uv__queue pq; ++ QUEUE* q; ++ QUEUE pq; + +- if (uv__queue_empty(&stream->write_completed_queue)) ++ if (QUEUE_EMPTY(&stream->write_completed_queue)) + return; + +- uv__queue_move(&stream->write_completed_queue, &pq); ++ QUEUE_MOVE(&stream->write_completed_queue, &pq); + +- while (!uv__queue_empty(&pq)) { ++ while (!QUEUE_EMPTY(&pq)) { + /* Pop a req off write_completed_queue. */ +- q = uv__queue_head(&pq); +- req = uv__queue_data(q, uv_write_t, queue); +- uv__queue_remove(q); ++ q = QUEUE_HEAD(&pq); ++ req = QUEUE_DATA(q, uv_write_t, queue); ++ QUEUE_REMOVE(q); + uv__req_unregister(stream->loop, req); + + if (req->bufs != NULL) { +@@ -1174,7 +1174,7 @@ int uv_shutdown(uv_shutdown_t* req, uv_stream_t* stream, uv_shutdown_cb cb) { + stream->shutdown_req = req; + stream->flags &= ~UV_HANDLE_WRITABLE; + +- if (uv__queue_empty(&stream->write_queue)) ++ if (QUEUE_EMPTY(&stream->write_queue)) + uv__io_feed(stream->loop, &stream->io_watcher); + + return 0; +@@ -1227,7 +1227,7 @@ static void uv__stream_io(uv_loop_t* loop, uv__io_t* w, unsigned int events) { + uv__write_callbacks(stream); + + /* Write queue drained. */ +- if (uv__queue_empty(&stream->write_queue)) ++ if (QUEUE_EMPTY(&stream->write_queue)) + uv__drain(stream); + } + } +@@ -1270,7 +1270,7 @@ static void uv__stream_connect(uv_stream_t* stream) { + stream->connect_req = NULL; + uv__req_unregister(stream->loop, req); + +- if (error < 0 || uv__queue_empty(&stream->write_queue)) { ++ if (error < 0 || QUEUE_EMPTY(&stream->write_queue)) { + uv__io_stop(stream->loop, &stream->io_watcher, POLLOUT); + } + +@@ -1352,7 +1352,7 @@ int uv_write2(uv_write_t* req, + req->handle = stream; + req->error = 0; + req->send_handle = send_handle; +- uv__queue_init(&req->queue); ++ QUEUE_INIT(&req->queue); + + req->bufs = req->bufsml; + if (nbufs > ARRAY_SIZE(req->bufsml)) +@@ -1367,7 +1367,7 @@ int uv_write2(uv_write_t* req, + stream->write_queue_size += uv__count_bufs(bufs, nbufs); + + /* Append the request to write_queue. */ +- uv__queue_insert_tail(&stream->write_queue, &req->queue); ++ QUEUE_INSERT_TAIL(&stream->write_queue, &req->queue); + + /* If the queue was empty when this function began, we should attempt to + * do the write immediately. Otherwise start the write_watcher and wait +diff --git a/deps/uv/src/unix/sunos.c b/deps/uv/src/unix/sunos.c +index 2d6bae79604..75b6fbad493 100644 +--- a/deps/uv/src/unix/sunos.c ++++ b/deps/uv/src/unix/sunos.c +@@ -148,7 +148,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + struct port_event events[1024]; + struct port_event* pe; + struct timespec spec; +- struct uv__queue* q; ++ QUEUE* q; + uv__io_t* w; + sigset_t* pset; + sigset_t set; +@@ -166,16 +166,16 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + int reset_timeout; + + if (loop->nfds == 0) { +- assert(uv__queue_empty(&loop->watcher_queue)); ++ assert(QUEUE_EMPTY(&loop->watcher_queue)); + return; + } + +- while (!uv__queue_empty(&loop->watcher_queue)) { +- q = uv__queue_head(&loop->watcher_queue); +- uv__queue_remove(q); +- uv__queue_init(q); ++ while (!QUEUE_EMPTY(&loop->watcher_queue)) { ++ q = QUEUE_HEAD(&loop->watcher_queue); ++ QUEUE_REMOVE(q); ++ QUEUE_INIT(q); + +- w = uv__queue_data(q, uv__io_t, watcher_queue); ++ w = QUEUE_DATA(q, uv__io_t, watcher_queue); + assert(w->pevents != 0); + + if (port_associate(loop->backend_fd, +@@ -316,8 +316,8 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + continue; /* Disabled by callback. */ + + /* Events Ports operates in oneshot mode, rearm timer on next run. */ +- if (w->pevents != 0 && uv__queue_empty(&w->watcher_queue)) +- uv__queue_insert_tail(&loop->watcher_queue, &w->watcher_queue); ++ if (w->pevents != 0 && QUEUE_EMPTY(&w->watcher_queue)) ++ QUEUE_INSERT_TAIL(&loop->watcher_queue, &w->watcher_queue); + } + + uv__metrics_inc_events(loop, nevents); +diff --git a/deps/uv/src/unix/tcp.c b/deps/uv/src/unix/tcp.c +index d6c848f4610..ab4e06c2f67 100644 +--- a/deps/uv/src/unix/tcp.c ++++ b/deps/uv/src/unix/tcp.c +@@ -124,7 +124,7 @@ int uv_tcp_init_ex(uv_loop_t* loop, uv_tcp_t* tcp, unsigned int flags) { + if (domain != AF_UNSPEC) { + err = new_socket(tcp, domain, 0); + if (err) { +- uv__queue_remove(&tcp->handle_queue); ++ QUEUE_REMOVE(&tcp->handle_queue); + if (tcp->io_watcher.fd != -1) + uv__close(tcp->io_watcher.fd); + tcp->io_watcher.fd = -1; +@@ -252,7 +252,7 @@ out: + uv__req_init(handle->loop, req, UV_CONNECT); + req->cb = cb; + req->handle = (uv_stream_t*) handle; +- uv__queue_init(&req->queue); ++ QUEUE_INIT(&req->queue); + handle->connect_req = req; + + uv__io_start(handle->loop, &handle->io_watcher, POLLOUT); +diff --git a/deps/uv/src/unix/tty.c b/deps/uv/src/unix/tty.c +index d099bdb3b67..7a5390c1a8b 100644 +--- a/deps/uv/src/unix/tty.c ++++ b/deps/uv/src/unix/tty.c +@@ -222,7 +222,7 @@ skip: + int rc = r; + if (newfd != -1) + uv__close(newfd); +- uv__queue_remove(&tty->handle_queue); ++ QUEUE_REMOVE(&tty->handle_queue); + do + r = fcntl(fd, F_SETFL, saved_flags); + while (r == -1 && errno == EINTR); +diff --git a/deps/uv/src/unix/udp.c b/deps/uv/src/unix/udp.c +index c2814512a5f..f556808fbae 100644 +--- a/deps/uv/src/unix/udp.c ++++ b/deps/uv/src/unix/udp.c +@@ -62,18 +62,18 @@ void uv__udp_close(uv_udp_t* handle) { + + void uv__udp_finish_close(uv_udp_t* handle) { + uv_udp_send_t* req; +- struct uv__queue* q; ++ QUEUE* q; + + assert(!uv__io_active(&handle->io_watcher, POLLIN | POLLOUT)); + assert(handle->io_watcher.fd == -1); + +- while (!uv__queue_empty(&handle->write_queue)) { +- q = uv__queue_head(&handle->write_queue); +- uv__queue_remove(q); ++ while (!QUEUE_EMPTY(&handle->write_queue)) { ++ q = QUEUE_HEAD(&handle->write_queue); ++ QUEUE_REMOVE(q); + +- req = uv__queue_data(q, uv_udp_send_t, queue); ++ req = QUEUE_DATA(q, uv_udp_send_t, queue); + req->status = UV_ECANCELED; +- uv__queue_insert_tail(&handle->write_completed_queue, &req->queue); ++ QUEUE_INSERT_TAIL(&handle->write_completed_queue, &req->queue); + } + + uv__udp_run_completed(handle); +@@ -90,16 +90,16 @@ void uv__udp_finish_close(uv_udp_t* handle) { + + static void uv__udp_run_completed(uv_udp_t* handle) { + uv_udp_send_t* req; +- struct uv__queue* q; ++ QUEUE* q; + + assert(!(handle->flags & UV_HANDLE_UDP_PROCESSING)); + handle->flags |= UV_HANDLE_UDP_PROCESSING; + +- while (!uv__queue_empty(&handle->write_completed_queue)) { +- q = uv__queue_head(&handle->write_completed_queue); +- uv__queue_remove(q); ++ while (!QUEUE_EMPTY(&handle->write_completed_queue)) { ++ q = QUEUE_HEAD(&handle->write_completed_queue); ++ QUEUE_REMOVE(q); + +- req = uv__queue_data(q, uv_udp_send_t, queue); ++ req = QUEUE_DATA(q, uv_udp_send_t, queue); + uv__req_unregister(handle->loop, req); + + handle->send_queue_size -= uv__count_bufs(req->bufs, req->nbufs); +@@ -121,7 +121,7 @@ static void uv__udp_run_completed(uv_udp_t* handle) { + req->send_cb(req, req->status); + } + +- if (uv__queue_empty(&handle->write_queue)) { ++ if (QUEUE_EMPTY(&handle->write_queue)) { + /* Pending queue and completion queue empty, stop watcher. */ + uv__io_stop(handle->loop, &handle->io_watcher, POLLOUT); + if (!uv__io_active(&handle->io_watcher, POLLIN)) +@@ -280,20 +280,20 @@ static void uv__udp_sendmsg(uv_udp_t* handle) { + uv_udp_send_t* req; + struct mmsghdr h[20]; + struct mmsghdr* p; +- struct uv__queue* q; ++ QUEUE* q; + ssize_t npkts; + size_t pkts; + size_t i; + +- if (uv__queue_empty(&handle->write_queue)) ++ if (QUEUE_EMPTY(&handle->write_queue)) + return; + + write_queue_drain: +- for (pkts = 0, q = uv__queue_head(&handle->write_queue); ++ for (pkts = 0, q = QUEUE_HEAD(&handle->write_queue); + pkts < ARRAY_SIZE(h) && q != &handle->write_queue; +- ++pkts, q = uv__queue_head(q)) { ++ ++pkts, q = QUEUE_HEAD(q)) { + assert(q != NULL); +- req = uv__queue_data(q, uv_udp_send_t, queue); ++ req = QUEUE_DATA(q, uv_udp_send_t, queue); + assert(req != NULL); + + p = &h[pkts]; +@@ -325,16 +325,16 @@ write_queue_drain: + if (npkts < 1) { + if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOBUFS) + return; +- for (i = 0, q = uv__queue_head(&handle->write_queue); ++ for (i = 0, q = QUEUE_HEAD(&handle->write_queue); + i < pkts && q != &handle->write_queue; +- ++i, q = uv__queue_head(&handle->write_queue)) { ++ ++i, q = QUEUE_HEAD(&handle->write_queue)) { + assert(q != NULL); +- req = uv__queue_data(q, uv_udp_send_t, queue); ++ req = QUEUE_DATA(q, uv_udp_send_t, queue); + assert(req != NULL); + + req->status = UV__ERR(errno); +- uv__queue_remove(&req->queue); +- uv__queue_insert_tail(&handle->write_completed_queue, &req->queue); ++ QUEUE_REMOVE(&req->queue); ++ QUEUE_INSERT_TAIL(&handle->write_completed_queue, &req->queue); + } + uv__io_feed(handle->loop, &handle->io_watcher); + return; +@@ -343,11 +343,11 @@ write_queue_drain: + /* Safety: npkts known to be >0 below. Hence cast from ssize_t + * to size_t safe. + */ +- for (i = 0, q = uv__queue_head(&handle->write_queue); ++ for (i = 0, q = QUEUE_HEAD(&handle->write_queue); + i < (size_t)npkts && q != &handle->write_queue; +- ++i, q = uv__queue_head(&handle->write_queue)) { ++ ++i, q = QUEUE_HEAD(&handle->write_queue)) { + assert(q != NULL); +- req = uv__queue_data(q, uv_udp_send_t, queue); ++ req = QUEUE_DATA(q, uv_udp_send_t, queue); + assert(req != NULL); + + req->status = req->bufs[0].len; +@@ -357,25 +357,25 @@ write_queue_drain: + * why we don't handle partial writes. Just pop the request + * off the write queue and onto the completed queue, done. + */ +- uv__queue_remove(&req->queue); +- uv__queue_insert_tail(&handle->write_completed_queue, &req->queue); ++ QUEUE_REMOVE(&req->queue); ++ QUEUE_INSERT_TAIL(&handle->write_completed_queue, &req->queue); + } + + /* couldn't batch everything, continue sending (jump to avoid stack growth) */ +- if (!uv__queue_empty(&handle->write_queue)) ++ if (!QUEUE_EMPTY(&handle->write_queue)) + goto write_queue_drain; + uv__io_feed(handle->loop, &handle->io_watcher); + #else /* __linux__ || ____FreeBSD__ */ + uv_udp_send_t* req; + struct msghdr h; +- struct uv__queue* q; ++ QUEUE* q; + ssize_t size; + +- while (!uv__queue_empty(&handle->write_queue)) { +- q = uv__queue_head(&handle->write_queue); ++ while (!QUEUE_EMPTY(&handle->write_queue)) { ++ q = QUEUE_HEAD(&handle->write_queue); + assert(q != NULL); + +- req = uv__queue_data(q, uv_udp_send_t, queue); ++ req = QUEUE_DATA(q, uv_udp_send_t, queue); + assert(req != NULL); + + memset(&h, 0, sizeof h); +@@ -414,8 +414,8 @@ write_queue_drain: + * why we don't handle partial writes. Just pop the request + * off the write queue and onto the completed queue, done. + */ +- uv__queue_remove(&req->queue); +- uv__queue_insert_tail(&handle->write_completed_queue, &req->queue); ++ QUEUE_REMOVE(&req->queue); ++ QUEUE_INSERT_TAIL(&handle->write_completed_queue, &req->queue); + uv__io_feed(handle->loop, &handle->io_watcher); + } + #endif /* __linux__ || ____FreeBSD__ */ +@@ -729,7 +729,7 @@ int uv__udp_send(uv_udp_send_t* req, + memcpy(req->bufs, bufs, nbufs * sizeof(bufs[0])); + handle->send_queue_size += uv__count_bufs(req->bufs, req->nbufs); + handle->send_queue_count++; +- uv__queue_insert_tail(&handle->write_queue, &req->queue); ++ QUEUE_INSERT_TAIL(&handle->write_queue, &req->queue); + uv__handle_start(handle); + + if (empty_queue && !(handle->flags & UV_HANDLE_UDP_PROCESSING)) { +@@ -739,7 +739,7 @@ int uv__udp_send(uv_udp_send_t* req, + * away. In such cases the `io_watcher` has to be queued for asynchronous + * write. + */ +- if (!uv__queue_empty(&handle->write_queue)) ++ if (!QUEUE_EMPTY(&handle->write_queue)) + uv__io_start(handle->loop, &handle->io_watcher, POLLOUT); + } else { + uv__io_start(handle->loop, &handle->io_watcher, POLLOUT); +@@ -1007,8 +1007,8 @@ int uv__udp_init_ex(uv_loop_t* loop, + handle->send_queue_size = 0; + handle->send_queue_count = 0; + uv__io_init(&handle->io_watcher, uv__udp_io, fd); +- uv__queue_init(&handle->write_queue); +- uv__queue_init(&handle->write_completed_queue); ++ QUEUE_INIT(&handle->write_queue); ++ QUEUE_INIT(&handle->write_completed_queue); + + return 0; + } +diff --git a/deps/uv/src/uv-common.c b/deps/uv/src/uv-common.c +index 916f3f4e006..cec771fab21 100644 +--- a/deps/uv/src/uv-common.c ++++ b/deps/uv/src/uv-common.c +@@ -533,17 +533,17 @@ int uv_udp_recv_stop(uv_udp_t* handle) { + + + void uv_walk(uv_loop_t* loop, uv_walk_cb walk_cb, void* arg) { +- struct uv__queue queue; +- struct uv__queue* q; ++ QUEUE queue; ++ QUEUE* q; + uv_handle_t* h; + +- uv__queue_move(&loop->handle_queue, &queue); +- while (!uv__queue_empty(&queue)) { +- q = uv__queue_head(&queue); +- h = uv__queue_data(q, uv_handle_t, handle_queue); ++ QUEUE_MOVE(&loop->handle_queue, &queue); ++ while (!QUEUE_EMPTY(&queue)) { ++ q = QUEUE_HEAD(&queue); ++ h = QUEUE_DATA(q, uv_handle_t, handle_queue); + +- uv__queue_remove(q); +- uv__queue_insert_tail(&loop->handle_queue, q); ++ QUEUE_REMOVE(q); ++ QUEUE_INSERT_TAIL(&loop->handle_queue, q); + + if (h->flags & UV_HANDLE_INTERNAL) continue; + walk_cb(h, arg); +@@ -553,14 +553,14 @@ void uv_walk(uv_loop_t* loop, uv_walk_cb walk_cb, void* arg) { + + static void uv__print_handles(uv_loop_t* loop, int only_active, FILE* stream) { + const char* type; +- struct uv__queue* q; ++ QUEUE* q; + uv_handle_t* h; + + if (loop == NULL) + loop = uv_default_loop(); + +- uv__queue_foreach(q, &loop->handle_queue) { +- h = uv__queue_data(q, uv_handle_t, handle_queue); ++ QUEUE_FOREACH(q, &loop->handle_queue) { ++ h = QUEUE_DATA(q, uv_handle_t, handle_queue); + + if (only_active && !uv__is_active(h)) + continue; +@@ -846,7 +846,7 @@ uv_loop_t* uv_loop_new(void) { + + + int uv_loop_close(uv_loop_t* loop) { +- struct uv__queue* q; ++ QUEUE* q; + uv_handle_t* h; + #ifndef NDEBUG + void* saved_data; +@@ -855,8 +855,8 @@ int uv_loop_close(uv_loop_t* loop) { + if (uv__has_active_reqs(loop)) + return UV_EBUSY; + +- uv__queue_foreach(q, &loop->handle_queue) { +- h = uv__queue_data(q, uv_handle_t, handle_queue); ++ QUEUE_FOREACH(q, &loop->handle_queue) { ++ h = QUEUE_DATA(q, uv_handle_t, handle_queue); + if (!(h->flags & UV_HANDLE_INTERNAL)) + return UV_EBUSY; + } +diff --git a/deps/uv/src/uv-common.h b/deps/uv/src/uv-common.h +index cd57e5a3515..decde5362c8 100644 +--- a/deps/uv/src/uv-common.h ++++ b/deps/uv/src/uv-common.h +@@ -323,7 +323,7 @@ void uv__threadpool_cleanup(void); + (h)->loop = (loop_); \ + (h)->type = (type_); \ + (h)->flags = UV_HANDLE_REF; /* Ref the loop when active. */ \ +- uv__queue_insert_tail(&(loop_)->handle_queue, &(h)->handle_queue); \ ++ QUEUE_INSERT_TAIL(&(loop_)->handle_queue, &(h)->handle_queue); \ + uv__handle_platform_init(h); \ + } \ + while (0) +@@ -415,7 +415,6 @@ struct uv__iou { + size_t sqelen; + int ringfd; + uint32_t in_flight; +- uint32_t flags; + }; + #endif /* __linux__ */ + +diff --git a/deps/uv/src/win/core.c b/deps/uv/src/win/core.c +index e9885a0f1ff..9a3be58849a 100644 +--- a/deps/uv/src/win/core.c ++++ b/deps/uv/src/win/core.c +@@ -255,8 +255,8 @@ int uv_loop_init(uv_loop_t* loop) { + loop->time = 0; + uv_update_time(loop); + +- uv__queue_init(&loop->wq); +- uv__queue_init(&loop->handle_queue); ++ QUEUE_INIT(&loop->wq); ++ QUEUE_INIT(&loop->handle_queue); + loop->active_reqs.count = 0; + loop->active_handles = 0; + +@@ -358,7 +358,7 @@ void uv__loop_close(uv_loop_t* loop) { + } + + uv_mutex_lock(&loop->wq_mutex); +- assert(uv__queue_empty(&loop->wq) && "thread pool work queue not empty!"); ++ assert(QUEUE_EMPTY(&loop->wq) && "thread pool work queue not empty!"); + assert(!uv__has_active_reqs(loop)); + uv_mutex_unlock(&loop->wq_mutex); + uv_mutex_destroy(&loop->wq_mutex); +diff --git a/deps/uv/src/win/fs.c b/deps/uv/src/win/fs.c +index fc209c54f47..deb9438d689 100644 +--- a/deps/uv/src/win/fs.c ++++ b/deps/uv/src/win/fs.c +@@ -144,97 +144,26 @@ void uv__fs_init(void) { + } + + +-static int32_t fs__decode_wtf8_char(const char** input) { +- uint32_t code_point; +- uint8_t b1; +- uint8_t b2; +- uint8_t b3; +- uint8_t b4; +- +- b1 = **input; +- if (b1 <= 0x7F) +- return b1; /* ASCII code point */ +- if (b1 < 0xC2) +- return -1; /* invalid: continuation byte */ +- code_point = b1; +- +- b2 = *++*input; +- if ((b2 & 0xC0) != 0x80) +- return -1; /* invalid: not a continuation byte */ +- code_point = (code_point << 6) | (b2 & 0x3F); +- if (b1 <= 0xDF) +- return 0x7FF & code_point; /* two-byte character */ +- +- b3 = *++*input; +- if ((b3 & 0xC0) != 0x80) +- return -1; /* invalid: not a continuation byte */ +- code_point = (code_point << 6) | (b3 & 0x3F); +- if (b1 <= 0xEF) +- return 0xFFFF & code_point; /* three-byte character */ +- +- b4 = *++*input; +- if ((b4 & 0xC0) != 0x80) +- return -1; /* invalid: not a continuation byte */ +- code_point = (code_point << 6) | (b4 & 0x3F); +- if (b1 <= 0xF4) +- if (code_point <= 0x10FFFF) +- return code_point; /* four-byte character */ +- +- /* code point too large */ +- return -1; +-} +- +- +-static ssize_t fs__get_length_wtf8(const char* source_ptr) { +- size_t w_target_len = 0; +- int32_t code_point; +- +- do { +- code_point = fs__decode_wtf8_char(&source_ptr); +- if (code_point < 0) +- return -1; +- if (code_point > 0xFFFF) +- w_target_len++; +- w_target_len++; +- } while (*source_ptr++); +- return w_target_len; +-} +- +- +-static void fs__wtf8_to_wide(const char* source_ptr, WCHAR* w_target) { +- int32_t code_point; +- +- do { +- code_point = fs__decode_wtf8_char(&source_ptr); +- /* fs__get_length_wtf8 should have been called and checked first. */ +- assert(code_point >= 0); +- if (code_point > 0x10000) { +- assert(code_point < 0x10FFFF); +- *w_target++ = (((code_point - 0x10000) >> 10) + 0xD800); +- *w_target++ = ((code_point - 0x10000) & 0x3FF) + 0xDC00; +- } else { +- *w_target++ = code_point; +- } +- } while (*source_ptr++); +-} +- +- + INLINE static int fs__capture_path(uv_fs_t* req, const char* path, + const char* new_path, const int copy_path) { +- WCHAR* buf; +- WCHAR* pos; +- size_t buf_sz = 0; +- size_t path_len = 0; +- ssize_t pathw_len = 0; +- ssize_t new_pathw_len = 0; ++ char* buf; ++ char* pos; ++ ssize_t buf_sz = 0, path_len = 0, pathw_len = 0, new_pathw_len = 0; + + /* new_path can only be set if path is also set. */ + assert(new_path == NULL || path != NULL); + + if (path != NULL) { +- pathw_len = fs__get_length_wtf8(path); +- if (pathw_len < 0) +- return ERROR_INVALID_NAME; ++ pathw_len = MultiByteToWideChar(CP_UTF8, ++ 0, ++ path, ++ -1, ++ NULL, ++ 0); ++ if (pathw_len == 0) { ++ return GetLastError(); ++ } ++ + buf_sz += pathw_len * sizeof(WCHAR); + } + +@@ -244,9 +173,16 @@ INLINE static int fs__capture_path(uv_fs_t* req, const char* path, + } + + if (new_path != NULL) { +- new_pathw_len = fs__get_length_wtf8(new_path); +- if (new_pathw_len < 0) +- return ERROR_INVALID_NAME; ++ new_pathw_len = MultiByteToWideChar(CP_UTF8, ++ 0, ++ new_path, ++ -1, ++ NULL, ++ 0); ++ if (new_pathw_len == 0) { ++ return GetLastError(); ++ } ++ + buf_sz += new_pathw_len * sizeof(WCHAR); + } + +@@ -258,7 +194,7 @@ INLINE static int fs__capture_path(uv_fs_t* req, const char* path, + return 0; + } + +- buf = uv__malloc(buf_sz); ++ buf = (char*) uv__malloc(buf_sz); + if (buf == NULL) { + return ERROR_OUTOFMEMORY; + } +@@ -266,17 +202,29 @@ INLINE static int fs__capture_path(uv_fs_t* req, const char* path, + pos = buf; + + if (path != NULL) { +- fs__wtf8_to_wide(path, pos); +- req->file.pathw = pos; +- pos += pathw_len; ++ DWORD r = MultiByteToWideChar(CP_UTF8, ++ 0, ++ path, ++ -1, ++ (WCHAR*) pos, ++ pathw_len); ++ assert(r == (DWORD) pathw_len); ++ req->file.pathw = (WCHAR*) pos; ++ pos += r * sizeof(WCHAR); + } else { + req->file.pathw = NULL; + } + + if (new_path != NULL) { +- fs__wtf8_to_wide(new_path, pos); +- req->fs.info.new_pathw = pos; +- pos += new_pathw_len; ++ DWORD r = MultiByteToWideChar(CP_UTF8, ++ 0, ++ new_path, ++ -1, ++ (WCHAR*) pos, ++ new_pathw_len); ++ assert(r == (DWORD) new_pathw_len); ++ req->fs.info.new_pathw = (WCHAR*) pos; ++ pos += r * sizeof(WCHAR); + } else { + req->fs.info.new_pathw = NULL; + } +@@ -284,8 +232,8 @@ INLINE static int fs__capture_path(uv_fs_t* req, const char* path, + req->path = path; + if (path != NULL && copy_path) { + memcpy(pos, path, path_len); +- assert(path_len == buf_sz - (pos - buf) * sizeof(WCHAR)); +- req->path = (char*) pos; ++ assert(path_len == buf_sz - (pos - buf)); ++ req->path = pos; + } + + req->flags |= UV_FS_FREE_PATHS; +@@ -311,115 +259,57 @@ INLINE static void uv__fs_req_init(uv_loop_t* loop, uv_fs_t* req, + } + + +-static int32_t fs__get_surrogate_value(const WCHAR* w_source_ptr, +- size_t w_source_len) { +- WCHAR u; +- WCHAR next; +- +- u = w_source_ptr[0]; +- if (u >= 0xD800 && u <= 0xDBFF && w_source_len > 1) { +- next = w_source_ptr[1]; +- if (next >= 0xDC00 && next <= 0xDFFF) +- return 0x10000 + ((u - 0xD800) << 10) + (next - 0xDC00); +- } +- return u; +-} +- +- +-static size_t fs__get_length_wide(const WCHAR* w_source_ptr, +- size_t w_source_len) { +- size_t target_len; +- int32_t code_point; ++static int fs__wide_to_utf8(WCHAR* w_source_ptr, ++ DWORD w_source_len, ++ char** target_ptr, ++ uint64_t* target_len_ptr) { ++ int r; ++ int target_len; ++ char* target; ++ target_len = WideCharToMultiByte(CP_UTF8, ++ 0, ++ w_source_ptr, ++ w_source_len, ++ NULL, ++ 0, ++ NULL, ++ NULL); + +- target_len = 0; +- for (; w_source_len; w_source_len--, w_source_ptr++) { +- code_point = fs__get_surrogate_value(w_source_ptr, w_source_len); +- /* Can be invalid UTF-8 but must be valid WTF-8. */ +- assert(code_point >= 0); +- if (code_point < 0x80) +- target_len += 1; +- else if (code_point < 0x800) +- target_len += 2; +- else if (code_point < 0x10000) +- target_len += 3; +- else { +- target_len += 4; +- w_source_ptr++; +- w_source_len--; +- } ++ if (target_len == 0) { ++ return -1; + } +- return target_len; +-} + +- +-static int fs__wide_to_wtf8(WCHAR* w_source_ptr, +- size_t w_source_len, +- char** target_ptr, +- size_t* target_len_ptr) { +- size_t target_len; +- char* target; +- int32_t code_point; +- +- /* If *target_ptr is provided, then *target_len_ptr must be its length +- * (excluding space for null), otherwise we will compute the target_len_ptr +- * length and may return a new allocation in *target_ptr if target_ptr is +- * provided. */ +- if (target_ptr == NULL || *target_ptr == NULL) { +- target_len = fs__get_length_wide(w_source_ptr, w_source_len); +- if (target_len_ptr != NULL) +- *target_len_ptr = target_len; +- } else { +- target_len = *target_len_ptr; ++ if (target_len_ptr != NULL) { ++ *target_len_ptr = target_len; + } + +- if (target_ptr == NULL) ++ if (target_ptr == NULL) { + return 0; +- +- if (*target_ptr == NULL) { +- target = uv__malloc(target_len + 1); +- if (target == NULL) { +- SetLastError(ERROR_OUTOFMEMORY); +- return -1; +- } +- *target_ptr = target; +- } else { +- target = *target_ptr; +- } +- +- for (; w_source_len; w_source_len--, w_source_ptr++) { +- code_point = fs__get_surrogate_value(w_source_ptr, w_source_len); +- /* Can be invalid UTF-8 but must be valid WTF-8. */ +- assert(code_point >= 0); +- +- if (code_point < 0x80) { +- *target++ = code_point; +- } else if (code_point < 0x800) { +- *target++ = 0xC0 | (code_point >> 6); +- *target++ = 0x80 | (code_point & 0x3F); +- } else if (code_point < 0x10000) { +- *target++ = 0xE0 | (code_point >> 12); +- *target++ = 0x80 | ((code_point >> 6) & 0x3F); +- *target++ = 0x80 | (code_point & 0x3F); +- } else { +- *target++ = 0xF0 | (code_point >> 18); +- *target++ = 0x80 | ((code_point >> 12) & 0x3F); +- *target++ = 0x80 | ((code_point >> 6) & 0x3F); +- *target++ = 0x80 | (code_point & 0x3F); +- w_source_ptr++; +- w_source_len--; +- } + } +- assert((size_t) (target - *target_ptr) == target_len); + +- *target++ = '\0'; ++ target = uv__malloc(target_len + 1); ++ if (target == NULL) { ++ SetLastError(ERROR_OUTOFMEMORY); ++ return -1; ++ } + ++ r = WideCharToMultiByte(CP_UTF8, ++ 0, ++ w_source_ptr, ++ w_source_len, ++ target, ++ target_len, ++ NULL, ++ NULL); ++ assert(r == target_len); ++ target[target_len] = '\0'; ++ *target_ptr = target; + return 0; + } + + +-INLINE static int fs__readlink_handle(HANDLE handle, +- char** target_ptr, +- size_t* target_len_ptr) { ++INLINE static int fs__readlink_handle(HANDLE handle, char** target_ptr, ++ uint64_t* target_len_ptr) { + char buffer[MAXIMUM_REPARSE_DATA_BUFFER_SIZE]; + REPARSE_DATA_BUFFER* reparse_data = (REPARSE_DATA_BUFFER*) buffer; + WCHAR* w_target; +@@ -549,8 +439,7 @@ INLINE static int fs__readlink_handle(HANDLE handle, + return -1; + } + +- assert(target_ptr == NULL || *target_ptr == NULL); +- return fs__wide_to_wtf8(w_target, w_target_len, target_ptr, target_len_ptr); ++ return fs__wide_to_utf8(w_target, w_target_len, target_ptr, target_len_ptr); + } + + +@@ -1540,8 +1429,7 @@ void fs__scandir(uv_fs_t* req) { + uv__dirent_t* dirent; + + size_t wchar_len; +- size_t wtf8_len; +- char* wtf8; ++ size_t utf8_len; + + /* Obtain a pointer to the current directory entry. */ + position += next_entry_offset; +@@ -1568,8 +1456,11 @@ void fs__scandir(uv_fs_t* req) { + info->FileName[1] == L'.') + continue; + +- /* Compute the space required to store the filename as WTF-8. */ +- wtf8_len = fs__get_length_wide(&info->FileName[0], wchar_len); ++ /* Compute the space required to store the filename as UTF-8. */ ++ utf8_len = WideCharToMultiByte( ++ CP_UTF8, 0, &info->FileName[0], wchar_len, NULL, 0, NULL, NULL); ++ if (utf8_len == 0) ++ goto win32_error; + + /* Resize the dirent array if needed. */ + if (dirents_used >= dirents_size) { +@@ -1589,17 +1480,26 @@ void fs__scandir(uv_fs_t* req) { + * includes room for the first character of the filename, but `utf8_len` + * doesn't count the NULL terminator at this point. + */ +- dirent = uv__malloc(sizeof *dirent + wtf8_len); ++ dirent = uv__malloc(sizeof *dirent + utf8_len); + if (dirent == NULL) + goto out_of_memory_error; + + dirents[dirents_used++] = dirent; + + /* Convert file name to UTF-8. */ +- wtf8 = &dirent->d_name[0]; +- if (fs__wide_to_wtf8(&info->FileName[0], wchar_len, &wtf8, &wtf8_len) == -1) ++ if (WideCharToMultiByte(CP_UTF8, ++ 0, ++ &info->FileName[0], ++ wchar_len, ++ &dirent->d_name[0], ++ utf8_len, ++ NULL, ++ NULL) == 0) + goto win32_error; + ++ /* Add a null terminator to the filename. */ ++ dirent->d_name[utf8_len] = '\0'; ++ + /* Fill out the type field. */ + if (info->FileAttributes & FILE_ATTRIBUTE_DEVICE) + dirent->d_type = UV__DT_CHAR; +@@ -1808,7 +1708,6 @@ void fs__closedir(uv_fs_t* req) { + + INLINE static int fs__stat_handle(HANDLE handle, uv_stat_t* statbuf, + int do_lstat) { +- size_t target_length = 0; + FILE_FS_DEVICE_INFORMATION device_info; + FILE_ALL_INFORMATION file_info; + FILE_FS_VOLUME_INFORMATION volume_info; +@@ -1904,10 +1803,9 @@ INLINE static int fs__stat_handle(HANDLE handle, uv_stat_t* statbuf, + * to be treated as a regular file. The higher level lstat function will + * detect this failure and retry without do_lstat if appropriate. + */ +- if (fs__readlink_handle(handle, NULL, &target_length) != 0) ++ if (fs__readlink_handle(handle, NULL, &statbuf->st_size) != 0) + return -1; + statbuf->st_mode |= S_IFLNK; +- statbuf->st_size = target_length; + } + + if (statbuf->st_mode == 0) { +@@ -2763,7 +2661,6 @@ static void fs__readlink(uv_fs_t* req) { + return; + } + +- assert(req->ptr == NULL); + if (fs__readlink_handle(handle, (char**) &req->ptr, NULL) != 0) { + DWORD error = GetLastError(); + SET_REQ_WIN32_ERROR(req, error); +@@ -2823,8 +2720,7 @@ static ssize_t fs__realpath_handle(HANDLE handle, char** realpath_ptr) { + return -1; + } + +- assert(*realpath_ptr == NULL); +- r = fs__wide_to_wtf8(w_realpath_ptr, w_realpath_len, realpath_ptr, NULL); ++ r = fs__wide_to_utf8(w_realpath_ptr, w_realpath_len, realpath_ptr, NULL); + uv__free(w_realpath_buf); + return r; + } +@@ -2844,7 +2740,6 @@ static void fs__realpath(uv_fs_t* req) { + return; + } + +- assert(req->ptr == NULL); + if (fs__realpath_handle(handle, (char**) &req->ptr) == -1) { + CloseHandle(handle); + SET_REQ_WIN32_ERROR(req, GetLastError()); +diff --git a/deps/uv/src/win/handle-inl.h b/deps/uv/src/win/handle-inl.h +index 4722e85790a..5c843c241ef 100644 +--- a/deps/uv/src/win/handle-inl.h ++++ b/deps/uv/src/win/handle-inl.h +@@ -75,7 +75,7 @@ + + #define uv__handle_close(handle) \ + do { \ +- uv__queue_remove(&(handle)->handle_queue); \ ++ QUEUE_REMOVE(&(handle)->handle_queue); \ + uv__active_handle_rm((uv_handle_t*) (handle)); \ + \ + (handle)->flags |= UV_HANDLE_CLOSED; \ +diff --git a/deps/uv/src/win/pipe.c b/deps/uv/src/win/pipe.c +index f0cac382256..5e4276387ac 100644 +--- a/deps/uv/src/win/pipe.c ++++ b/deps/uv/src/win/pipe.c +@@ -55,7 +55,7 @@ static const int pipe_prefix_len = sizeof(pipe_prefix) - 1; + typedef struct { + uv__ipc_socket_xfer_type_t xfer_type; + uv__ipc_socket_xfer_info_t xfer_info; +- struct uv__queue member; ++ QUEUE member; + } uv__ipc_xfer_queue_item_t; + + /* IPC frame header flags. */ +@@ -111,7 +111,7 @@ int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc) { + handle->name = NULL; + handle->pipe.conn.ipc_remote_pid = 0; + handle->pipe.conn.ipc_data_frame.payload_remaining = 0; +- uv__queue_init(&handle->pipe.conn.ipc_xfer_queue); ++ QUEUE_INIT(&handle->pipe.conn.ipc_xfer_queue); + handle->pipe.conn.ipc_xfer_queue_length = 0; + handle->ipc = ipc; + handle->pipe.conn.non_overlapped_writes_tail = NULL; +@@ -637,13 +637,13 @@ void uv__pipe_endgame(uv_loop_t* loop, uv_pipe_t* handle) { + + if (handle->flags & UV_HANDLE_CONNECTION) { + /* Free pending sockets */ +- while (!uv__queue_empty(&handle->pipe.conn.ipc_xfer_queue)) { +- struct uv__queue* q; ++ while (!QUEUE_EMPTY(&handle->pipe.conn.ipc_xfer_queue)) { ++ QUEUE* q; + SOCKET socket; + +- q = uv__queue_head(&handle->pipe.conn.ipc_xfer_queue); +- uv__queue_remove(q); +- xfer_queue_item = uv__queue_data(q, uv__ipc_xfer_queue_item_t, member); ++ q = QUEUE_HEAD(&handle->pipe.conn.ipc_xfer_queue); ++ QUEUE_REMOVE(q); ++ xfer_queue_item = QUEUE_DATA(q, uv__ipc_xfer_queue_item_t, member); + + /* Materialize socket and close it */ + socket = WSASocketW(FROM_PROTOCOL_INFO, +@@ -1124,20 +1124,20 @@ int uv__pipe_accept(uv_pipe_t* server, uv_stream_t* client) { + uv_loop_t* loop = server->loop; + uv_pipe_t* pipe_client; + uv_pipe_accept_t* req; +- struct uv__queue* q; ++ QUEUE* q; + uv__ipc_xfer_queue_item_t* item; + int err; + + if (server->ipc) { +- if (uv__queue_empty(&server->pipe.conn.ipc_xfer_queue)) { ++ if (QUEUE_EMPTY(&server->pipe.conn.ipc_xfer_queue)) { + /* No valid pending sockets. */ + return WSAEWOULDBLOCK; + } + +- q = uv__queue_head(&server->pipe.conn.ipc_xfer_queue); +- uv__queue_remove(q); ++ q = QUEUE_HEAD(&server->pipe.conn.ipc_xfer_queue); ++ QUEUE_REMOVE(q); + server->pipe.conn.ipc_xfer_queue_length--; +- item = uv__queue_data(q, uv__ipc_xfer_queue_item_t, member); ++ item = QUEUE_DATA(q, uv__ipc_xfer_queue_item_t, member); + + err = uv__tcp_xfer_import( + (uv_tcp_t*) client, item->xfer_type, &item->xfer_info); +@@ -1891,7 +1891,7 @@ static void uv__pipe_queue_ipc_xfer_info( + item->xfer_type = xfer_type; + item->xfer_info = *xfer_info; + +- uv__queue_insert_tail(&handle->pipe.conn.ipc_xfer_queue, &item->member); ++ QUEUE_INSERT_TAIL(&handle->pipe.conn.ipc_xfer_queue, &item->member); + handle->pipe.conn.ipc_xfer_queue_length++; + } + +diff --git a/deps/uv/src/win/tcp.c b/deps/uv/src/win/tcp.c +index 187f36e2a61..6b282e0b501 100644 +--- a/deps/uv/src/win/tcp.c ++++ b/deps/uv/src/win/tcp.c +@@ -175,14 +175,14 @@ int uv_tcp_init_ex(uv_loop_t* loop, uv_tcp_t* handle, unsigned int flags) { + sock = socket(domain, SOCK_STREAM, 0); + if (sock == INVALID_SOCKET) { + err = WSAGetLastError(); +- uv__queue_remove(&handle->handle_queue); ++ QUEUE_REMOVE(&handle->handle_queue); + return uv_translate_sys_error(err); + } + + err = uv__tcp_set_socket(handle->loop, handle, sock, domain, 0); + if (err) { + closesocket(sock); +- uv__queue_remove(&handle->handle_queue); ++ QUEUE_REMOVE(&handle->handle_queue); + return uv_translate_sys_error(err); + } + +diff --git a/deps/uv/src/win/udp.c b/deps/uv/src/win/udp.c +index eab53842d4f..8a982d1907d 100644 +--- a/deps/uv/src/win/udp.c ++++ b/deps/uv/src/win/udp.c +@@ -146,14 +146,14 @@ int uv__udp_init_ex(uv_loop_t* loop, + sock = socket(domain, SOCK_DGRAM, 0); + if (sock == INVALID_SOCKET) { + err = WSAGetLastError(); +- uv__queue_remove(&handle->handle_queue); ++ QUEUE_REMOVE(&handle->handle_queue); + return uv_translate_sys_error(err); + } + + err = uv__udp_set_socket(handle->loop, handle, sock, domain); + if (err) { + closesocket(sock); +- uv__queue_remove(&handle->handle_queue); ++ QUEUE_REMOVE(&handle->handle_queue); + return uv_translate_sys_error(err); + } + } diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch index 66e10a0d00..0178cec777 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Using-native-binaries.patch @@ -12,7 +12,7 @@ https://git.openembedded.org/meta-openembedded/commit/?id=feeb172d1a8bf010490d22 Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com> --- - node.gyp | 1 + + node.gyp | 3 + tools/v8_gypfiles/v8.gyp | 5 +++++ 2 files changed, 6 insertions(+) @@ -28,6 +28,23 @@ index e8e1d9f9..e60ccc10 100644 '<(node_mksnapshot_exec)', '<(node_snapshot_main)', ], +@@ -935,6 +935,7 @@ + 'action_name': 'node_js2c', + 'process_outputs_as_sources': 1, + 'inputs': [ ++ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh', + '<(node_js2c_exec)', + '<@(library_files)', + '<@(deps_files)', +@@ -944,6 +945,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc', + ], + 'action': [ ++ '<(PRODUCT_DIR)/v8-qemu-wrapper.sh', + '<(node_js2c_exec)', + '<@(_outputs)', + 'lib', + diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index 42e26cd9..bc721991 100644 --- a/tools/v8_gypfiles/v8.gyp diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch index c9a522d2e2..5af87d866e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-liftoff-Correct-function-signatures.patch @@ -1,6 +1,6 @@ From dc3652c0abcdf8573fd044907b19d8eda7ca1124 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 20 Oct 2021 12:49:58 -0700 +Date: Mon, 3 Jul 2023 12:33:16 +0000 Subject: [PATCH] [liftoff] Correct function signatures Fixes builds on mips where clang reports an error @@ -13,16 +13,15 @@ Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/v8/v8/+/3 Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com> --- deps/v8/src/wasm/baseline/liftoff-assembler.h | 6 +++--- - deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h | 2 +- deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h | 2 +- - .../src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) + deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deps/v8/src/wasm/baseline/liftoff-assembler.h b/deps/v8/src/wasm/baseline/liftoff-assembler.h -index 22c7f73a..db4cb168 100644 +index aef63c64..f2a11b01 100644 --- a/deps/v8/src/wasm/baseline/liftoff-assembler.h +++ b/deps/v8/src/wasm/baseline/liftoff-assembler.h -@@ -646,7 +646,7 @@ class LiftoffAssembler : public TurboAssembler { +@@ -717,7 +717,7 @@ class LiftoffAssembler : public MacroAssembler { void FinishCall(const ValueKindSig*, compiler::CallDescriptor*); // Move {src} into {dst}. {src} and {dst} must be different. @@ -31,7 +30,7 @@ index 22c7f73a..db4cb168 100644 // Parallel register move: For a list of tuples <dst, src, kind>, move the // {src} register of kind {kind} into {dst}. If {src} equals {dst}, ignore -@@ -795,8 +795,8 @@ class LiftoffAssembler : public TurboAssembler { +@@ -884,8 +884,8 @@ class LiftoffAssembler : public MacroAssembler { inline void MoveStackValue(uint32_t dst_offset, uint32_t src_offset, ValueKind); @@ -42,24 +41,11 @@ index 22c7f73a..db4cb168 100644 inline void Spill(int offset, LiftoffRegister, ValueKind); inline void Spill(int offset, WasmValue); -diff --git a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h -index c76fd2f4..0fffe231 100644 ---- a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h -+++ b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h -@@ -661,7 +661,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, - pinned = pinned | LiftoffRegList{dst_op.rm(), src}; - LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); - // Save original value. -- Move(tmp, src, type.value_type()); -+ Move(tmp, src, type.value_type().kind()); - - src = tmp; - pinned.set(tmp); diff --git a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h -index 36413545..48207337 100644 +index 96cba24c..53e1842d 100644 --- a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h +++ b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h -@@ -593,7 +593,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, +@@ -592,7 +592,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, pinned.set(dst_op.rm()); LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); // Save original value. @@ -68,11 +54,11 @@ index 36413545..48207337 100644 src = tmp; pinned.set(tmp); -diff --git a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h -index 642a7d2a..56ffcc2a 100644 ---- a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h -+++ b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h -@@ -589,7 +589,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, +diff --git a/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h b/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h +index 1d6ae09e..397e82b2 100644 +--- a/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h ++++ b/deps/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv64.h +@@ -286,7 +286,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, pinned.set(dst_op.rm()); LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); // Save original value. @@ -82,4 +68,4 @@ index 642a7d2a..56ffcc2a 100644 src = tmp; pinned.set(tmp); -- -2.34.1 +2.40.0 diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch deleted file mode 100644 index a0242d8e18..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-mips-Use-32bit-cast-for-operand-on-mips32.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e65dde8db17da5acddeef7eb9316199c4e5e0811 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 19 Apr 2022 12:40:25 -0700 -Subject: [PATCH] mips: Use 32bit cast for operand on mips32 - -Fixes -deps/v8/src/compiler/backend/mips/code-generator-mips.cc: In member function 'void v8::internal::compiler::CodeGenerator::AssembleReturn(v8::internal::compiler::InstructionOperand*)': -../deps/v8/src/compiler/backend/mips/code-generator-mips.cc:4233:48: error: call of overloaded 'Operand(int64_t)' is ambiguous - 4233 | Operand(static_cast<int64_t>(0))); - | ^ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - deps/v8/src/compiler/backend/mips/code-generator-mips.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/deps/v8/src/compiler/backend/mips/code-generator-mips.cc b/deps/v8/src/compiler/backend/mips/code-generator-mips.cc -index 2b8197e..b226140 100644 ---- a/deps/v8/src/compiler/backend/mips/code-generator-mips.cc -+++ b/deps/v8/src/compiler/backend/mips/code-generator-mips.cc -@@ -4230,7 +4230,7 @@ void CodeGenerator::AssembleReturn(InstructionOperand* additional_pop_count) { - } else if (FLAG_debug_code) { - __ Assert(eq, AbortReason::kUnexpectedAdditionalPopValue, - g.ToRegister(additional_pop_count), -- Operand(static_cast<int64_t>(0))); -+ Operand(static_cast<int32_t>(0))); - } - } - // Functions with JS linkage have at least one parameter (the receiver). --- -2.36.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0002-Revert-io_uring-changes-from-libuv-1.45.0.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0002-Revert-io_uring-changes-from-libuv-1.45.0.patch new file mode 100644 index 0000000000..77cd53b759 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0002-Revert-io_uring-changes-from-libuv-1.45.0.patch @@ -0,0 +1,1803 @@ +From 6d2ef4c8ba2304ee4941a6719b3ad9bd63e415a9 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@gmail.com> +Date: Wed, 18 Oct 2023 21:09:44 +0200 +Subject: [PATCH] Revert io_uring changes from libuv-1.45.0 + +This reverts https://github.com/libuv/libuv/pull/3952/commits/26c79a942b92573a1388c0ee8a6ad4397f009318 + +Included in nodejs-20.3.0 with the libuv upgrade to 1.45.0 in: +https://github.com/nodejs/node/commit/bfcb3d1d9a876f399013d326bd65804f9eda77e4 + +Reverted libuv commits: +Revert "linux: fix WRITEV with lots of bufs using io_uring (#4004)" +This reverts commit ef6a9a624df0a00687037474025a3608472f722a. +Revert "linux: work around EOWNERDEAD io_uring kernel bug (#4002)" +This reverts commit d23a20f62cc50b9fd7694992263f1d296d8f5cb4. +Revert "unix: handle CQ overflow in iou ring (#3991)" +This reverts commit 30fc896cc1b5822e9f1eb462587fe4b368a6215c. +Revert "unix: constrained_memory should return UINT64_MAX (#3753)" +This reverts commit 6ad347fae4520f39520d34bd7c7f5ddafab13a69. +Revert "linux: use io_uring to batch epoll_ctl calls (#3979)" +This reverts commit 6e073ef5daf93b708a654008959b823b58029e88. +Revert "linux: fix logic bug in sqe ring space check (#3980)" +This reverts commit f27208224084fc972b9d2802486d97ef31b51a39. +Revert "src: fix events/events_waiting metrics counter (#3957)" +This reverts commit e02642cf3b768b2c58a41f97fa38507e032ae415. +Revert "linux: remove bug workaround for obsolete kernels (#3965)" +This reverts commit 1c935a34454167b23f8eef7f0f63d7119f0de747. +Revert "linux: add IORING_OP_CLOSE support (#3964)" +This reverts commit dfae365f844e127621128a76bce7165e3f99a8d9. +Revert "linux: add IORING_OP_OPENAT support (#3963)" +This reverts commit 5ca5e475bb1711e65323ef1594a31818e5a1a9eb. +Revert "linux: fix academic valgrind warning (#3960)" +This reverts commit a7ff759ca1deacb2e0e6ae3c2d3dce91cc637dfe. +Revert "linux: introduce io_uring support (#3952)" +This reverts commit d2c31f429b87b476a7f1344d145dad4752a406d4. + +Dropped deps/uv/docs deps/uv/test changes as these dirs aren't included +in nodejs tarballs. + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- +Upstream-Status: Inappropriate [OE specific] + + deps/uv/docs/src/fs.rst | 6 - + deps/uv/docs/src/misc.rst | 5 +- + deps/uv/src/threadpool.c | 21 - + deps/uv/src/unix/aix.c | 11 +- + deps/uv/src/unix/fs.c | 57 +- + deps/uv/src/unix/internal.h | 23 - + deps/uv/src/unix/kqueue.c | 10 +- + deps/uv/src/unix/linux.c | 998 +++----------------------- + deps/uv/src/unix/os390.c | 11 +- + deps/uv/src/unix/posix-poll.c | 11 +- + deps/uv/src/uv-common.h | 28 - + deps/uv/src/win/core.c | 20 +- + deps/uv/test/test-fs.c | 33 - + deps/uv/test/test-list.h | 4 - + deps/uv/test/test-metrics.c | 151 ---- + deps/uv/test/test-threadpool-cancel.c | 34 +- + 16 files changed, 138 insertions(+), 1285 deletions(-) + +diff --git a/deps/uv/src/threadpool.c b/deps/uv/src/threadpool.c +index 51962bf0021..a3da53026f9 100644 +--- a/deps/uv/src/threadpool.c ++++ b/deps/uv/src/threadpool.c +@@ -275,13 +275,9 @@ void uv__work_submit(uv_loop_t* loop, + } + + +-/* TODO(bnoordhuis) teach libuv how to cancel file operations +- * that go through io_uring instead of the thread pool. +- */ + static int uv__work_cancel(uv_loop_t* loop, uv_req_t* req, struct uv__work* w) { + int cancelled; + +- uv_once(&once, init_once); /* Ensure |mutex| is initialized. */ + uv_mutex_lock(&mutex); + uv_mutex_lock(&w->loop->wq_mutex); + +@@ -311,15 +307,12 @@ void uv__work_done(uv_async_t* handle) { + QUEUE* q; + QUEUE wq; + int err; +- int nevents; + + loop = container_of(handle, uv_loop_t, wq_async); + uv_mutex_lock(&loop->wq_mutex); + QUEUE_MOVE(&loop->wq, &wq); + uv_mutex_unlock(&loop->wq_mutex); + +- nevents = 0; +- + while (!QUEUE_EMPTY(&wq)) { + q = QUEUE_HEAD(&wq); + QUEUE_REMOVE(q); +@@ -327,20 +320,6 @@ void uv__work_done(uv_async_t* handle) { + w = container_of(q, struct uv__work, wq); + err = (w->work == uv__cancelled) ? UV_ECANCELED : 0; + w->done(w, err); +- nevents++; +- } +- +- /* This check accomplishes 2 things: +- * 1. Even if the queue was empty, the call to uv__work_done() should count +- * as an event. Which will have been added by the event loop when +- * calling this callback. +- * 2. Prevents accidental wrap around in case nevents == 0 events == 0. +- */ +- if (nevents > 1) { +- /* Subtract 1 to counter the call to uv__work_done(). */ +- uv__metrics_inc_events(loop, nevents - 1); +- if (uv__get_internal_fields(loop)->current_timeout == 0) +- uv__metrics_inc_events_waiting(loop, nevents - 1); + } + } + +diff --git a/deps/uv/src/unix/aix.c b/deps/uv/src/unix/aix.c +index f1afbed49ec..b855282ebc8 100644 +--- a/deps/uv/src/unix/aix.c ++++ b/deps/uv/src/unix/aix.c +@@ -131,7 +131,6 @@ int uv__io_check_fd(uv_loop_t* loop, int fd) { + + + void uv__io_poll(uv_loop_t* loop, int timeout) { +- uv__loop_internal_fields_t* lfields; + struct pollfd events[1024]; + struct pollfd pqry; + struct pollfd* pe; +@@ -155,8 +154,6 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + return; + } + +- lfields = uv__get_internal_fields(loop); +- + while (!QUEUE_EMPTY(&loop->watcher_queue)) { + q = QUEUE_HEAD(&loop->watcher_queue); + QUEUE_REMOVE(q); +@@ -220,7 +217,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + base = loop->time; + count = 48; /* Benchmarks suggest this gives the best throughput. */ + +- if (lfields->flags & UV_METRICS_IDLE_TIME) { ++ if (uv__get_internal_fields(loop)->flags & UV_METRICS_IDLE_TIME) { + reset_timeout = 1; + user_timeout = timeout; + timeout = 0; +@@ -235,12 +232,6 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + if (timeout != 0) + uv__metrics_set_provider_entry_time(loop); + +- /* Store the current timeout in a location that's globally accessible so +- * other locations like uv__work_done() can determine whether the queue +- * of events in the callback were waiting when poll was called. +- */ +- lfields->current_timeout = timeout; +- + nfds = pollset_poll(loop->backend_fd, + events, + ARRAY_SIZE(events), +diff --git a/deps/uv/src/unix/fs.c b/deps/uv/src/unix/fs.c +index 00d385c24b7..c696a8d5500 100644 +--- a/deps/uv/src/unix/fs.c ++++ b/deps/uv/src/unix/fs.c +@@ -61,11 +61,10 @@ + #endif + + #if defined(__linux__) +-# include <sys/sendfile.h> +-# include <sys/utsname.h> ++# include "sys/utsname.h" + #endif + +-#if defined(__sun) ++#if defined(__linux__) || defined(__sun) + # include <sys/sendfile.h> + # include <sys/sysmacros.h> + #endif +@@ -1554,7 +1553,26 @@ static int uv__fs_statx(int fd, + return UV_ENOSYS; + } + +- uv__statx_to_stat(&statxbuf, buf); ++ buf->st_dev = makedev(statxbuf.stx_dev_major, statxbuf.stx_dev_minor); ++ buf->st_mode = statxbuf.stx_mode; ++ buf->st_nlink = statxbuf.stx_nlink; ++ buf->st_uid = statxbuf.stx_uid; ++ buf->st_gid = statxbuf.stx_gid; ++ buf->st_rdev = makedev(statxbuf.stx_rdev_major, statxbuf.stx_rdev_minor); ++ buf->st_ino = statxbuf.stx_ino; ++ buf->st_size = statxbuf.stx_size; ++ buf->st_blksize = statxbuf.stx_blksize; ++ buf->st_blocks = statxbuf.stx_blocks; ++ buf->st_atim.tv_sec = statxbuf.stx_atime.tv_sec; ++ buf->st_atim.tv_nsec = statxbuf.stx_atime.tv_nsec; ++ buf->st_mtim.tv_sec = statxbuf.stx_mtime.tv_sec; ++ buf->st_mtim.tv_nsec = statxbuf.stx_mtime.tv_nsec; ++ buf->st_ctim.tv_sec = statxbuf.stx_ctime.tv_sec; ++ buf->st_ctim.tv_nsec = statxbuf.stx_ctime.tv_nsec; ++ buf->st_birthtim.tv_sec = statxbuf.stx_btime.tv_sec; ++ buf->st_birthtim.tv_nsec = statxbuf.stx_btime.tv_nsec; ++ buf->st_flags = 0; ++ buf->st_gen = 0; + + return 0; + #else +@@ -1798,9 +1816,6 @@ int uv_fs_chown(uv_loop_t* loop, + int uv_fs_close(uv_loop_t* loop, uv_fs_t* req, uv_file file, uv_fs_cb cb) { + INIT(CLOSE); + req->file = file; +- if (cb != NULL) +- if (uv__iou_fs_close(loop, req)) +- return 0; + POST; + } + +@@ -1848,9 +1863,6 @@ int uv_fs_lchown(uv_loop_t* loop, + int uv_fs_fdatasync(uv_loop_t* loop, uv_fs_t* req, uv_file file, uv_fs_cb cb) { + INIT(FDATASYNC); + req->file = file; +- if (cb != NULL) +- if (uv__iou_fs_fsync_or_fdatasync(loop, req, /* IORING_FSYNC_DATASYNC */ 1)) +- return 0; + POST; + } + +@@ -1858,9 +1870,6 @@ int uv_fs_fdatasync(uv_loop_t* loop, uv_fs_t* req, uv_file file, uv_fs_cb cb) { + int uv_fs_fstat(uv_loop_t* loop, uv_fs_t* req, uv_file file, uv_fs_cb cb) { + INIT(FSTAT); + req->file = file; +- if (cb != NULL) +- if (uv__iou_fs_statx(loop, req, /* is_fstat */ 1, /* is_lstat */ 0)) +- return 0; + POST; + } + +@@ -1868,9 +1877,6 @@ int uv_fs_fstat(uv_loop_t* loop, uv_fs_t* req, uv_file file, uv_fs_cb cb) { + int uv_fs_fsync(uv_loop_t* loop, uv_fs_t* req, uv_file file, uv_fs_cb cb) { + INIT(FSYNC); + req->file = file; +- if (cb != NULL) +- if (uv__iou_fs_fsync_or_fdatasync(loop, req, /* no flags */ 0)) +- return 0; + POST; + } + +@@ -1917,9 +1923,6 @@ int uv_fs_lutime(uv_loop_t* loop, + int uv_fs_lstat(uv_loop_t* loop, uv_fs_t* req, const char* path, uv_fs_cb cb) { + INIT(LSTAT); + PATH; +- if (cb != NULL) +- if (uv__iou_fs_statx(loop, req, /* is_fstat */ 0, /* is_lstat */ 1)) +- return 0; + POST; + } + +@@ -1981,9 +1984,6 @@ int uv_fs_open(uv_loop_t* loop, + PATH; + req->flags = flags; + req->mode = mode; +- if (cb != NULL) +- if (uv__iou_fs_open(loop, req)) +- return 0; + POST; + } + +@@ -2012,11 +2012,6 @@ int uv_fs_read(uv_loop_t* loop, uv_fs_t* req, + memcpy(req->bufs, bufs, nbufs * sizeof(*bufs)); + + req->off = off; +- +- if (cb != NULL) +- if (uv__iou_fs_read_or_write(loop, req, /* is_read */ 1)) +- return 0; +- + POST; + } + +@@ -2124,9 +2119,6 @@ int uv_fs_sendfile(uv_loop_t* loop, + int uv_fs_stat(uv_loop_t* loop, uv_fs_t* req, const char* path, uv_fs_cb cb) { + INIT(STAT); + PATH; +- if (cb != NULL) +- if (uv__iou_fs_statx(loop, req, /* is_fstat */ 0, /* is_lstat */ 0)) +- return 0; + POST; + } + +@@ -2190,11 +2182,6 @@ int uv_fs_write(uv_loop_t* loop, + memcpy(req->bufs, bufs, nbufs * sizeof(*bufs)); + + req->off = off; +- +- if (cb != NULL) +- if (uv__iou_fs_read_or_write(loop, req, /* is_read */ 0)) +- return 0; +- + POST; + } + +diff --git a/deps/uv/src/unix/internal.h b/deps/uv/src/unix/internal.h +index 6c5822e6a0d..d439ae6dd3d 100644 +--- a/deps/uv/src/unix/internal.h ++++ b/deps/uv/src/unix/internal.h +@@ -329,28 +329,6 @@ int uv__random_getentropy(void* buf, size_t buflen); + int uv__random_readpath(const char* path, void* buf, size_t buflen); + int uv__random_sysctl(void* buf, size_t buflen); + +-/* io_uring */ +-#ifdef __linux__ +-int uv__iou_fs_close(uv_loop_t* loop, uv_fs_t* req); +-int uv__iou_fs_fsync_or_fdatasync(uv_loop_t* loop, +- uv_fs_t* req, +- uint32_t fsync_flags); +-int uv__iou_fs_open(uv_loop_t* loop, uv_fs_t* req); +-int uv__iou_fs_read_or_write(uv_loop_t* loop, +- uv_fs_t* req, +- int is_read); +-int uv__iou_fs_statx(uv_loop_t* loop, +- uv_fs_t* req, +- int is_fstat, +- int is_lstat); +-#else +-#define uv__iou_fs_close(loop, req) 0 +-#define uv__iou_fs_fsync_or_fdatasync(loop, req, fsync_flags) 0 +-#define uv__iou_fs_open(loop, req) 0 +-#define uv__iou_fs_read_or_write(loop, req, is_read) 0 +-#define uv__iou_fs_statx(loop, req, is_fstat, is_lstat) 0 +-#endif +- + #if defined(__APPLE__) + int uv___stream_fd(const uv_stream_t* handle); + #define uv__stream_fd(handle) (uv___stream_fd((const uv_stream_t*) (handle))) +@@ -427,7 +405,6 @@ int uv__statx(int dirfd, + int flags, + unsigned int mask, + struct uv__statx* statxbuf); +-void uv__statx_to_stat(const struct uv__statx* statxbuf, uv_stat_t* buf); + ssize_t uv__getrandom(void* buf, size_t buflen, unsigned flags); + #endif + +diff --git a/deps/uv/src/unix/kqueue.c b/deps/uv/src/unix/kqueue.c +index 82916d65933..deb486bae7a 100644 +--- a/deps/uv/src/unix/kqueue.c ++++ b/deps/uv/src/unix/kqueue.c +@@ -127,7 +127,6 @@ static void uv__kqueue_delete(int kqfd, const struct kevent *ev) { + + + void uv__io_poll(uv_loop_t* loop, int timeout) { +- uv__loop_internal_fields_t* lfields; + struct kevent events[1024]; + struct kevent* ev; + struct timespec spec; +@@ -156,7 +155,6 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + return; + } + +- lfields = uv__get_internal_fields(loop); + nevents = 0; + + while (!QUEUE_EMPTY(&loop->watcher_queue)) { +@@ -224,7 +222,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + base = loop->time; + count = 48; /* Benchmarks suggest this gives the best throughput. */ + +- if (lfields->flags & UV_METRICS_IDLE_TIME) { ++ if (uv__get_internal_fields(loop)->flags & UV_METRICS_IDLE_TIME) { + reset_timeout = 1; + user_timeout = timeout; + timeout = 0; +@@ -247,12 +245,6 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + if (pset != NULL) + pthread_sigmask(SIG_BLOCK, pset, NULL); + +- /* Store the current timeout in a location that's globally accessible so +- * other locations like uv__work_done() can determine whether the queue +- * of events in the callback were waiting when poll was called. +- */ +- lfields->current_timeout = timeout; +- + nfds = kevent(loop->backend_fd, + events, + nevents, +diff --git a/deps/uv/src/unix/linux.c b/deps/uv/src/unix/linux.c +index 5f84ad0eea3..343e37f2527 100644 +--- a/deps/uv/src/unix/linux.c ++++ b/deps/uv/src/unix/linux.c +@@ -27,8 +27,6 @@ + #include "internal.h" + + #include <inttypes.h> +-#include <stdatomic.h> +-#include <stddef.h> /* offsetof */ + #include <stdint.h> + #include <stdio.h> + #include <stdlib.h> +@@ -40,29 +38,15 @@ + #include <net/if.h> + #include <sys/epoll.h> + #include <sys/inotify.h> +-#include <sys/mman.h> + #include <sys/param.h> + #include <sys/prctl.h> + #include <sys/stat.h> + #include <sys/syscall.h> + #include <sys/sysinfo.h> +-#include <sys/sysmacros.h> + #include <sys/types.h> + #include <time.h> + #include <unistd.h> + +-#ifndef __NR_io_uring_setup +-# define __NR_io_uring_setup 425 +-#endif +- +-#ifndef __NR_io_uring_enter +-# define __NR_io_uring_enter 426 +-#endif +- +-#ifndef __NR_io_uring_register +-# define __NR_io_uring_register 427 +-#endif +- + #ifndef __NR_copy_file_range + # if defined(__x86_64__) + # define __NR_copy_file_range 326 +@@ -132,129 +116,6 @@ + # include <netpacket/packet.h> + #endif /* HAVE_IFADDRS_H */ + +-enum { +- UV__IORING_SETUP_SQPOLL = 2u, +-}; +- +-enum { +- UV__IORING_FEAT_SINGLE_MMAP = 1u, +- UV__IORING_FEAT_NODROP = 2u, +- UV__IORING_FEAT_RSRC_TAGS = 1024u, /* linux v5.13 */ +-}; +- +-enum { +- UV__IORING_OP_READV = 1, +- UV__IORING_OP_WRITEV = 2, +- UV__IORING_OP_FSYNC = 3, +- UV__IORING_OP_OPENAT = 18, +- UV__IORING_OP_CLOSE = 19, +- UV__IORING_OP_STATX = 21, +- UV__IORING_OP_EPOLL_CTL = 29, +-}; +- +-enum { +- UV__IORING_ENTER_GETEVENTS = 1u, +- UV__IORING_ENTER_SQ_WAKEUP = 2u, +-}; +- +-enum { +- UV__IORING_SQ_NEED_WAKEUP = 1u, +- UV__IORING_SQ_CQ_OVERFLOW = 2u, +-}; +- +-struct uv__io_cqring_offsets { +- uint32_t head; +- uint32_t tail; +- uint32_t ring_mask; +- uint32_t ring_entries; +- uint32_t overflow; +- uint32_t cqes; +- uint64_t reserved0; +- uint64_t reserved1; +-}; +- +-STATIC_ASSERT(40 == sizeof(struct uv__io_cqring_offsets)); +- +-struct uv__io_sqring_offsets { +- uint32_t head; +- uint32_t tail; +- uint32_t ring_mask; +- uint32_t ring_entries; +- uint32_t flags; +- uint32_t dropped; +- uint32_t array; +- uint32_t reserved0; +- uint64_t reserved1; +-}; +- +-STATIC_ASSERT(40 == sizeof(struct uv__io_sqring_offsets)); +- +-struct uv__io_uring_cqe { +- uint64_t user_data; +- int32_t res; +- uint32_t flags; +-}; +- +-STATIC_ASSERT(16 == sizeof(struct uv__io_uring_cqe)); +- +-struct uv__io_uring_sqe { +- uint8_t opcode; +- uint8_t flags; +- uint16_t ioprio; +- int32_t fd; +- union { +- uint64_t off; +- uint64_t addr2; +- }; +- union { +- uint64_t addr; +- }; +- uint32_t len; +- union { +- uint32_t rw_flags; +- uint32_t fsync_flags; +- uint32_t open_flags; +- uint32_t statx_flags; +- }; +- uint64_t user_data; +- union { +- uint16_t buf_index; +- uint64_t pad[3]; +- }; +-}; +- +-STATIC_ASSERT(64 == sizeof(struct uv__io_uring_sqe)); +-STATIC_ASSERT(0 == offsetof(struct uv__io_uring_sqe, opcode)); +-STATIC_ASSERT(1 == offsetof(struct uv__io_uring_sqe, flags)); +-STATIC_ASSERT(2 == offsetof(struct uv__io_uring_sqe, ioprio)); +-STATIC_ASSERT(4 == offsetof(struct uv__io_uring_sqe, fd)); +-STATIC_ASSERT(8 == offsetof(struct uv__io_uring_sqe, off)); +-STATIC_ASSERT(16 == offsetof(struct uv__io_uring_sqe, addr)); +-STATIC_ASSERT(24 == offsetof(struct uv__io_uring_sqe, len)); +-STATIC_ASSERT(28 == offsetof(struct uv__io_uring_sqe, rw_flags)); +-STATIC_ASSERT(32 == offsetof(struct uv__io_uring_sqe, user_data)); +-STATIC_ASSERT(40 == offsetof(struct uv__io_uring_sqe, buf_index)); +- +-struct uv__io_uring_params { +- uint32_t sq_entries; +- uint32_t cq_entries; +- uint32_t flags; +- uint32_t sq_thread_cpu; +- uint32_t sq_thread_idle; +- uint32_t features; +- uint32_t reserved[4]; +- struct uv__io_sqring_offsets sq_off; /* 40 bytes */ +- struct uv__io_cqring_offsets cq_off; /* 40 bytes */ +-}; +- +-STATIC_ASSERT(40 + 40 + 40 == sizeof(struct uv__io_uring_params)); +-STATIC_ASSERT(40 == offsetof(struct uv__io_uring_params, sq_off)); +-STATIC_ASSERT(80 == offsetof(struct uv__io_uring_params, cq_off)); +- +-STATIC_ASSERT(EPOLL_CTL_ADD < 4); +-STATIC_ASSERT(EPOLL_CTL_DEL < 4); +-STATIC_ASSERT(EPOLL_CTL_MOD < 4); +- + struct watcher_list { + RB_ENTRY(watcher_list) entry; + QUEUE watchers; +@@ -276,17 +137,6 @@ static int compare_watchers(const struct watcher_list* a, + static void maybe_free_watcher_list(struct watcher_list* w, + uv_loop_t* loop); + +-static void uv__epoll_ctl_flush(int epollfd, +- struct uv__iou* ctl, +- struct epoll_event (*events)[256]); +- +-static void uv__epoll_ctl_prep(int epollfd, +- struct uv__iou* ctl, +- struct epoll_event (*events)[256], +- int op, +- int fd, +- struct epoll_event* e); +- + RB_GENERATE_STATIC(watcher_root, watcher_list, entry, compare_watchers) + + +@@ -356,187 +206,7 @@ ssize_t uv__getrandom(void* buf, size_t buflen, unsigned flags) { + } + + +-int uv__io_uring_setup(int entries, struct uv__io_uring_params* params) { +- return syscall(__NR_io_uring_setup, entries, params); +-} +- +- +-int uv__io_uring_enter(int fd, +- unsigned to_submit, +- unsigned min_complete, +- unsigned flags) { +- /* io_uring_enter used to take a sigset_t but it's unused +- * in newer kernels unless IORING_ENTER_EXT_ARG is set, +- * in which case it takes a struct io_uring_getevents_arg. +- */ +- return syscall(__NR_io_uring_enter, +- fd, +- to_submit, +- min_complete, +- flags, +- NULL, +- 0L); +-} +- +- +-int uv__io_uring_register(int fd, unsigned opcode, void* arg, unsigned nargs) { +- return syscall(__NR_io_uring_register, fd, opcode, arg, nargs); +-} +- +- +-static int uv__use_io_uring(void) { +- /* Ternary: unknown=0, yes=1, no=-1 */ +- static _Atomic int use_io_uring; +- char* val; +- int use; +- +- use = atomic_load_explicit(&use_io_uring, memory_order_relaxed); +- +- if (use == 0) { +- val = getenv("UV_USE_IO_URING"); +- use = val == NULL || atoi(val) ? 1 : -1; +- atomic_store_explicit(&use_io_uring, use, memory_order_relaxed); +- } +- +- return use > 0; +-} +- +- +-static void uv__iou_init(int epollfd, +- struct uv__iou* iou, +- uint32_t entries, +- uint32_t flags) { +- struct uv__io_uring_params params; +- struct epoll_event e; +- size_t cqlen; +- size_t sqlen; +- size_t maxlen; +- size_t sqelen; +- uint32_t i; +- char* sq; +- char* sqe; +- int ringfd; +- +- sq = MAP_FAILED; +- sqe = MAP_FAILED; +- +- if (!uv__use_io_uring()) +- return; +- +- /* SQPOLL required CAP_SYS_NICE until linux v5.12 relaxed that requirement. +- * Mostly academic because we check for a v5.13 kernel afterwards anyway. +- */ +- memset(¶ms, 0, sizeof(params)); +- params.flags = flags; +- +- if (flags & UV__IORING_SETUP_SQPOLL) +- params.sq_thread_idle = 10; /* milliseconds */ +- +- /* Kernel returns a file descriptor with O_CLOEXEC flag set. */ +- ringfd = uv__io_uring_setup(entries, ¶ms); +- if (ringfd == -1) +- return; +- +- /* IORING_FEAT_RSRC_TAGS is used to detect linux v5.13 but what we're +- * actually detecting is whether IORING_OP_STATX works with SQPOLL. +- */ +- if (!(params.features & UV__IORING_FEAT_RSRC_TAGS)) +- goto fail; +- +- /* Implied by IORING_FEAT_RSRC_TAGS but checked explicitly anyway. */ +- if (!(params.features & UV__IORING_FEAT_SINGLE_MMAP)) +- goto fail; +- +- /* Implied by IORING_FEAT_RSRC_TAGS but checked explicitly anyway. */ +- if (!(params.features & UV__IORING_FEAT_NODROP)) +- goto fail; +- +- sqlen = params.sq_off.array + params.sq_entries * sizeof(uint32_t); +- cqlen = +- params.cq_off.cqes + params.cq_entries * sizeof(struct uv__io_uring_cqe); +- maxlen = sqlen < cqlen ? cqlen : sqlen; +- sqelen = params.sq_entries * sizeof(struct uv__io_uring_sqe); +- +- sq = mmap(0, +- maxlen, +- PROT_READ | PROT_WRITE, +- MAP_SHARED | MAP_POPULATE, +- ringfd, +- 0); /* IORING_OFF_SQ_RING */ +- +- sqe = mmap(0, +- sqelen, +- PROT_READ | PROT_WRITE, +- MAP_SHARED | MAP_POPULATE, +- ringfd, +- 0x10000000ull); /* IORING_OFF_SQES */ +- +- if (sq == MAP_FAILED || sqe == MAP_FAILED) +- goto fail; +- +- if (flags & UV__IORING_SETUP_SQPOLL) { +- /* Only interested in completion events. To get notified when +- * the kernel pulls items from the submission ring, add POLLOUT. +- */ +- memset(&e, 0, sizeof(e)); +- e.events = POLLIN; +- e.data.fd = ringfd; +- +- if (epoll_ctl(epollfd, EPOLL_CTL_ADD, ringfd, &e)) +- goto fail; +- } +- +- iou->sqhead = (uint32_t*) (sq + params.sq_off.head); +- iou->sqtail = (uint32_t*) (sq + params.sq_off.tail); +- iou->sqmask = *(uint32_t*) (sq + params.sq_off.ring_mask); +- iou->sqarray = (uint32_t*) (sq + params.sq_off.array); +- iou->sqflags = (uint32_t*) (sq + params.sq_off.flags); +- iou->cqhead = (uint32_t*) (sq + params.cq_off.head); +- iou->cqtail = (uint32_t*) (sq + params.cq_off.tail); +- iou->cqmask = *(uint32_t*) (sq + params.cq_off.ring_mask); +- iou->sq = sq; +- iou->cqe = sq + params.cq_off.cqes; +- iou->sqe = sqe; +- iou->sqlen = sqlen; +- iou->cqlen = cqlen; +- iou->maxlen = maxlen; +- iou->sqelen = sqelen; +- iou->ringfd = ringfd; +- iou->in_flight = 0; +- +- for (i = 0; i <= iou->sqmask; i++) +- iou->sqarray[i] = i; /* Slot -> sqe identity mapping. */ +- +- return; +- +-fail: +- if (sq != MAP_FAILED) +- munmap(sq, maxlen); +- +- if (sqe != MAP_FAILED) +- munmap(sqe, sqelen); +- +- uv__close(ringfd); +-} +- +- +-static void uv__iou_delete(struct uv__iou* iou) { +- if (iou->ringfd != -1) { +- munmap(iou->sq, iou->maxlen); +- munmap(iou->sqe, iou->sqelen); +- uv__close(iou->ringfd); +- iou->ringfd = -1; +- } +-} +- +- + int uv__platform_loop_init(uv_loop_t* loop) { +- uv__loop_internal_fields_t* lfields; +- +- lfields = uv__get_internal_fields(loop); +- lfields->ctl.ringfd = -1; +- lfields->iou.ringfd = -1; +- + loop->inotify_watchers = NULL; + loop->inotify_fd = -1; + loop->backend_fd = epoll_create1(O_CLOEXEC); +@@ -544,9 +214,6 @@ int uv__platform_loop_init(uv_loop_t* loop) { + if (loop->backend_fd == -1) + return UV__ERR(errno); + +- uv__iou_init(loop->backend_fd, &lfields->iou, 64, UV__IORING_SETUP_SQPOLL); +- uv__iou_init(loop->backend_fd, &lfields->ctl, 256, 0); +- + return 0; + } + +@@ -559,8 +226,6 @@ int uv__io_fork(uv_loop_t* loop) { + + uv__close(loop->backend_fd); + loop->backend_fd = -1; +- +- /* TODO(bnoordhuis) Loses items from the submission and completion rings. */ + uv__platform_loop_delete(loop); + + err = uv__platform_loop_init(loop); +@@ -572,62 +237,42 @@ int uv__io_fork(uv_loop_t* loop) { + + + void uv__platform_loop_delete(uv_loop_t* loop) { +- uv__loop_internal_fields_t* lfields; +- +- lfields = uv__get_internal_fields(loop); +- uv__iou_delete(&lfields->ctl); +- uv__iou_delete(&lfields->iou); +- +- if (loop->inotify_fd != -1) { +- uv__io_stop(loop, &loop->inotify_read_watcher, POLLIN); +- uv__close(loop->inotify_fd); +- loop->inotify_fd = -1; +- } ++ if (loop->inotify_fd == -1) return; ++ uv__io_stop(loop, &loop->inotify_read_watcher, POLLIN); ++ uv__close(loop->inotify_fd); ++ loop->inotify_fd = -1; + } + + +-struct uv__invalidate { +- struct epoll_event (*prep)[256]; +- struct epoll_event* events; +- int nfds; +-}; +- +- + void uv__platform_invalidate_fd(uv_loop_t* loop, int fd) { +- uv__loop_internal_fields_t* lfields; +- struct uv__invalidate* inv; ++ struct epoll_event* events; + struct epoll_event dummy; +- int i; ++ uintptr_t i; ++ uintptr_t nfds; + +- lfields = uv__get_internal_fields(loop); +- inv = lfields->inv; ++ assert(loop->watchers != NULL); ++ assert(fd >= 0); + +- /* Invalidate events with same file descriptor */ +- if (inv != NULL) +- for (i = 0; i < inv->nfds; i++) +- if (inv->events[i].data.fd == fd) +- inv->events[i].data.fd = -1; ++ events = (struct epoll_event*) loop->watchers[loop->nwatchers]; ++ nfds = (uintptr_t) loop->watchers[loop->nwatchers + 1]; ++ if (events != NULL) ++ /* Invalidate events with same file descriptor */ ++ for (i = 0; i < nfds; i++) ++ if (events[i].data.fd == fd) ++ events[i].data.fd = -1; + + /* Remove the file descriptor from the epoll. + * This avoids a problem where the same file description remains open + * in another process, causing repeated junk epoll events. + * + * We pass in a dummy epoll_event, to work around a bug in old kernels. +- * +- * Work around a bug in kernels 3.10 to 3.19 where passing a struct that +- * has the EPOLLWAKEUP flag set generates spurious audit syslog warnings. + */ +- memset(&dummy, 0, sizeof(dummy)); +- +- if (inv == NULL) { ++ if (loop->backend_fd >= 0) { ++ /* Work around a bug in kernels 3.10 to 3.19 where passing a struct that ++ * has the EPOLLWAKEUP flag set generates spurious audit syslog warnings. ++ */ ++ memset(&dummy, 0, sizeof(dummy)); + epoll_ctl(loop->backend_fd, EPOLL_CTL_DEL, fd, &dummy); +- } else { +- uv__epoll_ctl_prep(loop->backend_fd, +- &lfields->ctl, +- inv->prep, +- EPOLL_CTL_DEL, +- fd, +- &dummy); + } + } + +@@ -653,454 +298,27 @@ int uv__io_check_fd(uv_loop_t* loop, int fd) { + } + + +-/* Caller must initialize SQE and call uv__iou_submit(). */ +-static struct uv__io_uring_sqe* uv__iou_get_sqe(struct uv__iou* iou, +- uv_loop_t* loop, +- uv_fs_t* req) { +- struct uv__io_uring_sqe* sqe; +- uint32_t head; +- uint32_t tail; +- uint32_t mask; +- uint32_t slot; +- +- if (iou->ringfd == -1) +- return NULL; +- +- head = atomic_load_explicit((_Atomic uint32_t*) iou->sqhead, +- memory_order_acquire); +- tail = *iou->sqtail; +- mask = iou->sqmask; +- +- if ((head & mask) == ((tail + 1) & mask)) +- return NULL; /* No room in ring buffer. TODO(bnoordhuis) maybe flush it? */ +- +- slot = tail & mask; +- sqe = iou->sqe; +- sqe = &sqe[slot]; +- memset(sqe, 0, sizeof(*sqe)); +- sqe->user_data = (uintptr_t) req; +- +- /* Pacify uv_cancel(). */ +- req->work_req.loop = loop; +- req->work_req.work = NULL; +- req->work_req.done = NULL; +- QUEUE_INIT(&req->work_req.wq); +- +- uv__req_register(loop, req); +- iou->in_flight++; +- +- return sqe; +-} +- +- +-static void uv__iou_submit(struct uv__iou* iou) { +- uint32_t flags; +- +- atomic_store_explicit((_Atomic uint32_t*) iou->sqtail, +- *iou->sqtail + 1, +- memory_order_release); +- +- flags = atomic_load_explicit((_Atomic uint32_t*) iou->sqflags, +- memory_order_acquire); +- +- if (flags & UV__IORING_SQ_NEED_WAKEUP) +- if (uv__io_uring_enter(iou->ringfd, 0, 0, UV__IORING_ENTER_SQ_WAKEUP)) +- if (errno != EOWNERDEAD) /* Kernel bug. Harmless, ignore. */ +- perror("libuv: io_uring_enter(wakeup)"); /* Can't happen. */ +-} +- +- +-int uv__iou_fs_close(uv_loop_t* loop, uv_fs_t* req) { +- struct uv__io_uring_sqe* sqe; +- struct uv__iou* iou; +- +- iou = &uv__get_internal_fields(loop)->iou; +- +- sqe = uv__iou_get_sqe(iou, loop, req); +- if (sqe == NULL) +- return 0; +- +- sqe->fd = req->file; +- sqe->opcode = UV__IORING_OP_CLOSE; +- +- uv__iou_submit(iou); +- +- return 1; +-} +- +- +-int uv__iou_fs_fsync_or_fdatasync(uv_loop_t* loop, +- uv_fs_t* req, +- uint32_t fsync_flags) { +- struct uv__io_uring_sqe* sqe; +- struct uv__iou* iou; +- +- iou = &uv__get_internal_fields(loop)->iou; +- +- sqe = uv__iou_get_sqe(iou, loop, req); +- if (sqe == NULL) +- return 0; +- +- /* Little known fact: setting seq->off and seq->len turns +- * it into an asynchronous sync_file_range() operation. +- */ +- sqe->fd = req->file; +- sqe->fsync_flags = fsync_flags; +- sqe->opcode = UV__IORING_OP_FSYNC; +- +- uv__iou_submit(iou); +- +- return 1; +-} +- +- +-int uv__iou_fs_open(uv_loop_t* loop, uv_fs_t* req) { +- struct uv__io_uring_sqe* sqe; +- struct uv__iou* iou; +- +- iou = &uv__get_internal_fields(loop)->iou; +- +- sqe = uv__iou_get_sqe(iou, loop, req); +- if (sqe == NULL) +- return 0; +- +- sqe->addr = (uintptr_t) req->path; +- sqe->fd = AT_FDCWD; +- sqe->len = req->mode; +- sqe->opcode = UV__IORING_OP_OPENAT; +- sqe->open_flags = req->flags | O_CLOEXEC; +- +- uv__iou_submit(iou); +- +- return 1; +-} +- +- +-int uv__iou_fs_read_or_write(uv_loop_t* loop, +- uv_fs_t* req, +- int is_read) { +- struct uv__io_uring_sqe* sqe; +- struct uv__iou* iou; +- +- /* For the moment, if iovcnt is greater than IOV_MAX, fallback to the +- * threadpool. In the future we might take advantage of IOSQE_IO_LINK. */ +- if (req->nbufs > IOV_MAX) +- return 0; +- +- iou = &uv__get_internal_fields(loop)->iou; +- +- sqe = uv__iou_get_sqe(iou, loop, req); +- if (sqe == NULL) +- return 0; +- +- sqe->addr = (uintptr_t) req->bufs; +- sqe->fd = req->file; +- sqe->len = req->nbufs; +- sqe->off = req->off < 0 ? -1 : req->off; +- sqe->opcode = is_read ? UV__IORING_OP_READV : UV__IORING_OP_WRITEV; +- +- uv__iou_submit(iou); +- +- return 1; +-} +- +- +-int uv__iou_fs_statx(uv_loop_t* loop, +- uv_fs_t* req, +- int is_fstat, +- int is_lstat) { +- struct uv__io_uring_sqe* sqe; +- struct uv__statx* statxbuf; +- struct uv__iou* iou; +- +- statxbuf = uv__malloc(sizeof(*statxbuf)); +- if (statxbuf == NULL) +- return 0; +- +- iou = &uv__get_internal_fields(loop)->iou; +- +- sqe = uv__iou_get_sqe(iou, loop, req); +- if (sqe == NULL) { +- uv__free(statxbuf); +- return 0; +- } +- +- req->ptr = statxbuf; +- +- sqe->addr = (uintptr_t) req->path; +- sqe->addr2 = (uintptr_t) statxbuf; +- sqe->fd = AT_FDCWD; +- sqe->len = 0xFFF; /* STATX_BASIC_STATS + STATX_BTIME */ +- sqe->opcode = UV__IORING_OP_STATX; +- +- if (is_fstat) { +- sqe->addr = (uintptr_t) ""; +- sqe->fd = req->file; +- sqe->statx_flags |= 0x1000; /* AT_EMPTY_PATH */ +- } +- +- if (is_lstat) +- sqe->statx_flags |= AT_SYMLINK_NOFOLLOW; +- +- uv__iou_submit(iou); +- +- return 1; +-} +- +- +-void uv__statx_to_stat(const struct uv__statx* statxbuf, uv_stat_t* buf) { +- buf->st_dev = makedev(statxbuf->stx_dev_major, statxbuf->stx_dev_minor); +- buf->st_mode = statxbuf->stx_mode; +- buf->st_nlink = statxbuf->stx_nlink; +- buf->st_uid = statxbuf->stx_uid; +- buf->st_gid = statxbuf->stx_gid; +- buf->st_rdev = makedev(statxbuf->stx_rdev_major, statxbuf->stx_rdev_minor); +- buf->st_ino = statxbuf->stx_ino; +- buf->st_size = statxbuf->stx_size; +- buf->st_blksize = statxbuf->stx_blksize; +- buf->st_blocks = statxbuf->stx_blocks; +- buf->st_atim.tv_sec = statxbuf->stx_atime.tv_sec; +- buf->st_atim.tv_nsec = statxbuf->stx_atime.tv_nsec; +- buf->st_mtim.tv_sec = statxbuf->stx_mtime.tv_sec; +- buf->st_mtim.tv_nsec = statxbuf->stx_mtime.tv_nsec; +- buf->st_ctim.tv_sec = statxbuf->stx_ctime.tv_sec; +- buf->st_ctim.tv_nsec = statxbuf->stx_ctime.tv_nsec; +- buf->st_birthtim.tv_sec = statxbuf->stx_btime.tv_sec; +- buf->st_birthtim.tv_nsec = statxbuf->stx_btime.tv_nsec; +- buf->st_flags = 0; +- buf->st_gen = 0; +-} +- +- +-static void uv__iou_fs_statx_post(uv_fs_t* req) { +- struct uv__statx* statxbuf; +- uv_stat_t* buf; +- +- buf = &req->statbuf; +- statxbuf = req->ptr; +- req->ptr = NULL; +- +- if (req->result == 0) { +- uv__msan_unpoison(statxbuf, sizeof(*statxbuf)); +- uv__statx_to_stat(statxbuf, buf); +- req->ptr = buf; +- } +- +- uv__free(statxbuf); +-} +- +- +-static void uv__poll_io_uring(uv_loop_t* loop, struct uv__iou* iou) { +- struct uv__io_uring_cqe* cqe; +- struct uv__io_uring_cqe* e; +- uv_fs_t* req; +- uint32_t head; +- uint32_t tail; +- uint32_t mask; +- uint32_t i; +- uint32_t flags; +- int nevents; +- int rc; +- +- head = *iou->cqhead; +- tail = atomic_load_explicit((_Atomic uint32_t*) iou->cqtail, +- memory_order_acquire); +- mask = iou->cqmask; +- cqe = iou->cqe; +- nevents = 0; +- +- for (i = head; i != tail; i++) { +- e = &cqe[i & mask]; +- +- req = (uv_fs_t*) (uintptr_t) e->user_data; +- assert(req->type == UV_FS); +- +- uv__req_unregister(loop, req); +- iou->in_flight--; +- +- /* io_uring stores error codes as negative numbers, same as libuv. */ +- req->result = e->res; +- +- switch (req->fs_type) { +- case UV_FS_FSTAT: +- case UV_FS_LSTAT: +- case UV_FS_STAT: +- uv__iou_fs_statx_post(req); +- break; +- default: /* Squelch -Wswitch warnings. */ +- break; +- } +- +- uv__metrics_update_idle_time(loop); +- req->cb(req); +- nevents++; +- } +- +- atomic_store_explicit((_Atomic uint32_t*) iou->cqhead, +- tail, +- memory_order_release); +- +- /* Check whether CQE's overflowed, if so enter the kernel to make them +- * available. Don't grab them immediately but in the next loop iteration to +- * avoid loop starvation. */ +- flags = atomic_load_explicit((_Atomic uint32_t*) iou->sqflags, +- memory_order_acquire); +- +- if (flags & UV__IORING_SQ_CQ_OVERFLOW) { +- do +- rc = uv__io_uring_enter(iou->ringfd, 0, 0, UV__IORING_ENTER_GETEVENTS); +- while (rc == -1 && errno == EINTR); +- +- if (rc < 0) +- perror("libuv: io_uring_enter(getevents)"); /* Can't happen. */ +- } +- +- uv__metrics_inc_events(loop, nevents); +- if (uv__get_internal_fields(loop)->current_timeout == 0) +- uv__metrics_inc_events_waiting(loop, nevents); +-} +- +- +-static void uv__epoll_ctl_prep(int epollfd, +- struct uv__iou* ctl, +- struct epoll_event (*events)[256], +- int op, +- int fd, +- struct epoll_event* e) { +- struct uv__io_uring_sqe* sqe; +- struct epoll_event* pe; +- uint32_t mask; +- uint32_t slot; +- +- if (ctl->ringfd == -1) { +- if (!epoll_ctl(epollfd, op, fd, e)) +- return; +- +- if (op == EPOLL_CTL_DEL) +- return; /* Ignore errors, may be racing with another thread. */ +- +- if (op != EPOLL_CTL_ADD) +- abort(); +- +- if (errno != EEXIST) +- abort(); +- +- /* File descriptor that's been watched before, update event mask. */ +- if (!epoll_ctl(epollfd, EPOLL_CTL_MOD, fd, e)) +- return; +- +- abort(); +- } else { +- mask = ctl->sqmask; +- slot = (*ctl->sqtail)++ & mask; +- +- pe = &(*events)[slot]; +- *pe = *e; +- +- sqe = ctl->sqe; +- sqe = &sqe[slot]; +- +- memset(sqe, 0, sizeof(*sqe)); +- sqe->addr = (uintptr_t) pe; +- sqe->fd = epollfd; +- sqe->len = op; +- sqe->off = fd; +- sqe->opcode = UV__IORING_OP_EPOLL_CTL; +- sqe->user_data = op | slot << 2 | (int64_t) fd << 32; +- +- if ((*ctl->sqhead & mask) == (*ctl->sqtail & mask)) +- uv__epoll_ctl_flush(epollfd, ctl, events); +- } +-} +- +- +-static void uv__epoll_ctl_flush(int epollfd, +- struct uv__iou* ctl, +- struct epoll_event (*events)[256]) { +- struct epoll_event oldevents[256]; +- struct uv__io_uring_cqe* cqe; +- uint32_t oldslot; +- uint32_t slot; +- uint32_t n; +- int fd; +- int op; +- int rc; +- +- STATIC_ASSERT(sizeof(oldevents) == sizeof(*events)); +- assert(ctl->ringfd != -1); +- assert(*ctl->sqhead != *ctl->sqtail); +- +- n = *ctl->sqtail - *ctl->sqhead; +- do +- rc = uv__io_uring_enter(ctl->ringfd, n, n, UV__IORING_ENTER_GETEVENTS); +- while (rc == -1 && errno == EINTR); +- +- if (rc < 0) +- perror("libuv: io_uring_enter(getevents)"); /* Can't happen. */ +- +- if (rc != (int) n) +- abort(); +- +- assert(*ctl->sqhead == *ctl->sqtail); +- +- memcpy(oldevents, *events, sizeof(*events)); +- +- /* Failed submissions are either EPOLL_CTL_DEL commands for file descriptors +- * that have been closed, or EPOLL_CTL_ADD commands for file descriptors +- * that we are already watching. Ignore the former and retry the latter +- * with EPOLL_CTL_MOD. +- */ +- while (*ctl->cqhead != *ctl->cqtail) { +- slot = (*ctl->cqhead)++ & ctl->cqmask; +- +- cqe = ctl->cqe; +- cqe = &cqe[slot]; +- +- if (cqe->res == 0) +- continue; +- +- fd = cqe->user_data >> 32; +- op = 3 & cqe->user_data; +- oldslot = 255 & (cqe->user_data >> 2); +- +- if (op == EPOLL_CTL_DEL) +- continue; +- +- if (op != EPOLL_CTL_ADD) +- abort(); +- +- if (cqe->res != -EEXIST) +- abort(); +- +- uv__epoll_ctl_prep(epollfd, +- ctl, +- events, +- EPOLL_CTL_MOD, +- fd, +- &oldevents[oldslot]); +- } +-} +- +- + void uv__io_poll(uv_loop_t* loop, int timeout) { +- uv__loop_internal_fields_t* lfields; ++ /* A bug in kernels < 2.6.37 makes timeouts larger than ~30 minutes ++ * effectively infinite on 32 bits architectures. To avoid blocking ++ * indefinitely, we cap the timeout and poll again if necessary. ++ * ++ * Note that "30 minutes" is a simplification because it depends on ++ * the value of CONFIG_HZ. The magic constant assumes CONFIG_HZ=1200, ++ * that being the largest value I have seen in the wild (and only once.) ++ */ ++ static const int max_safe_timeout = 1789569; + struct epoll_event events[1024]; +- struct epoll_event prep[256]; +- struct uv__invalidate inv; + struct epoll_event* pe; + struct epoll_event e; +- struct uv__iou* ctl; +- struct uv__iou* iou; + int real_timeout; + QUEUE* q; + uv__io_t* w; + sigset_t* sigmask; + sigset_t sigset; + uint64_t base; +- int have_iou_events; + int have_signals; + int nevents; +- int epollfd; + int count; + int nfds; + int fd; +@@ -1109,9 +327,47 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + int user_timeout; + int reset_timeout; + +- lfields = uv__get_internal_fields(loop); +- ctl = &lfields->ctl; +- iou = &lfields->iou; ++ if (loop->nfds == 0) { ++ assert(QUEUE_EMPTY(&loop->watcher_queue)); ++ return; ++ } ++ ++ memset(&e, 0, sizeof(e)); ++ ++ while (!QUEUE_EMPTY(&loop->watcher_queue)) { ++ q = QUEUE_HEAD(&loop->watcher_queue); ++ QUEUE_REMOVE(q); ++ QUEUE_INIT(q); ++ ++ w = QUEUE_DATA(q, uv__io_t, watcher_queue); ++ assert(w->pevents != 0); ++ assert(w->fd >= 0); ++ assert(w->fd < (int) loop->nwatchers); ++ ++ e.events = w->pevents; ++ e.data.fd = w->fd; ++ ++ if (w->events == 0) ++ op = EPOLL_CTL_ADD; ++ else ++ op = EPOLL_CTL_MOD; ++ ++ /* XXX Future optimization: do EPOLL_CTL_MOD lazily if we stop watching ++ * events, skip the syscall and squelch the events after epoll_wait(). ++ */ ++ if (epoll_ctl(loop->backend_fd, op, w->fd, &e)) { ++ if (errno != EEXIST) ++ abort(); ++ ++ assert(op == EPOLL_CTL_ADD); ++ ++ /* We've reactivated a file descriptor that's been watched before. */ ++ if (epoll_ctl(loop->backend_fd, EPOLL_CTL_MOD, w->fd, &e)) ++ abort(); ++ } ++ ++ w->events = w->pevents; ++ } + + sigmask = NULL; + if (loop->flags & UV_LOOP_BLOCK_SIGPROF) { +@@ -1125,7 +381,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + count = 48; /* Benchmarks suggest this gives the best throughput. */ + real_timeout = timeout; + +- if (lfields->flags & UV_METRICS_IDLE_TIME) { ++ if (uv__get_internal_fields(loop)->flags & UV_METRICS_IDLE_TIME) { + reset_timeout = 1; + user_timeout = timeout; + timeout = 0; +@@ -1134,56 +390,24 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + user_timeout = 0; + } + +- epollfd = loop->backend_fd; +- +- memset(&e, 0, sizeof(e)); +- +- while (!QUEUE_EMPTY(&loop->watcher_queue)) { +- q = QUEUE_HEAD(&loop->watcher_queue); +- w = QUEUE_DATA(q, uv__io_t, watcher_queue); +- QUEUE_REMOVE(q); +- QUEUE_INIT(q); +- +- op = EPOLL_CTL_MOD; +- if (w->events == 0) +- op = EPOLL_CTL_ADD; +- +- w->events = w->pevents; +- e.events = w->pevents; +- e.data.fd = w->fd; +- +- uv__epoll_ctl_prep(epollfd, ctl, &prep, op, w->fd, &e); +- } +- +- inv.events = events; +- inv.prep = &prep; +- inv.nfds = -1; +- + for (;;) { +- if (loop->nfds == 0) +- if (iou->in_flight == 0) +- break; +- +- /* All event mask mutations should be visible to the kernel before +- * we enter epoll_pwait(). +- */ +- if (ctl->ringfd != -1) +- while (*ctl->sqhead != *ctl->sqtail) +- uv__epoll_ctl_flush(epollfd, ctl, &prep); +- + /* Only need to set the provider_entry_time if timeout != 0. The function + * will return early if the loop isn't configured with UV_METRICS_IDLE_TIME. + */ + if (timeout != 0) + uv__metrics_set_provider_entry_time(loop); + +- /* Store the current timeout in a location that's globally accessible so +- * other locations like uv__work_done() can determine whether the queue +- * of events in the callback were waiting when poll was called. ++ /* See the comment for max_safe_timeout for an explanation of why ++ * this is necessary. Executive summary: kernel bug workaround. + */ +- lfields->current_timeout = timeout; ++ if (sizeof(int32_t) == sizeof(long) && timeout >= max_safe_timeout) ++ timeout = max_safe_timeout; + +- nfds = epoll_pwait(epollfd, events, ARRAY_SIZE(events), timeout, sigmask); ++ nfds = epoll_pwait(loop->backend_fd, ++ events, ++ ARRAY_SIZE(events), ++ timeout, ++ sigmask); + + /* Update loop->time unconditionally. It's tempting to skip the update when + * timeout == 0 (i.e. non-blocking poll) but there is no guarantee that the +@@ -1203,7 +427,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + continue; + + if (timeout == 0) +- break; ++ return; + + /* We may have been inside the system call for longer than |timeout| + * milliseconds so we need to update the timestamp to avoid drift. +@@ -1224,18 +448,27 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + continue; + + if (timeout == 0) +- break; ++ return; + + /* Interrupted by a signal. Update timeout and poll again. */ + goto update_timeout; + } + +- have_iou_events = 0; + have_signals = 0; + nevents = 0; + +- inv.nfds = nfds; +- lfields->inv = &inv; ++ { ++ /* Squelch a -Waddress-of-packed-member warning with gcc >= 9. */ ++ union { ++ struct epoll_event* events; ++ uv__io_t* watchers; ++ } x; ++ ++ x.events = events; ++ assert(loop->watchers != NULL); ++ loop->watchers[loop->nwatchers] = x.watchers; ++ loop->watchers[loop->nwatchers + 1] = (void*) (uintptr_t) nfds; ++ } + + for (i = 0; i < nfds; i++) { + pe = events + i; +@@ -1245,12 +478,6 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + if (fd == -1) + continue; + +- if (fd == iou->ringfd) { +- uv__poll_io_uring(loop, iou); +- have_iou_events = 1; +- continue; +- } +- + assert(fd >= 0); + assert((unsigned) fd < loop->nwatchers); + +@@ -1262,7 +489,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + * Ignore all errors because we may be racing with another thread + * when the file descriptor is closed. + */ +- uv__epoll_ctl_prep(epollfd, ctl, &prep, EPOLL_CTL_DEL, fd, pe); ++ epoll_ctl(loop->backend_fd, EPOLL_CTL_DEL, fd, pe); + continue; + } + +@@ -1319,13 +546,11 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + loop->signal_io_watcher.cb(loop, &loop->signal_io_watcher, POLLIN); + } + +- lfields->inv = NULL; +- +- if (have_iou_events != 0) +- break; /* Event loop should cycle now so don't poll again. */ ++ loop->watchers[loop->nwatchers] = NULL; ++ loop->watchers[loop->nwatchers + 1] = NULL; + + if (have_signals != 0) +- break; /* Event loop should cycle now so don't poll again. */ ++ return; /* Event loop should cycle now so don't poll again. */ + + if (nevents != 0) { + if (nfds == ARRAY_SIZE(events) && --count != 0) { +@@ -1333,11 +558,11 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + timeout = 0; + continue; + } +- break; ++ return; + } + + if (timeout == 0) +- break; ++ return; + + if (timeout == -1) + continue; +@@ -1347,14 +572,10 @@ update_timeout: + + real_timeout -= (loop->time - base); + if (real_timeout <= 0) +- break; ++ return; + + timeout = real_timeout; + } +- +- if (ctl->ringfd != -1) +- while (*ctl->sqhead != *ctl->sqtail) +- uv__epoll_ctl_flush(epollfd, ctl, &prep); + } + + uint64_t uv__hrtime(uv_clocktype_t type) { +@@ -1867,7 +1088,7 @@ static uint64_t uv__read_uint64(const char* filename) { + if (0 == uv__slurp(filename, buf, sizeof(buf))) + if (1 != sscanf(buf, "%" PRIu64, &rc)) + if (0 == strcmp(buf, "max\n")) +- rc = UINT64_MAX; ++ rc = ~0ull; + + return rc; + } +@@ -1903,7 +1124,6 @@ static void uv__get_cgroup1_memory_limits(char buf[static 1024], uint64_t* high, + char filename[4097]; + char* p; + int n; +- uint64_t cgroup1_max; + + /* Find out where the controller is mounted. */ + p = uv__cgroup1_find_memory_controller(buf, &n); +@@ -1920,22 +1140,12 @@ static void uv__get_cgroup1_memory_limits(char buf[static 1024], uint64_t* high, + * as indicated by uv__read_uint64 returning 0. + */ + if (*high != 0 && *max != 0) +- goto update_limits; ++ return; + } + + /* Fall back to the limits of the global memory controller. */ + *high = uv__read_uint64("/sys/fs/cgroup/memory/memory.soft_limit_in_bytes"); + *max = uv__read_uint64("/sys/fs/cgroup/memory/memory.limit_in_bytes"); +- +- /* uv__read_uint64 detects cgroup2's "max", so we need to separately detect +- * cgroup1's maximum value (which is derived from LONG_MAX and PAGE_SIZE). +- */ +-update_limits: +- cgroup1_max = LONG_MAX & ~(sysconf(_SC_PAGESIZE) - 1); +- if (*high == cgroup1_max) +- *high = UINT64_MAX; +- if (*max == cgroup1_max) +- *max = UINT64_MAX; + } + + static void uv__get_cgroup2_memory_limits(char buf[static 1024], uint64_t* high, +diff --git a/deps/uv/src/unix/os390.c b/deps/uv/src/unix/os390.c +index a87c2d77faf..3954b2c2753 100644 +--- a/deps/uv/src/unix/os390.c ++++ b/deps/uv/src/unix/os390.c +@@ -808,7 +808,6 @@ static int os390_message_queue_handler(uv__os390_epoll* ep) { + + void uv__io_poll(uv_loop_t* loop, int timeout) { + static const int max_safe_timeout = 1789569; +- uv__loop_internal_fields_t* lfields; + struct epoll_event events[1024]; + struct epoll_event* pe; + struct epoll_event e; +@@ -831,8 +830,6 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + return; + } + +- lfields = uv__get_internal_fields(loop); +- + while (!QUEUE_EMPTY(&loop->watcher_queue)) { + uv_stream_t* stream; + +@@ -880,7 +877,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + int nevents = 0; + have_signals = 0; + +- if (lfields->flags & UV_METRICS_IDLE_TIME) { ++ if (uv__get_internal_fields(loop)->flags & UV_METRICS_IDLE_TIME) { + reset_timeout = 1; + user_timeout = timeout; + timeout = 0; +@@ -899,12 +896,6 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + if (sizeof(int32_t) == sizeof(long) && timeout >= max_safe_timeout) + timeout = max_safe_timeout; + +- /* Store the current timeout in a location that's globally accessible so +- * other locations like uv__work_done() can determine whether the queue +- * of events in the callback were waiting when poll was called. +- */ +- lfields->current_timeout = timeout; +- + nfds = epoll_wait(loop->ep, events, + ARRAY_SIZE(events), timeout); + +diff --git a/deps/uv/src/unix/posix-poll.c b/deps/uv/src/unix/posix-poll.c +index 7e7de86845d..711780ece8d 100644 +--- a/deps/uv/src/unix/posix-poll.c ++++ b/deps/uv/src/unix/posix-poll.c +@@ -132,7 +132,6 @@ static void uv__pollfds_del(uv_loop_t* loop, int fd) { + + + void uv__io_poll(uv_loop_t* loop, int timeout) { +- uv__loop_internal_fields_t* lfields; + sigset_t* pset; + sigset_t set; + uint64_t time_base; +@@ -153,8 +152,6 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + return; + } + +- lfields = uv__get_internal_fields(loop); +- + /* Take queued watchers and add their fds to our poll fds array. */ + while (!QUEUE_EMPTY(&loop->watcher_queue)) { + q = QUEUE_HEAD(&loop->watcher_queue); +@@ -182,7 +179,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + assert(timeout >= -1); + time_base = loop->time; + +- if (lfields->flags & UV_METRICS_IDLE_TIME) { ++ if (uv__get_internal_fields(loop)->flags & UV_METRICS_IDLE_TIME) { + reset_timeout = 1; + user_timeout = timeout; + timeout = 0; +@@ -201,12 +198,6 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { + if (timeout != 0) + uv__metrics_set_provider_entry_time(loop); + +- /* Store the current timeout in a location that's globally accessible so +- * other locations like uv__work_done() can determine whether the queue +- * of events in the callback were waiting when poll was called. +- */ +- lfields->current_timeout = timeout; +- + if (pset != NULL) + if (pthread_sigmask(SIG_BLOCK, pset, NULL)) + abort(); +diff --git a/deps/uv/src/uv-common.h b/deps/uv/src/uv-common.h +index decde5362c8..2720121addc 100644 +--- a/deps/uv/src/uv-common.h ++++ b/deps/uv/src/uv-common.h +@@ -396,37 +396,9 @@ struct uv__loop_metrics_s { + void uv__metrics_update_idle_time(uv_loop_t* loop); + void uv__metrics_set_provider_entry_time(uv_loop_t* loop); + +-#ifdef __linux__ +-struct uv__iou { +- uint32_t* sqhead; +- uint32_t* sqtail; +- uint32_t* sqarray; +- uint32_t sqmask; +- uint32_t* sqflags; +- uint32_t* cqhead; +- uint32_t* cqtail; +- uint32_t cqmask; +- void* sq; /* pointer to munmap() on event loop teardown */ +- void* cqe; /* pointer to array of struct uv__io_uring_cqe */ +- void* sqe; /* pointer to array of struct uv__io_uring_sqe */ +- size_t sqlen; +- size_t cqlen; +- size_t maxlen; +- size_t sqelen; +- int ringfd; +- uint32_t in_flight; +-}; +-#endif /* __linux__ */ +- + struct uv__loop_internal_fields_s { + unsigned int flags; + uv__loop_metrics_t loop_metrics; +- int current_timeout; +-#ifdef __linux__ +- struct uv__iou ctl; +- struct uv__iou iou; +- void* inv; /* used by uv__platform_invalidate_fd() */ +-#endif /* __linux__ */ + }; + + #endif /* UV_COMMON_H_ */ +diff --git a/deps/uv/src/win/core.c b/deps/uv/src/win/core.c +index 9a3be58849a..e4041ec86a6 100644 +--- a/deps/uv/src/win/core.c ++++ b/deps/uv/src/win/core.c +@@ -424,7 +424,6 @@ int uv_backend_timeout(const uv_loop_t* loop) { + + + static void uv__poll_wine(uv_loop_t* loop, DWORD timeout) { +- uv__loop_internal_fields_t* lfields; + DWORD bytes; + ULONG_PTR key; + OVERLAPPED* overlapped; +@@ -434,10 +433,9 @@ static void uv__poll_wine(uv_loop_t* loop, DWORD timeout) { + uint64_t user_timeout; + int reset_timeout; + +- lfields = uv__get_internal_fields(loop); + timeout_time = loop->time + timeout; + +- if (lfields->flags & UV_METRICS_IDLE_TIME) { ++ if (uv__get_internal_fields(loop)->flags & UV_METRICS_IDLE_TIME) { + reset_timeout = 1; + user_timeout = timeout; + timeout = 0; +@@ -452,12 +450,6 @@ static void uv__poll_wine(uv_loop_t* loop, DWORD timeout) { + if (timeout != 0) + uv__metrics_set_provider_entry_time(loop); + +- /* Store the current timeout in a location that's globally accessible so +- * other locations like uv__work_done() can determine whether the queue +- * of events in the callback were waiting when poll was called. +- */ +- lfields->current_timeout = timeout; +- + GetQueuedCompletionStatus(loop->iocp, + &bytes, + &key, +@@ -515,7 +507,6 @@ static void uv__poll_wine(uv_loop_t* loop, DWORD timeout) { + + + static void uv__poll(uv_loop_t* loop, DWORD timeout) { +- uv__loop_internal_fields_t* lfields; + BOOL success; + uv_req_t* req; + OVERLAPPED_ENTRY overlappeds[128]; +@@ -527,10 +518,9 @@ static void uv__poll(uv_loop_t* loop, DWORD timeout) { + uint64_t actual_timeout; + int reset_timeout; + +- lfields = uv__get_internal_fields(loop); + timeout_time = loop->time + timeout; + +- if (lfields->flags & UV_METRICS_IDLE_TIME) { ++ if (uv__get_internal_fields(loop)->flags & UV_METRICS_IDLE_TIME) { + reset_timeout = 1; + user_timeout = timeout; + timeout = 0; +@@ -547,12 +537,6 @@ static void uv__poll(uv_loop_t* loop, DWORD timeout) { + if (timeout != 0) + uv__metrics_set_provider_entry_time(loop); + +- /* Store the current timeout in a location that's globally accessible so +- * other locations like uv__work_done() can determine whether the queue +- * of events in the callback were waiting when poll was called. +- */ +- lfields->current_timeout = timeout; +- + success = pGetQueuedCompletionStatusEx(loop->iocp, + overlappeds, + ARRAY_SIZE(overlappeds), diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/big-endian.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/big-endian.patch deleted file mode 100644 index 529381842f..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/big-endian.patch +++ /dev/null @@ -1,18 +0,0 @@ - -https://github.com/v8/v8/commit/878ccb33bd3cf0e6dc018ff8d15843f585ac07be - -did some automated cleanups but it missed big-endian code. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/deps/v8/src/runtime/runtime-utils.h -+++ b/deps/v8/src/runtime/runtime-utils.h -@@ -126,7 +126,7 @@ static inline ObjectPair MakePair(Object - #if defined(V8_TARGET_LITTLE_ENDIAN) - return x.ptr() | (static_cast<ObjectPair>(y.ptr()) << 32); - #elif defined(V8_TARGET_BIG_ENDIAN) -- return y->ptr() | (static_cast<ObjectPair>(x->ptr()) << 32); -+ return y.ptr() | (static_cast<ObjectPair>(x.ptr()) << 32); - #else - #error Unknown endianness - #endif diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/mips-less-memory.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/mips-less-memory.patch deleted file mode 100644 index 16776cb762..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/mips-less-memory.patch +++ /dev/null @@ -1,37 +0,0 @@ -Description: mksnapshot uses too much memory on 32-bit mipsel -Author: Jérémy Lal <kapouer@melix.org> -Last-Update: 2020-06-03 -Forwarded: https://bugs.chromium.org/p/v8/issues/detail?id=10586 - -This ensures that we reserve 500M instead of 2G range for codegen -ensures that qemu-mips can allocate such large ranges - -Upstream-Status: Inappropriate [embedded specific] - -Imported from debian https://salsa.debian.org/js-team/nodejs/-/blob/master-12.x/debian/patches/mips-less-memory.patch -https://buildd.debian.org/status/fetch.php?pkg=nodejs&arch=mipsel&ver=12.17.0~dfsg-2&stamp=1591050388&raw=0 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/deps/v8/src/common/globals.h -+++ b/deps/v8/src/common/globals.h -@@ -224,7 +224,7 @@ constexpr size_t kMinimumCodeRangeSize = - constexpr size_t kMinExpectedOSPageSize = 64 * KB; // OS page on PPC Linux - #elif V8_TARGET_ARCH_MIPS - constexpr bool kPlatformRequiresCodeRange = false; --constexpr size_t kMaximalCodeRangeSize = 2048LL * MB; -+constexpr size_t kMaximalCodeRangeSize = 512 * MB; - constexpr size_t kMinimumCodeRangeSize = 0 * MB; - constexpr size_t kMinExpectedOSPageSize = 4 * KB; // OS page. - #else ---- a/deps/v8/src/codegen/mips/constants-mips.h -+++ b/deps/v8/src/codegen/mips/constants-mips.h -@@ -140,7 +140,7 @@ const uint32_t kLeastSignificantByteInIn - namespace v8 { - namespace internal { - --constexpr size_t kMaxPCRelativeCodeRangeInMB = 4096; -+constexpr size_t kMaxPCRelativeCodeRangeInMB = 1024; - - // ----------------------------------------------------------------------------- - // Registers and FPURegisters. diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/run-ptest b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/run-ptest index 07a8f2a99c..e82f373626 100755 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/run-ptest +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/run-ptest @@ -1,3 +1,8 @@ #!/bin/sh ./cctest +if [ $? = 0 ]; then + echo "PASS: nodejs" +else + echo "FAIL: nodejs" +fi diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.17.1.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb index ee5e848bf8..65f4eb3f3a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_18.17.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bc1f9ebe76be76f163e3b675303ad9cd" +LIC_FILES_CHKSUM = "file://LICENSE;md5=162595a4a2f3453a0534e60b0afe4e7b" CVE_PRODUCT = "nodejs node.js" @@ -22,11 +22,10 @@ COMPATIBLE_HOST:powerpc = "null" SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ file://0004-v8-don-t-override-ARM-CFLAGS.patch \ - file://big-endian.patch \ - file://mips-less-memory.patch \ file://system-c-ares.patch \ file://0001-liftoff-Correct-function-signatures.patch \ - file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \ + file://0001-Revert-io_uring-changes-from-libuv-1.46.0.patch \ + file://0002-Revert-io_uring-changes-from-libuv-1.45.0.patch \ file://run-ptest \ " @@ -39,7 +38,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] = "f215cf03d0f00f07ac0b674c6819f804c1542e16f152da04980022aeccf5e65a" +SRC_URI[sha256sum] = "f799c66f6a6386bb8ac2c75a378f740c455e97f1fe964393dd39c9f9f6efbc70" S = "${WORKDIR}/node-v${PV}" @@ -148,8 +147,6 @@ do_configure () { # $TARGET_ARCH settings don't match --dest-cpu settings python3 configure.py --verbose --prefix=${prefix} \ --shared-openssl \ - --without-dtrace \ - --without-etw \ --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH'), d)}" \ --dest-os=linux \ --libdir=${baselib} \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20220807.0.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20231003.0.bb index f597a8dab0..e28b6ea018 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20220807.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_20231003.0.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0ebd37caf53781e8b7223e6b99b63f4e" DEPENDS = "perl" SRC_URI = "git://github.com/toddr/IPC-Run.git;branch=master;protocol=https" -SRCREV = "44b1f2d2021615c88f2f6b1a6cbdd9aebaeb4ad1" +SRCREV = "ad56c3b5f5a211d32bbb8ac29f180d707ee58c1b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch new file mode 100644 index 0000000000..896a568e19 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch @@ -0,0 +1,106 @@ +From 62b2fd0a150133b6439f6537cb1762d35f5790ee Mon Sep 17 00:00:00 2001 +From: Xiangyu Chen <xiangyu.chen@windriver.com> +Date: Fri, 31 Mar 2023 16:02:50 +0800 +Subject: [PATCH] Makefile.am: do not compile the code which was generated from + test-full.proto in protobuf-c-native + +Those code was auto generated by protoc command with test-full.proto, those code are not compatible +with protobuf 4.22.x, so temporarily disable compile those code until protobuf-c upstream adapt +the test-full.proto with latest version protobuf. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> +--- + Makefile.am | 75 ----------------------------------------------------- + 1 file changed, 75 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index ff12664..7412aef 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -136,81 +136,6 @@ else + + LOG_COMPILER = $(VALGRIND) + +-check_PROGRAMS += \ +- t/generated-code/test-generated-code \ +- t/generated-code2/test-generated-code2 \ +- t/generated-code3/test-generated-code3 \ +- t/version/version +- +-TESTS += \ +- t/generated-code/test-generated-code \ +- t/generated-code2/test-generated-code2 \ +- t/generated-code3/test-generated-code3 \ +- t/version/version +- +-t_generated_code_test_generated_code_SOURCES = \ +- t/generated-code/test-generated-code.c \ +- t/test.pb-c.c +-t_generated_code_test_generated_code_LDADD = \ +- protobuf-c/libprotobuf-c.la +- +-t_generated_code2_test_generated_code2_SOURCES = \ +- t/generated-code2/test-generated-code2.c \ +- t/test-full.pb-c.c \ +- t/test-optimized.pb-c.c +-t_generated_code2_test_generated_code2_LDADD = \ +- protobuf-c/libprotobuf-c.la +- +-t_generated_code3_test_generated_code3_CPPFLAGS = \ +- -DPROTO3 +- +-t_generated_code3_test_generated_code3_SOURCES = \ +- t/generated-code/test-generated-code.c \ +- t/test-proto3.pb-c.c +- +-t_generated_code3_test_generated_code3_LDADD = \ +- protobuf-c/libprotobuf-c.la +- +-noinst_PROGRAMS += \ +- t/generated-code2/cxx-generate-packed-data +- +-t_generated_code2_cxx_generate_packed_data_SOURCES = \ +- t/generated-code2/cxx-generate-packed-data.cc \ +- t/test-full.pb.cc \ +- protobuf-c/protobuf-c.pb.cc +-$(t_generated_code2_cxx_generate_packed_data_OBJECTS): t/test-full.pb.h +-t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \ +- $(AM_CXXFLAGS) \ +- $(protobuf_CFLAGS) +-t_generated_code2_cxx_generate_packed_data_LDADD = \ +- $(protobuf_LIBS) +- +-t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto +- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto +- +-t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto +- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto +- +-t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto +- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto +- +-t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto +- $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto +- +-t/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.proto +- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto +- +-t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT) +- $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc +- +-BUILT_SOURCES += \ +- t/test.pb-c.c t/test.pb-c.h \ +- t/test-full.pb-c.c t/test-full.pb-c.h \ +- t/test-optimized.pb-c.c t/test-optimized.pb-c.h \ +- t/test-full.pb.cc t/test-full.pb.h \ +- t/test-proto3.pb-c.c t/test-proto3.pb-c.h \ +- t/generated-code2/test-full-cxx-output.inc +- + t_version_version_SOURCES = \ + t/version/version.c + t_version_version_LDADD = \ +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb index d724287d66..1d9ca9daae 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb @@ -12,8 +12,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9f725889e0d77383e26cb42b0b62cea2" DEPENDS = "protobuf-native protobuf" -SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https" -SRCREV = "abc67a11c6db271bedbb9f58be85d6f4e2ea8389" +SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=next;protocol=https" +SRC_URI:append:class-native = " file://0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch" + +SRCREV = "ba4c55f0e686e0252c451f7163ab529e4b36831a" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch deleted file mode 100644 index 2bc44c898b..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-Fix-linking-error-with-ld-gold.patch +++ /dev/null @@ -1,69 +0,0 @@ -From a91130bb95528743a3f7253f8fe945b7505047d5 Mon Sep 17 00:00:00 2001 -From: Kyungjik Min <dp.min@lge.com> -Date: Mon, 28 Dec 2020 15:56:09 +0900 -Subject: [PATCH] Fix linking error with ld-gold - -:Release Notes: - -:Detailed Notes: -https://github.com/protocolbuffers/protobuf/issues/6113 -There's a bug in the CMake build leading it to not use the version -scripts, which hides the problem (because all symbols are now public) -but doesn't solve it properly. - -:Testing Performed: - -:QA Notes: -N/A - -:Issues Addressed: -[PLAT-130467] Fix build error for libgoogleassistant with latest - protobuf-3.11.4 - ---- -Upstream-Status: Pending - - src/libprotobuf-lite.map | 2 ++ - src/libprotobuf.map | 2 ++ - src/libprotoc.map | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/src/libprotobuf-lite.map b/src/libprotobuf-lite.map -index 391554669..a1853ca6c 100644 ---- a/src/libprotobuf-lite.map -+++ b/src/libprotobuf-lite.map -@@ -3,6 +3,8 @@ - extern "C++" { - *google*; - }; -+ scc_info_*; -+ descriptor_table_*; - - local: - *; -diff --git a/src/libprotobuf.map b/src/libprotobuf.map -index 391554669..a1853ca6c 100644 ---- a/src/libprotobuf.map -+++ b/src/libprotobuf.map -@@ -3,6 +3,8 @@ - extern "C++" { - *google*; - }; -+ scc_info_*; -+ descriptor_table_*; - - local: - *; -diff --git a/src/libprotoc.map b/src/libprotoc.map -index 391554669..a1853ca6c 100644 ---- a/src/libprotoc.map -+++ b/src/libprotoc.map -@@ -3,6 +3,8 @@ - extern "C++" { - *google*; - }; -+ scc_info_*; -+ descriptor_table_*; - - local: - *; diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch index 36c3c597ac..7c4bf260eb 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch @@ -30,7 +30,7 @@ Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/Makefile b/examples/Makefile -index 1c7ec8d63..85f591231 100644 +index ef7a4ef58..7206e14e1 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -2,6 +2,8 @@ @@ -42,17 +42,20 @@ index 1c7ec8d63..85f591231 100644 all: cpp java python cpp: add_person_cpp list_people_cpp -@@ -40,11 +42,11 @@ protoc_middleman_dart: addressbook.proto +@@ -41,11 +43,11 @@ protoc_middleman_dart: addressbook.proto add_person_cpp: add_person.cc protoc_middleman pkg-config --cflags protobuf # fails if protobuf is not installed -- c++ -std=c++11 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf` -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp +- c++ -std=c++14 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf` ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp #$(CXX) -std=c++17 $(PROTOBUF) add_person.cc addressbook.pb.cc -o add_person_cpp list_people_cpp: list_people.cc protoc_middleman pkg-config --cflags protobuf # fails if protobuf is not installed -- c++ -std=c++11 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf` -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp +- c++ -std=c++14 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf` ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) ../src/google/protobuf/.libs/timestamp.pb.o $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp #$(CXX) -std=c++17 $(PROTOBUF) list_people.cc addressbook.pb.cc -o list_people_cpp add_person_dart: add_person.dart protoc_middleman_dart +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.21.12.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.23.4.bb index d95e1c20f3..1edc21cdfc 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.21.12.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.23.4.bb @@ -7,15 +7,14 @@ SECTION = "console/tools" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" -DEPENDS = "zlib" +DEPENDS = "zlib abseil-cpp" DEPENDS:append:class-target = " protobuf-native" -SRCREV = "f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c" +SRCREV = "2c5fa078d8e86e5f4bd34e6f4c9ea9e8d7d4d44a" -SRC_URI = "git://github.com/protocolbuffers/protobuf.git;branch=21.x;protocol=https \ +SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=23.x;protocol=https \ file://run-ptest \ file://0001-examples-Makefile-respect-CXX-LDFLAGS-variables-fix-.patch \ - file://0001-Fix-linking-error-with-ld-gold.patch \ " SRC_URI:append:mips:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " SRC_URI:append:mipsel:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " @@ -35,6 +34,7 @@ EXTRA_OECMAKE += "\ -Dprotobuf_BUILD_LIBPROTOC=ON \ -Dprotobuf_BUILD_TESTS=OFF \ -Dprotobuf_BUILD_EXAMPLES=OFF \ + -Dprotobuf_ABSL_PROVIDER="package" \ " TEST_SRC_DIR = "examples" @@ -50,9 +50,18 @@ do_compile_ptest() { cp ${S}/${TEST_SRC_DIR}/*.proto "${B}/${TEST_SRC_DIR}/" cp ${S}/${TEST_SRC_DIR}/*.py "${B}/${TEST_SRC_DIR}/" cp ${S}/${TEST_SRC_DIR}/Makefile "${B}/${TEST_SRC_DIR}/" + # Adapt protobuf.pc sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" - sed -e 's|Cflags:|Cflags: -I${S}/src|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Cflags:|Cflags: -I${S}/src |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Cflags:|Cflags: -I${WORKDIR}/recipe-sysroot${includedir} |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" sed -e 's|Libs:|Libs: -L${B}|' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Libs:|Libs: -L${WORKDIR}/recipe-sysroot/usr/lib |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Libs:|Libs: -labsl_log_internal_check_op |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + sed -e 's|Libs:|Libs: -labsl_log_internal_message |' -i "${B}/${TEST_SRC_DIR}/protobuf.pc" + # Adapt uf8_range.pc + cp "${B}/third_party/utf8_range/utf8_range.pc" "${B}/${TEST_SRC_DIR}/utf8_range.pc" + sed -e 's|libdir=|libdir=${PKG_CONFIG_SYSROOT_DIR}|' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc" + sed -e 's|Libs:|Libs= -L${B}/third_party/utf8_range |' -i "${B}/${TEST_SRC_DIR}/utf8_range.pc" # Until out-of-tree build of examples is supported, we have to use this approach sed -e 's|../src/google/protobuf/.libs/timestamp.pb.o|${B}/CMakeFiles/libprotobuf.dir/src/google/protobuf/timestamp.pb.cc.o|' -i "${B}/${TEST_SRC_DIR}/Makefile" export PKG_CONFIG_PATH="${B}/${TEST_SRC_DIR}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.13.bb b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb index 7df8fc43b8..458958edf5 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.13.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb @@ -7,10 +7,10 @@ data-driven tree queries." HOMEPAGE = "https://pugixml.org/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=d11b640daff611273752ec136394347c" +LIC_FILES_CHKSUM = "file://readme.txt;beginline=29;endline=52;md5=ad370df61d83846cf9e4726244671201" SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[sha256sum] = "40c0b3914ec131485640fa57e55bf1136446026b41db91c1bef678186a12abbe" +SRC_URI[sha256sum] = "2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015" UPSTREAM_CHECK_URI = "https://github.com/zeux/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip_6.7.11.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip_6.7.12.bb index 66ec979ac0..00823cf1a6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip_6.7.11.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/sip/sip_6.7.12.bb @@ -11,6 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" inherit pypi setuptools3 python3native PYPI_PACKAGE = "sip" -SRC_URI[sha256sum] = "f0dc3287a0b172e5664931c87847750d47e4fdcda4fe362b514af8edd655b469" +SRC_URI[sha256sum] = "08e66f742592eb818ac8fda4173e2ed64c9f2d40b70bee11db1c499127d98450" BBCLASSEXTEND = "native" 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 479c12d6ae..bd4a5b3e89 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb @@ -1,11 +1,12 @@ SUMMARY = "Collects and summarises system performance statistics" DESCRIPTION = "collectd is a daemon which collects system performance statistics periodically and provides mechanisms to store the values in a variety of ways, for example in RRD files." +HOMEPAGE = "https://collectd.org/" LICENSE = "GPL-2.0-only & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=1bd21f19f7f0c61a7be8ecacb0e28854" DEPENDS = "rrdtool curl libpcap libxml2 yajl libgcrypt libtool lvm2" -SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ +SRC_URI = "https://collectd.org/files/collectd-${PV}.tar.bz2 \ file://collectd.init \ file://collectd.service \ file://no-gcrypt-badpath.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20230209.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20231002.bb index 444b97c4e6..8887700e8a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20230209.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20231002.bb @@ -9,7 +9,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "https://invisible-mirror.net/archives/${BPN}/${BP}.tgz" -SRC_URI[sha256sum] = "0c26282305264be2217f335f3798f48b1dce3cf12c5a076bf231cadf77a6d6a8" +SRC_URI[sha256sum] = "315640ab0719225d5cbcab130585c05f0791fcf073072a5fe9479969aa2b833b" # 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/544.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch new file mode 100644 index 0000000000..3699b8c83a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/544.patch @@ -0,0 +1,80 @@ +Upstream-Status: Submitted [https://github.com/COVESA/dlt-daemon/pull/544] + +From 8121a979026d5fcb05bd4e5d3a0647f321b56106 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Thu, 28 Sep 2023 12:54:23 +0200 +Subject: [PATCH] Add common dlt_cdh_cpuinfo.c to unblock build on non amd64 + and i386 arcs + +--- + src/core_dump_handler/dlt_cdh.h | 2 ++ + src/core_dump_handler/dlt_cdh_cpuinfo.c | 33 +++++++++++++++++++++++++ + src/core_dump_handler/dlt_cdh_crashid.c | 2 +- + 3 files changed, 36 insertions(+), 1 deletion(-) + create mode 100644 src/core_dump_handler/dlt_cdh_cpuinfo.c + +diff --git a/src/core_dump_handler/dlt_cdh.h b/src/core_dump_handler/dlt_cdh.h +index d572ecf3..8608c6c4 100644 +--- a/src/core_dump_handler/dlt_cdh.h ++++ b/src/core_dump_handler/dlt_cdh.h +@@ -55,6 +55,8 @@ typedef struct + uint64_t pc; + uint64_t ip; + uint64_t lr; ++ uint64_t sp; ++ uint64_t fp; + + } cdh_registers_t; + +diff --git a/src/core_dump_handler/dlt_cdh_cpuinfo.c b/src/core_dump_handler/dlt_cdh_cpuinfo.c +new file mode 100644 +index 00000000..03509fda +--- /dev/null ++++ b/src/core_dump_handler/dlt_cdh_cpuinfo.c +@@ -0,0 +1,33 @@ ++/* ++ * SPDX license identifier: MPL-2.0 ++ * ++ * Copyright (C) 2011-2015, BMW AG ++ * ++ * This file is part of COVESA Project DLT - Diagnostic Log and Trace. ++ * ++ * This Source Code Form is subject to the terms of the ++ * Mozilla Public License (MPL), v. 2.0. ++ * If a copy of the MPL was not distributed with this file, ++ * You can obtain one at http://mozilla.org/MPL/2.0/. ++ * ++ * For further information see http://www.covesa.org/. ++ */ ++ ++/*! ++ * \author Gianfranco Costamagna <locutusofborg@debian.org> ++ * ++ * \copyright Copyright © 2011-2015 BMW AG. \n ++ * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. ++ * ++ * \file dlt_cdh_cpuinfo.c ++ */ ++ ++#include "dlt_cdh_cpuinfo.h" ++ ++void get_registers(prstatus_t *prstatus, cdh_registers_t *registers) ++{ ++/* struct user_regs_struct *ptr_reg = (struct user_regs_struct *)prstatus->pr_reg; ++ ++ registers->pc = ptr_reg->pc;*/ /* [REG_PROC_COUNTER]; */ ++ ++} +diff --git a/src/core_dump_handler/dlt_cdh_crashid.c b/src/core_dump_handler/dlt_cdh_crashid.c +index bca44e0e..8dd98d70 100644 +--- a/src/core_dump_handler/dlt_cdh_crashid.c ++++ b/src/core_dump_handler/dlt_cdh_crashid.c +@@ -30,7 +30,7 @@ + #include <stdio.h> + #include <string.h> + #include <errno.h> +-#include <asm/prctl.h> ++#include <sys/prctl.h> + #include <inttypes.h> + + #include "dlt_cdh.h" diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb index 33fae06190..410fffa24b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb @@ -17,17 +17,19 @@ DEPENDS = "zlib gzip-native json-c" SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \ file://0002-Don-t-execute-processes-as-a-specific-user.patch \ file://0004-Modify-systemd-config-directory.patch \ + file://544.patch \ " SRCREV = "0f2d4cfffada6f8448a2cb27995b38eb4271044f" S = "${WORKDIR}/git" -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal dlt-examples dlt-adaptor dlt-adaptor-stdin dlt-adaptor-udp dlt-console ', '', d)} \ +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal ', '', d)} \ + dlt-examples dlt-adaptor dlt-adaptor-stdin dlt-adaptor-udp dlt-console \ udp-connection dlt-system dlt-filetransfer " # dlt-dbus # General options -PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF,,dlt-daemon-systemd" +PACKAGECONFIG[dlt-examples] = "-DWITH_DLT_EXAMPLES=ON,-DWITH_DLT_EXAMPLES=OFF" # Linux options PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF -DWITH_DLT_SYSTEM=OFF,systemd" @@ -38,26 +40,28 @@ PACKAGECONFIG[udp-connection] = "-DWITH_UDP_CONNECTION=ON,-DWITH_UDP_CONNECTION= # Command line options PACKAGECONFIG[dlt-system] = "-DWITH_DLT_SYSTEM=ON,-DWITH_DLT_SYSTEM=OFF" -PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF,,dlt-daemon-systemd" -PACKAGECONFIG[dlt-adaptor-stdin] = "-DWITH_DLT_ADAPTOR_STDIN=ON,-DWITH_DLT_ADAPTOR_STDIN=OFF,,dlt-daemon-systemd" -PACKAGECONFIG[dlt-adaptor-udp] = "-DWITH_DLT_ADAPTOR_UDP=ON,-DWITH_DLT_ADAPTOR_UDP=OFF,,dlt-daemon-systemd" +PACKAGECONFIG[dlt-adaptor] = "-DWITH_DLT_ADAPTOR=ON,-DWITH_DLT_ADAPTOR=OFF" +PACKAGECONFIG[dlt-adaptor-stdin] = "-DWITH_DLT_ADAPTOR_STDIN=ON,-DWITH_DLT_ADAPTOR_STDIN=OFF" +PACKAGECONFIG[dlt-adaptor-udp] = "-DWITH_DLT_ADAPTOR_UDP=ON,-DWITH_DLT_ADAPTOR_UDP=OFF" PACKAGECONFIG[dlt-filetransfer] = "-DWITH_DLT_FILETRANSFER=ON,-DWITH_DLT_FILETRANSFER=OFF" -PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt-daemon-systemd" +PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF" inherit autotools gettext cmake pkgconfig systemd +# -DWITH_DLT_COREDUMPHANDLER=ON this feature is too experimental, disable for now +#FILES:${PN} += "${libdir}/sysctl.d" EXTRA_OECMAKE += "-DWITH_DLT_LOGSTORAGE_GZIP=ON -DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}" PACKAGES += "${PN}-systemd" SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" SYSTEMD_SERVICE:${PN} = " ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'dlt.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-system', 'dlt-system.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-dbus', 'dlt-dbus.service', '', d)}" + ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-system', 'dlt-system.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-dbus', 'dlt-dbus.service', '', d)}" SYSTEMD_AUTO_ENABLE:${PN} = "enable" SYSTEMD_SERVICE:${PN}-systemd = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-adaptor-udp', 'dlt-adaptor-udp.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples', 'dlt-example-user.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples dlt-console', 'dlt-receive.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-adaptor-udp', 'dlt-adaptor-udp.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-examples', 'dlt-example-user.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'systemd dlt-examples dlt-console', 'dlt-receive.service', '', d)} \ " SYSTEMD_AUTO_ENABLE:${PN}-systemd = "disable" diff --git a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch new file mode 100644 index 0000000000..ce12d4270a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch @@ -0,0 +1,68 @@ +From cb79329010d73e36ce64830914005f1c17f8f53c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com> +Date: Sat, 23 Sep 2023 11:32:18 +0200 +Subject: [PATCH] cmake: fix when cross compiling +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In order to generate protobuf files CMake need to use the protoc +and grpc-cpp-plugin compiled for the host architecture. + +Unfortunately, the protoc and grpc-cpp-plugin in the gRPC CMake +configuration file are the one for the target architecture. + +Fix this by properly finding the correct executable when +CMake is cross compiling. + +Signed-off-by: Clément Péron <peron.clem@gmail.com> +--- +Upstream-Status: Pending + + CMakeLists.txt | 28 ++++++++++++++++++++++++++-- + 1 file changed, 26 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5aa1310..80ebad2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,10 +120,34 @@ if(Protobuf_PROTOC_EXECUTABLE) + endif() + endif() + ++# When cross compiling we look for the native protoc compiler ++# overwrite protobuf::protoc with the proper protoc ++if(CMAKE_CROSSCOMPILING) ++ find_program(Protobuf_PROTOC_EXECUTABLE REQUIRED NAMES protoc) ++ if(NOT TARGET protobuf::protoc) ++ add_executable(protobuf::protoc IMPORTED) ++ endif() ++ set_target_properties(protobuf::protoc PROPERTIES ++ IMPORTED_LOCATION "${Protobuf_PROTOC_EXECUTABLE}") ++endif() ++ + find_package(gRPC QUIET) +-if(gRPC_FOUND AND TARGET gRPC::grpc AND TARGET gRPC::grpc_cpp_plugin) ++if(gRPC_FOUND AND TARGET gRPC::grpc) ++ # When cross compiling we look for the native grpc_cpp_plugin ++ if(CMAKE_CROSSCOMPILING) ++ find_program(GRPC_CPP_PLUGIN REQUIRED NAMES grpc_cpp_plugin) ++ if(NOT TARGET gRPC::grpc_cpp_plugin) ++ add_executable(gRPC::grpc_cpp_plugin IMPORTED) ++ endif() ++ set_target_properties(gRPC::grpc_cpp_plugin PROPERTIES ++ IMPORTED_LOCATION "${GRPC_CPP_PLUGIN}") ++ elseif(TARGET gRPC::grpc_cpp_plugin) ++ get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION) ++ else() ++ message(FATAL_ERROR "Found gRPC but no gRPC CPP plugin defined") ++ endif() ++ + set(GRPC_LIBRARIES gRPC::gpr gRPC::grpc gRPC::grpc++) +- get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION) + get_target_property(GRPC_INCLUDE_DIR gRPC::grpc INTERFACE_INCLUDE_DIRECTORIES) + else() + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGRPC.cmake) +-- +2.39.3 (Apple Git-145) + diff --git a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb index 71744026da..e8299bab5f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.14.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb @@ -4,8 +4,12 @@ HOMEPAGE = "https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450" -SRC_URI += "git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https" -SRCREV = "5e2884f36276e44f683fa02fca39807716fdbc16" +SRC_URI = " \ + git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https \ + file://0001-cmake-fix-when-cross-compiling.patch \ +" + +SRCREV = "e31ac4d4caa55fa662e207150ba40f8151b7ad96" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb b/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb index 609e55f4ac..46fa81866b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb @@ -11,20 +11,17 @@ DEPENDS += "libunwind" SRC_URI = "git://github.com/ianlancetaylor/libbacktrace;protocol=https;branch=master" PV = "1.0+git${SRCPV}" -SRCREV = "4f57c999716847e45505b3df170150876b545088" +SRCREV = "9ae4f4ae4481b1e69d38ed810980d33103544613" S = "${WORKDIR}/git" inherit autotools -EXTR_OECONF += "--with-system-libunwind" - -CFLAGS += "-fPIC" +EXTRA_OECONF += "--with-system-libunwind --enable-shared --disable-static" do_configure() { oe_runconf } -# libunwind does not support RISCV yet -COMPATIBLE_HOST:riscv64 = "null" +# libunwind does not support RISCV32 yet COMPATIBLE_HOST:riscv32 = "null" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-pythondir-for-multilib-when-cross-compiling.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-pythondir-for-multilib-when-cross-compiling.patch new file mode 100644 index 0000000000..ec3a9fe470 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-pythondir-for-multilib-when-cross-compiling.patch @@ -0,0 +1,32 @@ +From 297abed277ce3aa0cf12adbfda3c8581afdba850 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Sun, 8 Oct 2023 19:30:29 -0700 +Subject: [PATCH] fix pythondir for multilib when cross compiling + +In case of cross compiling + multilib, the 'shell python3' line is +not likely to give out correct result. Make use of pythondir instead. + +This patch is related to meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch +in oe-core, so this one is marked as oe specific. + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + src/python/gi/overrides/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/python/gi/overrides/Makefile.am b/src/python/gi/overrides/Makefile.am +index 5e8e75f7..7c30601c 100644 +--- a/src/python/gi/overrides/Makefile.am ++++ b/src/python/gi/overrides/Makefile.am +@@ -1,5 +1,5 @@ + if WITH_PYTHON3 +-py3libdir = $(shell python3 -c "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '${exec_prefix}'}))") ++py3libdir = $(pythondir) + py3overridesdir = $(py3libdir)/gi/overrides + dist_py3overrides_DATA = BlockDev.py + endif +-- +2.42.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.28.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_3.03.bb index 2e7412e823..99175e6112 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.28.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_3.03.bb @@ -10,33 +10,29 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" inherit autotools gobject-introspection pkgconfig lib_package -DEPENDS = "autoconf-archive-native glib-2.0 kmod udev" +DEPENDS = "autoconf-archive-native glib-2.0 kmod udev libnvme" -SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch;protocol=https \ -" -SRCREV = "1412dc51c8f76bf8d9a6008228737db4a9a26d69" +SRC_URI = "git://github.com/storaged-project/libblockdev;branch=master;protocol=https \ + file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \ + " +SRCREV = "38378931d285b91333ff2e2a391b1fe91072f9bb" S = "${WORKDIR}/git" -FILES:${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages" +FILES:${PN} += "${libdir}/python3.*/site-packages" -PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath nvdimm tools" +PACKAGECONFIG ??= "python3 lvm lvm-dbus dm parted fs escrow btrfs crypto mdraid mpath nvdimm tools" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" -PACKAGECONFIG[python2] = "--with-python2, --without-python2,,python" PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2" PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2" PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2" -PACKAGECONFIG[dmraid] = "--with-dmraid, --without-dmraid" -PACKAGECONFIG[kmod] = "--with-kbd, --without-kbd,libbytesize" PACKAGECONFIG[parted] = "--with-part, --without-part, parted" PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux" PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm, ndctl util-linux" -PACKAGECONFIG[vdo] = "--with-vdo, --without-vdo,libbytesize" PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key" PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools" PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup nss volume-key" PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" -PACKAGECONFIG[kbd] = "--with-kbd,--without-kbd,libbytesize" PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper" diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.111.bb b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.128.bb index e59235690a..55dbb82029 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.111.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.128.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" -SRCREV = "8b0b910a2dcb7360cb5b0aaefbd1338271d50946" +SRCREV = "7e5ea21030fe6632b6faad30c0de8d9669503773" 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/minifi-cpp/files/0001-BundledOSSPUUID.cmake-Pass-CFLAGS-to-compiler.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-BundledOSSPUUID.cmake-Pass-CFLAGS-to-compiler.patch index a0265eaa32..ceb8ec34b1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-BundledOSSPUUID.cmake-Pass-CFLAGS-to-compiler.patch +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-BundledOSSPUUID.cmake-Pass-CFLAGS-to-compiler.patch @@ -12,6 +12,8 @@ Upsteam-Status: Pending Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- +Upstream-Status: Pending + cmake/BundledOSSPUUID.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch index acb96f40d5..cd837d8de4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-the-constness-issues-around-autovector-iterator_.patch @@ -19,6 +19,8 @@ Pulled By: ltamasi fbshipit-source-id: 04e82d73bc0c67fb0ded018383af8dfc332050cc --- +Upstream-Status: Pending + thirdparty/rocksdb/util/autovector.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.1.bb index 08cfededa7..3a7b51c145 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-102_102.15.1.bb @@ -16,7 +16,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://musl-disable-stackwalk.patch \ file://0001-add-arm-to-list-of-mozinline.patch \ " -SRC_URI[sha256sum] = "81fa590408f5a3af8f004d839ac47fb4121e05fe717334445cec9ca55d8746af" +SRC_URI[sha256sum] = "09194fb765953bc6979a35aa8834118c453b9d6060bf1ec4e134551bad740113" S = "${WORKDIR}/firefox-${PV}" @@ -66,13 +66,16 @@ do_install() { inherit multilib_script multilib_header -MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js102-config" +MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" +MULTILIB_SCRIPTS += "${PN}-dev:${bindir}/js${MAJ_VER}-config" do_install:append() { - oe_multilib_header mozjs-102/js-config.h + oe_multilib_header mozjs-${MAJ_VER}/js-config.h sed -e 's@${STAGING_DIR_HOST}@@g' \ - -i ${D}${bindir}/js102-config + -i ${D}${bindir}/js${MAJ_VER}-config rm -f ${D}${libdir}/libjs_static.ajs + # remove the build path + sed -i -e 's@${WORKDIR}@@g' `find ${B} -name Unified_c*.c*` } PACKAGES =+ "lib${BPN}" diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch index fe905fe4dd..38496ea56c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch @@ -14,16 +14,31 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de> build/moz.configure/init.configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 81f500a0b7..0b7a2ff60f 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure -@@ -585,7 +585,7 @@ def help_host_target(help, host, target): +@@ -647,24 +647,7 @@ def help_host_target(help, host, target) def config_sub(shell, triplet): config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub") -- return check_cmd_output(shell, config_sub, triplet).strip() +- # Config.sub doesn't like the *-windows-msvc/*-windows-gnu triplets, so +- # munge those before and after calling config.sub. +- suffix = None +- munging = { +- "-windows-msvc": "-mingw32", +- "-windows-gnu": "-mingw32", +- } +- for check_suffix, replacement in munging.items(): +- if triplet.endswith(check_suffix): +- suffix = check_suffix +- triplet = triplet[: -len(suffix)] + replacement +- break +- result = check_cmd_output(shell, config_sub, triplet).strip() +- if suffix: +- assert result.endswith(replacement) +- result = result[: -len(replacement)] + suffix +- return result +- + return triplet - @depends("--host", shell) + @checking("for host system type", lambda h: h.alias) diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch index d2b87e8033..22f31e05f8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch @@ -8,6 +8,8 @@ Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: https://github.com/void-linux/void-packages/issues/2598 --- +Upstream-Status: Pending + js/src/old-configure.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb index 799b8abd90..fcdf64c932 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115_115.2.0.bb @@ -9,6 +9,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ file://0004-use-asm-sgidefs.h.patch \ file://fix-musl-build.patch \ + file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \ file://riscv32.patch \ file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ file://0001-rewrite-cargo-host-linker-in-python3.patch \ @@ -65,12 +66,13 @@ do_install() { inherit multilib_script multilib_header -MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js102-config" +MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" +MULTILIB_SCRIPTS += "${PN}-dev:${bindir}/js${MAJ_VER}-config" do_install:append() { - oe_multilib_header mozjs-115/js-config.h + oe_multilib_header mozjs-${MAJ_VER}/js-config.h sed -e 's@${STAGING_DIR_HOST}@@g' \ - -i ${D}${bindir}/js115-config + -i ${D}${bindir}/js${MAJ_VER}-config rm -f ${D}${libdir}/libjs_static.ajs } diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.5.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.7.bb index bc465dd624..d91b0a3037 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.7.bb @@ -22,7 +22,7 @@ GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \ file://run-ptest \ " -SRC_URI[sha256sum] = "bc593afb31fe1ac3d50419f917fafe321a0a3561d7bb2ba498a83740fe3adb14" +SRC_URI[sha256sum] = "19cda718705f7ac8c018c939c38b1bb8412deaaa04862da98cd9fe9243f073bf" S = "${WORKDIR}/libostree-${PV}" @@ -73,6 +73,7 @@ PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --withou PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" PACKAGECONFIG[ed25519-libsodium] = "--with-ed25519-libsodium, --without-ed25519-libsodium, libsodium" +PACKAGECONFIG[ed25519-openssl] = "--with-openssl, --without-openssl, openssl" PACKAGECONFIG[gjs] = "ac_cv_path_GJS=${bindir}/gjs" PACKAGECONFIG[glib] = "--with-crypto=glib, , , , , gnutls openssl" PACKAGECONFIG[gnutls] = "--with-crypto=gnutls, , gnutls, , , glib openssl" @@ -90,7 +91,6 @@ PACKAGECONFIG[soup2] = "--with-soup, --without-soup, libsoup-2.4, , , soup3" PACKAGECONFIG[soup3] = "--with-soup3, --without-soup3, libsoup, , , soup2" PACKAGECONFIG[static] = "" PACKAGECONFIG[systemd] = "--with-libsystemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-libsystemd, systemd" -PACKAGECONFIG[trivial-httpd-cmdline] = "--enable-trivial-httpd-cmdline, --disable-trivial-httpd-cmdline" EXTRA_OECONF = " \ ${@bb.utils.contains('PACKAGECONFIG', 'static', '--with-static-compiler=\'${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}\'', '', d)} \ @@ -138,7 +138,6 @@ PACKAGE_BEFORE_PN = " \ ${PN}-grub \ ${PN}-mkinitcpio \ ${PN}-switchroot \ - ${PN}-trivial-httpd \ " FILES:${PN} += " \ @@ -163,13 +162,7 @@ FILES:${PN}-switchroot = " \ ${nonarch_libdir}/${BPN}/ostree-prepare-root \ ${systemd_system_unitdir}/ostree-prepare-root.service \ " -FILES:${PN}-trivial-httpd = " \ - ${libexecdir}/libostree/ostree-trivial-httpd \ -" -RDEPENDS:${PN} = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'trivial-httpd-cmdline', '${PN}-trivial-httpd', '', d)} \ -" RDEPENDS:${PN}-dracut = "bash" RDEPENDS:${PN}-mkinitcpio = "bash" RDEPENDS:${PN}:class-target = " \ @@ -182,7 +175,6 @@ RDEPENDS:${PN}:class-target = " \ # # xattr in DISTRO_FEATURES (default) # static ostree-prepare-root -# ostree-trivial-httpd (requires soup - note soup and curl can coexist) # overlayfs in your kernel # busybox built statically # C.UTF-8 locale available (default) @@ -208,7 +200,6 @@ RDEPENDS:${PN}-ptest += " \ tar \ util-linux \ xz \ - ${PN}-trivial-httpd \ python3-pyyaml \ ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/0001-src-Do-not-reset-FINAL_LIBS.patch index e8d8b1d53f..e8d8b1d53f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/0001-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/0001-src-Do-not-reset-FINAL_LIBS.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/0006-Define-correct-gregs-for-RISCV32.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/0006-Define-correct-gregs-for-RISCV32.patch index 385b0aeed0..385b0aeed0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/0006-Define-correct-gregs-for-RISCV32.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/0006-Define-correct-gregs-for-RISCV32.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/GNU_SOURCE-7.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/GNU_SOURCE-7.patch index 6e07c25c6a..6e07c25c6a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/GNU_SOURCE-7.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/GNU_SOURCE-7.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/hiredis-use-default-CC-if-it-is-set.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/hiredis-use-default-CC-if-it-is-set.patch index 5b9b71ea69..7785acca5c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/hiredis-use-default-CC-if-it-is-set.patch @@ -18,6 +18,8 @@ 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/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/init-redis-server b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/init-redis-server index c5f335f57d..c5f335f57d 100755 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/init-redis-server +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/init-redis-server diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/lua-update-Makefile-to-use-environment-build-setting.patch index bff07535de..bff07535de 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/lua-update-Makefile-to-use-environment-build-setting.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/oe-use-libc-malloc.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/oe-use-libc-malloc.patch index be186b57da..7b601e02a9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/oe-use-libc-malloc.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/oe-use-libc-malloc.patch @@ -15,6 +15,8 @@ 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/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/redis.conf b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/redis.conf index 75037d6dc8..75037d6dc8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/redis.conf +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/redis.conf diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/redis.service b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/redis.service index a52204cc70..a52204cc70 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.1/redis.service +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.2/redis.service diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.2.1.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.2.2.bb index f8e30e086d..44fb01bc85 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.2.2.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] = "5c76d990a1b1c5f949bcd1eed90d0c8a4f70369bdbdcb40288c561ddf88967a4" +SRC_URI[sha256sum] = "ca999be08800edc6d265379c4c7aafad92f0ee400692e4e2d69829ab4b4c3d08" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_4.9.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.1.bb index d7b7eef977..577acda59b 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_4.9.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.1.bb @@ -11,6 +11,6 @@ inherit meson SRC_URI = "git://github.com/lassekongo83/adw-gtk3.git;protocol=https;branch=main" S = "${WORKDIR}/git" -SRCREV = "08d3dfbde51d4cb0a3bb8e58a81aa61064857d89" +SRCREV = "a3e1050341956fcae53b2b4403affcf2578a42f4" FILES:${PN} = "${datadir}/themes" diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch new file mode 100644 index 0000000000..0d3f412706 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch @@ -0,0 +1,58 @@ +From 671e0d091b40ef7deb4a9d43e0dbed2a44edbec8 Mon Sep 17 00:00:00 2001 +From: Matthew Fernandez <matthew.fernandez@gmail.com> +Date: Sat, 9 Sep 2023 01:03:04 -0700 +Subject: [PATCH] Autotools: fix: do not put '$prefix' based paths in + compilation flags + +This was causing problems with cross-compilation with a dedicated sysroot, +because compilation would incorrectly use headers and libraries from the +`--prefix` path. The `--prefix` path is meant to indicate a target path to +install to, not a path from which to source dependent libraries. + +Gitlab: fixes #2442 +Reported-by: Daniel Klauer +Suggested-by: Daniel Klauer + +Upstream-Status: Backport [https://gitlab.com/graphviz/graphviz/-/commit/012d250a903e13114bce3ba40995fb957fed7848] +Signed-off-by: Daniel Klauer <daniel.klauer@gin.de> +--- + CHANGELOG.md | 3 +++ + configure.ac | 8 -------- + 2 files changed, 3 insertions(+), 8 deletions(-) + +diff --git a/CHANGELOG.md b/CHANGELOG.md +index b9b7e8e08..3a15fd256 100644 +--- a/CHANGELOG.md ++++ b/CHANGELOG.md +@@ -39,6 +39,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 + longer fails due to missing PHP files. #2388 + - Syntax for a loop in `gvmap.sh` has been corrected. This was a regression in + Graphviz 2.50.0. #2404 ++- The Autotools build system no longer uses headers and libraries from the ++ `--prefix` path given on the command line. This previously caused ++ cross-compilation to incorrectly pick up host headers and libraries. #2442 + + ## [8.0.5] – 2023-04-30 + +diff --git a/configure.ac b/configure.ac +index 573a3ee5d..7d53346de 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -190,14 +190,6 @@ if test "x${prefix}" = "xNONE"; then + AC_SUBST([prefix]) + fi + +-# automatically check for other dependencies in $prefix first +-if test "x${prefix}" != "x/usr"; then +- CPPFLAGS="$CPPFLAGS -I${prefix}/include" +- LDFLAGS="$LDFLAGS -L${prefix}/lib" +- PKG_CONFIG_PATH="$prefix/lib/pkgconfig$PATHSEPARATOR$PKG_CONFIG_PATH" +- export PKG_CONFIG_PATH +-fi +- + dnl ----------------------------------- + # Static/Shared binaries + +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb index ccc114007c..4d40ee4dee 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb @@ -19,6 +19,7 @@ DEPENDS:append:class-nativesdk = " ${BPN}-native" inherit autotools-brokensep pkgconfig gettext qemu SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-releases/${PV}/${BP}.tar.xz \ + file://0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch \ " # Use native mkdefs SRC_URI:append:class-target = "\ diff --git a/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb b/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.2.0.bb index 078058e8ba..7c1ebc159c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.2.0.bb @@ -15,7 +15,7 @@ DEPENDS = " \ " S = "${WORKDIR}/git" -SRCREV = "0d63d125f899dbb1b932468f2f3b911f9c121e58" +SRCREV = "ad320fc0e0ec2cd75a87fed454a9c7d6d1921464" PACKAGECONFIG ?= "dbus ${@bb.utils.filter('DISTRO_FEATURES', 'gtk+3', d)}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers.inc b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers.inc index dcf1ad14ba..6cfb7fa076 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lv-drivers.inc @@ -17,6 +17,8 @@ LVGL_CONFIG_USE_WAYLAND = "${@bb.utils.contains('PACKAGECONFIG', 'wayland', '1', LVGL_CONFIG_WAYLAND_HOR_RES ?= "480" LVGL_CONFIG_WAYLAND_VER_RES ?= "320" +ALLOW_EMPTY:${PN} = "1" + EXTRA_OECMAKE += "-Dinstall:BOOL=ON -DLIB_INSTALL_DIR=${baselib}" do_configure:append() { diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.3.9.bb b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.3.10.bb index dc681c249b..7dd36cac2d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.3.9.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_8.3.10.bb @@ -9,13 +9,15 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" SRC_URI = "git://github.com/lvgl/lvgl;protocol=https;branch=release/v8.3" -SRCREV = "9ec3b8706b098f60940cee6ac211d3cb3141aedf" +SRCREV = "06e229cc7679c01119ca5d905a1f9dad96f475f0" inherit cmake EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${baselib}" S = "${WORKDIR}/git" +ALLOW_EMPTY:${PN} = "1" + LVGL_CONFIG_LV_MEM_CUSTOM ?= "0" LVGL_CONFIG_LV_COLOR_DEPTH ?= "32" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb index 4c97c03978..9a15077316 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb @@ -1,6 +1,6 @@ SUMMARY = "openbox Window Manager" SECTION = "x11/wm" -DEPENDS = "glib-2.0 pango libxml2 virtual/libx11 libcroco librsvg gdk-pixbuf" +DEPENDS = "glib-2.0 pango libxml2 virtual/libx11 librsvg gdk-pixbuf" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb index c71e535649..f2d74078e8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb @@ -18,4 +18,4 @@ EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_LIB_DIR=${@d.getVar('baselib').replace('/', FILES:${PN} += "${libdir}/openjpeg*" -BBCLASSEXTEND = "native nativesdk" +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.3.2.bb b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.3.3.bb index db66e890fa..e5310ae25a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.3.3.bb @@ -5,7 +5,7 @@ BUGTRACKER = "https://github.com/tesseract-ocr/tesseract/issues" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "489f101c7e2276c00490f3ab70e9e7926fc6b481" +SRCREV = "e082522c248d3121e466959a8ba4fd4f7ad1a525" SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.5.bb index a672ba5e5e..f078ad60eb 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.5.bb @@ -13,7 +13,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=64322fab5239f5c8d97cf6e0e14f1c62" DEPENDS += "libxaw libxkbfile" -BBCLASSEXTEND = "native" - SRC_URI_EXT = "xz" SRC_URI[sha256sum] = "f6a4a8e9c54582beb3787b1faa8168caab125c1fee0ca9cfa5b6c9c1df25eea4" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.2.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.2.bb index 30a1e089e3..a9a8acf05c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.2.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.2.bb @@ -8,7 +8,6 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=6ea29dbee22324787c061f039e0529de" DEPENDS += "xbitmaps libxcursor" -BBCLASSEXTEND = "native" SRC_URI[md5sum] = "5fe769c8777a6e873ed1305e4ce2c353" SRC_URI[sha256sum] = "10c442ba23591fb5470cea477a0aa5f679371f4f879c8387a1d9d05637ae417c" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_384.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_387.bb index ae046b18c2..09bb2976a6 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_384.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_387.bb @@ -8,7 +8,7 @@ SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ file://0001-Add-configure-time-check-for-setsid.patch \ " -SRC_URI[sha256sum] = "31ef870740ceae020c3c4b4a9601c7f47bfd46672c1aaf2d213a565d64cbc373" +SRC_URI[sha256sum] = "81dd59cc2ecef1e849ed21722e37a24756e02b54ec19d157cb545b273813f4b8" PACKAGECONFIG ?= "" PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 3d97ea0967..291a83aaad 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -19,6 +19,8 @@ SRC_URI += "file://run-ptest \ # bpf was added in 4.10 with: https://github.com/torvalds/linux/commit/5aa5bd14c5f8660c64ceedf14a549781be47e53d # if you have older kernel than that you need to remove it from PACKAGECONFIG PACKAGECONFIG ??= "firmware" +# bpf needs working clang compiler anyway +PACKAGECONFIG:append:toolchain-clang:x86-64 = " bpf" PACKAGECONFIG:remove:x86 = "bpf" PACKAGECONFIG:remove:arm = "bpf vm" # host ptrace.h is used to compile BPF target but mips ptrace.h is needed @@ -28,34 +30,41 @@ PACKAGECONFIG:remove:arm = "bpf vm" PACKAGECONFIG:remove:qemumips = "bpf vm" # riscv does not support libhugetlbfs yet -PACKAGECONFIG:remove:riscv64 = "vm" -PACKAGECONFIG:remove:riscv32 = "vm" +PACKAGECONFIG:remove:riscv64 = "bpf vm" +PACKAGECONFIG:remove:riscv32 = "bpf vm" -PACKAGECONFIG[bpf] = ",,elfutils libcap libcap-ng rsync-native," +PACKAGECONFIG[bpf] = ",,elfutils elfutils-native libcap libcap-ng rsync-native python3-docutils-native," PACKAGECONFIG[firmware] = ",,libcap, bash" PACKAGECONFIG[vm] = ",,libcap libhugetlbfs,libgcc bash" do_patch[depends] += "virtual/kernel:do_shared_workdir" +do_compile[depends] += "virtual/kernel:do_install" -inherit linux-kernel-base kernel-arch ptest +inherit linux-kernel-base module-base kernel-arch ptest siteinfo S = "${WORKDIR}/${BP}" +DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" + TEST_LIST = "\ ${@bb.utils.filter('PACKAGECONFIG', 'bpf firmware vm', d)} \ rtc \ " - EXTRA_OEMAKE = '\ CROSS_COMPILE=${TARGET_PREFIX} \ ARCH=${ARCH} \ CC="${CC}" \ - CLANG="clang -fno-stack-protector -target ${TARGET_ARCH} ${TOOLCHAIN_OPTIONS}" \ AR="${AR}" \ LD="${LD}" \ + CLANG="clang -fno-stack-protector -target ${TARGET_ARCH} ${TOOLCHAIN_OPTIONS} -isystem ${S} -D__WORDSIZE=\'64\' -Wno-error=unused-command-line-argument" \ DESTDIR="${D}" \ - MACHINE="${ARCH}" \ + V=1 \ ' +EXTRA_OEMAKE:append:toolchain-clang = "\ + LLVM=1 CONFIG_CC_IS_GCC= CONFIG_CC_IS_CLANG=y CONFIG_CC_IMPLICIT_FALLTHROUGH= \ + HOSTCC="clang -unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++ ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -Wno-error=unused-command-line-argument" \ + HOSTLD="clang ${BUILD_LDFLAGS} -unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++" \ +" KERNEL_SELFTEST_SRC ?= "Makefile \ include \ @@ -66,7 +75,6 @@ KERNEL_SELFTEST_SRC ?= "Makefile \ arch \ LICENSES \ " - do_compile() { if [ ${@bb.utils.contains('PACKAGECONFIG', 'bpf', 'True', 'False', d)} = 'True' ]; then if [ ${@bb.utils.contains('DEPENDS', 'clang-native', 'True', 'False', d)} = 'False' ]; then @@ -74,7 +82,17 @@ do_compile() { either install it and add it to HOSTTOOLS, or add clang-native from meta-clang to dependency" fi fi - + mkdir -p ${S}/include/config ${S}/bits + install -Dm 0644 ${STAGING_KERNEL_BUILDDIR}/.config ${S}/include/config/auto.conf + if [ "${SITEINFO_BITS}" != "32" ]; then + for f in long-double endianness floatn struct_rwlock; do + cp ${RECIPE_SYSROOT}${includedir}/bits/$f-64.h ${S}/bits/$f-32.h + done + fi + oe_runmake -C ${S} headers + sed -i -e 's|^all: docs|all:|' ${S}/tools/testing/selftests/bpf/Makefile + sed -i -e '/mrecord-mcount/d' ${S}/Makefile + sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/Makefile for i in ${TEST_LIST} do oe_runmake -C ${S}/tools/testing/selftests/${i} @@ -133,9 +151,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_PACKAGE_DEBUG_SPLIT="1" FILES:${PN} += "/usr/kernel-selftest" -RDEPENDS:${PN} += "python3 perl" +RDEPENDS:${PN} += "python3 perl perl-module-io-handle" # tools/testing/selftests/vm/Makefile doesn't respect LDFLAGS and tools/testing/selftests/Makefile explicitly overrides to empty -INSANE_SKIP:${PN} += "ldflags" +INSANE_SKIP:${PN} += "ldflags libdir" SECURITY_CFLAGS = "" COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest index d40b9576d8..0903d097e1 100755 --- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest @@ -1,11 +1,7 @@ #!/bin/sh -export PATH=$PATH:/usr/kernel-selftest/bpf - -# test_align -test_align | grep "12 pass" &> /dev/null +/usr/kernel-selftest/run_kselftest.sh -s if [ $? == 0 ]; then - echo "[PASS]: test_align" + echo "PASS: kernel-selftest" else - echo "[FAIL]: test_align" + echo "[FAIL]: kernel-selftest" fi - diff --git a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_1.2.0.bb b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_1.2.0.bb index 71ca10e5a0..a8e1e5c0cb 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_1.2.0.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=master" SRCREV = "fbd60dbff51c870f5e80a17c4f2fd639eb80af90" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_HOST = "(x86_64|i.86|aarch64|riscv64|powerpc64).*-linux" +COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux" S = "${WORKDIR}/git/src" diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/run-ptest b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/run-ptest index fbddc0774d..6746132ce6 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/run-ptest +++ b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/run-ptest @@ -6,7 +6,7 @@ echo expecting Segmentation fault with core dump ... minicoredumper_demo 6 & sleep 3 && minicoredumper_demo if ls /var/crash/ | grep minicoredumper; then - echo SUCCESS + echo "PASS: minicoredumper" else - echo FAIL + echo "FAIL: minicoredumper" fi 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 104b946c68..ef9936daba 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 @@ -50,4 +50,3 @@ FILES:jack-utils = "${bindir}/*" FILES:${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/*" -BBCLASSEXTEND = "native nativesdk" 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.1.bb index 558b448baf..eab5546a1b 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.1.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -SRCREV = "d6eb9696aa72473c1a11d34d928d35a3acc0c9a9" +SRCREV = "10b9492dcf05b652e2e4b370e205bd605d421972" SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main \ file://libvpx-configure-support-blank-prefix.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.1.1.bb b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.3.0.bb index 6ce1c88772..59bded87f5 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.3.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27445198ba1500f508fce2b183ce0ff" DEPENDS = "sqlite3 sqlite3-native" SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "003cd4010e52bb5eb8f7de1c143753aa830c8902b6ed01209f294846e40e6d39" +SRC_URI[sha256sum] = "91a3695a004ea28db0448a34460bed4cc3b130e5c7d74339ec999efdab0e547d" inherit cmake lib_package diff --git a/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb b/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb index fd82bb39c2..01c29d2c97 100644 --- a/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb +++ b/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb @@ -30,8 +30,6 @@ EXTRA_OECONF:class-native += " --with-pdftops=pdftops \ --disable-ldap \ --with-png --without-jpeg --without-tiff" -BBCLASSEXTEND = "native" - PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg" PACKAGECONFIG[png] = "--with-png,--without-png,libpng" PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff" diff --git a/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb b/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint_5.3.4.bb index f0dc6adea0..5263890239 100644 --- a/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb +++ b/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint_5.3.4.bb @@ -12,18 +12,14 @@ DESCRIPTION = "Gutenprint printer drivers" HOMEPAGE = "http://gimp-print.sourceforge.net/" LICENSE = "GPL-2.0-or-later" - -SRC_URI = "git://git.code.sf.net/p/gimp-print/source;protocol=https;branch=master" -SRCREV = "66b0a7bc3fd25659a3f295db0ebb39d04e413c01" -PV = "5.3.3+git${SRCPV}" - -S = "${WORKDIR}/git" - LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" +SRC_URI = "https://downloads.sourceforge.net/gimp-print/${BP}.tar.xz" +SRC_URI[sha256sum] = "db44a701d2b8e6a8931c83cec06c91226be266d23e5c189d20a39dd175f2023b" + inherit autotools gettext pkgconfig -DEPENDS += "glib-2.0-native cups gutenprint-native" +DEPENDS += "glib-2.0-native cups gutenprint-native tiff libusb libpng libjpeg-turbo ghostscript" # autogen.sh needs autopoint DEPENDS:class-native = "glib-2.0-native gettext-native" @@ -36,18 +32,11 @@ do_configure:prepend:class-target() { # So we are using the xmli18n-tmp.h created by gutenprint-native sed -i 's/all-local: xmli18n-tmp.h xml-stamp/all-local: xml-stamp/' ${S}/src/xml/Makefile.am sed -i 's/dist-hook: xmli18n-tmp.h xml-stamp/dist-hook: xml-stamp/' ${S}/src/xml/Makefile.am + sed -i '/$(AM_TESTS_ENVIRONMENT) .\/check_duplicate_printers.test/d' ${S}/src/xml/printers/Makefile.am # Despite being a generated file, this needs to be in S. cp ${STAGING_DATADIR_NATIVE}/gutenprint/xmli18n-tmp.h ${S}/src/xml/ } -do_configure() { - # Need to call autogen.sh as that creates m4/stp_release.m4 - cd ${S} - NOCONFIGURE=1 ./autogen.sh - cd ${B} - oe_runconf -} - do_install:append() { # This file contains build paths and isn't very useful, remove it rm -f ${D}${libdir}/gutenprint/*/config.summary diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.19.1.bb b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.20.1.bb index 1440d72711..85379dc40d 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.19.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.20.1.bb @@ -3,10 +3,10 @@ SUMMARY = "c-ares is a C library that resolves names asynchronously." HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fdbc58a6da11a9f68aa73c453818decc" SRC_URI = "git://github.com/c-ares/c-ares.git;branch=main;protocol=https" -SRCREV = "6360e96b5cf8e5980c887ce58ef727e53d77243a" +SRCREV = "e8fe27eaa841ed32a4f82bef7a72c4e04e7f86a7" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.1.0.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb index d3c6b421e6..18db0721de 100644 --- a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb @@ -1,12 +1,12 @@ DESCRIPTION = "Ceres Solver is an open source C++ library for modeling and solving large, complicated optimization problems." HOMEPAGE = "http://ceres-solver.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bb761279816b72be19d7ce646e4e2a14" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3585a26c9cd9ec0cb36a7d65542878ca" DEPENDS = "libeigen glog" SRC_URI = "git://github.com/ceres-solver/ceres-solver.git;branch=master;protocol=https" -SRCREV = "f68321e7de8929fbcdb95dd42877531e64f72f66" +SRCREV = "85331393dc0dff09f6fb9903ab0c4bfa3e134b01" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch b/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch new file mode 100644 index 0000000000..c93b76619c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch @@ -0,0 +1,30 @@ +From a53f123040998744602f190944464af0e159ea19 Mon Sep 17 00:00:00 2001 +From: jjll <jjll@gmv.com> +Date: Wed, 6 Sep 2023 20:47:41 +0200 +Subject: [PATCH] Compatibility with boost 1.83 + +Upstream-Status: Backport [https://github.com/cpp-netlib/cpp-netlib/pull/902] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libs/network/src/server_request_parsers_impl.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/boost/network/protocol/http/server/impl/parsers.ipp ++++ b/boost/network/protocol/http/server/impl/parsers.ipp +@@ -13,6 +13,7 @@ + #include <tuple> + #include <boost/fusion/include/std_tuple.hpp> + #include <boost/network/protocol/http/message/header.hpp> ++#include <boost/regex/pending/unicode_iterator.hpp> + + #ifdef BOOST_NETWORK_NO_LIB + #ifndef BOOST_NETWORK_INLINE +@@ -32,7 +33,7 @@ typedef std::basic_string<uint32_t> u32_ + template <> // <typename Attrib, typename T, typename Enable> + struct assign_to_container_from_value<std::string, u32_string, void> { + static void call(u32_string const& val, std::string& attr) { +- u32_to_u8_iterator<u32_string::const_iterator> begin = val.begin(), ++ boost::u32_to_u8_iterator<u32_string::const_iterator> begin = val.begin(), + end = val.end(); + for (; begin != end; ++begin) attr += *begin; + } diff --git a/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb b/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb index 3c271ae5d1..bda5177fc4 100644 --- a/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb @@ -8,13 +8,13 @@ DESCRIPTION = "Modern C++ network programming libraries." SECTION = "libs" LICENSE = "BSL-1.0 & MIT & Python-2.0" LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" +PV = "0.13.0" +SRCREV = "31d304cdf52b485f465ada433d8905171b61cbff" SRC_URI = "\ git://github.com/cpp-netlib/cpp-netlib.git;protocol=https;branch=0.13-release \ + file://a53f123040998744602f190944464af0e159ea19.patch \ " -SRC_URI[sha256sum] = "0b9255bb0668d89867a1f367d770f12d7038db4f5b6111774ef032f669cccad4" - -SRCREV = "ca95f04d140acf619892ee02a82e930dd91ff7d4" S = "${WORKDIR}/git" @@ -24,3 +24,7 @@ DEPENDS = "zlib boost openssl" EXTRA_OECMAKE:append = " -DCPP-NETLIB_BUILD_TESTS=OFF -DCPP-NETLIB_BUILD_EXAMPLES=OFF" +do_install:append() { + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibConfig.cmake + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibTargets-noconfig.cmake +} diff --git a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb index 1633412cf5..36545503ed 100644 --- a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb +++ b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.18.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste file://disable-float-tests.patch \ file://disable-outside-tests.patch " -# tag 2.10.17 +# tag 2.10.18 SRCREV= "122d09549201da5383321d870bed45ecb9e168c5" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb b/meta-openembedded/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb index 58e4fd6e88..f88d3b6ca1 100644 --- a/meta-openembedded/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb @@ -1,4 +1,5 @@ SUMMARY = "cpulimit is a tool which limits the CPU usage of a process" +DESCRIPTION = "cpulimit is a simple program that attempts to limit the CPU usage of a process (expressed in percentage, not in CPU time). This is useful to control batch jobs, when you don't want them to eat too much CPU. It does not act on the nice value or other priority stuff, but on the real CPU usage. Besides it is able to adapt itself to the overall system load, dynamically and quickly." HOMEPAGE = "http://cpulimit.sourceforge.net" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=86c1c0d961a437e529db93aa3bb32dc4" diff --git a/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb b/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb index c1f512160d..48b52eefca 100644 --- a/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb @@ -7,7 +7,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=2ef696d66c156139232201f223c22592" SRC_URI= "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master" -SRCREV = "e052f5f9fdf74ca11aa1a8edfa62eff8d0aa3d0d" +SRCREV = "5920bf2a756b2f748c49ff6a08b9f421026473c5" PV = "0.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/fftw/fftw/run-ptest b/meta-openembedded/meta-oe/recipes-support/fftw/fftw/run-ptest index 6d8dd96f02..4d19057975 100644 --- a/meta-openembedded/meta-oe/recipes-support/fftw/fftw/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/fftw/fftw/run-ptest @@ -10,21 +10,18 @@ cd ../fftwl /usr/bin/perl -w ./check.pl -r -c=30 -v `pwd`/benchl fftwl_result=$? -echo -n "fftw test result:" if [ $fftw_result = "0" ]; then - echo PASSED + echo "PASS: fftw" else - echo FAILED + echo "FAIL: fftw" fi -echo -n "fftwf test result:" if [ $fftwf_result = "0" ]; then - echo PASSED + echo "PASS: fftwf" else - echo FAILED + echo "FAIL: fftwf" fi -echo -n "fftwl test result:" if [ $fftwl_result = "0" ]; then - echo PASSED + echo "PASS: fftwl" else - echo FAILED + echo "FAIL: fftwl" fi diff --git a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.11.1.bb b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb index 063a63b1e3..c8d996d416 100644 --- a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.11.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb @@ -13,7 +13,7 @@ inherit pkgconfig cmake gitpkgv PE = "1" PKGV = "${GITPKGVTAG}" -SRCREV = "9d3d40bf3e429c0cd6609f686c0e73ed0eff0a07" +SRCREV = "a38c1be9eee39a9bc22b511fffe96e63fdf8ebe7" SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ file://winpr-makecert-Build-with-install-RPATH.patch \ file://0001-Fix-const-qualifier-error.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.9.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb index dfc7b42dca..926a603b81 100644 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "2fa27aa3acccc70b9f6c3bf2e569e3d33a381e83" -SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master;protocol=https" +SRCREV = "6e83cc6f6dff4f126fc79284e0c3c1c50123380d" +SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=main;protocol=https" inherit gettext autotools pkgconfig python3native diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb index 28305c9854..72044427dd 100644 --- a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." HOMEPAGE = "http://eigen.tuxfamily.org/" -LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPL-3.0-only & LGPL-2.1-only & MINPACK" +LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPL-2.0-only & LGPL-2.1-only & MINPACK" LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ file://COPYING.BSD;md5=2dd0510ee95e59ca28834b875bc96596 \ file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \ diff --git a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch new file mode 100644 index 0000000000..ef9cc47d25 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch @@ -0,0 +1,68 @@ +From ca47ba3119365eafac0ab25a86cab9d9a1b29bd4 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 30 Sep 2023 06:38:53 +0100 +Subject: [PATCH] test: handle POSIX ioctl prototype + +glibc has the following prototype for ioctl: int ioctl(int fd, unsigned long request, ...) +POSIX (inc. musl) has the following for ioctl: int ioctl(int fd, int request, ...) + +Check which prototype is used in <sys/ioctl.h> to avoid a conflict and conditionally +define the right one for the system. + +Bug: https://bugs.gentoo.org/914921 +Signed-off-by: Sam James <sam@gentoo.org> +Upstream-Status: Backport [https://github.com/linux-nvme/libnvme/commit/ca47ba3119365eafac0ab25a86cab9d9a1b29bd4] +--- + meson.build | 10 ++++++++++ + test/ioctl/mock.c | 6 +++++- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6fcf1da..2c979cc 100644 +--- a/meson.build ++++ b/meson.build +@@ -230,6 +230,16 @@ conf.set( + ), + description: 'Is network address and service translation available' + ) ++conf.set( ++ 'HAVE_GLIBC_IOCTL', ++ cc.compiles( ++ '''#include <sys/ioctl.h> ++ int ioctl(int fd, unsigned long request, ...); ++ ''', ++ name: 'ioctl has glibc-style prototype' ++ ), ++ description: 'Is ioctl the glibc interface (rather than POSIX)' ++) + + if cc.has_function_attribute('fallthrough') + conf.set('fallthrough', '__attribute__((__fallthrough__))') +diff --git a/test/ioctl/mock.c b/test/ioctl/mock.c +index e917244..5d2ac94 100644 +--- a/test/ioctl/mock.c ++++ b/test/ioctl/mock.c +@@ -114,7 +114,11 @@ void end_mock_cmds(void) + } \ + }) + ++#ifdef HAVE_GLIBC_IOCTL + int ioctl(int fd, unsigned long request, ...) ++#else ++int ioctl(int fd, int request, ...) ++#endif + { + struct mock_cmds *mock_cmds; + bool result64; +@@ -141,7 +145,7 @@ int ioctl(int fd, unsigned long request, ...) + result64 = true; + break; + default: +- fail("unexpected %s %lu", __func__, request); ++ fail("unexpected %s %lu", __func__, (unsigned long) request); + } + check(mock_cmds->remaining_cmds, + "unexpected %s command", mock_cmds->name); +-- +2.40.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.5.bb b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.6.bb index 4b6f1e30be..802edac508 100644 --- a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.6.bb @@ -11,9 +11,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" DEPENDS = "json-c" -SRCREV = "4fea83db8328ea788ea8f1001e8ce1cb80ef5fae" +SRCREV = "37a803cf77e224f66d86b1e1d9e74a15f55ea600" -SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" +SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master \ + file://0001-test-handle-POSIX-ioctl-prototype.patch \ +" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch new file mode 100644 index 0000000000..265d723c6e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch @@ -0,0 +1,203 @@ +From 75f7475fcfb35cbe4d8f5ccf5c4ac8bc78f2dc30 Mon Sep 17 00:00:00 2001 +From: Kumataro <Kumataro@users.noreply.github.com> +Date: Thu, 19 Oct 2023 14:45:08 +0900 +Subject: [PATCH] Merge pull request #24372 from Kumataro:fix24369 + +Supporting protobuf v22 and later(with abseil-cpp/C++17) #24372 + +fix https://github.com/opencv/opencv/issues/24369 +related https://github.com/opencv/opencv/issues/23791 + +1. This patch supports external protobuf v22 and later, it required abseil-cpp and c++17. + Even if the built-in protobuf is upgraded to v22 or later, + the dependency on abseil-cpp and the requirement for C++17 will continue. +2. Some test for caffe required patched protobuf, so this patch disable them. + +This patch is tested by following libraries. +- Protobuf: /usr/local/lib/libprotobuf.so (4.24.4) +- abseil-cpp: YES (20230125) + +See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request + +- [x] I agree to contribute to the project under Apache 2 License. +- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV +- [x] The PR is proposed to the proper branch +- [x] There is a reference to the original bug report and related work +- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable + Patch to opencv_extra has the same branch name. +- [x] The feature is well documented and sample code can be built with the project CMake + +Upstream-Status: Backport [https://github.com/opencv/opencv/commit/6e4280ea81b59c6dca45bb9801b758377beead55] +--- + cmake/OpenCVFindProtobuf.cmake | 35 +++++++++++++++++++++++++++----- + modules/dnn/CMakeLists.txt | 6 ++++++ + modules/dnn/test/test_layers.cpp | 24 ++++++++++++++++++---- + 3 files changed, 56 insertions(+), 9 deletions(-) + +diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake +index 8835347d1d..5b1e17529f 100644 +--- a/cmake/OpenCVFindProtobuf.cmake ++++ b/cmake/OpenCVFindProtobuf.cmake +@@ -30,8 +30,14 @@ if(BUILD_PROTOBUF) + set(Protobuf_LIBRARIES "libprotobuf") + set(HAVE_PROTOBUF TRUE) + else() ++ # we still need this for command PROTOBUF_GENERATE_CPP. ++ set(protobuf_MODULE_COMPATIBLE ON) ++ + unset(Protobuf_VERSION CACHE) +- find_package(Protobuf QUIET) ++ find_package(Protobuf QUIET CONFIG) ++ if(NOT Protobuf_FOUND) ++ find_package(Protobuf QUIET) ++ endif() + + # Backwards compatibility + # Define camel case versions of input variables +@@ -67,6 +73,20 @@ else() + endif() + endif() + ++# See https://github.com/opencv/opencv/issues/24369 ++# In Protocol Buffers v22.0 and later drops C++11 support and depends abseil-cpp. ++# Details: https://protobuf.dev/news/2022-08-03/ ++# And if std::text_view is in abseil-cpp requests C++17 and later. ++ ++if(HAVE_PROTOBUF) ++ if(NOT (Protobuf_VERSION VERSION_LESS 22)) ++ if((CMAKE_CXX_STANDARD EQUAL 98) OR (CMAKE_CXX_STANDARD LESS 17)) ++ message(STATUS "CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} is too old to support protobuf(${Protobuf_VERSION}) and/or abseil-cpp. Use C++17 or later. Turning HAVE_PROTOBUF off") ++ set(HAVE_PROTOBUF FALSE) ++ endif() ++ endif() ++endif() ++ + if(HAVE_PROTOBUF AND PROTOBUF_UPDATE_FILES AND NOT COMMAND PROTOBUF_GENERATE_CPP) + message(FATAL_ERROR "Can't configure protobuf dependency (BUILD_PROTOBUF=${BUILD_PROTOBUF} PROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES})") + endif() +@@ -74,15 +94,20 @@ endif() + if(HAVE_PROTOBUF) + list(APPEND CUSTOM_STATUS protobuf) + if(NOT BUILD_PROTOBUF) ++ unset( __location) + if(TARGET "${Protobuf_LIBRARIES}") + get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_RELEASE) + if(NOT __location) + get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION) + endif() +- elseif(Protobuf_LIBRARY) +- set(__location "${Protobuf_LIBRARY}") +- else() +- set(__location "${Protobuf_LIBRARIES}") ++ endif() ++ ++ if(NOT __location) ++ if(Protobuf_LIBRARY) ++ set(__location "${Protobuf_LIBRARY}") ++ else() ++ set(__location "${Protobuf_LIBRARIES}") ++ endif() + endif() + endif() + list(APPEND CUSTOM_STATUS_protobuf " Protobuf:" +diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt +index 804b78ead2..9fcc460909 100644 +--- a/modules/dnn/CMakeLists.txt ++++ b/modules/dnn/CMakeLists.txt +@@ -245,6 +245,12 @@ ocv_create_module(${libs} ${dnn_runtime_libs}) + ocv_add_samples() + ocv_add_accuracy_tests(${dnn_runtime_libs}) + ++if(NOT BUILD_PROTOBUF) ++ if(TARGET opencv_test_dnn) ++ ocv_target_compile_definitions(opencv_test_dnn PRIVATE "OPENCV_DNN_EXTERNAL_PROTOBUF=1") ++ endif() ++endif() ++ + set(perf_path "${CMAKE_CURRENT_LIST_DIR}/perf") + file(GLOB_RECURSE perf_srcs "${perf_path}/*.cpp") + file(GLOB_RECURSE perf_hdrs "${perf_path}/*.hpp" "${perf_path}/*.h") +diff --git a/modules/dnn/test/test_layers.cpp b/modules/dnn/test/test_layers.cpp +index 763d94b99c..6cb6d54b3f 100644 +--- a/modules/dnn/test/test_layers.cpp ++++ b/modules/dnn/test/test_layers.cpp +@@ -756,11 +756,15 @@ TEST_F(Layer_RNN_Test, get_set_test) + + TEST_P(Test_Caffe_layers, Accum) + { ++#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF ++ throw SkipTestException("Requires patched protobuf"); ++#else + if (backend == DNN_BACKEND_OPENCV && target != DNN_TARGET_CPU) + applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL, CV_TEST_TAG_DNN_SKIP_OPENCL_FP16); + + testLayerUsingCaffeModels("accum", false, false, 0.0, 0.0, 2); + testLayerUsingCaffeModels("accum_ref", false, false, 0.0, 0.0, 2); ++#endif + } + + TEST_P(Test_Caffe_layers, FlowWarp) +@@ -780,27 +784,39 @@ TEST_P(Test_Caffe_layers, ChannelNorm) + + TEST_P(Test_Caffe_layers, DataAugmentation) + { ++#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF ++ throw SkipTestException("Requires patched protobuf"); ++#else + if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16) + applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL_FP16); + testLayerUsingCaffeModels("data_augmentation", true, false); + testLayerUsingCaffeModels("data_augmentation_2x1", true, false); + testLayerUsingCaffeModels("data_augmentation_8x6", true, false); ++#endif + } + + TEST_P(Test_Caffe_layers, Resample) + { ++#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF ++ throw SkipTestException("Requires patched protobuf"); ++#else + if (backend != DNN_BACKEND_OPENCV) + applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, CV_TEST_TAG_DNN_SKIP_IE_NGRAPH); + testLayerUsingCaffeModels("nearest_2inps", false, false, 0.0, 0.0, 2); + testLayerUsingCaffeModels("nearest", false, false); ++#endif + } + + TEST_P(Test_Caffe_layers, Correlation) + { ++#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF ++ throw SkipTestException("Requires patched protobuf"); ++#else + if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16) + applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NGRAPH, CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER, + CV_TEST_TAG_DNN_SKIP_OPENCL, CV_TEST_TAG_DNN_SKIP_OPENCL_FP16); + testLayerUsingCaffeModels("correlation", false, false, 0.0, 0.0, 2); ++#endif + } + + TEST_P(Test_Caffe_layers, Convolution2Inputs) +@@ -1641,12 +1657,11 @@ private: + int outWidth, outHeight, zoomFactor; + }; + +-#ifndef OPENCV_DNN_EXTERNAL_PROTOBUF + TEST_P(Test_Caffe_layers, Interp) +-#else +-TEST_P(Test_Caffe_layers, DISABLED_Interp) // requires patched protobuf (available in OpenCV source tree only) +-#endif + { ++#ifdef OPENCV_DNN_EXTERNAL_PROTOBUF ++ throw SkipTestException("Requires patched protobuf"); ++#else + #if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021030000) + if (backend == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH && target == DNN_TARGET_MYRIAD) + applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_MYRIAD, CV_TEST_TAG_DNN_SKIP_IE_NGRAPH); // exception +@@ -1670,6 +1685,7 @@ TEST_P(Test_Caffe_layers, DISABLED_Interp) // requires patched protobuf (availa + + // Test an implemented layer. + testLayerUsingCaffeModels("layer_interp", false, false); ++#endif + } + + INSTANTIATE_TEST_CASE_P(/*nothing*/, Test_Caffe_layers, dnnBackendsAndTargets()); diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.8.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.8.0.bb index 9564bbbe9d..85eb230b08 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.8.0.bb @@ -31,6 +31,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=ht file://download.patch \ file://0001-Make-ts-module-external.patch \ file://0008-Do-not-embed-build-directory-in-binaries.patch \ + file://fix-build-with-protobuf-v22.patch \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" @@ -98,7 +99,7 @@ PACKAGECONFIG:remove:libc-musl:riscv32 = "tbb" PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," -PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," +PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF -DCMAKE_CXX_STANDARD=17,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Fix-data-race-when-create-POSIX-thread.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Fix-data-race-when-create-POSIX-thread.patch new file mode 100644 index 0000000000..1a7f4dcdca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Fix-data-race-when-create-POSIX-thread.patch @@ -0,0 +1,33 @@ +From 03b68fc924b24e12c87512d790d37fc6ddc352ac Mon Sep 17 00:00:00 2001 +From: Dawid Drozd <drozddawid@gmail.com> +Date: Sat, 11 Feb 2023 14:48:39 +0400 +Subject: [PATCH] Fix data race when create POSIX thread + +When creating thread using pthread_create() `_pData->thread` will be set. +It could lead to data race as in runnableEntry() we refer to that variable. + +Instead use pthread_self(). +getName() is already under mutex. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/3942/commits/9c8a79b994a367f626c5551e0f38c27d0d8431f1] +--- + Foundation/src/Thread_POSIX.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Foundation/src/Thread_POSIX.cpp b/Foundation/src/Thread_POSIX.cpp +index ceab76e82..3e52cd31f 100644 +--- a/Foundation/src/Thread_POSIX.cpp ++++ b/Foundation/src/Thread_POSIX.cpp +@@ -351,7 +351,7 @@ void* ThreadImpl::runnableEntry(void* pThread) + #endif + + ThreadImpl* pThreadImpl = reinterpret_cast<ThreadImpl*>(pThread); +- setThreadName(pThreadImpl->_pData->thread, reinterpret_cast<Thread*>(pThread)->getName()); ++ setThreadName(pthread_self(), reinterpret_cast<Thread*>(pThread)->getName()); + AutoPtr<ThreadData> pData = pThreadImpl->_pData; + try + { +-- +2.42.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.4.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.4.bb index 8505f66e8b..12532e4ef1 100644 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.4.bb @@ -11,6 +11,7 @@ DEPENDS = "libpcre2 zlib" SRC_URI = "git://github.com/pocoproject/poco.git;branch=master;protocol=https \ file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \ file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ + file://0001-Fix-data-race-when-create-POSIX-thread.patch \ file://run-ptest \ " SRCREV = "1211613642269b7d53bea58b02de7fcd25ece3b9" diff --git a/meta-openembedded/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch b/meta-openembedded/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch index 3c364dcc4e..c51fb1cfdb 100644 --- a/meta-openembedded/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch +++ b/meta-openembedded/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch @@ -15,6 +15,8 @@ correctly and pv_in_foreground() returns also true in that case. Signed-off-by: Michael Weiß <michael.weiss@aisec.fraunhofer.de> --- +Upstream-Status: Pending + src/pv/display.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-openembedded/meta-oe/recipes-support/re2/re2/run-ptest b/meta-openembedded/meta-oe/recipes-support/re2/re2/run-ptest new file mode 100644 index 0000000000..8bd5fd1efb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/re2/re2/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +ctest --force-new-ctest-process | sed -u 's/\*\*\*/ /g' | awk '/Test +#/{gsub(/Passed/,"PASS"); gsub(/Failed/,"FAIL"); gsub(/Skipped/,"SKIP"); print $6": "$4; fflush();}' diff --git a/meta-openembedded/meta-oe/recipes-support/re2/re2_2023.03.01.bb b/meta-openembedded/meta-oe/recipes-support/re2/re2_2023.03.01.bb index 78bf695a4a..fe210d5107 100644 --- a/meta-openembedded/meta-oe/recipes-support/re2/re2_2023.03.01.bb +++ b/meta-openembedded/meta-oe/recipes-support/re2/re2_2023.03.01.bb @@ -6,17 +6,27 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760" # tag 2023-03-01 SRCREV = "241e2e430836e80f93d704d1f06cd3e7fe3100f5" -SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https" +SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \ + " S = "${WORKDIR}/git" -inherit cmake +inherit cmake ptest +RDEPENDS:${PN}-ptest += "cmake sed" EXTRA_OECMAKE += " \ -DBUILD_SHARED_LIBS=ON \ - -DRE2_BUILD_TESTING=OFF \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-DRE2_BUILD_TESTING=ON', '-DRE2_BUILD_TESTING=OFF', d)} \ " +do_install_ptest () { + cp -r ${B}/*_test ${D}${PTEST_PATH} + cp -r ${B}/CTestTestfile.cmake ${D}${PTEST_PATH} + sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` + sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` +} + # ignore .so in /usr/lib64 FILES:${PN} = "${libdir}" INSANE_SKIP:${PN} += "dev-so" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.32.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.33.bb index 74c68a59d8..590f5089e5 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.32.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.33.bb @@ -25,7 +25,7 @@ DEPENDS = " \ DEPENDS:append:libc-musl = " libexecinfo" LDFLAGS:append:libc-musl = " -lexecinfo" -SRCREV = "4804f68f23045a38c3a7be46810fce14bac2fc3c" +SRCREV = "2c4e1479433e51418ecb6089f35182bfebc5b57e" SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/tio/tio_2.6.bb b/meta-openembedded/meta-oe/recipes-support/tio/tio_2.7.bb index faef290737..59c772b5d0 100644 --- a/meta-openembedded/meta-oe/recipes-support/tio/tio_2.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/tio/tio_2.7.bb @@ -7,7 +7,7 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=0e1a95b7892d3015ecd6d0016f601f2c" SRC_URI = "git://github.com/tio/tio;protocol=https;branch=master" -SRCREV = "88ef473362c5a1ff0dcd389fd5b1d4d6bf202472" +SRCREV = "1c32555c2a4f26b60f94757656825fc6684d6892" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch new file mode 100644 index 0000000000..727c5a32fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch @@ -0,0 +1,47 @@ +From b1b58f122a3e05b5689358fdd3203ba110cca567 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Sun, 24 Sep 2023 22:20:42 +0200 +Subject: [PATCH] Reproducibility fix + +This fixes: +WARNING: udisks2-2.10.1-r0 do_package_qa: QA Issue: File /usr/lib/udisks2/modules/libudisks2_btrfs.so in package udisks2 contains reference to TMPDIR +File /usr/lib/udisks2/modules/libudisks2_lvm2.so in package udisks2 contains reference to TMPDIR +File /usr/libexec/udisks2/udisksd in package udisks2 contains reference to TMPDIR [buildpaths] + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + modules/lvm2/Makefile.am | 2 +- + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/lvm2/Makefile.am b/modules/lvm2/Makefile.am +index 67b8aa6b3..e4ae462e7 100644 +--- a/modules/lvm2/Makefile.am ++++ b/modules/lvm2/Makefile.am +@@ -16,7 +16,7 @@ CPPFLAGS = \ + -DLVM_HELPER_DIR=\""$(prefix)/lib/udisks2/"\" \ + -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ + -DUDISKS_COMPILATION \ +- -DBUILD_DIR=\"$(abs_top_builddir)/\" \ ++ -DBUILD_DIR=\"/usr/src/\" \ + $(POLKIT_GOBJECT_1_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ +diff --git a/src/Makefile.am b/src/Makefile.am +index 5a174d1ab..0da3a497b 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -20,7 +20,7 @@ CPPFLAGS = \ + -DUDISKS_MODULE_DIR=\"$(libdir)/udisks2/modules\" \ + -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ + -DUDISKS_COMPILATION \ +- -DBUILD_DIR=\"$(abs_top_builddir)/\" \ ++ -DBUILD_DIR=\"/usr/src/\" \ + $(POLKIT_GOBJECT_1_CFLAGS) \ + $(GUDEV_CFLAGS) \ + $(GLIB_CFLAGS) \ +-- +2.42.0 + diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb index 2030063712..cb1cbe670d 100644 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.9.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb @@ -17,8 +17,11 @@ DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" RDEPENDS:${PN} = "acl" -SRC_URI = "git://github.com/storaged-project/udisks.git;branch=2.9.x-branch;protocol=https" -SRCREV = "001c486e6d099ed33e2de4f5c73c03e3ee180f81" +SRC_URI = " \ + git://github.com/storaged-project/udisks.git;branch=2.10.x-branch;protocol=https \ + file://0001-Makefile.am-Dont-include-buildpath.patch \ +" +SRCREV = "18c9faf089e306ad6f3f51f5cb887a6b9aa08350" S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" @@ -45,6 +48,7 @@ FILES:${PN} += " \ ${datadir}/dbus-1/ \ ${datadir}/polkit-1 \ ${datadir}/bash-completion \ + ${datadir}/zsh \ ${libdir}/polkit-1/extensions/*.so \ ${nonarch_base_libdir}/udev/* \ ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.12.bb index f193636524..5574cdb2a4 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.12.bb @@ -15,7 +15,7 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 file://Makefile.utils \ " -SRC_URI[sha256sum] = "0b1e6d8b7f87d017c7fae37f80586acff04f799ffc1d51e995954d6415dee371" +SRC_URI[sha256sum] = "d76634c6ccf62503726a5aeae6c78a3462474c51a0ebe4942591ccc2d939890a" S ?= "${WORKDIR}/vbox_module" S:task-patch = "${WORKDIR}/${VBOX_NAME}" diff --git a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch new file mode 100644 index 0000000000..c660baa1f7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch @@ -0,0 +1,21 @@ +clang/arm: Do not use MUST_TAIL_CALL + +This causes clang-17 to crash see [1] +this code is new in webkit 2.42[2] thats why we do not see the crash in older webkit + +[1] https://github.com/llvm/llvm-project/issues/67767 +[2] https://github.com/WebKit/WebKit/commit/4d816460b765acd8aef90ab474615850b91ecc35 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/Source/WTF/wtf/Compiler.h ++++ b/Source/WTF/wtf/Compiler.h +@@ -284,7 +284,7 @@ + /* MUST_TAIL_CALL */ + + #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute) +-#if __has_cpp_attribute(clang::musttail) ++#if __has_cpp_attribute(clang::musttail) && !defined(__arm__) + #define MUST_TAIL_CALL [[clang::musttail]] + #endif + #endif diff --git a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.0.bb b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.0.bb index 5f94d32ee4..f682cd9f03 100644 --- a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.0.bb @@ -13,6 +13,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ file://reproducibility.patch \ file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ + file://no-musttail-arm.patch \ " SRC_URI[sha256sum] = "828f95935861fae583fb8f2ae58cf64c63c178ae2b7c2d6f73070813ad64ed1b" @@ -86,6 +87,9 @@ EXTRA_OECMAKE = " \ ${@bb.utils.contains('GIDOCGEN_ENABLED', 'True', '-DENABLE_DOCUMENTATION=ON', '-DENABLE_DOCUMENTATION=OFF', d)} \ -DENABLE_MINIBROWSER=ON \ " +# Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the +# debug symbols (4.3GB to 700M at time of writing) +DEBUG_FLAGS:append = "${@oe.utils.vartrue('DEBUG_BUILD', '', ' -g1', d)}" # Javascript JIT is not supported on ARC EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.3.1.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.3.2.bb index 2961e449f1..27ebd63949 100644 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.3.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242" SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main" -SRCREV = "b462b1587f7d3aa782689430e83e96c737748f33" +SRCREV = "bdd6d6fc150d53d89658bebbfa73a7bfd9a89cb4" S = "${WORKDIR}/git" DEPENDS = "zstd" diff --git a/meta-openembedded/meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb b/meta-openembedded/meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb index ed7a3f06af..1bcfb0a9bf 100644 --- a/meta-openembedded/meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb +++ b/meta-openembedded/meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Linux firmware validation framework" DESCRIPTION = "Cukinia is designed to help Linux-based embedded firmware \ developers run simple system-level validation tests on their firmware." HOMEPAGE = "https://github.com/savoirfairelinux/cukinia" -LICENSE = "GPL-3.0-only & Apache-2.0" +LICENSE = "GPL-3.0-only | Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" diff --git a/meta-openembedded/meta-perl/README.md b/meta-openembedded/meta-perl/README.md index 13014b0ff3..756de02884 100644 --- a/meta-openembedded/meta-perl/README.md +++ b/meta-openembedded/meta-perl/README.md @@ -52,7 +52,7 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/openembedded-core - branch: master + branch: nanbield Adding the meta-perl layer to your build --------------------------------------- @@ -73,14 +73,13 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org with -'[meta-perl]' in the subject. +'[meta-perl][nanbield]' in the subject. When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-perl][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-perl][nanbield][PATCH' -Layer maintainers: - Hongxu Jia <hongxu.jia@windriver.com> - Tim "moto-timo" Orling <ticotimo@gmail.com> +Layer maintainers: Armin Kuster <akuster808@gmail.com> + License ------- diff --git a/meta-openembedded/meta-perl/conf/include/ptest-packagelists-meta-perl.inc b/meta-openembedded/meta-perl/conf/include/ptest-packagelists-meta-perl.inc index e27981de7e..bb6796f812 100644 --- a/meta-openembedded/meta-perl/conf/include/ptest-packagelists-meta-perl.inc +++ b/meta-openembedded/meta-perl/conf/include/ptest-packagelists-meta-perl.inc @@ -17,6 +17,7 @@ PTESTS_FAST_META_PERL = "\ libstrictures-perl \ libterm-readkey-perl \ libtest-nowarnings-perl \ + libtext-diff-perl \ " PTESTS_SLOW_META_PERL = "\ diff --git a/meta-openembedded/meta-perl/files/static-group-meta-perl b/meta-openembedded/meta-perl/files/static-group-meta-perl new file mode 100644 index 0000000000..7dd58bbbda --- /dev/null +++ b/meta-openembedded/meta-perl/files/static-group-meta-perl @@ -0,0 +1 @@ +logcheck:x:670:
\ No newline at end of file diff --git a/meta-openembedded/meta-perl/files/static-passwd-meta-perl b/meta-openembedded/meta-perl/files/static-passwd-meta-perl new file mode 100644 index 0000000000..7b3591ac50 --- /dev/null +++ b/meta-openembedded/meta-perl/files/static-passwd-meta-perl @@ -0,0 +1 @@ +logcheck:x:670:670::/:/bin/nologin
\ No newline at end of file diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-base.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-base.bb deleted file mode 100644 index 2af10b218c..0000000000 --- a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-base.bb +++ /dev/null @@ -1,7 +0,0 @@ -SUMMARY = "meta-perl build test image" - -IMAGE_INSTALL = "packagegroup-core-boot" - -LICENSE = "MIT" - -inherit core-image diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-all.bb index b8d3a76e6a..c46cba21cd 100644 --- a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image.bb +++ b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-all.bb @@ -1,4 +1,4 @@ -require meta-perl-base.bb +require recipes-core/images/core-image-base.bb SUMMARY = "meta-perl build test image" diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb index 236043c22a..e2cafa98a5 100644 --- a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb +++ b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb @@ -12,9 +12,9 @@ require conf/include/ptest-packagelists-meta-perl.inc PTESTS_META_PERL = "${PTESTS_FAST_META_PERL} ${PTESTS_SLOW_META_PERL}" do_testimage[noexec] = "1" -do_testimage[depends] = "${@' '.join(['meta-perl-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PERL').split()])}" +do_testimage[depends] = "${@' '.join(['meta-perl-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PERL').split()])}" -do_build[depends] = "${@' '.join(['meta-perl-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_PERL').split()])}" +do_build[depends] = "${@' '.join(['meta-perl-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_PERL').split()])}" # normally image.bbclass would do this EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-fast.bb index 5d8afa08e7..1ac78f30b7 100644 --- a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb +++ b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-fast.bb @@ -1,4 +1,4 @@ -require meta-perl-ptest-all-image.bb +require meta-perl-image-ptest-all.bb DESCRIPTION = "Recipe to trigger execution of all fast meta-perl ptest images." diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-image.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest.bb index 7cca6402b2..7905977828 100644 --- a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-ptest-image.bb +++ b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest.bb @@ -1,10 +1,9 @@ inherit features_check REQUIRED_DISTRO_FEATURES += "ptest" -require meta-perl-base.bb - SUMMARY = "meta-perl build ptest image" +require recipes-core/images/core-image-minimal.bb require conf/include/ptest-packagelists-meta-perl.inc DESCRIPTION += "Also including the ${MCNAME} ptest package." diff --git a/meta-openembedded/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb b/meta-openembedded/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb index 187424b449..2672ab584a 100644 --- a/meta-openembedded/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb +++ b/meta-openembedded/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb @@ -79,7 +79,6 @@ RDEPENDS:packagegroup-meta-perl = "\ libtest-nowarnings-perl \ libtest-warn-perl \ libunicode-linebreak-perl \ - po4a \ " RDEPENDS:packagegroup-meta-perl-extended = "\ diff --git a/meta-openembedded/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb b/meta-openembedded/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb index 5db0bb4269..5c3701f16b 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libconfig/libconfig-autoconf-perl_0.319.bb @@ -38,4 +38,4 @@ S = "${WORKDIR}/Config-AutoConf-${PV}" inherit cpan ptest-perl -BBCLASSEXTEND = "native nativesdk" +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.083.bb b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.083.bb index 8ae5c0e68d..028d9e9163 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.083.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.083.bb @@ -38,7 +38,7 @@ do_install:append () { } RDEPENDS:${PN}-ptest += "\ - libnet-libidn-perl \ + libnet-idn-encode \ liburi-perl \ perl-module-file-glob \ perl-module-findbin \ @@ -52,5 +52,3 @@ RDEPENDS:${PN}-ptest += "\ do_install_ptest:append () { cp -r ${B}/t/certs ${D}${PTEST_PATH} } - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.40.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.40.bb index 65616136c3..e30125ab7b 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.40.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.40.bb @@ -62,4 +62,3 @@ python __anonymous () { d.getVar('TCLIBC')) } -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-idn-encode/Net-IDN-Encode-2.500-use_uvchr_to_utf8_flags_instead_of_uvuni_to_utf8_flags.patch b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-idn-encode/Net-IDN-Encode-2.500-use_uvchr_to_utf8_flags_instead_of_uvuni_to_utf8_flags.patch new file mode 100644 index 0000000000..f0e9010bf4 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-idn-encode/Net-IDN-Encode-2.500-use_uvchr_to_utf8_flags_instead_of_uvuni_to_utf8_flags.patch @@ -0,0 +1,36 @@ +Subject: [PATCH] use uvchr_to_utf8_flags instead of uvuni_to_utf8_flags (which is removed in perl 5.38.0) + +https://perldoc.perl.org/5.36.0/perlintern#uvuni_to_utf8_flags +Signed-off-by: Shin Kojima <shin@kojima.org> +Upstream-Status: Submitted [https://github.com/cfaerber/Net-IDN-Encode/pull/11] +--- + lib/Net/IDN/Punycode.xs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/lib/Net/IDN/Punycode.xs b/lib/Net/IDN/Punycode.xs +index 211ef9c..36530dd 100644 +--- a/lib/Net/IDN/Punycode.xs ++++ b/lib/Net/IDN/Punycode.xs +@@ -24,6 +24,10 @@ + #define utf8_to_uvchr_buf(in_p,in_e,u8) utf8_to_uvchr(in_p,u8); + #endif + ++#ifndef uvchr_to_utf8_flags ++#define uvchr_to_utf8_flags(d, uv, flags) uvuni_to_utf8_flags(d, uv, flags); ++#endif ++ + static char enc_digit[BASE] = { + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', + 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', +@@ -253,7 +257,7 @@ decode_punycode(input) + if(skip_p < re_p) /* move succeeding chars */ + Move(skip_p, skip_p + u8, re_p - skip_p, char); + re_p += u8; +- uvuni_to_utf8_flags((U8*)skip_p, n, UNICODE_ALLOW_ANY); ++ uvchr_to_utf8_flags((U8*)skip_p, n, UNICODE_ALLOW_ANY); + } + + if(!first) SvUTF8_on(RETVAL); /* UTF-8 chars have been inserted */ +-- +2.41.0 + diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-idn-encode_2.500.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-idn-encode_2.500.bb new file mode 100644 index 0000000000..7f33fd2b1f --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-idn-encode_2.500.bb @@ -0,0 +1,25 @@ +SUMMARY = "IDN Perl module" +DESCRIPTION = "This module provides an easy-to-use interface for encoding \ + and decoding Internationalized Domain Names (IDNs)." + +SECTION = "libs" + +LICENSE = "Artistic-1.0 | GPL-1.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8ea5704cf65ca4ec6e9e167fb94f14dd" + +SRC_URI = "${CPAN_MIRROR}/authors/id/C/CF/CFAERBER/Net-IDN-Encode-${PV}.tar.gz \ + file://Net-IDN-Encode-2.500-use_uvchr_to_utf8_flags_instead_of_uvuni_to_utf8_flags.patch \ +" +SRC_URI[sha256sum] = "55453633e3ff24ce325b34bc2c8157b9859962a31ab5cf28bf7ccc1c9b3a3eaa" + +S = "${WORKDIR}/Net-IDN-Encode-${PV}" + +inherit cpan ptest-perl + +do_configure:prepend() { + perl -pi -e 's/auto_install_now.*//g' Makefile.PL +} + +BBCLASSEXTEND = "native" + +RDEPENDS:${PN} += "perl-module-unicode-normalize perl-module-encode-encoding" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.68.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.68.bb index dcc5ea88b1..a77381dce8 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.68.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.68.bb @@ -41,5 +41,3 @@ RDEPENDS:${PN}-ptest += " \ perl-module-perlio \ perl-module-test-more \ " - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb b/meta-openembedded/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb index c568ade997..cf290d9908 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libstatgrab/libunix-statgrab_0.112.bb @@ -37,4 +37,3 @@ export LD = "${CCLD}" inherit cpan pkgconfig ptest-perl -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-diff-perl/run-ptest b/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-diff-perl/run-ptest new file mode 100644 index 0000000000..c65b6cf8e0 --- /dev/null +++ b/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-diff-perl/run-ptest @@ -0,0 +1,19 @@ +#!/bin/sh + +for case in `find t -type f -name '*.t'`; do + perl $case >$case.output 2>&1 + ret=$? + cat $case.output + if [ $ret -ne 0 ]; then + echo "FAIL: ${case%.t}" + elif grep -i 'SKIP' $case.output; then + echo "SKIP: ${case%.t}" + else + echo "PASS: ${case%.t}" + fi + + rm -f $case.output +done + + + diff --git a/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-diff-perl_1.41.bb b/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-diff-perl_1.41.bb index afdf63ede4..9dfadde8e5 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-diff-perl_1.41.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-diff-perl_1.41.bb @@ -11,17 +11,24 @@ HOMEPAGE = "http://search.cpan.org/~ovid/Text-Diff/" LICENSE = "Artistic-1.0 | GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=385c55653886acac3821999a3ccd17b3" -SRC_URI = "${CPAN_MIRROR}/authors/id/O/OV/OVID/Text-Diff-${PV}.tar.gz" +SRC_URI = "${CPAN_MIRROR}/authors/id/O/OV/OVID/Text-Diff-${PV}.tar.gz \ + file://run-ptest \ + " SRC_URI[md5sum] = "30d56e6dd5551ca16b8e16cc7299dc21" SRC_URI[sha256sum] = "a67f50a48e313c1680cc662109ce5f913ea71454db355d0cf4db87ac89d2d2fa" S = "${WORKDIR}/Text-Diff-${PV}" -inherit cpan +inherit cpan ptest +RDEPENDS:${PN}-ptest += "perl-module-test perl-module-test-more" RDEPENDS:${PN} = " libalgorithm-diff-perl \ perl-module-extutils-makemaker \ perl-module-exporter \ " +do_install_ptest () { + cp -r ${B}/t ${D}${PTEST_PATH} +} + BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/po4a/po4a_0.49.bb b/meta-openembedded/meta-perl/recipes-perl/po4a/po4a_0.49.bb deleted file mode 100644 index 679ea0fb44..0000000000 --- a/meta-openembedded/meta-perl/recipes-perl/po4a/po4a_0.49.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "PO for anything" -DESCRIPTION = "The po4a (PO for anything) project goal is to ease translations \ -(and more interestingly, the maintenance of translations) using gettext tools \ -on areas where they were not expected like documentation." -HOMEPAGE = "https://po4a.alioth.debian.org" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=a96fc9b4cc36d80659e694ea109f0325" - -SRC_URI = "git://github.com/mquinson/po4a.git;protocol=https;branch=master" - -# v0.49 -SRCREV = "79ed87a577a543538fe39c7b60079981f5997072" - -S = "${WORKDIR}/git" - -DEPENDS = " \ - libmodule-build-perl-native \ - libtext-wrapi18n-perl \ - libterm-readkey-perl \ - liblocale-gettext-perl \ - libunicode-linebreak-perl \ -" - -RRECOMMENDS:${PN} = " \ - libtext-wrapi18n-perl \ - libterm-readkey-perl \ - liblocale-gettext-perl \ - libunicode-linebreak-perl \ -" - -inherit cpan_build - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/README.md b/meta-openembedded/meta-python/README.md index 36c193957c..6118f2c40a 100644 --- a/meta-openembedded/meta-python/README.md +++ b/meta-openembedded/meta-python/README.md @@ -13,11 +13,11 @@ The meta-python layer depends on: URI: git://git.openembedded.org/openembedded-core layers: meta - branch: master + branch: nanbield URI: git://git.openembedded.org/meta-openembedded layers: meta-oe - branch: master + branch: nanbield Contributing ------------------------- @@ -28,14 +28,12 @@ comments and patch review. It is subscriber only, so please register before posting. Send pull requests to openembedded-devel@lists.openembedded.org with -'[meta-python]' in the subject. +'[meta-python][nanbield]' in the subject. When sending single patches, please use something like: -git send-email -M -1 --to=openembedded-devel@lists.openembedded.org --subject-prefix='meta-python][PATCH' +git send-email -M -1 --to=openembedded-devel@lists.openembedded.org --subject-prefix='meta-python][nanbield][PATCH' Maintenance ------------------------- -Layer maintainers: - Tim "moto-timo" Orling <TicoTimo@gmail.com> - Derek Straka <derek@asterius.io> +Layer maintainers: Armin Kuster <akuster808@gmail.com> diff --git a/meta-openembedded/meta-python/conf/include/ptest-packagelists-meta-python.inc b/meta-openembedded/meta-python/conf/include/ptest-packagelists-meta-python.inc index c4a752ae61..3272d98192 100644 --- a/meta-openembedded/meta-python/conf/include/ptest-packagelists-meta-python.inc +++ b/meta-openembedded/meta-python/conf/include/ptest-packagelists-meta-python.inc @@ -29,10 +29,13 @@ PTESTS_FAST_META_PYTHON = "\ python3-prettytable \ python3-pylint \ python3-ptyprocess \ + python3-py-cpuinfo \ python3-pyasn1-modules \ python3-pyroute2 \ python3-pyserial \ + python3-pytest-mock \ python3-pytoml \ + python3-rapidjson \ python3-requests-file \ python3-requests-toolbelt \ python3-semver \ @@ -70,9 +73,7 @@ PTESTS_PROBLEMS_META_PYTHON ="\ python3-parse \ python3-pillow \ python3-pint \ - python3-py-cpuinfo \ python3-pytest-lazy-fixture \ - python3-pytest-mock \ python3-pyzmq \ python3-scrypt \ python3-service-identity \ diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb index 9bb3053885..63065e00ba 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.16.0.bb @@ -17,4 +17,4 @@ RDEPENDS:${PN} += "\ python3-threading \ " -BBCLASSEXTEND = "native nativesdk" +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-image.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-all.bb index 6353d389b5..fbe3efc600 100644 --- a/meta-openembedded/meta-python/recipes-core/images/meta-python-image.bb +++ b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-all.bb @@ -1,4 +1,4 @@ -require meta-python-image-base.bb +require recipes-core/images/core-image-base.bb SUMMARY = "meta-python build test image" diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-base.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-base.bb deleted file mode 100644 index 81081e61b2..0000000000 --- a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-base.bb +++ /dev/null @@ -1,7 +0,0 @@ -SUMMARY = "meta-python build test image" - -IMAGE_INSTALL = "packagegroup-core-boot" - -LICENSE = "MIT" - -inherit core-image diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-all-image.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-all.bb index fd4dc42487..56c392f036 100644 --- a/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-all-image.bb +++ b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-all.bb @@ -12,9 +12,9 @@ require conf/include/ptest-packagelists-meta-python.inc PTESTS_META_PYTHON = "${PTESTS_FAST_META_PYTHON} ${PTESTS_SLOW_META_PYTHON}" do_testimage[noexec] = "1" -do_testimage[depends] = "${@' '.join(['meta-python-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PYTHON').split()])}" +do_testimage[depends] = "${@' '.join(['meta-python-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PYTHON').split()])}" -do_build[depends] = "${@' '.join(['meta-python-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_PYTHON').split()])}" +do_build[depends] = "${@' '.join(['meta-python-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_PYTHON').split()])}" # normally image.bbclass would do this EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-fast-image.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-fast.bb index 4f93a15959..bb6e8213fe 100644 --- a/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-fast-image.bb +++ b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-fast.bb @@ -1,4 +1,4 @@ -require meta-python-ptest-all-image.bb +require meta-python-image-ptest-all.bb DESCRIPTION = "Recipe to trigger execution of all fast meta-python ptest images." diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-image.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest.bb index a649cbb94c..fed676c42e 100644 --- a/meta-openembedded/meta-python/recipes-core/images/meta-python-ptest-image.bb +++ b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest.bb @@ -1,10 +1,9 @@ inherit features_check REQUIRED_DISTRO_FEATURES = "ptest" +require recipes-core/images/core-image-minimal.bb require conf/include/ptest-packagelists-meta-python.inc -require meta-python-image-base.bb - SUMMARY = "meta-python ptest test image" DESCRIPTION += "Also including the ${MCNAME} ptest package." diff --git a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index f75007e13e..3b9a0f0481 100644 --- a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -360,7 +360,6 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-python-vlc \ python3-pytoml \ python3-pytun \ - python3-pytz-deprecation-shim \ python3-pyudev \ python3-pyusb \ python3-pywbem \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-idna-ssl.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-idna-ssl.inc deleted file mode 100644 index 356a3873ee..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-idna-ssl.inc +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Patch ssl.match_hostname for Unicode(idna) domains support" -HOMEPAGE = "https://github.com/aio-libs/idna-ssl" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a61b9c5aec8796b64a6bf15d42605073" - -SRC_URI[md5sum] = "dd44ec53bac36e68446766fd8d3835bd" -SRC_URI[sha256sum] = "a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c" - -PYPI_PACKAGE = "idna-ssl" -inherit pypi - -RDEPENDS:${PN} += " \ - python3-idna \ - python3-io \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiodns_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiodns_3.1.1.bb index 64599d43c3..5c685d7e40 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiodns_3.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiodns_3.1.1.bb @@ -4,8 +4,7 @@ HOMEPAGE = "https://github.com/saghul/aiodns" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a565d8b5d06b9620968a135a2657b093" -SRC_URI[md5sum] = "181e11935c78965de2b2b7b0e5efba8d" -SRC_URI[sha256sum] = "946bdfabe743fceeeb093c8a010f5d1645f708a241be849e17edfb0e49e08cd6" +SRC_URI[sha256sum] = "1073eac48185f7a4150cad7f96a5192d6911f12b4fb894de80a088508c9b3a99" PYPI_PACKAGE = "aiodns" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.5.1.bb index 68cbb265f4..4c4ed3ffd9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.5.1.bb @@ -11,5 +11,3 @@ RDEPENDS:${PN} += " \ ${PYTHON_PN}-jinja2 \ ${PYTHON_PN}-aiohttp \ " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.8.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.8.6.bb index d04279ed97..f8ca9a4739 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.8.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.8.6.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=748073912af33aa59430d3702aa32d41" -SRC_URI[sha256sum] = "b9552ec52cc147dbf1944ac7ac98af7602e51ea2dcd076ed194ca3c0d1c7d0bc" +SRC_URI[sha256sum] = "b0cf2a4501bff9330a8a5248b4ce951851e415bdcce9dc158e76cfd55e15085c" PYPI_PACKAGE = "aiohttp" inherit python_setuptools_build_meta pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-apiflask_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-apiflask_2.0.2.bb index ad946470ea..88afdda717 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-apiflask_2.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-apiflask_2.0.2.bb @@ -7,7 +7,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "APIFlask" -SRC_URI[sha256sum] = "7ffe29e082c6cc76d8ae78ba2445b5fcd69092fac04f4f8cd23b1c887cb291cc" +SRC_URI[sha256sum] = "c1ab81640a1ab252888e2cc7ae556272a169b449c582abae309a8fe295f9337d" RDEPENDS:${PN} += "\ python3-flask \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.29.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.29.4.bb index 93e0a84eea..f67ac9d6c6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.29.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.29.4.bb @@ -14,7 +14,7 @@ LICENSE = "LGPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ file://README.rst;beginline=261;endline=275;md5=a8bf3475df7e0d575a53d04c83d5e090" -SRC_URI[sha256sum] = "58e438ce9169aaa2e6de147e3ceb34ceacfe26556a2306f50e2d46f52779acb1" +SRC_URI[sha256sum] = "695c0ae4534270cae2697841b4a56f434a990694a00264ea10ebbbcdc02c13f7" inherit pypi python_flit_core diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-arrow_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-arrow_1.3.0.bb new file mode 100644 index 0000000000..ec49d04eb9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-arrow_1.3.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Better dates and times for Python" +HOMEPAGE = "https://github.com/crsmithdev/arrow" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=14a2e29a9d542fb9052d75344d67619d" + +SRC_URI[sha256sum] = "d4540617648cb5f895730f1ad8c82a65f2dad0166f57b75f3ca54759c4d67a85" + +inherit setuptools3 pypi + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-dateutil \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.15.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.0.1.bb index 7325eb13f3..db3ef43920 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.15.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.0.1.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" -SRC_URI[sha256sum] = "903f024859b7c7687d7a7f3a3f73b17301f8e42dfd9cc9df9d4418172d3e2dbd" +SRC_URI[sha256sum] = "86b0bb7d7da0be1a7c4aedb7974e391b32d4ed89e33de6ed6902b4b15c97577e" inherit pypi python_setuptools_build_meta @@ -27,9 +27,12 @@ RDEPENDS:${PN}:class-target += "\ ${PYTHON_PN}-six \ ${PYTHON_PN}-wrapt \ ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-typing-extensions \ " RDEPENDS:${PN}-tests:class-target += "\ ${PYTHON_PN}-unittest \ ${PYTHON_PN}-xml \ " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-async-timeout_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-async-timeout_4.0.0.bb deleted file mode 100644 index ca61490fac..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-async-timeout_4.0.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "asyncio-compatible timeout context manager" -DESCRIPTION = "\ -The context manager is useful in cases when you want to apply \ -timeout logic around block of code or in cases when asyncio.wait_for() \ -is not suitable. Also it's much faster than asyncio.wait_for() because \ -timeout doesn't create a new task." -HOMEPAGE = "https://github.com/aio-libs/async-timeout" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4fa41f15bb5f23b6d3560c5845eb8d57" - -SRC_URI[sha256sum] = "7d87a4e8adba8ededb52e579ce6bc8276985888913620c935094c2276fd83382" - -PYPI_PACKAGE = "async-timeout" -inherit pypi setuptools3 - -RDEPENDS:${PN} = "\ - ${PYTHON_PN}-asyncio \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.6.2.bb index 54c8f23fc3..42a8e0e7b5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.6.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.6.2.bb @@ -19,5 +19,3 @@ RDEPENDS:${PN} += " \ ${PYTHON_PN}-txaio \ ${PYTHON_PN}-six \ " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.5.bb index bccdf284e5..ede7f92e8d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.5.bb @@ -17,5 +17,3 @@ RDEPENDS:${PN} += "\ python3-six \ python3-stevedore \ " - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.8.2.bb index cb94df5644..39d2b6a717 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.8.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray" LICENSE = "PSF-2.0" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" -SRC_URI[sha256sum] = "e68ceef35a88625d16169550768fcc8d3894913e363c24ecbf6b8c07eb02c8f3" +SRC_URI[sha256sum] = "f90b2f44b5b23364d5fbade2c34652e15b1fcfe813c46f828e008f68a709160f" inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.17.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.18.0.bb index d1d30cdb3c..ee1ecd66b1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.17.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.18.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/bitstruct" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" -SRC_URI[sha256sum] = "eb94b40e4218a23aa8f90406b836a9e6ed83e48b8d112ce3f96408463bd1b874" +SRC_URI[sha256sum] = "91865b210a4bfa86817537c0d934fac97fe671717f08665dc134551cfed3be13" PYPI_PACKAGE = "bitstruct" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker_1.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker_1.6.3.bb index b0728e66cd..4f0dead703 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker_1.6.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker_1.6.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Fast, simple object-to-object and broadcast signaling." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=42cd19c88fc13d1307a4efd64ee90e4e" -SRC_URI[sha256sum] = "4afd3de66ef3a9f8067559fb7a1cbe555c17dcbe15971b05d1b625c3e7abe213" +SRC_URI[sha256sum] = "152090d27c1c5c722ee7e48504b02d76502811ce02e1523553b4cf8c8b3d3a8d" inherit pypi python_setuptools_build_meta ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-booleanpy_4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-booleanpy_4.0.bb deleted file mode 100644 index 41fd3d960a..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-booleanpy_4.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Define boolean algebras, create and parse boolean expressions and create custom boolean DSL" -HOMEPAGE = "https://github.com/bastikr/boolean.py" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d118b5feceee598ebeca76e13395c2bd" - -SRC_URI[sha256sum] = "17b9a181630e43dde1851d42bef546d616d5d9b4480357514597e78b203d06e4" - -PYPI_PACKAGE = "boolean.py" - -inherit pypi setuptools3 - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachecontrol_0.13.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachecontrol_0.13.1.bb index 535bac0e3e..b4c90bcffd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachecontrol_0.13.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachecontrol_0.13.1.bb @@ -7,6 +7,9 @@ SRC_URI[sha256sum] = "f012366b79d2243a6118309ce73151bf52a38d4a5dac8ea57f09bd2908 inherit pypi python_poetry_core +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/CacheControl/" +UPSTREAM_CHECK_REGEX = "/CacheControl/(?P<pver>(\d+[\.\-_]*)+)" + RDEPENDS:${PN} += "\ python3-crypt \ python3-datetime \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-can_4.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-can_4.2.2.bb index f3cfd17244..9ca926d66c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-can_4.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-can_4.2.2.bb @@ -27,5 +27,3 @@ RDEPENDS:${PN} += " \ python3-typing-extensions \ python3-wrapt \ " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_3.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_3.3.0.bb index 0c2810c62a..8502be7b4e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_3.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_3.3.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/ousret/charset_normalizer" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=0974a390827087287db39928f7c524b5" -SRC_URI[sha256sum] = "3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace" +SRC_URI[sha256sum] = "63563193aec44bce707e0c5ca64ff69fa72ed7cf34ce6e11d5127555756fd2f6" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-click/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-click/run-ptest deleted file mode 100644 index b63c4de0d9..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-click/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.1.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.1.7.bb deleted file mode 100644 index a4ec6cd1ef..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-click_8.1.7.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "A simple wrapper around optparse for powerful command line utilities." -DESCRIPTION = "\ -Click is a Python package for creating beautiful command line interfaces \ -in a composable way with as little code as necessary. It's the "Command \ -Line Interface Creation Kit". It's highly configurable but comes with \ -sensible defaults out of the box." -HOMEPAGE = "http://click.pocoo.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=1fa98232fd645608937a0fdc82e999b8" - -SRC_URI[sha256sum] = "ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" - -inherit pypi setuptools3 ptest - -SRC_URI += "file://run-ptest" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-unixadmin \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - cp -rf ${S}/setup.cfg ${D}${PTEST_PATH}/ - cp -rf ${S}/docs ${D}${PTEST_PATH}/ -} - -UPSTREAM_CHECK_REGEX = "click/(?P<pver>\d+(\.\d+)+)/" - -CLEANBROKEN = "1" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-threading \ - " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmake_3.27.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmake_3.27.7.bb index ad58c6d1d9..b613fd3a19 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmake_3.27.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmake_3.27.7.bb @@ -11,7 +11,7 @@ PYPI_PACKAGE = "cmake" PYPI_ARCHIVE_NAME_PREFIX = "pypi-" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "101d4e56154658c974e9425acd31f0fedde3ce68b47263fd14f789b028f8a13a" +SRC_URI[sha256sum] = "9f4a7c7be2a25de5901f045618f41b833ea6c0f647115201d38e4fdf7e2815bc" SRC_URI += " \ file://CMakeLists.txt \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-covdefaults_2.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-covdefaults_2.3.0.bb index b7709aa1ca..a0ef2af828 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-covdefaults_2.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-covdefaults_2.3.0.bb @@ -27,5 +27,3 @@ do_install_ptest() { install -d ${D}${PTEST_PATH} cp -rf ${S}/tests ${D}${PTEST_PATH} } - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.3.2.bb index 636b7377a3..12496b03d4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.3.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://coverage.readthedocs.io" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI[sha256sum] = "6cb7fe1581deb67b782c153136541e20901aa312ceedaf1467dcb35255787952" +SRC_URI[sha256sum] = "be32ad29341b0170e795ca590e1c07e81fc061cb5b10c74ce7203491484404ef" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_2.0.1.bb index e9f84eb9e5..7f418b063f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_2.0.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b8ee59850b882cbf623188489ea748e2" PYPI_PACKAGE = "croniter" -SRC_URI[sha256sum] = "1a6df60eacec3b7a0aa52a8f2ef251ae3dd2a7c7c8b9874e73e791636d55a361" +SRC_URI[sha256sum] = "d199b2ec3ea5e82988d1f72022433c5f9302b3b3ea9e6bfd6a1518f6ea5e700a" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-fast_1.85.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-fast_2.12.0.bb index 6e1b599351..05502e223b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-fast_1.85.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-fast_2.12.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/bluetooth-devices/dbus-fast" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=729e372b5ea0168438e4fd4a00a04947" -SRC_URI[sha256sum] = "af346e87e34fa52c7ae82d117303cbfe089cd5391b5a1cc0e51f67066ef426f5" +SRC_URI[sha256sum] = "849478e11d251fa4ebb99ce5bfee332cb6383c63ef0bc97bae23cef4e0badf9c" PYPI_PACKAGE = "dbus_fast" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.7.bb index b6b788110d..673964f3b7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.7.bb @@ -15,3 +15,5 @@ RDEPENDS:${PN} += "\ ${PYTHON_PN}-profile \ ${PYTHON_PN}-core \ " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_2.0.0.bb index 2350c4d758..74e08b82ce 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_1.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_2.0.0.bb @@ -3,7 +3,7 @@ SECTION = "devel/python" LICENSE = "CC0-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032" -SRC_URI[sha256sum] = "d178c5c6fa6c6824e9b04f199cf23e79ac15756786573c190d2ad13089411ad2" +SRC_URI[sha256sum] = "f4904f4145c11f8de5897afbb8d7db4b465c57f13db1c8c106c16d02bceebd9a" PYPI_PACKAGE = "email_validator" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.8.0.bb index 0ef64268a7..1cc79f1a9b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.7.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.8.0.bb @@ -17,4 +17,4 @@ RDEPENDS:${PN} += " \ python3-asyncio \ " -SRC_URI[sha256sum] = "a8422e345cd9a21451303380b160742ff02197975b1c3a02cef115febe2b1b20" +SRC_URI[sha256sum] = "2a32585d8fecd0118264fe0c39788670456ca9aa466d7c026d995cfff68af164" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-abi_3.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-abi_4.2.1.bb index 3d8a67ba56..c01860acd7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-abi_3.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-abi_4.2.1.bb @@ -2,9 +2,9 @@ SUMMARY = "Python utilities for working with Ethereum ABI definitions, especiall HOMEPAGE = "https://github.com/ethereum/eth-abi" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bf9691ead96f1163622689e47ce3f366" +LIC_FILES_CHKSUM = "file://LICENSE;md5=731f4de9c79bfeba6d8d55f83d0d2423" -SRC_URI[sha256sum] = "c3872e3ac1e9ef3f8c6599aaca4ee536d536eefca63a6892ab937f0560edb656" +SRC_URI[sha256sum] = "60d88788d53725794cdb07c0f0bb0df2a31a6e1ad19644313fe6117ac24eeeb0" PYPI_PACKAGE = "eth_abi" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_3.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_3.5.0.bb index a1594fbf54..6a8bec7a54 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_3.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_3.5.0.bb @@ -4,6 +4,6 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3d7bdfe69b1ffbde073ca6e96f5c53f7" -SRC_URI[sha256sum] = "7f49610469811ee97ac43eaf6baa294778ce74042d41e61ecf22e5ebe385590f" +SRC_URI[sha256sum] = "a92f6896896752143a4704c57441eedf7b1f65d5df4b1c20cb802bb4aa602d7e" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-utils_2.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-utils_2.2.2.bb index bace620eef..839e8cd9a1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-utils_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-utils_2.2.2.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6749008d847c14b9718949c2e24d5c0a" -SRC_URI[sha256sum] = "f79a95f86dd991344697c763db40271dbe43fbbcd5776f49b0c4fb7b645ee1c4" +SRC_URI[sha256sum] = "5ca6265177ce544d9d43cdf2272ae2227e5d6d9529c270bbb707d17339087101" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-executing_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-executing_2.0.0.bb index 89f935c672..4c4fd45166 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-executing_1.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-executing_2.0.0.bb @@ -6,4 +6,4 @@ DEPENDS = "python3-setuptools-scm-native" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "19da64c18d2d851112f09c287f8d3dbbdf725ab0e569077efb6cdcbd3497c107" +SRC_URI[sha256sum] = "0ff053696fdeef426cda5bd18eacd94f82c91f49823a2e9090124212ceea9b08" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_4.0.0.bb index 657c190ec5..4d8aee532c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_2.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_4.0.0.bb @@ -2,12 +2,11 @@ DESCRIPTION = "i18n and l10n support for Flask based on babel and pytz" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=51917f3e8e858f5ae295a7d0e2eb3cc9" -SRC_URI[md5sum] = "50d5e92d96ef58787bf85b5a1b0a5567" -SRC_URI[sha256sum] = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d" +SRC_URI[sha256sum] = "dbeab4027a3f4a87678a11686496e98e1492eb793cbdd77ab50f4e9a2602a593" -PYPI_PACKAGE = "Flask-Babel" +PYPI_PACKAGE = "flask_babel" -inherit pypi setuptools3 +inherit pypi python_poetry_core RDEPENDS:${PN} += "\ ${PYTHON_PN}-speaklater \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb new file mode 100644 index 0000000000..1d0d86b4e7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb @@ -0,0 +1,16 @@ +HOMEPAGE = "https://pypi.python.org/pypi/Flask-Cors/" +SUMMARY = "A Flask extension adding a decorator for CORS support" +DESCRIPTION = "\ + A Flask extension for handling Cross Origin Resource Sharing (CORS), making cross-origin AJAX possible \ + " +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=118fecaa576ab51c1520f95e98db61ce" + +PYPI_PACKAGE = "Flask-Cors" + +SRC_URI[sha256sum] = "f268522fcb2f73e2ecdde1ef45e2fd5c71cc48fe03cffb4b441c6d1b40684eb0" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-flask" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-jwt-extended_4.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-jwt-extended_4.5.3.bb index f55d771745..d5438f11a8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-jwt-extended_4.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-jwt-extended_4.5.3.bb @@ -7,7 +7,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "Flask-JWT-Extended" -SRC_URI[sha256sum] = "ba56245ba43b71c8ae936784b867625dce8b9956faeedec2953222e57942fb0b" +SRC_URI[sha256sum] = "061ef3d25ed5743babe4964ab38f36d870e6d2fd8a126bab5d77ddef8a01932b" RDEPENDS:${PN} += "\ python3-werkzeug \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.3.3.bb index c4c1ff7dec..c8c8d870ac 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_2.3.3.bb @@ -6,9 +6,7 @@ HOMEPAGE = "https://github.com/mitsuhiko/flask/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[sha256sum] = "8c2f9abd47a9e8df7f0c3f091ce9497d011dc3b31effcf4c85a6e2b50f4114ef" - -PYPI_PACKAGE = "Flask" +SRC_URI[sha256sum] = "09c347a92aa7ff4a8e7f3206795f30d826654baf38b873d0744cd571ca609efc" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-git-pw_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-git-pw_2.5.0.bb new file mode 100644 index 0000000000..d060a922b7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-git-pw_2.5.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "A tool for integrating Git with Patchwork" +HOMEPAGE = "https://github.com/getpatchwork/git-pw" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=26e1a171d943c64f00c51f90c256b9d4" + +SRC_URI[sha256sum] = "c60169f9566bd6710f9c0985a005a0c326460b739d3f2b5c5c71e85211584590" + +inherit pypi python_setuptools_build_meta + +DEPENDS += " \ + python3-pbr-native \ +" + +RDEPENDS:${PN} += " \ + python3-arrow \ + python3-click \ + python3-pyyaml \ + python3-requests \ + python3-tabulate \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.12.0.bb index de2bd3d12d..28c6a7989c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.11.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.12.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit pypi setuptools3 -SRC_URI[sha256sum] = "25d29e05a0058ed5f19c61c0a78b1b53adea4d9364b464d014fbda941f6d1c9a" +SRC_URI[sha256sum] = "c22e01b1e3c4dcd90998494879612c38d0a3411d1f7b679eb89e2abe3ce1f553" RDEPENDS:${PN} += "\ ${PYTHON_PN}-asyncio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.100.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.104.0.bb index 1c6253a83a..34600f0f31 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.100.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.104.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "eaed50efc2f8a4027dcca8fd0037f4b1b03b8093efc84ce3cb6c75bfc79a7e31" +SRC_URI[sha256sum] = "bbc66520e7fe9417b93fd113f2a0a1afa789d686de9009b6e94e48fdea50a60f" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.23.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.23.3.bb index f7fb76b3f6..e5433b0839 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.23.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.23.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit pypi setuptools3 -SRC_URI[sha256sum] = "753a26312e6f1eaeec20bc6f2644a10926697da93446e1f8e24d6d32d45a922a" +SRC_URI[sha256sum] = "6864247895eea5d13b9c57c9e03abb49cb94ce2dc7c58e91cba3248c7477c9e3" RDEPENDS:${PN} += "\ ${PYTHON_PN}-asyncio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.60.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.61.0.bb index 5c9ba5fb4b..171bc67b78 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.60.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.61.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca inherit pypi setuptools3 -SRC_URI[sha256sum] = "e73ebb404098db405ba95d1e1ae0aa91c3e15a71da031a2eeb6b2e23e7bc3708" +SRC_URI[sha256sum] = "8a64866a97f6304a7179873a465d6eee97b7a24ec6cfd78e0f575e96b821240b" RDEPENDS:${PN} += "\ ${PYTHON_PN}-grpcio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.10.0.bb index 834bb031ca..400233e64a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.10.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=113251d71fb0384712c719b567261c5c" -SRC_URI[sha256sum] = "e604db6521c1e367c6bd7fad239c847f53cc46646f2d2651372d05ae5e95f817" +SRC_URI[sha256sum] = "d93adc48ceeb33347eb24a634fb787efc7ae4644e6ea4ba733d099605045c049" SRC_URI += "file://0001-setup_build.py-avoid-absolute-path.patch" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.4.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.5.0.bb index dbddd6cb80..c6e5606090 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.4.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.5.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5cac039fcc82f01141cc170b48f315d4" PYPI_PACKAGE = "huey" -SRC_URI[sha256sum] = "760cf150deff1fa34b852da37701a5a750d1148f03ea07aa2b3764dc6060b4c3" +SRC_URI[sha256sum] = "2ffb52fb5c46a1b0d53c79d59df3622312b27e2ab68d81a580985a8ea4ca3480" RDEPENDS:${PN} += " \ python3-datetime \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-idna-ssl_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna-ssl_1.1.0.bb index 3643fcfd30..503b79d667 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-idna-ssl_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna-ssl_1.1.0.bb @@ -1,2 +1,17 @@ -inherit setuptools3 -require python-idna-ssl.inc +SUMMARY = "Patch ssl.match_hostname for Unicode(idna) domains support" +HOMEPAGE = "https://github.com/aio-libs/idna-ssl" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a61b9c5aec8796b64a6bf15d42605073" + +SRC_URI[sha256sum] = "a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c" + +PYPI_PACKAGE = "idna-ssl" +inherit pypi setuptools3 + +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/idna_ssl/" +UPSTREAM_CHECK_REGEX = "/idna_ssl/(?P<pver>(\d+[\.\-_]*)+)" + +RDEPENDS:${PN} += " \ + python3-idna \ + python3-io \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.31.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.31.5.bb index 709822da70..4efea1dad9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.31.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.31.5.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=24cb9a367a9e641b459a01c4d15256ba" -SRC_URI[sha256sum] = "74c6a832d81b7ad5a8a80976dea58ee033d3e2b99a54990cbd789b4cb0b31461" +SRC_URI[sha256sum] = "d8e53f9cd4054880276a3dac0a28c85ba7874084856a55a0294a8ae6ed7f3a8e" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.16.1.bb index f06e501d76..fba797ae46 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.15.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.16.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" PYPI_PACKAGE = "ipython" -SRC_URI[sha256sum] = "2baeb5be6949eeebf532150f81746f8333e2ccce02de1c7eedde3f23ed5e9f1e" +SRC_URI[sha256sum] = "ad52f58fca8f9f848e256c629eff888efc0528c12fe0f8ec14f33205f23ef938" RDEPENDS:${PN} = "\ ${PYTHON_PN}-setuptools \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isodate_0.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isodate_0.6.1.bb deleted file mode 100644 index c65083b777..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-isodate_0.6.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "ISO 8601 date/time parser" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" - -SRC_URI[sha256sum] = "48c5881de7e8b0a0d648cb024c8062dc84e7b840ed81e864c7614fd3c127bde9" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - python3-numbers \ - python3-six \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.19.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.19.1.bb index 58e8cc17a1..f335625188 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.19.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.19.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5ed06eebfcb244cd66ebf6cef9c23ab4" PYPI_PACKAGE = "jedi" -SRC_URI[sha256sum] = "bcf9894f1753969cbac8022a8c2eaee06bfa3724e4192470aaffe7eb6272b0c4" +SRC_URI[sha256sum] = "cf0496f3651bc65d7174ac1b7d043eff454892c708a87d1b683e57b569927ffd" RDEPENDS:${PN} = " \ ${PYTHON_PN}-parso \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression/run-ptest deleted file mode 100644 index 5cec711696..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -pytest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.1.1.bb deleted file mode 100644 index 31fb88d6e5..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_30.1.1.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Utility library to parse, compare, simplify and normalize license expressions" -HOMEPAGE = "https://github.com/nexB/license-expression" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://apache-2.0.LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -SRC_URI[sha256sum] = "42375df653ad85e6f5b4b0385138b2dbea1f5d66360783d8625c3e4f97f11f0c" - -inherit pypi ptest python_setuptools_build_meta - -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-booleanpy \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-logging \ -" - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - install -d ${D}${PTEST_PATH}/src - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ - cp -rf ${S}/src/* ${D}${PTEST_PATH}/src/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4/run-ptest index 1b245bcd8f..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -v +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_4.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_4.3.2.bb index 9d31ab68c2..f0c8684b0d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_4.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lz4_4.3.2.bb @@ -22,6 +22,7 @@ RDEPENDS:${PN}-ptest += "\ python3-pytest-runner \ python3-multiprocessing \ python3-psutil \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.7.0.bb index a2c72fcc99..265b28a771 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.7.0.bb @@ -9,3 +9,5 @@ SRC_URI[sha256sum] = "348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f inherit pypi setuptools3 DEPENDS += "${PYTHON_PN}-pytest-runner-native" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-meson-python_0.13.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-meson-python_0.14.0.bb index 6b9ff24f2a..d6ee64b015 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-meson-python_0.13.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-meson-python_0.14.0.bb @@ -11,7 +11,7 @@ DEPENDS = " \ PYPI_PACKAGE = "meson_python" inherit pypi python_mesonpy -SRC_URI[sha256sum] = "63b3170001425c42fa4cfedadb9051cbd28925ff8eed7c40d36ba0099e3c7618" +SRC_URI[sha256sum] = "b96866690326544dfe452583753ac3f43313227e9fd9416701a8df90af212234" DEPENDS:remove:class-native = "python3-meson-python-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.7.bb index 3cddcb9ae3..79943b55e4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.7.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751" inherit pypi setuptools3 ptest -SRC_URI[sha256sum] = "25d3746da40f3c8c59c3b1d001e49fd2aa17904438f980d9a391370366df001e" +SRC_URI[sha256sum] = "572efc93db7a4d27e404501975ca6d2d9775705c2d922390d878fcf768d92c87" RDEPENDS:${PN}:class-target += "\ ${PYTHON_PN}-io \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_1.6.1.bb index 50ad9efea1..fe9e3e3864 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_1.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_1.6.1.bb @@ -1,11 +1,11 @@ SUMMARY = "Optional static typing for Python 3 and 2 (PEP 484)" HOMEPAGE = "https://github.com/python/mypy" LICENSE = "MIT & Python-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6ba8ec528da02073b7e1f4124c0f836f" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8d62fd8f8648cb018e52857347e340b9" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "b031b9601f1060bf1281feab89697324726ba0c0bae9d7cd7ab4b690940f0b92" +SRC_URI[sha256sum] = "4d01c00d09a0be62a4ca3f933e315455bde83f37f892ba4b08ce92f3cf44bcc1" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb new file mode 100644 index 0000000000..7d5292745b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Python binding to the Networking and Cryptography (NaCl) library" +HOMEPAGE = "https://github.com/pyca/pynacl" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8cc789b082b3d97e1ccc5261f8594d3f" + +PYPI_PACKAGE = "PyNaCl" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba" + +DEPENDS += "\ + libsodium \ + python3-cffi-native \ + python3-pip-native \ +" + +RDEPENDS:${PN}:class-target += " \ + python3-cffi \ + python3-pycparser \ +" + +export SODIUM_INSTALL = "system" + +BBCLASSEXTEND = "native"
\ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb index 9a6326f37d..ec7747307d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb @@ -8,3 +8,5 @@ SRC_URI[sha256sum] = "342dc97b9e88a6495bae22953ee6063f91d2f03db6f727b62ba5c3092a inherit pypi setuptools3 PYPI_PACKAGE = "ninja_syntax" +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/ninja_syntax/" +UPSTREAM_CHECK_REGEX = "/ninja_syntax/(?P<pver>(\d+[\.\-_]*)+)"
\ No newline at end of file diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb index 3b9077f326..dd07968f03 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb @@ -22,4 +22,3 @@ RDEPENDS:${PN} = " \ python3-ninja-syntax \ " -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.6.2.bb index 7eebbfb503..99493db322 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.6.2.bb @@ -1,15 +1,14 @@ SUMMARY = "Simplifies building parse types based on the parse module" HOMEPAGE = "https://github.com/jenisys/parse_type" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=16374dbaeaca1890153edb3f41371222" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2e469278ace89c246d52505acc39c3da" -SRC_URI[md5sum] = "b954062f14ab723a91fe1e2be15e859d" -SRC_URI[sha256sum] = "7f690b18d35048c15438d6d0571f9045cffbec5907e0b1ccf006f889e3a38c0b" +SRC_URI[sha256sum] = "79b1f2497060d0928bc46016793f1fca1057c4aacdf15ef876aa48d75a73a355" PYPI_PACKAGE = "parse_type" inherit pypi ptest setuptools3 -RDEPENDS:${PN} += "${PYTHON_PN}-parse ${PYTHON_PN}-six" +RDEPENDS:${PN} += "${PYTHON_PN}-parse" SRC_URI += " \ file://run-ptest \ @@ -19,11 +18,6 @@ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " -do_configure:prepend() { - sed -i -e "/python_version >= 3.0/d" ${S}/setup.py - sed -i -e "/use_2to3/d" ${S}/setup.py -} - do_install_ptest() { install -d ${D}${PTEST_PATH}/tests cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_3.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_3.11.0.bb index 264b06d676..5a65d67706 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_3.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_3.11.0.bb @@ -7,7 +7,7 @@ SRC_URI += " \ file://run-ptest \ " -SRC_URI[sha256sum] = "b45696dab2d7cc691a3226759c0d3b00c47c8b6e293d96f6436f733303f77f6d" +SRC_URI[sha256sum] = "cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3" inherit pypi python_hatchling ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb index 0c0692b144..c1e394d9b3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb @@ -1,9 +1,9 @@ SUMMARY = "Python library for displaying tabular data in a ASCII table format" HOMEPAGE = "http://code.google.com/p/prettytable" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=c9a6829fcd174d9535b46211917c7671" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c9a6829fcd174d9535b46211917c7671" -SRC_URI[sha256sum] = "2e0026af955b4ea67b22122f310b90eae890738c08cb0458693a49b6221530ac" +SRC_URI[sha256sum] = "f4ed94803c23073a90620b201965e5dc0bccf1760b7a7eaf3158cab8aaffdf34" do_install:append() { perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "*.txt" -o -name "PKG-INFO"` @@ -12,9 +12,6 @@ do_install:append() { done } -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/PrettyTable/" -UPSTREAM_CHECK_REGEX = "/PrettyTable/(?P<pver>(\d+[\.\-_]*)+)" - BBCLASSEXTEND = "native nativesdk" inherit pypi ptest python_hatchling diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.36.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.39.bb index a5299318b3..05ff41e7a9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.36.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.39.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" -SRC_URI[sha256sum] = "3e163f254bef5a03b146397d7c1963bd3e2812f0964bb9a24e6ec761fd28db63" +SRC_URI[sha256sum] = "04505ade687dc26dc4284b1ad19a83be2f2afe83e7a828ace0c72f3a1df72aac" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.24.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.24.4.bb index b78ae6a1b0..4b530c3b1d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.24.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.24.4.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=53dbfa56f61b90215a inherit pypi setuptools3 SRC_URI += "file://0001-message.c-Cast-uintptr_t-types-to-upb_MessageDef.patch" -SRC_URI[sha256sum] = "12e9ad2ec079b833176d2921be2cb24281fa591f0b119b208b788adc48c2561d" +SRC_URI[sha256sum] = "5a70731910cd9104762161719c3d883c960151eea077134458503723b60e3667" # http://errors.yoctoproject.org/Errors/Details/184715/ # Can't find required file: ../src/google/protobuf/descriptor.proto diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo/0001-test_cli.py-disable.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo/0001-test_cli.py-disable.patch new file mode 100644 index 0000000000..e4165d2d66 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo/0001-test_cli.py-disable.patch @@ -0,0 +1,32 @@ +From 620cb80b0bb5ec58fe15592f033487a4e1cd3859 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <tgamblin@baylibre.com> +Date: Thu, 12 Oct 2023 16:46:53 -0400 +Subject: [PATCH] test_cli.py: disable + +These tests fail if .../site-packages/cpuinfo/cpuinfo.py isn't +executable, but setting it so during do_install doesn't seem to work. +Disable them for now so that the ptests work with the remaining ~150 +successes. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> +--- + tests/test_cli.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/test_cli.py b/tests/test_cli.py +index a6b1985..43c4334 100644 +--- a/tests/test_cli.py ++++ b/tests/test_cli.py +@@ -6,6 +6,7 @@ import helpers + + + ++@unittest.skip("Disable while permissions issues are figured out") + class TestCLI(unittest.TestCase): + def setUp(self): + helpers.backup_data_source(cpuinfo) +-- +2.41.0 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb index 5fbac03ac0..84172c058e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb @@ -11,8 +11,16 @@ SRC_URI[sha256sum] = "3cdbbf3fac90dc6f118bfd64384f309edeadd902d7c8fb17f02ffa1fc3 inherit ptest pypi setuptools3 SRC_URI += "file://run-ptest \ + file://0001-test_cli.py-disable.patch \ " +do_install:append() { + # Make sure we use /usr/bin/env python3 + for PYTHSCRIPT in `grep -rIl '^#!.*python' ${D}`; do + sed -i -e '1s|^#!.*|#!/usr/bin/env ${PYTHON_PN}|' $PYTHSCRIPT + done +} + do_install_ptest() { install -d ${D}${PTEST_PATH}/tests cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.3.0.bb index d6a2749c24..d158876fcd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.3.0.bb @@ -4,10 +4,11 @@ DESCRIPTION = "A collection of ASN.1 modules expressed in form of pyasn1\ data structures (X.509, PKCS etc.)." HOMEPAGE = "https://github.com/etingof/pyasn1-modules" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a14482d15c2249de3b6f0e8a47e021fd" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=190f79253908c986e6cacf380c3a5f6d" -SRC_URI[md5sum] = "107e1ece7d0a41d782f69f8a95a4d9bc" -SRC_URI[sha256sum] = "905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e" +SRC_URI[sha256sum] = "5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c" + +PYPI_PACKAGE = "pyasn1_modules" inherit pypi ptest setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez/0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez/0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch index 9126aba8d3..fea87a2ff0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez/0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez/0001-Use-Py_ssize_t-when-parsing-buffer-length-fix-426-42.patch @@ -19,9 +19,10 @@ From python 3.8 changes: > values for detail. (Contributed by Inada Naoki in bpo-36381.) Fixes https://github.com/pybluez/pybluez/issues/426 ---- -Upstream-Status: Accepted +Upstream-Status: Backport [https://github.com/pybluez/pybluez/pull/427] +Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> +--- bluez/btmodule.c | 23 ++++++++++++++--------- msbt/_msbt.c | 6 ++++-- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycares_4.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycares_4.4.0.bb index f5223913cf..5e5f0c92f5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycares_4.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycares_4.4.0.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/saghul/pycares" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b1538fcaea82ebf2313ed648b96c69b1" -SRC_URI[sha256sum] = "c542696f6dac978e9d99192384745a65f80a7d9450501151e4a7563e06010d45" +SRC_URI[sha256sum] = "f47579d508f2f56eddd16ce72045782ad3b1b3b678098699e2b6a1b30733e1c2" PYPI_PACKAGE = "pycares" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycodestyle_2.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycodestyle_2.11.1.bb index 9a8d1076fc..a282afb466 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycodestyle_2.11.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycodestyle_2.11.1.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=a8546d0e77f416fb05a26acd89c8b3bd" -SRC_URI[sha256sum] = "259bcc17857d8a8b3b4a2327324b79e5f020a13c16074670f9c8c8f872ea76d0" +SRC_URI[sha256sum] = "41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_1.10.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_2.4.2.bb index 9d59cf8598..a83789d977 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_1.10.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_2.4.2.bb @@ -1,11 +1,13 @@ SUMMARY = "Data validation and settings management using Python type hinting" HOMEPAGE = "https://github.com/samuelcolvin/pydantic" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2c02ea30650b91528657db64baea1757" +LIC_FILES_CHKSUM = "file://LICENSE;md5=09280955509d1c4ca14bae02f21d49a6" -inherit pypi setuptools3 +inherit pypi python_hatchling -SRC_URI[sha256sum] = "cfc83c0678b6ba51b0532bea66860617c4cd4251ecf76e9846fa5a9f3454e97e" +SRC_URI[sha256sum] = "94f336138093a5d7f426aac732dcfe7ab4eb4da243c88f891d65deb4a2556ee7" + +DEPENDS += "python3-hatch-fancy-pypi-readme-native" RDEPENDS:${PN} += "\ python3-core \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_2.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_2.0.4.bb index 888278af80..4ee84531e1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_2.0.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_2.0.4.bb @@ -9,6 +9,9 @@ inherit pypi python_setuptools_build_meta DEPENDS += "${PYTHON_PN}-hatch-vcs-native" +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/PyHamcrest/" +UPSTREAM_CHECK_REGEX = "/PyHamcrest/(?P<pver>(\d+[\.\-_]*)+)" + RDEPENDS:${PN} += " \ ${PYTHON_PN}-six \ ${PYTHON_PN}-numbers \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_git.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_0.0.11.bb index 29a0bc86c5..b5bd89de76 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_git.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_0.0.11.bb @@ -1,24 +1,18 @@ SUMMARY = "Pyiface is a package that exposes the network interfaces of the operating system in a easy to use and transparent way" -SECTION = "devel/python" HOMEPAGE = "https://pypi.python.org/pypi/pyiface/" +SECTION = "devel/python" LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fe869ee987a340198fb0d54c55c47f1" DEPENDS += "python3-setuptools-scm-native" +SRC_URI[sha256sum] = "e231e5735d329c5b2d4fc8854f069fdaa5436d3ef91ed64ee49e41e3f5e8a3f5" + +inherit pypi setuptools3 + RDEPENDS:${PN} += " \ python3-ctypes \ python3-fcntl \ python3-io \ " - -inherit setuptools3 - -SRC_URI = "git://github.com/bat-serjo/PyIface.git;protocol=https;branch=master" -SRCREV = "4557dbda96d2e4b1142c60603d4a27d007a9ffe6" -PV = "0.1.dev33+g4557dbd" - -PIP_INSTALL_PACKAGE = "pyiface" - -S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/0001-pylint-remove-plugin-pickle-test.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/0001-pylint-remove-plugin-pickle-test.patch deleted file mode 100644 index a7637a5ca6..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/0001-pylint-remove-plugin-pickle-test.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 341e19dd69d847f84859e85cabff5846e7da24c4 Mon Sep 17 00:00:00 2001 -From: Trevor Gamblin <tgamblin@baylibre.com> -Date: Mon, 15 May 2023 09:26:04 -0400 -Subject: [PATCH] pylint: remove plugin pickle test - -Upstream-Status: Inappropriate (oe-specific) - -Upstream uses an assertion in the removed test to state that the test -needs changing if the plugin loading succeeds. The same failure wasn't -seen when running the tests on the host with pytest, so disable it by -removing the test from the suite. - -Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> ---- - tests/test_check_parallel.py | 22 ---------------------- - 1 file changed, 22 deletions(-) - -diff --git a/tests/test_check_parallel.py b/tests/test_check_parallel.py -index d56502eaf..34fec140f 100644 ---- a/tests/test_check_parallel.py -+++ b/tests/test_check_parallel.py -@@ -257,28 +257,6 @@ class TestCheckParallelFramework: - assert stats.statement == 18 - assert stats.warning == 0 - -- def test_linter_with_unpickleable_plugins_is_pickleable(self) -> None: -- """The linter needs to be pickle-able in order to be passed between workers""" -- linter = PyLinter(reporter=Reporter()) -- # We load an extension that we know is not pickle-safe -- linter.load_plugin_modules(["pylint.extensions.overlapping_exceptions"]) -- try: -- dill.dumps(linter) -- raise AssertionError( -- "Plugins loaded were pickle-safe! This test needs altering" -- ) -- except (KeyError, TypeError, PickleError, NotImplementedError): -- pass -- -- # And expect this call to make it pickle-able -- linter.load_plugin_configuration() -- try: -- dill.dumps(linter) -- except KeyError as exc: -- raise AssertionError( -- "Cannot pickle linter when using non-pickleable plugin" -- ) from exc -- - def test_worker_check_sequential_checker(self) -> None: - """Same as test_worker_check_single_file_no_checkers with SequentialTestChecker.""" - linter = PyLinter(reporter=Reporter()) --- -2.40.1 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch deleted file mode 100644 index 7950e72077..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/0001-pyproject.toml-Remove-hard-coded-dependencies.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c5c415a240189ac6730ba95de0bb5883dfb53609 Mon Sep 17 00:00:00 2001 -From: Trevor Gamblin <tgamblin@baylibre.com> -Date: Mon, 1 May 2023 11:32:24 -0400 -Subject: [PATCH] pyproject.toml: Remove hard-coded dependencies - -Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> ---- -Upstream-Status: Pending - - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index bd542646b..2c0ed9485 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,5 +1,5 @@ - [build-system] --requires = ["setuptools~=62.6", "wheel~=0.37.1"] -+requires = ["setuptools", "wheel"] - build-backend = "setuptools.build_meta" - - [project] --- -2.40.0 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.17.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.0.1.bb index 96fce2e048..7de38b768f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_2.17.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.0.1.bb @@ -6,10 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" SRC_URI += " \ git://github.com/pylint-dev/pylint;branch=main;protocol=https \ file://run-ptest \ - file://0001-pyproject.toml-Remove-hard-coded-dependencies.patch \ - file://0001-pylint-remove-plugin-pickle-test.patch \ " -SRCREV ?= "fc34a4b6abe56f3ac07ca15d846b1c1955545f85" +SRCREV ?= "f2cded41f7f3d4b45236cbe107b366b6caf84bde" inherit python_setuptools_build_meta ptest @@ -47,5 +45,8 @@ S = "${WORKDIR}/git" do_install_ptest() { install -d ${D}${PTEST_PATH}/tests cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + install -Dm 0644 ${S}/tests/.pylint_primer_tests/.gitkeep ${D}${PTEST_PATH}/tests/.pylint_primer_tests/.gitkeep sed -i 's#/usr/bin/python$#/usr/bin/python3#g' ${D}${PTEST_PATH}/tests/data/ascript } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.1.0.bb index 1f6fbd3bb1..f797674e84 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.1.0.bb @@ -8,9 +8,12 @@ HOMEPAGE = "https://pymysql.readthedocs.io" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=528175c84163bb800d23ad835c7fa0fc" -SRC_URI[sha256sum] = "816927a350f38d56072aeca5dfb10221fe1dc653745853d30a216637f5d7ad36" +SRC_URI[sha256sum] = "4f13a7df8bf36a51e81dd9f3605fede45a4878fe02f9236349fd82a3f0612f96" PYPI_PACKAGE = "PyMySQL" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta + +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/pymysql/" +UPSTREAM_CHECK_REGEX = "/pymysql/(?P<pver>(\d+[\.\-_]*)+)" RDEPENDS:${PN} += "${PYTHON_PN}-cryptography" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb index 6e53461979..5a8ed131af 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb @@ -10,6 +10,10 @@ PYPI_PACKAGE = "PyNaCl" inherit pypi python_setuptools_build_meta +# in meta-virtualization layer +# +RCONFLICTS:${PN} = "python3-nacl" + DEPENDS += "\ ${PYTHON_PN}-cffi-native \ libsodium \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch index 9b5d9d6364..65f38814c3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux/0002-Fixed-relative-imports.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fixed relative imports Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> --- -Upstream-Status: Accepted +Upstream-Status: Backport [https://github.com/rlisagor/pynetlinux/commit/afb778669efbc658a29e6bdb1c4834fee42931aa] pynetlinux/__init__.py | 8 ++++---- pynetlinux/brctl.py | 2 +- diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb index d8708f5e72..a4121c3934 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb @@ -8,7 +8,7 @@ PYPI_PACKAGE = "pyproj" inherit pypi setuptools3 -SRC_URI[sha256sum] = "a5b111865b3f0f8b77b3983f2fbe4dd6248fc09d3730295949977c8dcd988062" +SRC_URI[sha256sum] = "44aa7c704c2b7d8fb3d483bbf75af6cb2350d30a63b144279a09b75fead501bf" RDEPENDS:${PN} = " \ python3-certifi \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.6.1.bb index 1b458fa2df..739df2a1ba 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.6.1.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://pyproject-api.readthedocs.io" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" -SRC_URI[sha256sum] = "435f46547a9ff22cf4208ee274fca3e2869aeb062a4834adfc99a4dd64af3cf9" +SRC_URI[sha256sum] = "1817dc018adc0d1ff9ca1ed8c60e1623d5aaca40814b953af14a9cf9a5cae538" PYPI_PACKAGE = "pyproject_api" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb index 39fbd1a00e..baf3cf8ede 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.9.bb @@ -30,6 +30,7 @@ SRC_URI += " \ RDEPENDS:${PN}-ptest += " \ python3-pytest \ python3-fcntl \ + python3-sqlite3 \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch new file mode 100644 index 0000000000..f024e79d93 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch @@ -0,0 +1,38 @@ +From e184fb950ad3b52c5c16438d39fe4d516c784e30 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <tgamblin@baylibre.com> +Date: Thu, 12 Oct 2023 17:32:40 -0400 +Subject: [PATCH] test_pytest_mock: skip args introspection tests + +Disable these two tests for now so that python3-pytest-mock can have +successful ptest runs. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> +--- + tests/test_pytest_mock.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py +index 3d53241..157b6c3 100644 +--- a/tests/test_pytest_mock.py ++++ b/tests/test_pytest_mock.py +@@ -581,6 +581,7 @@ def test_assert_called_wrapper(mocker: MockerFixture) -> None: + stub.assert_called() + + ++@pytest.mark.skip("Async not correctly detected, skip for now") + @pytest.mark.usefixtures("needs_assert_rewrite") + def test_assert_called_args_with_introspection(mocker: MockerFixture) -> None: + stub = mocker.stub() +@@ -597,6 +598,7 @@ def test_assert_called_args_with_introspection(mocker: MockerFixture) -> None: + stub.assert_called_once_with(*wrong_args) + + ++@pytest.mark.skip("Async not correctly detected, skip for now") + @pytest.mark.usefixtures("needs_assert_rewrite") + def test_assert_called_kwargs_with_introspection(mocker: MockerFixture) -> None: + stub = mocker.stub() +-- +2.41.0 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.11.1.bb index 69d74567c3..5dda1da469 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.11.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.11.1.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = " \ SRC_URI = " \ git://github.com/pytest-dev/pytest-mock;branch=main;protocol=https \ file://run-ptest \ + file://0001-test_pytest_mock-skip-args-introspection-tests.patch \ " SRCREV ?= "d3e73f2e93f7b93eba0a36e17e43bafd969da4fe" @@ -21,6 +22,7 @@ DEPENDS += "${PYTHON_PN}-setuptools-scm-native" RDEPENDS:${PN} += " \ python3-asyncio \ python3-pytest \ + python3-pytest-asyncio \ python3-unittest \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.2.0.bb index c4faec6c61..da8bc5dd35 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.2.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d8048cd156eda3df2e7f111b0ae9ceff" PYPI_PACKAGE = "pytest-timeout" -SRC_URI[sha256sum] = "c07ca07404c612f8abbe22294b23c368e2e5104b521c1790195561f37e1ac3d9" +SRC_URI[sha256sum] = "3b0b95dabf3cb50bac9ef5ca912fa0cfc286526af17afc806824df20c2f72c90" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz-deprecation-shim_0.1.0.post0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz-deprecation-shim_0.1.0.post0.bb deleted file mode 100644 index 022cf39ac0..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz-deprecation-shim_0.1.0.post0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Shims to help you safely remove pytz" -HOMEPAGE = "https://github.com/pganssle/pytz-deprecation-shim" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fca9fd5c15a28eb874ba38577a585d48" - -SRC_URI[sha256sum] = "af097bae1b616dde5c5744441e2ddc69e74dfdcb0c263129610d85b87445a59d" - -PYPI_PACKAGE = "pytz_deprecation_shim" -PYPI_SRC_URI = "https://files.pythonhosted.org/packages/94/f0/909f94fea74759654390a3e1a9e4e185b6cd9aa810e533e3586f39da3097/${PYPI_PACKAGE}-${PV}.tar.gz" - -inherit pypi python_setuptools_build_meta - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-zoneinfo \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyu2f_0.1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyu2f_0.1.5.bb new file mode 100644 index 0000000000..c58981a327 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyu2f_0.1.5.bb @@ -0,0 +1,20 @@ +SUMMARY = "U2F host library for interacting with a U2F device over USB." +HOMEPAGE = "https://github.com/google/pyu2f/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI[sha256sum] = "a3caa3a11842fc7d5746376f37195e6af5f17c0a15737538bb1cebf656fb306b" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-crypt \ + ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-six \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb index 98817f9312..6fcf346bc4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb @@ -20,5 +20,3 @@ RDEPENDS:${PN} = "\ ${PYTHON_PN}-fcntl \ libudev \ " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.1.1.bb index 39a7614fc5..504ef7abc0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.1.1.bb @@ -3,17 +3,17 @@ DESCRIPTION = "This package contains Python bindings for ZeroMQ. ZMQ is a lightw HOMEPAGE = "http://zeromq.org/bindings:python" LICENSE = "BSD-3-Clause & LGPL-3.0-only" LIC_FILES_CHKSUM = "\ - file://COPYING.BSD;md5=11c65680f637c3df7f58bbc8d133e96e \ - file://COPYING.LESSER;md5=12c592fa0bcfff3fb0977b066e9cb69e \ + file://LICENSE.BSD;md5=1787206f198344195a671b60326c59dc \ + file://LICENSE.LESSER;md5=0e99bfbdd8b9d33b0221986fe3be89ed \ " -DEPENDS = "python3-packaging-native zeromq" +DEPENDS = "python3-packaging-native python3-cython-native python3-setuptools-scm-native zeromq" SRC_URI:append = " \ file://club-rpath-out.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "f330a1a2c7f89fd4b0aa4dcb7bf50243bf1c8da9a2f1efc31daf57a2046b31f2" +SRC_URI[sha256sum] = "259c22485b71abacdfa8bf79720cd7bcf4b9d128b30ea554f01ae71fdbfdaa23" inherit pypi pkgconfig python_setuptools_build_meta ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson/run-ptest new file mode 100644 index 0000000000..8d2017d39c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.11.bb deleted file mode 100644 index 930ad34340..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.11.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Python wrapper around rapidjson" -HOMEPAGE = "https://github.com/python-rapidjson/python-rapidjson" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4daf3929156304df67003c33274a98bd" - -SRC_URI = "git://github.com/python-rapidjson/python-rapidjson.git;protocol=https;branch=master" -SRCREV = "e1b41f64df1705770b7b70d7221a4812909c1d0f" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -SETUPTOOLS_BUILD_ARGS += " --rj-include-dir=${RECIPE_SYSROOT}${includedir}" - -DEPENDS += " \ - rapidjson \ -" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-core \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.12.bb new file mode 100644 index 0000000000..f0f6c0dbac --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.12.bb @@ -0,0 +1,41 @@ +SUMMARY = "Python wrapper around rapidjson" +HOMEPAGE = "https://github.com/python-rapidjson/python-rapidjson" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4daf3929156304df67003c33274a98bd" + +SRC_URI = "git://github.com/python-rapidjson/python-rapidjson.git;protocol=https;branch=master" +SRCREV = "5063cc63008b41e129344b012fc59b114cacd5c9" + +S = "${WORKDIR}/git" + +# Inheriting ptest provides functionality for packaging and installing runtime tests for this recipe +inherit setuptools3 ptest + +SETUPTOOLS_BUILD_ARGS += " --rj-include-dir=${RECIPE_SYSROOT}${includedir}" + +# run-ptest is a shell script that starts the test suite +SRC_URI += " \ + file://run-ptest \ +" + +DEPENDS += " \ + rapidjson \ +" + +# Adding required python package for the ptest (pytest and pytest->automake report translation) +RDEPENDS:${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-unittest-automake-output \ + ${PYTHON_PN}-pytz \ +" + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-core \ +" + +# Installing the test suite on the target +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rdflib_7.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rdflib_7.0.0.bb deleted file mode 100644 index 952c210116..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-rdflib_7.0.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "RDFLib is a pure Python package for working with RDF" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=37d489c0cefe52a17e1d5007e196464a" - -SRC_URI[sha256sum] = "9995eb8569428059b8c1affd26b25eac510d64f5043d9ce8c84e0d0036e995ae" - -inherit pypi python_poetry_core - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-isodate \ - ${PYTHON_PN}-pyparsing \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-xml \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-core \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.1.bb index f04e04bbe2..2c473c03ea 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://github.com/andymccurdy/redis-py" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=609ded3add9111c4c6e102f1d421d3f8" -SRC_URI[sha256sum] = "5cea6c0d335c9a7332a460ed8729ceabb4d0c489c7285b0a86dbbf8a017bd120" +SRC_URI[sha256sum] = "0dab495cd5753069d3bc650a0dde8a8f9edde16fc5691b689a566eda58100d0f" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2023.8.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2023.10.3.bb index 1676bab26a..c26d55f474 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2023.8.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2023.10.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069" inherit pypi setuptools3 -SRC_URI[sha256sum] = "fcbdc5f2b0f1cd0f6a56cdb46fe41d2cce1e644e3b68832f3eeebc5fb0f7712e" +SRC_URI[sha256sum] = "3fef4f844d2290ee0ba57addcec17eec9e3df73f10a2748485dfd6a3a188cc0f" RDEPENDS:${PN} += " \ python3-stringold \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.4.3.bb index 4ad5c3601d..4c0bd7e3ec 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.4.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.4.3.bb @@ -13,5 +13,3 @@ RDEPENDS:${PN} += " \ ${PYTHON_PN}-pyserial \ ${PYTHON_PN}-robotframework \ " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-schedule_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-schedule_1.2.1.bb index 98b7690e1b..de326815ac 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-schedule_1.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-schedule_1.2.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/dbader/schedule" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6400f153491d45ea3459761627ca24b2" -SRC_URI[sha256sum] = "b4ad697aafba7184c9eb6a1e2ebc41f781547242acde8ceae9a0a25b04c0922d" +SRC_URI[sha256sum] = "843bc0538b99c93f02b8b50e3e39886c06f2d003b24f48e1aa4cadfa3f341279" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_3.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_3.0.2.bb index 2d85d789c7..f90ea0c9dc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_3.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_3.0.2.bb @@ -4,8 +4,7 @@ BUGTRACKER = "https://github.com/python-semver/python-semver" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d9da679db3bdce30a1b4328d5c474f98" -SRC_URI[md5sum] = "b7502c12ce325ffffeab694fed52f6f5" -SRC_URI[sha256sum] = "9ec78c5447883c67b97f98c3b6212796708191d22e4ad30f4570f840171cbce1" +SRC_URI[sha256sum] = "6253adb39c70f6e51afed2fa7152bcd414c411286088fb4b9effb133885ab4cc" inherit pypi python_setuptools_build_meta ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.19.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.19.2.bb index 1fb31a3a3a..91f6b35b32 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.19.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.19.2.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://cheeseshop.python.org/pypi/simplejson" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c6338d7abd321c0b50a2a547e441c52e" -SRC_URI[sha256sum] = "6277f60848a7d8319d27d2be767a7546bc965535b28070e310b3a9af90604a4c" +SRC_URI[sha256sum] = "9eb442a2442ce417801c912df68e1f6ccfcd41577ae7274953ab3ad24ef7d82c" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.1.bb index 8a30f7cb78..bd0979d0b4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-snappy_0.6.1.bb @@ -11,5 +11,3 @@ inherit pypi setuptools3 PYPI_PACKAGE = "python-snappy" RDEPENDS:${PN} += "snappy" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.10.0.bb index 9064ee4b8d..68168bb635 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.10.0.bb @@ -9,7 +9,7 @@ inherit pypi python_setuptools_build_meta PYPI_PACKAGE = "python-socketio" -SRC_URI[sha256sum] = "dc42735f65534187f381fde291ebf620216a4960001370f32de940229b2e7f8f" +SRC_URI[sha256sum] = "01c616946fa9f67ed5cc3d1568e1c4940acfc64aeeb9ff621a53e80cabeb748a" PACKAGECONFIG ?= "asyncio_client client" PACKAGECONFIG[asyncio_client] = ",,,${PYTHON_PN}-aiohttp ${PYTHON_PN}-websockets" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.21.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.22.bb index 92db5045ce..59ac0ecc7a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.21.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.22.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b707d50badb798e1d897f2c8f649382d" -SRC_URI[sha256sum] = "05b971ab1ac2994a14c56b35eaaa91f86ba080e9ad481b20d99d77f381bb6258" +SRC_URI[sha256sum] = "5434cc601aa17570d79e5377f5fd45ff92f9379e2abed0be5e8c2fba8d353d2b" PYPI_PACKAGE = "SQLAlchemy" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-stack-data_0.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-stack-data_0.6.3.bb index 21e4b77378..55ddff383f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-stack-data_0.6.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-stack-data_0.6.3.bb @@ -8,7 +8,7 @@ PYPI_PACKAGE = "stack_data" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "32d2dd0376772d01b6cb9fc996f3c8b57a357089dec328ed4b6553d037eaf815" +SRC_URI[sha256sum] = "836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9" RDEPENDS:${PN} = " \ python3-asttokens \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-texttable_1.6.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-texttable_1.7.0.bb index e8024987c9..56448f738e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-texttable_1.6.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-texttable_1.7.0.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7a97cdac2d9679ffdcfef3dc036d24f6" inherit pypi setuptools3 -SRC_URI[sha256sum] = "290348fb67f7746931bcdfd55ac7584ecd4e5b0846ab164333f0794b121760f2" +SRC_URI[sha256sum] = "2d2068fb55115807d3ac77a4ca68fa48803e84ebb0ee2340f858107a36522638" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.12.1.bb index e86a3c7898..59e83e00db 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.12.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.12.1.bb @@ -27,3 +27,5 @@ do_install_ptest() { install -d ${D}${PTEST_PATH}/tests cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.11.2.bb index fc25271449..f2f70b8187 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.11.2.bb @@ -1,9 +1,9 @@ SUMMARY = "Traitlets Python config system" HOMEPAGE = "http://ipython.org" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING.md;md5=f17a3ba4cd59794dd6e005c8e150aef0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=13bed0ee6f46a6f6dbf1f9f9572f250a" -SRC_URI[sha256sum] = "f6cde21a9c68cf756af02035f72d5a723bf607e862e7be33ece505abf4a3bad9" +SRC_URI[sha256sum] = "7564b5bf8d38c40fa45498072bf4dc5e8346eb087bbf1e2ae2d8774f6a0f078e" inherit pypi python_hatchling diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_23.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_23.1.1.bb index 7559accf41..3b0562421b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_23.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_23.1.1.bb @@ -10,5 +10,3 @@ inherit pypi setuptools3 RDEPENDS:${PN} += " \ ${PYTHON_PN}-twisted \ " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.17.bb index 02245be622..055cecd640 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.16.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.17.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=ef4dc1e740f5c928f1 inherit pypi setuptools3 -SRC_URI[sha256sum] = "4e9b219efb625d3d04f6bf106934f87cab49aa41a94b0a3b3089403f47a79228" +SRC_URI[sha256sum] = "f7d8769812d72a4b513d7ec9eb5580fe2f6013fc270394a603cb6534811f3e4d" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_5.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_5.1.bb index a59fd93643..2f69000b3a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_5.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_5.1.bb @@ -3,12 +3,11 @@ HOMEPAGE = "https://pypi.org/project/tzlocal/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=57e0bd61643d81d05683cdce65b11d10" -SRC_URI[sha256sum] = "46eb99ad4bdb71f3f72b7d24f4267753e240944ecfc16f25d2719ba89827a803" +SRC_URI[sha256sum] = "a5ccb2365b295ed964e0a98ad076fe10c495591e75505d34f154d60a7f1ed722" inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += " \ python3-datetime \ python3-logging \ - python3-pytz-deprecation-shim \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.11.1.bb index cba7ffe0db..aabea69a3d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.11.1.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=373fede350846fdffd23648fba504635" -SRC_URI[sha256sum] = "ea89f8a6ee74b74c3ff21954eafe00ec914365adb904c6c374f559bc46d4a61c" +SRC_URI[sha256sum] = "d301d7120922d5b9e5c9535ef9780012ea25ea4011c2b177490ba7d3ef886b92" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.6.4.bb index 8104d37599..961cdb916c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.6.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.6.4.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/websocket-client/websocket-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=6eae3bb7247ccb2c3a087ea8de759c01" -SRC_URI[sha256sum] = "3aad25d31284266bcfcfd1fd8a743f63282305a364b8d0948a43bd606acc652f" +SRC_URI[sha256sum] = "b3324019b3c28572086c4a319f91d1dcd44e6e11cd340232978c684a7650d0df" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.1.8.bb index 6952d533da..06797f4857 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.1.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.1.8.bb @@ -16,6 +16,6 @@ RDEPENDS:${PN} += " \ python3-io \ " -SRC_URI[sha256sum] = "696c16458d50712a3a5f902676c045ddb4c1bd1b54595f501e582d549abdbdb9" +SRC_URI[sha256sum] = "059d0786fbfa3055588e81e9d5acf4ace28394bf09353a31ae2cae635740fc15" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmltodict/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmltodict/run-ptest deleted file mode 100644 index 3385d68939..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmltodict/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmltodict_0.13.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmltodict_0.13.0.bb deleted file mode 100644 index a1f3957adc..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmltodict_0.13.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Makes working with XML feel like you are working with JSON" -HOMEPAGE = "https://github.com/martinblech/xmltodict" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=01441d50dc74476db58a41ac10cb9fa2" - -SRC_URI[sha256sum] = "341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56" - -PYPI_PACKAGE = "xmltodict" - -inherit pypi setuptools3 ptest - -SRC_URI += " \ - file://run-ptest \ -" - -RDEPENDS:${PN} += " \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-xml \ - ${PYTHON_PN}-io \ -" - -RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ -" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.4.1.bb index c4d74306ce..4050d12eb9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.4.1.bb @@ -3,13 +3,15 @@ SECTION = "devel/python" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=3a9dab7f159514231249aa3e108ab26b" -SRC_URI[sha256sum] = "1afd47af8955c5db730f630ad53ae798cf7fae0acb64cebb3cf94d35c47dd088" +DEPENDS += "python3-setuptools-scm-native" + +SRC_URI[sha256sum] = "0379d6cf1ff987cd421609a264ce025e74f346e3e145dd106c0cc2e3ec3f99a9" SRC_URI += " \ file://run-ptest \ " -inherit pypi setuptools3 ptest +inherit pypi python_setuptools_build_meta ptest RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.112.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.119.0.bb index 6ff4fffb08..a62c1b8d99 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.112.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.119.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jstasiak/python-zeroconf" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=6517bdc8f2416f27ab725d4702f7aac3" -SRC_URI[sha256sum] = "f2457ed290c70dbca686b411f2351c3ff9f367afaae668d75cf378e9a439b8aa" +SRC_URI[sha256sum] = "dbe3548ac0a68ab88241f6ac03bc6b7c19c23160bd78ed4c94ae4d92196be230" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_6.1.bb index 264898adb6..07e329a4a8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_6.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e54fd776274c1b7423 PYPI_PACKAGE = "zope.interface" inherit pypi setuptools3 -SRC_URI[sha256sum] = "aab584725afd10c710b8f1e6e208dbee2d0ad009f57d674cb9d1b3964037275d" +SRC_URI[sha256sum] = "2fdc7ccbd6eb6b7df5353012fbed6c3c5d04ceaca0038f75e601060e95345309" PACKAGES =. "${PN}-test " diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.4.bb b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.5.bb index 8850b79e8c..0478d0d5c2 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.4.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.5.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://rhodesmill.org/pyephem/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=9c930b395b435b00bb13ec83b0c99f40" -SRC_URI[sha256sum] = "73a59f0d2162d1624535c3c3b75f956556bdbb2055eaf554a7bef147d3f9c760" +SRC_URI[sha256sum] = "0c64a8aa401574c75942045b9af70d1656e14c5366151c0cbb400cbeedc2362a" PYPI_PACKAGE = "ephem" diff --git a/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.5.3.bb b/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.6.0.bb index 2c385fc66b..b606b4f7a9 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.5.3.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.6.0.bb @@ -8,7 +8,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303" -SRC_URI[sha256sum] = "87b43e0543149efa1253f485cd845bb7ee54df16c9617b8a893650ab84b4acb6" +SRC_URI[sha256sum] = "5c14d22737e6d5084ef4771b62d5d4363165b403455a30a1c8ca39dc7b644bef" inherit pypi python_poetry_core diff --git a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.6.2.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.6.2.bb index 01e4719ba4..f607de7799 100644 --- a/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.6.2.bb +++ b/meta-openembedded/meta-python/recipes-extended/pywbem/python3-pywbem_1.6.2.bb @@ -49,5 +49,3 @@ ALTERNATIVE:${PN} = "mof_compiler" ALTERNATIVE_TARGET[mof_compiler] = "${bindir}/mof_compiler" ALTERNATIVE_PRIORITY = "60" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-webserver/README.md b/meta-openembedded/meta-webserver/README.md index d23f6cc65c..9c4854a3e2 100644 --- a/meta-openembedded/meta-webserver/README.md +++ b/meta-openembedded/meta-webserver/README.md @@ -13,13 +13,13 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core subdirectory: meta -branch: master +branch: nanbield For some recipes, the meta-oe layer is required: URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-oe -branch: master +branch: nanbield @@ -50,9 +50,12 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org -with '[meta-webserver]' in the subject. +with '[meta-webserver][nanbield]' in the subject. -Layer maintainer: Derek Straka <derek@asterius.io> +When sending single patches, please using something like: +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-webserver][nanbield][PATCH' + +Layer maintainer: Armin Kuster <akuster808@gmail.com> License diff --git a/meta-openembedded/meta-webserver/files/static-passwd-meta-webserver b/meta-openembedded/meta-webserver/files/static-passwd-meta-webserver new file mode 100644 index 0000000000..028cf8d941 --- /dev/null +++ b/meta-openembedded/meta-webserver/files/static-passwd-meta-webserver @@ -0,0 +1,2 @@ +www:x:690:nogroup::/:/bin/nologin +netdata:x:691:nogroup::/:/bin/nologin
\ No newline at end of file diff --git a/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image.bb b/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-all.bb index ce4f8a0387..9d2badc236 100644 --- a/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image.bb +++ b/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-all.bb @@ -1,3 +1,3 @@ -require meta-webserver-image-base.bb +require recipes-core/images/core-image-base.bb IMAGE_INSTALL += "packagegroup-meta-webserver" diff --git a/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-base.bb b/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-base.bb deleted file mode 100644 index a4ce10f674..0000000000 --- a/meta-openembedded/meta-webserver/recipes-core/images/meta-webserver-image-base.bb +++ /dev/null @@ -1,7 +0,0 @@ -SUMMARY = "meta-webserver build test image" - -IMAGE_INSTALL = "packagegroup-core-boot" - -LICENSE = "MIT" - -inherit core-image diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch index 996eabf586..9accbf18a1 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch @@ -4,7 +4,7 @@ Date: Tue, 18 Apr 2023 15:38:53 +0200 Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory to include path if mod_rewrite is enabled. -Upstream-Status: Accepted [https://svn.apache.org/viewvc?view=revision&revision=1909241] +Upstream-Status: Backport [https://svn.apache.org/viewvc?view=revision&revision=1909241] --- modules/mappers/config9.m4 | 5 +++++ diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/0001-configure-libxslt-conf.patch b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/0001-configure-libxslt-conf.patch new file mode 100644 index 0000000000..7ba2a1fb85 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/0001-configure-libxslt-conf.patch @@ -0,0 +1,39 @@ +From 0c3c669464a514cf8d0cac08282ecb2b486f440f Mon Sep 17 00:00:00 2001 +From: Joe Slater <joe.slater@windriver.com> +Date: Tue, 3 Oct 2023 19:21:17 +0000 +Subject: [PATCH] configure: libxslt conf + +Modify to find libxslt related include files under sysroot. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <joe.slater@windriver.com> +--- + auto/lib/libxslt/conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf +index 3063ac7..eb77886 100644 +--- a/auto/lib/libxslt/conf ++++ b/auto/lib/libxslt/conf +@@ -12,7 +12,7 @@ + #include <libxslt/xsltInternals.h> + #include <libxslt/transform.h> + #include <libxslt/xsltutils.h>" +- ngx_feature_path="/usr/include/libxml2" ++ ngx_feature_path="=/usr/include/libxml2" + ngx_feature_libs="-lxml2 -lxslt" + ngx_feature_test="xmlParserCtxtPtr ctxt = NULL; + xsltStylesheetPtr sheet = NULL; +@@ -100,7 +100,7 @@ fi + ngx_feature_name=NGX_HAVE_EXSLT + ngx_feature_run=no + ngx_feature_incs="#include <libexslt/exslt.h>" +- ngx_feature_path="/usr/include/libxml2" ++ ngx_feature_path="=/usr/include/libxml2" + ngx_feature_libs="-lexslt" + ngx_feature_test="exsltRegisterAll();" + . auto/feature +-- +2.35.5 + diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc index 1ea32f7c94..8890e0bea1 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -22,6 +22,7 @@ SRC_URI = " \ file://nginx-volatile.conf \ file://nginx.service \ file://nginx-fix-pidfile.patch \ + file://0001-configure-libxslt-conf.patch \ " inherit siteinfo update-rc.d useradd systemd @@ -47,6 +48,8 @@ PACKAGECONFIG[ipv6] = "--with-ipv6,," PACKAGECONFIG[webdav] = "--with-http_dav_module,," PACKAGECONFIG[stream] = "--with-stream,," +PACKAGECONFIG[xslt] = "--with-http_xslt_module,,libxslt" + do_configure () { if [ "${SITEINFO_BITS}" = "64" ]; then PTRSIZE=8 diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.36.1.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.43.0.bb index 52d99e7704..07ee03d86e 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.36.1.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.43.0.bb @@ -5,11 +5,11 @@ HOMEPAGE = "https://github.com/netdata/netdata/" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" -DEPENDS += "libuv util-linux zlib" +DEPENDS += "libuv util-linux zlib libyaml json-c" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ " -SRC_URI[sha256sum] = "f4a1233112b55e07e2862ffda0416255f0aa4c8e2b16929b76fa7ad6b69fd931" +SRC_URI[sha256sum] = "d3c66273d8eb62290d412c870dcde45ea214ad187df9d5350f682d9e6d19d426" # default netdata.conf for netdata configuration SRC_URI += "file://netdata.conf" @@ -41,10 +41,10 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable" USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" -PACKAGECONFIG ??= "https" -PACKAGECONFIG[cloud] = "--enable-cloud, --disable-cloud, json-c" -PACKAGECONFIG[compression] = "--enable-compression, --disable-compression, lz4" -PACKAGECONFIG[https] = "--enable-https, --disable-https, openssl" +PACKAGECONFIG ??= "openssl" +PACKAGECONFIG[cloud] = "--enable-cloud, --disable-cloud," +PACKAGECONFIG[lz4] = "--enable-lz4, --disable-lz4, lz4" +PACKAGECONFIG[openssl] = "--enable-openssl, --disable-openssl, openssl" # ebpf doesn't compile (or detect) the cross compilation well EXTRA_OECONF += "--disable-ebpf" diff --git a/meta-openembedded/meta-xfce/README.md b/meta-openembedded/meta-xfce/README.md index 3d6158628f..cd65970a59 100644 --- a/meta-openembedded/meta-xfce/README.md +++ b/meta-openembedded/meta-xfce/README.md @@ -1,10 +1,10 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: nanbield URI: git://git.openembedded.org/meta-openembedded -branch: master +branch: nanbield meta-xfce depends on meta-oe, meta-gnome and meta-multimedia in this repository. @@ -13,10 +13,9 @@ this to local.conf: BBMASK = "meta-xfce/recipes-multimedia" -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce][nanbield]' in the subject' When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-xfce][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-xfce][nanbield][PATCH' -Layer maintainer: Kai Kang <kai.kang@windriver.com> -Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> +Layer maintainer: Armin Kuster <akuster808@gmail.com> |